diff --git a/manifest.webapp b/manifest.webapp index 7364ccf1054867c79572f38d7b860c419dc3cb09..82c13c9197505acfb1838db9f2eb81db73378cbc 100644 --- a/manifest.webapp +++ b/manifest.webapp @@ -3,9 +3,17 @@ "slug": "ecolyo", "icon": "icon.svg", "categories": [], - "version": "0.1.1", + "version": "0.1.2", "licence": "AGPL-3.0", - "editor": "Grand Lyon", + "editor": "Métropole de Lyon", + "default_locale": "fr", + "locales": { + "fr": { + "short_description": "Ecolyo est le service proposé par la Métropole de Lyon pour suivre et comprendre la consommation énergétique globale de votre foyer.", + "long_description": "Ecolyo est le service proposé par la Métropole de Lyon pour suivre et comprendre la consommation énergétique globale de votre foyer afin de vous accompagner dans la gestion de votre consommation quotidienne de façon ludique en vous lançant des défis personnalisés." + } + }, + "langs": ["fr"], "routes": { "/": { "folder": "/", @@ -15,90 +23,46 @@ }, "permissions": { "apps": { - "description": "Required by the cozy-bar to display the icons of the apps", + "description": "Requis par cozy-bar pour afficher les icônes de l'application", "type": "io.cozy.apps", "verbs": ["GET"] }, "settings": { - "description": "Required by the cozy-bar display Claudy and to know which applications are coming soon", + "description": "Requis par cozy-bar pour afficher les paramètres Cozy", "type": "io.cozy.settings", "verbs": ["GET"] }, - "enedisMinute": { - "description": "Auth to get daily data from enedis connector", - "type": "io.enedis.minute" - }, - "enedisDay": { - "description": "Auth to get daily data from enedis connector", - "type": "io.enedis.day" - }, - "enedisMonth": { - "description": "Auth to get monthly data from enedis connector", - "type": "io.enedis.month" - }, - "enedisYear": { - "description": "Auth to get data yearly from enedis connector", - "type": "io.enedis.year" - }, - "grdfHour": { - "description": "Auth to get daily data from enedis connector", - "type": "io.grdf.hour" - }, - "grdfDay": { - "description": "Auth to get daily data from enedis connector", - "type": "io.grdf.day" + "enedis": { + "description": "Utilisé pour partager vos données Enedis", + "type": "io.enedis.*" }, - "grdfYear": { - "description": "Auth to get monthly data from grdf connector", - "type": "io.grdf.year" + "grdf": { + "description": "Utilisé pour partager vos données GRDF", + "type": "io.grdf.*" }, - "grdfMonth": { - "description": "Auth to get daily data from grdf connector", - "type": "io.grdf.month" - }, - "eglDay": { - "description": "Auth to get data from egl connector", - "type": "io.egl.day" - }, - "egl_Month": { - "description": "Auth to get daily data from egl connector", - "type": "io.egl.month" - }, - "egl_Year": { - "description": "Auth to get monthly data from egl connector", - "type": "io.egl.year" + "egl": { + "description": "Utilisé pour partager vos données EGL", + "type": "io.egl.*" }, "accounts": { - "description": "accounts", + "description": "Utilisé pour obtenir les données du compte", "type": "io.cozy.accounts" }, "konnectors": { - "description": "konnectors", + "description": "Utilisé pour gérer les connecteurs", "type": "io.cozy.konnectors" }, "triggers": { - "description": "triggers", + "description": "Utilisé pour récupérer de la donnée depuis vos comptes énergétiques", "type": "io.cozy.triggers" }, "jobs": { - "description": "jobs", + "description": "Utilisé pour récupérer de la donnée depuis vos comptes énergétiques", "type": "io.cozy.jobs" }, - "challengetype": { - "description": "challengetype", - "type": "io.ecolyo.challengetype" - }, - "userchallenge": { - "description": "userchallenge", - "type": "io.ecolyo.userchallenge" - }, - "ecogesture": { - "description": "ecogesture", - "type": "io.ecolyo.ecogesture" - }, - "userprofile": { - "description": "userprofile", - "type": "io.ecolyo.userprofile" + "ecolyo": { + "description": "Utilisé pour partager vos données Ecolyo.", + "type": "io.ecolyo.*" } } } diff --git a/package.json b/package.json index 7f5b29f9195561db58952dc7df269e9ea54cf51a..58a9068f8429cb305238c3bf3804f76e18d6d5f8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ecolyo", - "version": "0.1.1", + "version": "0.1.2", "scripts": { "tx": "tx pull --all || true", "lint": "yarn lint:js && yarn lint:styles", diff --git a/src/assets/icons/badges/CHA00000001-1.svg b/src/assets/icons/badges/CHA00000001-1.svg deleted file mode 100644 index 8a7d8c6569f99b3768c4ef9c72fd1375005d9858..0000000000000000000000000000000000000000 --- a/src/assets/icons/badges/CHA00000001-1.svg +++ /dev/null @@ -1 +0,0 @@ -<svg width="188" height="170" fill="none" xmlns="http://www.w3.org/2000/svg"><g opacity=".25" filter="url(#filter0_f)"><path d="M167.866 77.932a13.997 13.997 0 010 14.136l-30.812 52.684a14 14 0 01-12.085 6.932H63.031a14 14 0 01-12.085-6.932L20.134 92.068a14 14 0 010-14.136l30.812-52.684a14 14 0 0112.085-6.932h61.938a14 14 0 0112.085 6.932l30.812 52.684z" fill="#FFE7AE"/></g><path d="M164.804 76a18.002 18.002 0 010 18l-27.608 47.818a18 18 0 01-15.588 9H66.392a18 18 0 01-15.588-9L23.196 94a18 18 0 010-18l27.608-47.818a18 18 0 0115.588-9h55.216a18 18 0 0115.588 9L164.804 76z" fill="#000"/><path d="M75.44 101.621v1.371c0 3.77 3.075 6.855 6.834 6.855h23.918c3.759 0 6.834-3.085 6.834-6.855v-1.371l-18.793-6.34-18.793 6.34z" fill="url(#paint0_linear)"/><path d="M60.576 37.706c.684-2.228 2.392-4.113 4.442-5.14l-6.15-2.914c-.171-.171-.513-.171-.684-.171-.683 0-1.196.514-1.537 1.028l-2.905 6.169c-.17.343-.17.857 0 1.2.171.513.513.856.855 1.027l5.125 2.4.854-3.6z" fill="url(#paint1_linear)"/><path d="M75.44 78.66v21.077l17.939-5.998v-5.312l-17.94-9.767z" fill="url(#paint2_linear)"/><path d="M127.206 37.706l.342.857c0 .171.171.171.171.342l.683 2.4 4.955-2.228c.341-.172.683-.514.854-1.028.171-.514.171-1.029 0-1.371l-2.905-6.169c-.341-.686-.854-1.028-1.537-1.028-.171 0-.513 0-.684.171l-6.321 2.913c2.05 1.028 3.759 2.913 4.442 5.14z" fill="url(#paint3_linear)"/><path d="M95.087 93.74l17.939 5.997V79.002l-17.939 10.11v4.626z" fill="url(#paint4_linear)"/><path d="M132.844 62.724l-5.809-19.192-1.366-4.627c-1.196-3.255-4.784-5.312-8.201-4.284L95.941 40.62a6.999 6.999 0 01-3.758 0L70.656 34.62c-3.588-1.028-7.346 1.029-8.372 4.627L55.28 62.724c-.854 2.57 0 5.483 2.05 7.197l3.075 2.741L73.56 84.143V77.46l11.618-23.818-15.547 2.57c-1.538.343-3.246-.342-4.1-1.542l-2.734-3.941c-.854-1.2.17-2.57 1.709-2.57h7.175c1.709 0 3.417.342 4.955 1.028l10.592 4.112L75.44 77.803l16.913 4.113c1.538.342 3.247.342 4.784 0l15.718-3.942L102.433 53.3l10.593-4.112c1.538-.686 3.246-1.028 4.954-1.028h7.005c1.538 0 2.563 1.37 1.709 2.57l-2.734 3.941c-.854 1.2-2.392 1.885-4.1 1.542l-15.376-2.57 10.25 24.675v5.826l16.06-14.222c2.05-1.885 2.904-4.627 2.05-7.197z" fill="url(#paint5_linear)"/><path d="M166.672 76.432L137.97 26.568A17.137 17.137 0 00123.106 18H65.702a17.135 17.135 0 00-14.864 8.568L22.306 76.432a17.067 17.067 0 000 17.136l28.703 49.864A17.136 17.136 0 0065.872 152h57.405c6.15 0 11.788-3.256 14.863-8.568l28.703-49.864c2.904-5.312 2.904-11.824-.171-17.136zm-1.367 11.652c-.342 1.371-.854 2.742-1.538 3.942l-.512.856-42.37-11.823-2.563 2.228 43.566 11.994-2.221 4.113-41.174-16.108-2.05 1.885 41.857 16.622-2.221 3.941-39.636-20.563-1.538 1.371v2.056l39.808 19.364-2.392 4.112-37.416-23.475v1.713l36.22 23.99-2.221 3.941-33.999-28.102v3.77l32.632 26.56-2.392 4.112-30.24-30.672v4.626l28.873 28.445-2.562 4.455-26.482-32.9v4.969l24.944 30.33-2.904 5.141-22.21-34.785c-.171 1.199-.684 2.57-1.367 3.598l22.21 33.757-.342.686c-.854 1.542-2.05 2.913-3.588 4.112l-18.964-37.698c-.683.857-1.366 1.542-2.391 2.056l19.305 37.013c-1.708.857-3.588 1.371-5.638 1.542l-14.351-38.383c-1.025.514-2.05.685-3.075.685l14.18 37.356h-5.809l-9.738-37.356h-3.246l10.422 37.356h-5.467l-5.638-37.356h-3.246l6.321 37.356h-5.126l-1.708-37.356h-3.075l2.22 37.356h-5.125l2.221-37.356h-3.075l-1.708 37.356H83.64l6.322-37.356h-3.246l-5.638 37.356h-5.126l10.251-37.356h-3.246l-9.738 37.356h-5.81l14.523-37.356c-1.025 0-2.05-.343-3.075-.685l-14.18 38.041c-2.05-.172-3.93-.686-5.639-1.543l19.135-36.841c-.854-.514-1.708-1.2-2.392-2.056l-18.793 37.698c-1.367-1.028-2.562-2.399-3.587-3.941l-.342-.686 22.039-33.414c-.683-1.028-1.196-2.228-1.367-3.598l-21.868 34.271-2.904-4.97 24.772-30.33v-4.969l-26.14 32.9-2.733-4.626 28.873-28.445v-3.941l-30.24 30.158-2.391-4.112L73.73 94.596v-3.427l-33.827 26.903-2.221-3.942 36.22-23.132v-2.914l-37.587 23.819-2.392-3.941 39.807-19.878v-1.713L72.194 85l-39.637 20.563-2.22-3.942 41.857-16.792-1.88-1.714L28.97 99.223l-2.391-4.113 43.566-12.166-2.563-2.228-42.37 11.995-.342-.685c-.683-1.2-1.196-2.57-1.538-3.942l44.25-7.197-2.563-2.227-42.028 6.854c0-1.713.17-3.427.854-4.97l41.174-1.884-3.588-3.084-36.22 2.056 2.563-4.456 33.316 2.057-3.759-3.256-28.36-.857 2.562-4.455 23.577 3.256c-.683-.686-1.025-1.543-1.367-2.4L32.9 64.267l1.88-3.427 18.792 5.14a9.347 9.347 0 010-3.084L36.145 58.44l1.708-3.084 15.89 6.168.853-2.913-15.376-5.826 1.709-2.913 14.01 7.368 1.024-2.913-13.668-6.854 1.709-2.913 12.472 8.225.854-3.084-11.788-7.711 1.708-2.913 10.763 8.91.855-3.084-10.251-8.225 1.88-3.085 2.05 2.057 1.195-2.742-1.708-1.714 1.708-3.084c0-.171.171-.171.171-.343l1.196 1.543s.17.17.17.342c.342-1.028 1.197-1.713 2.222-1.885l-1.88-2.227c.855-1.028 1.88-1.714 3.076-2.4l3.93 6.17 4.783 2.227-6.15-9.424c1.195-.343 2.562-.686 3.929-.686l5.809 11.48h.341l3.588 1.03-6.492-12.51h3.759l4.954 13.023 3.588 1.028-5.467-14.05h3.246l3.759 14.564 3.416 1.029-4.441-15.594h3.075l2.562 16.108 3.246.856-2.904-16.964h2.904l.855 17.136 2.05.514c.342.171.683.171 1.025.171l-1.025-17.82h2.904l-1.196 17.82c.342 0 .684 0 1.025-.171l2.05-.514.855-17.136h2.904l-2.904 16.964 3.246-.856 2.392-16.108h3.075l-4.442 15.765 3.417-1.028 3.929-14.737h3.246l-5.637 14.394 3.587-1.028 5.126-13.366h3.588l-6.664 12.852 3.588-1.028h.342l5.98-11.824c1.366 0 2.733.343 3.929.686l-6.321 9.424 4.954-2.399 3.759-5.997c1.196.685 2.221 1.37 3.075 2.399l-2.05 2.399h-.171c.854.342 1.709 1.028 2.05 1.884v.172l1.88-2.4c.17.172.17.344.341.515l1.709 2.913-2.221 2.228 1.196 2.741 2.392-2.399 1.879 3.085-10.422 8.396.854 3.085 10.935-9.082 1.708 2.913-11.959 7.882 1.025 3.084 12.472-8.225 1.708 2.913-13.668 6.855.855 2.913 14.18-7.368 1.708 2.913-15.547 5.997.855 2.913 16.059-6.34 1.709 3.084-17.427 4.627a9.337 9.337 0 010 3.084l18.793-5.14 1.88 3.427-20.844 3.256c-.341 1.199-1.195 2.398-2.221 3.427l24.602-4.113 2.221 3.941-28.018 1.2-3.93 3.427 33.486-2.056 2.563 4.455-36.22-2.57-3.417 3.084 41.174 1.885c.513 1.542.855 3.255.855 4.97l-42.029-6.855-2.733 2.399 44.249 7.025z" fill="url(#paint6_linear)"/><defs><linearGradient id="paint0_linear" x1="125.425" y1="35.622" x2="49.186" y2="135.393" gradientUnits="userSpaceOnUse"><stop stop-color="#F2AA32"/><stop offset=".068" stop-color="#B3653D"/><stop offset=".172" stop-color="#F8B116"/><stop offset=".344" stop-color="#EBB12A"/><stop offset=".542" stop-color="#9E5810"/><stop offset=".677" stop-color="#E2AF0A"/><stop offset=".797" stop-color="#FBE05B"/><stop offset=".885" stop-color="#DC972D"/><stop offset="1" stop-color="#EBC50B"/></linearGradient><linearGradient id="paint1_linear" x1="125.425" y1="35.622" x2="49.186" y2="135.393" gradientUnits="userSpaceOnUse"><stop stop-color="#F2AA32"/><stop offset=".068" stop-color="#B3653D"/><stop offset=".172" stop-color="#F8B116"/><stop offset=".344" stop-color="#EBB12A"/><stop offset=".542" stop-color="#9E5810"/><stop offset=".677" stop-color="#E2AF0A"/><stop offset=".797" stop-color="#FBE05B"/><stop offset=".885" stop-color="#DC972D"/><stop offset="1" stop-color="#EBC50B"/></linearGradient><linearGradient id="paint2_linear" x1="125.425" y1="35.622" x2="49.186" y2="135.393" gradientUnits="userSpaceOnUse"><stop stop-color="#F2AA32"/><stop offset=".068" stop-color="#B3653D"/><stop offset=".172" stop-color="#F8B116"/><stop offset=".344" stop-color="#EBB12A"/><stop offset=".542" stop-color="#9E5810"/><stop offset=".677" stop-color="#E2AF0A"/><stop offset=".797" stop-color="#FBE05B"/><stop offset=".885" stop-color="#DC972D"/><stop offset="1" stop-color="#EBC50B"/></linearGradient><linearGradient id="paint3_linear" x1="125.425" y1="35.622" x2="49.186" y2="135.393" gradientUnits="userSpaceOnUse"><stop stop-color="#F2AA32"/><stop offset=".068" stop-color="#B3653D"/><stop offset=".172" stop-color="#F8B116"/><stop offset=".344" stop-color="#EBB12A"/><stop offset=".542" stop-color="#9E5810"/><stop offset=".677" stop-color="#E2AF0A"/><stop offset=".797" stop-color="#FBE05B"/><stop offset=".885" stop-color="#DC972D"/><stop offset="1" stop-color="#EBC50B"/></linearGradient><linearGradient id="paint4_linear" x1="125.425" y1="35.622" x2="49.186" y2="135.393" gradientUnits="userSpaceOnUse"><stop stop-color="#F2AA32"/><stop offset=".068" stop-color="#B3653D"/><stop offset=".172" stop-color="#F8B116"/><stop offset=".344" stop-color="#EBB12A"/><stop offset=".542" stop-color="#9E5810"/><stop offset=".677" stop-color="#E2AF0A"/><stop offset=".797" stop-color="#FBE05B"/><stop offset=".885" stop-color="#DC972D"/><stop offset="1" stop-color="#EBC50B"/></linearGradient><linearGradient id="paint5_linear" x1="125.425" y1="35.622" x2="49.186" y2="135.393" gradientUnits="userSpaceOnUse"><stop stop-color="#F2AA32"/><stop offset=".068" stop-color="#B3653D"/><stop offset=".172" stop-color="#F8B116"/><stop offset=".344" stop-color="#EBB12A"/><stop offset=".542" stop-color="#9E5810"/><stop offset=".677" stop-color="#E2AF0A"/><stop offset=".797" stop-color="#FBE05B"/><stop offset=".885" stop-color="#DC972D"/><stop offset="1" stop-color="#EBC50B"/></linearGradient><linearGradient id="paint6_linear" x1="125.425" y1="35.622" x2="49.186" y2="135.393" gradientUnits="userSpaceOnUse"><stop stop-color="#F2AA32"/><stop offset=".068" stop-color="#B3653D"/><stop offset=".172" stop-color="#F8B116"/><stop offset=".344" stop-color="#EBB12A"/><stop offset=".542" stop-color="#9E5810"/><stop offset=".677" stop-color="#E2AF0A"/><stop offset=".797" stop-color="#FBE05B"/><stop offset=".885" stop-color="#DC972D"/><stop offset="1" stop-color="#EBC50B"/></linearGradient><filter id="filter0_f" x=".219" y=".316" width="187.563" height="169.368" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB"><feFlood flood-opacity="0" result="BackgroundImageFix"/><feBlend in="SourceGraphic" in2="BackgroundImageFix" result="shape"/><feGaussianBlur stdDeviation="9" result="effect1_foregroundBlur"/></filter></defs></svg> \ No newline at end of file diff --git a/src/assets/icons/badges/CHA00000002-0.svg b/src/assets/icons/badges/CHA00000002-0.svg deleted file mode 100644 index d868020a3bdee47d5d0b8ab643c95bb5c763623f..0000000000000000000000000000000000000000 --- a/src/assets/icons/badges/CHA00000002-0.svg +++ /dev/null @@ -1,126 +0,0 @@ -<svg width="188" height="170" viewBox="0 0 188 170" fill="none" xmlns="http://www.w3.org/2000/svg"> -<g clip-path="url(#clip0)"> -<g opacity="0.65" filter="url(#filter0_f)"> -<path d="M91.5509 143.947C93.1658 140.902 93.1068 136.754 92.6074 133.343C91.9338 128.744 93.6117 123.01 97.4947 118.089C97.5423 118.029 97.59 117.97 97.638 117.911C103.151 111.114 111.13 101.184 116.639 94.3842C116.686 94.3265 116.733 94.2688 116.78 94.2113C119.768 90.5324 123.507 87.9813 127.185 86.8416C132.291 85.2595 139.152 83.4735 143.864 80.9501C148.979 78.3343 154.771 77.665 158.735 79.2021C158.814 79.2326 158.903 79.2062 158.952 79.1372C158.988 79.086 158.995 79.0199 158.971 78.9623C158.065 76.8603 156.318 74.737 154.764 72.7511C153.417 71.0484 151.87 69.2041 151.494 68.038C151.148 67.0426 151.425 65.5885 151.703 64.1344C152.147 61.597 152.674 58.518 150.892 55.3075C149.599 52.8923 147.198 51.1946 145.397 49.9213C144.397 49.2139 143.597 48.648 142.596 47.9406C141.625 47.404 140.825 46.8381 140.024 46.2722C138.824 45.4233 137.994 44.6866 137.365 44.0914C136.277 42.8717 135.442 41.081 134.437 39.3196C133.055 36.3921 131.445 33.1524 128.214 30.7179C125.013 28.4543 121.251 28.0449 118.03 27.7184C116.064 27.5284 114.097 27.3383 112.555 26.5481C111.784 26.1529 110.813 25.6163 109.613 24.7674C108.812 24.2015 108.012 23.6356 107.182 22.8989C106.353 22.1622 105.352 21.4548 104.381 20.9182C102.581 19.6449 100.038 18.1473 97.4715 17.5328C93.8509 16.9233 91.1234 18.4461 88.879 19.7102C87.4299 20.4862 86.3224 21.2037 85.2684 21.2087C84.0437 21.243 81.7892 20.3991 79.7349 19.6968C76.3679 18.5164 72.8008 17.1945 69.5853 17.922C66.3698 18.6495 64.472 20.9089 63.0279 22.7389C62.502 23.3556 61.976 23.9724 61.4678 24.4727C60.8585 25.0727 60.0676 25.45 59.2144 25.5064C58.3545 25.5632 57.2887 25.526 56.2897 25.4772C53.4694 25.4337 50.2782 25.278 47.7508 26.9422C45.3943 28.5771 44.2089 30.8902 43.1649 33.0031C42.5161 34.3451 42.0088 35.4869 41.2428 36.1458C40.6476 36.7753 39.34 37.3513 38.2032 37.8979C36.0709 38.7911 33.6265 39.9138 31.9287 42.3147C30.0895 44.9157 30.4168 47.8482 30.5148 50.4685C30.5491 51.6932 30.642 53.2595 30.3884 53.8305C30.1347 54.4014 28.8857 55.3189 27.7781 56.0363C25.7338 57.4419 23.4065 59.2476 22.6799 62.1852C21.7582 66.0352 28.8705 88.0212 32.1069 97.6626C32.4171 98.5907 32.7642 99.5449 33.1323 100.514C34.1072 103.08 34.3792 105.864 33.8256 108.553L32.0851 117.005C31.9028 117.766 32.0211 118.476 32.3562 119.075C32.8256 119.914 33.7693 120.325 34.6512 120.708L39.4316 122.784C42.2473 124.007 44.542 126.147 46.1735 128.747C48.4342 132.35 50.7192 135.244 53.0598 136.788C55.3232 138.389 59.0271 139.642 63.4263 140.601C66.3313 141.234 69.0488 142.587 71.1369 144.704L76.8419 150.487C77.4214 151.074 78.0347 151.684 78.8378 151.874C79.6209 152.059 80.4548 151.952 81.0748 151.496L89.0337 146.769C90.0837 146.145 90.9787 145.026 91.5509 143.947Z" fill="black"/> -</g> -<path d="M100.623 141.772C96.1578 137.264 97.0544 128.144 102.831 120.824C106.88 115.734 112.535 112.83 117.263 112.722C116.272 107.97 117.896 102.065 122.116 96.946C127.922 89.7968 136.568 86.9069 142.082 90.356C143.409 87.8429 145.819 85.4955 149.2 83.6848C154.372 81.0394 160.237 80.3848 164.205 81.9896L164.346 81.7895C163.453 79.6573 161.676 77.5008 160.1 75.4858C158.753 73.7831 157.206 71.9388 156.83 70.7727C156.484 69.7773 156.762 68.3232 157.039 66.8691C157.483 64.3317 158.01 61.2526 156.228 58.0422C154.935 55.627 152.534 53.9293 150.733 52.656C149.733 51.9486 148.933 51.3827 147.932 50.6753C146.961 50.1387 146.161 49.5727 145.36 49.0068C144.16 48.158 143.33 47.4213 142.701 46.8261C141.613 45.6063 140.778 43.8157 139.773 42.0543C138.391 39.1268 136.781 35.887 133.55 33.4526C130.349 31.189 126.587 30.7796 123.366 30.4531C121.4 30.2631 119.433 30.073 117.891 29.2827C117.12 28.8876 116.149 28.351 114.949 27.5021C114.148 26.9362 113.348 26.3703 112.518 25.6336C111.689 24.8969 110.688 24.1895 109.717 23.6529C107.917 22.3796 105.374 20.8819 102.808 20.2675C99.1869 19.658 96.4595 21.1808 94.2151 22.4449C92.766 23.2209 91.6584 23.9383 90.6045 23.9434C89.3797 23.9777 87.1253 23.1338 85.0709 22.4315C81.7039 21.2511 78.1368 19.9292 74.9214 20.6567C71.7059 21.3841 69.8081 23.6436 68.364 25.4736C67.4858 26.5033 66.6076 27.533 65.8123 28.021C64.9878 28.3383 63.2214 28.2897 61.6258 28.2119C58.8054 28.1683 55.6142 28.0126 53.0869 29.6769C50.7303 31.3118 49.5449 33.6248 48.501 35.7378C47.8522 37.0797 47.3449 38.2216 46.5789 38.8805C45.9837 39.51 44.676 40.0859 43.5392 40.6326C41.407 41.5258 38.9625 42.6484 37.2648 45.0494C35.4255 47.6504 35.7529 50.5829 35.8508 53.2032C35.8851 54.4279 35.978 55.9942 35.7244 56.5651C35.4707 57.1361 34.2217 58.0536 33.1142 58.771C31.0698 60.1766 28.7426 61.9823 28.0159 64.9199C27.0942 68.7699 34.2066 90.7559 37.4429 100.397C38.1654 102.559 39.0879 104.862 40.0105 107.165L37.4211 119.74C37.1139 121.023 37.6605 122.16 38.6609 122.867L49.1085 127.404C52.154 132.859 55.2238 137.43 58.3958 139.523C61.3969 141.645 71.2245 149.371 77.5534 150.394L83.0489 154.105C84.0493 154.812 85.4741 154.919 86.4109 154.231L95.9836 148.545C97.2519 145.69 98.7789 143.319 100.623 141.772Z" fill="url(#paint0_linear)"/> -<path d="M95.2871 139.037C90.8218 134.529 91.7184 125.409 97.4947 118.089C101.544 112.999 107.199 110.095 111.927 109.987C110.936 105.235 112.56 99.3305 116.78 94.2113C122.586 87.0621 131.232 84.1723 136.746 87.6213C138.073 85.1082 140.483 82.7609 143.864 80.9501C149.036 78.3048 154.901 77.6501 158.869 79.2549L159.01 79.0549C158.117 76.9227 156.34 74.7662 154.764 72.7511C153.417 71.0484 151.87 69.2041 151.494 68.038C151.148 67.0426 151.425 65.5885 151.703 64.1344C152.147 61.597 152.674 58.518 150.892 55.3075C149.599 52.8923 147.198 51.1946 145.397 49.9213C144.397 49.2139 143.597 48.648 142.596 47.9406C141.625 47.404 140.825 46.8381 140.024 46.2722C138.824 45.4233 137.994 44.6866 137.365 44.0914C136.277 42.8717 135.442 41.081 134.437 39.3196C133.055 36.3921 131.445 33.1524 128.214 30.7179C125.013 28.4543 121.251 28.0449 118.03 27.7184C116.064 27.5284 114.097 27.3383 112.555 26.5481C111.784 26.1529 110.813 25.6163 109.613 24.7674C108.812 24.2015 108.012 23.6356 107.182 22.8989C106.353 22.1622 105.352 21.4548 104.381 20.9182C102.581 19.6449 100.038 18.1473 97.4715 17.5328C93.8509 16.9233 91.1234 18.4461 88.879 19.7102C87.4299 20.4862 86.3224 21.2037 85.2684 21.2087C84.0437 21.243 81.7892 20.3991 79.7349 19.6968C76.3679 18.5164 72.8008 17.1945 69.5853 17.922C66.3698 18.6495 64.472 20.9089 63.0279 22.7389C62.1498 23.7686 61.2716 24.7983 60.4763 25.2864C59.6517 25.6036 57.8853 25.5551 56.2897 25.4772C53.4694 25.4337 50.2782 25.278 47.7508 26.9422C45.3943 28.5771 44.2089 30.8902 43.1649 33.0031C42.5161 34.3451 42.0088 35.4869 41.2428 36.1458C40.6476 36.7753 39.34 37.3513 38.2032 37.8979C36.0709 38.7911 33.6265 39.9138 31.9287 42.3147C30.0895 44.9157 30.4168 47.8482 30.5148 50.4685C30.5491 51.6932 30.642 53.2595 30.3884 53.8305C30.1347 54.4014 28.8857 55.3189 27.7781 56.0363C25.7338 57.4419 23.4065 59.2476 22.6799 62.1852C21.7582 66.0352 28.8705 88.0212 32.1069 97.6626C32.8294 99.8242 33.7519 102.127 34.6744 104.43L32.0851 117.005C31.7779 118.288 32.3245 119.425 33.3249 120.133L43.7725 124.669C46.818 130.124 49.8878 134.696 53.0598 136.788C56.0609 138.911 61.5945 140.423 67.9233 141.446L77.7129 151.37C78.7132 152.077 80.1381 152.184 81.0748 151.496L90.6476 145.81C91.9159 142.956 93.4429 140.584 95.2871 139.037Z" fill="#1B0800"/> -<path d="M137.446 120.041L135.369 118.573L123.279 126.122L125.458 128.182L134.037 128.536L137.446 120.041Z" fill="url(#paint1_linear)"/> -<path d="M149.875 121.559L148.49 120.58L144.066 123.164L145.643 125.403L150.483 125.105L149.875 121.559Z" fill="url(#paint2_linear)"/> -<path d="M151.494 109.722L149.788 107.581L141.346 110.854L143.93 115.278L150.717 112.288L151.494 109.722Z" fill="url(#paint3_linear)"/> -<path d="M74.8913 139.023C80.9907 139.735 87.7147 139.987 94.4094 140.069C93.0775 141.529 91.8335 143.5 90.7067 146.155L81.1339 151.841C80.1971 152.529 78.7723 152.421 77.7719 151.714L67.9823 141.791C61.6535 140.767 56.12 139.255 53.1188 137.133C49.9468 135.04 46.877 130.468 43.8315 125.013L33.3839 120.477C32.3835 119.769 31.8369 118.632 32.1441 117.349L34.7335 104.774C33.8109 102.471 32.8884 100.168 32.1659 98.0068C28.9296 88.3654 21.8172 66.3794 22.7389 62.5294C23.4656 59.5918 25.7928 57.7861 27.8372 56.3805C28.9447 55.6631 30.1937 54.7456 30.4474 54.1746C30.6678 53.6785 30.6265 52.4308 30.5894 51.3087C30.5838 51.1395 30.5783 50.9732 30.5738 50.8127C30.5649 50.5744 30.5541 50.3335 30.5432 50.0906C30.4343 47.6619 30.3159 45.0232 31.9878 42.6589C33.6855 40.2579 36.13 39.1353 38.2622 38.2421C38.3945 38.1785 38.5291 38.1144 38.6647 38.05L38.6661 38.0493C39.6947 37.5602 40.7762 37.0459 41.3019 36.4899C42.0031 35.8868 42.4876 34.8788 43.0622 33.6831C43.1153 33.5727 43.1691 33.4607 43.224 33.3473C44.2679 31.2343 45.4533 28.9213 47.8099 27.2864C50.1977 25.714 53.178 25.7662 55.8784 25.8135L55.8796 25.8135C56.037 25.8163 56.1935 25.819 56.3488 25.8214C57.9444 25.8992 59.7108 25.9478 60.5354 25.6305C61.3306 25.1425 62.2088 24.1128 63.087 23.0831C64.5311 21.2531 66.4289 18.9936 69.6444 18.2662C72.7452 17.5646 76.1731 18.7689 79.4331 19.9143L79.7939 20.0409C80.0437 20.1263 80.2964 20.2138 80.5499 20.3016C82.3813 20.9355 84.2516 21.583 85.3275 21.5528C86.2138 21.5486 87.138 21.0406 88.2715 20.4175C88.4857 20.2997 88.7077 20.1777 88.9381 20.0544C91.1825 18.7903 93.9099 17.2675 97.5306 17.877C100.097 18.4914 102.64 19.9891 104.44 21.2624C105.411 21.799 106.412 22.5064 107.241 23.2431C108.071 23.9798 108.871 24.5457 109.672 25.1116C110.872 25.9605 111.843 26.4971 112.614 26.8922C114.156 27.6825 116.123 27.8725 118.089 28.0626C121.31 28.3891 125.072 28.7985 128.273 31.0621C131.504 33.4965 133.114 36.7363 134.496 39.6638C134.745 40.1016 134.985 40.5412 135.22 40.9734C135.932 42.2801 136.606 43.519 137.424 44.4356C138.053 45.0308 138.883 45.7675 140.083 46.6163C140.884 47.1822 141.684 47.7482 142.655 48.2848L145.456 50.2655C147.257 51.5388 149.658 53.2365 150.951 55.6517C152.733 58.8621 152.206 61.9412 151.762 64.4786C151.485 65.9327 151.207 67.3868 151.553 68.3822C151.883 69.4065 153.117 70.9541 154.325 72.4694C154.493 72.6791 154.659 72.8883 154.823 73.0953C154.97 73.2832 155.119 73.4722 155.268 73.6624C156.723 75.5121 158.259 77.4657 159.069 79.399L158.928 79.5991C154.96 77.9943 149.095 78.6489 143.923 81.2943C140.542 83.1051 138.132 85.4524 136.805 87.9655C131.291 84.5165 122.645 87.4063 116.839 94.5555C113.81 98.4156 112.093 102.754 111.883 106.657L70.0685 125.259L147.986 67.0603C148.028 66.7895 148.034 66.5687 148.04 66.3479C148.046 66.1271 148.052 65.9063 148.093 65.6355L67.5504 122.878L133.984 45.9047C133.941 45.6547 133.822 45.5119 133.672 45.3308C133.617 45.2645 133.557 45.1931 133.496 45.1095L64.72 120.726L113.059 30.5079C112.809 30.5508 112.635 30.4865 112.414 30.4049C112.333 30.375 112.246 30.3429 112.146 30.3128L61.9189 118.746L89.0703 23.8994C88.9695 23.9534 88.8762 24.0061 88.7868 24.0565C88.4482 24.2476 88.1681 24.4058 87.7627 24.4753L58.8642 117.336L66.5126 24.605C66.0588 25.0345 65.4636 25.664 65.0392 26.2643L55.8387 116.097L47.6642 32.5855C47.204 33.0723 46.8809 33.7457 46.5754 34.3825C46.4858 34.5693 46.3976 34.753 46.308 34.9278L52.7011 115.229L34.3937 45.4106C33.9722 46.6131 34.061 48.1765 34.1498 49.7399C34.1854 50.3653 34.2209 50.9906 34.2238 51.5929L49.6514 114.873L27.262 61.2259C26.6375 61.6847 26.3839 62.2556 26.1595 62.9973C26.018 63.1974 26.0473 63.3682 26.0766 63.539L46.631 114.688L34.5954 93.7223C37.6852 102.51 41.2046 111.751 44.9433 119.197C45.0556 119.276 45.1234 119.419 45.2018 119.584C45.263 119.713 45.3307 119.855 45.4313 119.992C45.5607 120.234 45.6973 120.518 45.834 120.802C45.9706 121.086 46.1073 121.37 46.2366 121.612C46.5871 122.089 46.8379 122.583 47.0521 123.005C47.1183 123.136 47.181 123.259 47.2421 123.373C47.3567 123.529 47.4287 123.693 47.5007 123.856C47.5727 124.02 47.6447 124.183 47.7594 124.339C48.2768 125.305 48.7648 126.101 49.2529 126.896C51.2344 130.248 53.2402 132.717 55.241 134.131C57.2417 135.546 60.2379 136.614 64.0586 137.365C64.9711 137.56 66.0544 137.726 67.1376 137.892C67.3231 137.948 67.5512 137.997 67.7793 138.046C68.0074 138.094 68.2356 138.143 68.421 138.199C68.9919 138.453 69.7043 138.506 70.4167 138.56C71.0438 138.628 71.7135 138.689 72.3832 138.75C73.0529 138.811 73.7226 138.872 74.3497 138.94C74.4351 138.925 74.5278 138.953 74.6205 138.982C74.7132 139.01 74.8059 139.038 74.8913 139.023Z" fill="url(#paint4_angular)"/> -<path d="M111.957 110.161L111.752 108.965L106.863 111.211C108.683 110.547 110.391 110.254 111.957 110.161Z" fill="url(#paint5_angular)"/> -<path d="M97.5245 118.263C96.5048 119.492 95.6559 120.693 95.0072 122.035L72.0743 127.727L104.106 112.562C101.72 114.027 99.393 115.832 97.5245 118.263Z" fill="url(#paint6_angular)"/> -<path d="M74.1094 130.367L93.7681 125.06C93.2901 126.373 92.9535 127.485 92.8171 128.739L74.1094 130.367Z" fill="url(#paint7_angular)"/> -<path d="M93.6527 136.683C94.1407 137.478 94.8289 138.415 95.4877 139.181L76.4719 135.939L93.6527 136.683Z" fill="url(#paint8_angular)"/> -<path d="M92.5735 131.418L75.4613 133.124L92.8715 134.18C92.6957 133.155 92.5492 132.302 92.5735 131.418Z" fill="url(#paint9_angular)"/> -<path d="M143.626 113.506L141.346 110.855L146.158 106.987L149.907 107.561L149.232 110.719L143.626 113.506Z" fill="url(#paint10_angular)"/> -<path d="M135.369 118.573L126.082 120.166L123.28 126.123L131.014 126.621L135.369 118.573Z" fill="url(#paint11_angular)"/> -<path d="M146.126 120.986L148.49 120.581L149.099 124.127L145.553 124.735L144.066 123.165L146.126 120.986Z" fill="url(#paint12_angular)"/> -</g> -<defs> -<filter id="filter0_f" x="-1.76089" y="-13.2413" width="188.639" height="190.226" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB"> -<feFlood flood-opacity="0" result="BackgroundImageFix"/> -<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/> -<feGaussianBlur stdDeviation="9" result="effect1_foregroundBlur"/> -</filter> -<linearGradient id="paint0_linear" x1="163.68" y1="60.1748" x2="75.8817" y2="151.29" gradientUnits="userSpaceOnUse"> -<stop stop-color="#2B0C00"/> -<stop offset="0.135457" stop-color="#250A00"/> -<stop offset="0.148241" stop-color="#4A1702"/> -<stop offset="0.296875" stop-color="#2B0C00"/> -<stop offset="0.328519" stop-color="#4F1904"/> -<stop offset="0.547481" stop-color="#2B0C00"/> -<stop offset="0.563995" stop-color="#5A1B02"/> -<stop offset="0.67508" stop-color="#391102"/> -<stop offset="0.810829" stop-color="#1D0901"/> -<stop offset="0.836111" stop-color="#3C1404"/> -<stop offset="0.883729" stop-color="#3F1504"/> -<stop offset="0.906754" stop-color="#2B0C00"/> -</linearGradient> -<linearGradient id="paint1_linear" x1="124.867" y1="128.284" x2="137.058" y2="121.325" gradientUnits="userSpaceOnUse"> -<stop stop-color="#591B02"/> -<stop offset="0.429301" stop-color="#501802"/> -<stop offset="0.481041" stop-color="#1F0A01"/> -<stop offset="1" stop-color="#300F02"/> -</linearGradient> -<linearGradient id="paint2_linear" x1="145.454" y1="125.436" x2="150.714" y2="123.403" gradientUnits="userSpaceOnUse"> -<stop stop-color="#591B02"/> -<stop offset="0.585609" stop-color="#501802"/> -<stop offset="0.721729" stop-color="#1F0A01"/> -<stop offset="1" stop-color="#300F02"/> -</linearGradient> -<linearGradient id="paint3_linear" x1="144.677" y1="113.876" x2="152.807" y2="110.223" gradientUnits="userSpaceOnUse"> -<stop stop-color="#591B02"/> -<stop offset="0.585609" stop-color="#501802"/> -<stop offset="0.721729" stop-color="#1F0A01"/> -<stop offset="1" stop-color="#300F02"/> -</linearGradient> -<radialGradient id="paint4_angular" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(63.5347 125.422) rotate(19.2493) scale(95.2862 96.0495)"> -<stop offset="0.638609" stop-color="#A66340"/> -<stop offset="0.697633" stop-color="#AE5F38"/> -<stop offset="0.751458" stop-color="#A7511C"/> -<stop offset="0.806819" stop-color="#A4573A"/> -<stop offset="0.858755" stop-color="#9E4E24"/> -</radialGradient> -<radialGradient id="paint5_angular" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(63.5347 125.422) rotate(19.2493) scale(95.2862 96.0495)"> -<stop offset="0.638609" stop-color="#A66340"/> -<stop offset="0.697633" stop-color="#AE5F38"/> -<stop offset="0.751458" stop-color="#A7511C"/> -<stop offset="0.806819" stop-color="#A4573A"/> -<stop offset="0.858755" stop-color="#9E4E24"/> -</radialGradient> -<radialGradient id="paint6_angular" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(63.5347 125.422) rotate(19.2493) scale(95.2862 96.0495)"> -<stop offset="0.638609" stop-color="#A66340"/> -<stop offset="0.697633" stop-color="#AE5F38"/> -<stop offset="0.751458" stop-color="#A7511C"/> -<stop offset="0.806819" stop-color="#A4573A"/> -<stop offset="0.858755" stop-color="#9E4E24"/> -</radialGradient> -<radialGradient id="paint7_angular" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(63.5347 125.422) rotate(19.2493) scale(95.2862 96.0495)"> -<stop offset="0.638609" stop-color="#A66340"/> -<stop offset="0.697633" stop-color="#AE5F38"/> -<stop offset="0.751458" stop-color="#A7511C"/> -<stop offset="0.806819" stop-color="#A4573A"/> -<stop offset="0.858755" stop-color="#9E4E24"/> -</radialGradient> -<radialGradient id="paint8_angular" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(63.5347 125.422) rotate(19.2493) scale(95.2862 96.0495)"> -<stop offset="0.638609" stop-color="#A66340"/> -<stop offset="0.697633" stop-color="#AE5F38"/> -<stop offset="0.751458" stop-color="#A7511C"/> -<stop offset="0.806819" stop-color="#A4573A"/> -<stop offset="0.858755" stop-color="#9E4E24"/> -</radialGradient> -<radialGradient id="paint9_angular" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(63.5347 125.422) rotate(19.2493) scale(95.2862 96.0495)"> -<stop offset="0.638609" stop-color="#A66340"/> -<stop offset="0.697633" stop-color="#AE5F38"/> -<stop offset="0.751458" stop-color="#A7511C"/> -<stop offset="0.806819" stop-color="#A4573A"/> -<stop offset="0.858755" stop-color="#9E4E24"/> -</radialGradient> -<radialGradient id="paint10_angular" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(63.5347 125.422) rotate(19.2493) scale(95.2862 96.0495)"> -<stop offset="0.638609" stop-color="#A66340"/> -<stop offset="0.697633" stop-color="#AE5F38"/> -<stop offset="0.751458" stop-color="#A7511C"/> -<stop offset="0.806819" stop-color="#A4573A"/> -<stop offset="0.858755" stop-color="#9E4E24"/> -</radialGradient> -<radialGradient id="paint11_angular" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(63.5347 125.422) rotate(19.2493) scale(95.2862 96.0495)"> -<stop offset="0.638609" stop-color="#A66340"/> -<stop offset="0.697633" stop-color="#AE5F38"/> -<stop offset="0.751458" stop-color="#A7511C"/> -<stop offset="0.806819" stop-color="#A4573A"/> -<stop offset="0.858755" stop-color="#9E4E24"/> -</radialGradient> -<radialGradient id="paint12_angular" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(63.5347 125.422) rotate(19.2493) scale(95.2862 96.0495)"> -<stop offset="0.638609" stop-color="#A66340"/> -<stop offset="0.697633" stop-color="#AE5F38"/> -<stop offset="0.751458" stop-color="#A7511C"/> -<stop offset="0.806819" stop-color="#A4573A"/> -<stop offset="0.858755" stop-color="#9E4E24"/> -</radialGradient> -<clipPath id="clip0"> -<path d="M0 0H188V170H0V0Z" fill="white"/> -</clipPath> -</defs> -</svg> diff --git a/src/assets/icons/badges/CHA00000002-1.svg b/src/assets/icons/badges/CHA00000002-1.svg deleted file mode 100644 index e1f42e6b2ef64acbb7e112fc90f7807319ced926..0000000000000000000000000000000000000000 --- a/src/assets/icons/badges/CHA00000002-1.svg +++ /dev/null @@ -1,28 +0,0 @@ -<svg width="188" height="170" viewBox="0 0 188 170" fill="none" xmlns="http://www.w3.org/2000/svg"> -<g clip-path="url(#clip0)"> -<g opacity="0.65" filter="url(#filter0_f)"> -<path d="M147.013 130.843C149.508 129.976 152.591 128.867 154.264 126.385C155.838 124.048 156.047 121.216 156.205 118.775C156.31 117.359 156.316 116.089 156.662 115.26C157.008 114.432 157.941 113.362 159.02 112.39C160.591 110.688 162.505 108.793 163.105 106.011C163.803 103.084 162.548 99.9035 161.535 97.31C160.859 95.7927 160.281 94.1292 160.236 93.2499C160.191 92.3705 160.978 91.2021 161.62 89.9353C162.851 87.7922 164.378 85.211 163.856 81.8872C163.335 78.5635 160.906 75.8654 158.429 72.9229C156.972 71.3041 155.467 69.4408 154.984 68.2663C154.647 67.1901 154.752 65.7742 155.101 64.3107C155.504 61.8217 156.008 58.5517 154.119 55.3679C152.763 52.9681 150.28 51.2954 148.381 50.0164C147.359 49.3276 146.482 48.7373 145.46 48.0486C144.584 47.4582 143.707 46.8679 142.831 46.2776C142.337 45.945 141.87 45.6299 141.465 45.3253C140.551 44.6369 139.83 43.7123 139.178 42.7711C138.485 41.7691 137.828 40.5717 137.151 39.2657C135.309 36.3263 133.664 33.0948 130.305 30.8318C126.946 28.5688 123.333 28.2583 119.964 27.9001C117.914 27.7925 115.961 27.5389 114.304 26.8471C113.475 26.5012 112.5 26.0569 111.332 25.2698C110.456 24.6794 109.579 24.0891 108.703 23.4988C107.827 22.9084 106.805 22.2197 105.782 21.531C103.884 20.2519 101.302 18.7253 98.6673 18.2242C94.8608 17.5708 92.2642 19.2189 90.0104 20.6732C88.6391 21.4481 87.5122 22.1752 86.3884 22.2675C85.1186 22.2614 82.8264 21.5665 80.7786 20.824C77.2673 19.7325 73.7083 18.3965 70.4322 19.1621C67.1561 19.9278 65.3374 22.3122 63.8139 24.2585C62.8807 25.3285 62.0936 26.4969 61.2619 26.786C60.4302 27.075 58.6714 27.1642 57.0111 27.1073C54.0809 27.0443 50.8079 27.175 48.3573 28.9214C46.0052 30.5219 44.9675 33.0078 43.9805 35.1032C43.3394 36.37 42.8444 37.7352 42.2064 38.367C41.5684 38.9989 40.2955 39.6277 39.1209 40.1104C36.9179 41.1743 34.4705 42.2858 32.7978 44.7686C31.0268 47.3975 31.2559 50.5245 31.6341 53.115C31.7264 54.2388 31.8155 55.9975 31.6664 56.5341C31.4189 57.2166 30.1936 58.0899 29.2128 58.9154C27.2035 60.3221 24.8006 62.313 24.1027 65.2402C23.0588 68.9959 30.815 91.2076 34.4801 100.896C34.8537 101.922 35.2273 102.948 35.6148 103.984C36.5397 106.456 36.845 109.126 36.3937 111.726L34.8738 120.484C34.7132 121.328 34.8539 122.114 35.2833 122.777C35.7923 123.562 36.71 123.943 37.5749 124.301L42.5286 126.351C45.3645 127.525 47.6918 129.628 49.3925 132.183C51.8076 135.812 54.2197 138.612 56.6106 140.223C59.0203 141.846 62.6958 143.009 67.1217 143.811C70.128 144.356 72.9715 145.643 75.1733 147.762L81.2102 153.57C81.7932 154.131 82.4075 154.711 83.1958 154.893C84.0068 155.08 84.8943 154.967 85.6514 154.479L97.8121 146.729C98.8607 146.06 100.08 145.708 101.323 145.714C108.26 145.504 134.981 144.607 138.558 142.133C141.107 140.241 141.853 137.558 142.547 135.266C142.71 134.766 142.848 134.249 142.992 133.779C143.327 132.685 144.176 131.856 145.253 131.467C145.796 131.271 146.417 131.066 147.013 130.843Z" fill="black"/> -</g> -<path d="M147.013 130.843C149.508 129.976 152.591 128.867 154.264 126.385C155.838 124.048 156.047 121.216 156.205 118.775C156.31 117.359 156.316 116.089 156.662 115.26C157.008 114.432 157.941 113.362 159.02 112.39C160.591 110.688 162.505 108.793 163.105 106.011C163.803 103.084 162.548 99.9035 161.535 97.31C160.859 95.7927 160.281 94.1292 160.236 93.2499C160.191 92.3705 160.978 91.2021 161.62 89.9353C162.851 87.7922 164.378 85.211 163.856 81.8872C163.335 78.5635 160.906 75.8654 158.429 72.9229C156.972 71.3041 155.467 69.4408 154.984 68.2663C154.647 67.1901 154.752 65.7742 155.101 64.3107C155.504 61.8217 156.008 58.5517 154.119 55.3679C152.763 52.9681 150.28 51.2954 148.381 50.0164C147.359 49.3276 146.482 48.7373 145.46 48.0486C144.584 47.4582 143.707 46.8679 142.831 46.2776C141.663 45.4904 140.64 44.8017 140.253 44.116C139.135 42.9384 138.167 41.2243 137.151 39.2657C135.309 36.3263 133.664 33.0948 130.305 30.8318C126.946 28.5688 123.333 28.2583 119.964 27.9001C117.914 27.7925 115.961 27.5389 114.304 26.8471C113.475 26.5012 112.5 26.0569 111.332 25.2698C110.456 24.6794 109.579 24.0891 108.703 23.4988C107.827 22.9084 106.805 22.2197 105.782 21.531C103.884 20.2519 101.302 18.7253 98.6673 18.2242C94.8608 17.5708 92.2642 19.2189 90.0104 20.6732C88.6391 21.4481 87.5122 22.1752 86.3884 22.2675C85.1186 22.2614 82.8264 21.5665 80.7786 20.824C77.2673 19.7325 73.7083 18.3965 70.4322 19.1621C67.1561 19.9278 65.3374 22.3122 63.8139 24.2585C62.8807 25.3285 62.0936 26.4969 61.2619 26.786C60.4302 27.075 58.6714 27.1642 57.0111 27.1073C54.0809 27.0443 50.8079 27.175 48.3573 28.9214C46.0052 30.5219 44.9675 33.0078 43.9805 35.1032C43.3394 36.37 42.8444 37.7352 42.2064 38.367C41.5684 38.9989 40.2955 39.6277 39.1209 40.1104C36.9179 41.1743 34.4705 42.2858 32.7978 44.7686C31.0268 47.3975 31.2559 50.5245 31.6341 53.115C31.7264 54.2388 31.8155 55.9975 31.6664 56.5341C31.4189 57.2166 30.1936 58.0899 29.2128 58.9154C27.2035 60.3221 24.8006 62.313 24.1027 65.2402C23.0588 68.9959 30.815 91.2076 34.4801 100.896C35.2995 103.147 36.1189 105.397 37.0844 107.746L34.8738 120.484C34.6232 121.801 35.106 122.976 36.2744 123.763L46.9006 128.161C50.146 133.745 53.3975 138.058 56.6106 140.223C59.8237 142.388 65.2875 143.733 71.7798 144.497L82.0863 154.413C83.1086 155.101 84.5245 155.206 85.6514 154.479L99.4184 145.705C100.053 145.708 100.688 145.711 101.323 145.714C108.26 145.504 134.981 144.607 138.558 142.133C141.107 140.241 141.853 137.558 142.547 135.266C142.944 134.047 143.195 132.729 143.734 132.244C144.029 131.805 145.594 131.373 147.013 130.843Z" fill="#121212"/> -<path d="M147.013 130.843C149.508 129.976 152.591 128.867 154.264 126.385C155.838 124.048 156.047 121.216 156.205 118.775C156.31 117.359 156.316 116.089 156.662 115.26C157.008 114.432 157.941 113.362 159.02 112.39C160.591 110.688 162.505 108.793 163.105 106.011C163.803 103.084 162.548 99.9035 161.535 97.31C160.859 95.7927 160.281 94.1292 160.236 93.2499C160.191 92.3705 160.978 91.2021 161.62 89.9353C162.851 87.7922 164.378 85.211 163.856 81.8872C163.335 78.5635 160.906 75.8654 158.429 72.9229C156.972 71.3041 155.467 69.4408 154.984 68.2663C154.647 67.1901 154.752 65.7742 155.101 64.3107C155.504 61.8217 156.008 58.5517 154.119 55.3679C152.763 52.9681 150.28 51.2954 148.381 50.0164C147.359 49.3276 146.482 48.7373 145.46 48.0486C144.584 47.4582 143.707 46.8679 142.831 46.2775C141.663 45.4904 140.64 44.8017 140.253 44.116C139.135 42.9384 138.167 41.2243 137.151 39.2657C135.309 36.3263 133.664 33.0948 130.305 30.8318C126.946 28.5688 123.333 28.2583 119.964 27.9001C117.914 27.7925 115.961 27.5389 114.304 26.8471C113.475 26.5012 112.5 26.0569 111.332 25.2698C110.456 24.6794 109.579 24.0891 108.703 23.4988C107.827 22.9084 106.805 22.2197 105.782 21.531C103.884 20.2519 101.302 18.7253 98.6673 18.2242C94.8608 17.5708 92.2642 19.2189 90.0104 20.6732C88.6391 21.4481 87.5122 22.1752 86.3884 22.2675C85.1186 22.2613 82.8264 21.5665 80.7786 20.8239C77.2673 19.7325 73.7083 18.3965 70.4322 19.1621C67.1561 19.9278 65.3374 22.3122 63.8139 24.2585C62.8807 25.3285 62.0936 26.4969 61.2619 26.786C60.4302 27.075 58.6714 27.1642 57.0111 27.1073C54.0809 27.0443 50.8079 27.175 48.3573 28.9214C46.0052 30.5218 44.9675 33.0078 43.9805 35.1032C43.3394 36.37 42.8444 37.7352 42.2064 38.367C41.5684 38.9989 40.2955 39.6277 39.1209 40.1104C36.9179 41.1743 34.4705 42.2858 32.7978 44.7686C31.0268 47.3975 31.2559 50.5245 31.6341 53.115C31.7264 54.2388 31.8155 55.9975 31.6664 56.534C31.4189 57.2166 30.1936 58.0899 29.2128 58.9154C27.2035 60.3221 24.8006 62.313 24.1027 65.2402C23.0588 68.9959 30.815 91.2076 34.4801 100.896C35.2995 103.147 36.1189 105.397 37.0844 107.746L34.8738 120.484C34.6232 121.801 35.106 122.976 36.2744 123.763L46.9006 128.161C50.146 133.745 53.3975 138.058 56.6106 140.223C59.8237 142.388 65.2875 143.733 71.7798 144.497L82.0863 154.413C83.1086 155.101 84.5245 155.206 85.6514 154.479L99.4184 145.705C100.053 145.708 100.688 145.711 101.323 145.714C108.26 145.503 134.981 144.607 138.558 142.133C141.107 140.241 141.853 137.558 142.547 135.266C142.944 134.047 143.195 132.729 143.734 132.244C144.029 131.805 145.594 131.373 147.013 130.843ZM145.857 127.516L78.953 135.74L137.799 137.587C137.405 138.172 137.011 138.756 136.472 139.242C136.373 139.388 136.227 139.289 136.129 139.435L80.1122 138.432L103.685 142.209C95.2337 142.461 86.4431 142.272 78.7286 141.746C78.4842 141.794 78.3381 141.696 78.1921 141.597C76.7762 141.493 75.6047 141.341 74.1888 141.236C73.4078 141.135 72.7729 141.132 72.0903 140.884C71.6998 140.833 71.1633 140.684 70.7728 140.633C69.6013 140.481 68.6743 140.281 67.5028 140.129C63.5503 139.377 60.4294 138.337 58.5308 137.058C56.4861 135.68 54.3491 133.179 52.3137 129.897C51.7802 129.113 51.2467 128.329 50.6656 127.3C50.4719 126.957 50.2782 126.614 50.0845 126.272C49.8431 125.684 49.3573 125.145 49.1159 124.557C48.8745 123.97 48.5348 123.529 48.1474 122.843C47.9537 122.5 47.906 122.256 47.7123 121.913C43.8412 114.422 39.8809 105.171 36.6508 96.4131L49.2481 117.427L27.3696 66.3793C27.3219 66.1349 27.4203 65.9888 27.4203 65.9888C27.6678 65.3062 27.9153 64.6237 28.4549 64.1378L52.2736 117.979L35.2438 54.0604C35.0593 51.8128 34.7288 49.4668 35.2745 47.7111L55.4959 118.239L47.0983 36.7789C47.4442 35.9503 47.7901 35.1216 48.3804 34.2453L58.6675 118.889L65.7033 27.4424C66.0969 26.8582 66.7349 26.2263 67.1284 25.6421L61.6899 120.076L88.9635 25.0639C89.4524 24.9686 89.8936 24.6288 90.2365 24.4351L64.9061 121.606L113.993 30.4599C114.384 30.5106 114.676 30.7074 114.92 30.6597L67.9255 123.427L136.098 44.9263C136.291 45.2691 136.583 45.4659 136.631 45.7103L70.7481 125.541L151.139 65.4637C151.088 65.8542 151.085 66.4891 151.035 66.8796L73.2279 127.849L158.702 87.3326C158.308 87.9168 157.962 88.7454 157.569 89.3296L75.6092 130.302L157.918 108.038C157.426 108.768 156.788 109.4 156.051 110.178L77.4034 132.997L150.362 125.242C149.282 126.214 147.619 126.792 145.857 127.516Z" fill="url(#paint0_angular)"/> -</g> -<defs> -<filter id="filter0_f" x="-22" y="-28" width="231.061" height="227.153" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB"> -<feFlood flood-opacity="0" result="BackgroundImageFix"/> -<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/> -<feGaussianBlur stdDeviation="9" result="effect1_foregroundBlur"/> -</filter> -<radialGradient id="paint0_angular" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(65.2858 127.704) rotate(35.3625) scale(91.7 86.3917)"> -<stop offset="0.571966" stop-color="#BF723B"/> -<stop offset="0.616417" stop-color="#DD9A2B"/> -<stop offset="0.675478" stop-color="#F6D74C"/> -<stop offset="0.721651" stop-color="#D1880D"/> -<stop offset="0.803358" stop-color="#A05B11"/> -<stop offset="0.847248" stop-color="#F5B11B"/> -<stop offset="0.912791" stop-color="#BE7D1B"/> -</radialGradient> -<clipPath id="clip0"> -<path d="M0 0H188V170H0V0Z" fill="white"/> -</clipPath> -</defs> -</svg> diff --git a/src/assets/icons/badges/available-big.svg b/src/assets/icons/badges/available-big.svg deleted file mode 100644 index 89e6813f4ded1bd9e631ef4ae496f1a8a8bb71c5..0000000000000000000000000000000000000000 --- a/src/assets/icons/badges/available-big.svg +++ /dev/null @@ -1,4 +0,0 @@ -<svg width="110" height="110" viewBox="0 0 110 110" fill="none" xmlns="http://www.w3.org/2000/svg"> -<path opacity="0.7" d="M54.5 3.35862C67.6642 11.4865 81.8605 16.4994 97.7391 17.5152C97.806 18.5812 97.8729 19.6371 97.9393 20.683C99.1904 40.4055 100.216 56.5768 95.6133 70.3105C90.7707 84.7589 79.5579 96.7635 54.5 106.846C29.4421 96.7635 18.2293 84.7589 13.3867 70.3105C8.78368 56.5768 9.80956 40.4055 11.0607 20.683C11.1271 19.6371 11.1941 18.5812 11.2609 17.5152C27.1396 16.4994 41.3358 11.4865 54.5 3.35862Z" fill="#1B1C22" stroke="#61F0F2" stroke-width="4"/> -<path d="M43.3035 37.8376C43.9268 37.2876 44.6051 36.7651 45.3385 36.2701C46.0901 35.7751 46.8968 35.3442 47.7585 34.9776C48.6201 34.6109 49.5551 34.3267 50.5635 34.1251C51.5718 33.9051 52.6626 33.7951 53.836 33.7951C55.431 33.7951 56.8793 34.0151 58.181 34.4551C59.501 34.8951 60.6285 35.5276 61.5635 36.3526C62.4985 37.1592 63.2226 38.1401 63.736 39.2951C64.2493 40.4501 64.506 41.7426 64.506 43.1726C64.506 44.5659 64.3043 45.7759 63.901 46.8026C63.4976 47.8109 62.9935 48.6909 62.3885 49.4426C61.7835 50.1942 61.1143 50.8451 60.381 51.3951C59.666 51.9451 58.9876 52.4676 58.346 52.9626C57.7043 53.4392 57.1451 53.9159 56.6685 54.3926C56.2101 54.8509 55.9351 55.3734 55.8435 55.9601L55.211 59.9751H50.5635L50.096 55.4926C49.986 54.6309 50.1051 53.8792 50.4535 53.2376C50.8201 52.5776 51.2968 51.9817 51.8835 51.4501C52.4885 50.9001 53.1576 50.3776 53.891 49.8826C54.6243 49.3692 55.3118 48.8192 55.9535 48.2326C56.5951 47.6276 57.1268 46.9584 57.5485 46.2251C57.9885 45.4734 58.2085 44.5842 58.2085 43.5576C58.2085 42.8976 58.0801 42.3109 57.8235 41.7976C57.5851 41.2659 57.246 40.8167 56.806 40.4501C56.366 40.0651 55.8343 39.7717 55.211 39.5701C54.606 39.3684 53.946 39.2676 53.231 39.2676C52.186 39.2676 51.2968 39.3867 50.5635 39.6251C49.8485 39.8451 49.2343 40.1017 48.721 40.3951C48.226 40.6701 47.8043 40.9267 47.456 41.1651C47.1076 41.3851 46.796 41.4951 46.521 41.4951C45.861 41.4951 45.3843 41.2201 45.091 40.6701L43.3035 37.8376ZM48.501 70.2601C48.501 69.6917 48.6018 69.1509 48.8035 68.6376C49.0235 68.1242 49.3168 67.6842 49.6835 67.3176C50.0501 66.9509 50.4901 66.6576 51.0035 66.4376C51.5168 66.2176 52.0668 66.1076 52.6535 66.1076C53.2401 66.1076 53.781 66.2176 54.276 66.4376C54.7893 66.6576 55.2293 66.9509 55.596 67.3176C55.981 67.6842 56.2835 68.1242 56.5035 68.6376C56.7235 69.1509 56.8335 69.6917 56.8335 70.2601C56.8335 70.8467 56.7235 71.3967 56.5035 71.9101C56.2835 72.4051 55.981 72.8359 55.596 73.2026C55.2293 73.5692 54.7893 73.8534 54.276 74.0551C53.781 74.2751 53.2401 74.3851 52.6535 74.3851C52.0668 74.3851 51.5168 74.2751 51.0035 74.0551C50.4901 73.8534 50.0501 73.5692 49.6835 73.2026C49.3168 72.8359 49.0235 72.4051 48.8035 71.9101C48.6018 71.3967 48.501 70.8467 48.501 70.2601Z" fill="#E3B82A"/> -</svg> diff --git a/src/assets/icons/badges/available.svg b/src/assets/icons/badges/available.svg deleted file mode 100644 index 12dc3f8a8d49cb5ab0c8938b07e4d38c0f624ad4..0000000000000000000000000000000000000000 --- a/src/assets/icons/badges/available.svg +++ /dev/null @@ -1,4 +0,0 @@ -<svg width="78" height="78" viewBox="0 0 78 78" fill="none" xmlns="http://www.w3.org/2000/svg"> -<path d="M38.5 11.591C45.5838 16.0293 53.2239 18.7277 61.804 19.1906C61.85 19.9314 61.8964 20.6636 61.9424 21.3874C62.6 31.7544 63.1485 40.4002 60.6868 47.7573C58.0539 55.6264 51.9418 62.0852 38.5 67.4617C25.0582 62.0852 18.9461 55.6264 16.3132 47.7573C13.8515 40.4002 14.4 31.7544 15.0576 21.3874C15.1036 20.6636 15.15 19.9314 15.196 19.1907C23.7761 18.7277 31.4162 16.0293 38.5 11.591Z" fill="#199B9D" stroke="#61F0F2"/> -<path d="M31.5898 30.33C31.9978 29.97 32.4418 29.628 32.9218 29.304C33.4138 28.98 33.9418 28.698 34.5058 28.458C35.0698 28.218 35.6818 28.032 36.3418 27.9C37.0018 27.756 37.7158 27.684 38.4838 27.684C39.5278 27.684 40.4758 27.828 41.3278 28.116C42.1918 28.404 42.9298 28.818 43.5418 29.358C44.1538 29.886 44.6278 30.528 44.9638 31.284C45.2998 32.04 45.4678 32.886 45.4678 33.822C45.4678 34.734 45.3358 35.526 45.0718 36.198C44.8078 36.858 44.4718 37.434 44.0638 37.926C43.6678 38.418 43.2358 38.844 42.7678 39.204C42.2998 39.564 41.8558 39.906 41.4358 40.23C41.0158 40.542 40.6498 40.854 40.3378 41.166C40.0378 41.466 39.8578 41.808 39.7978 42.192L39.3838 44.82H36.3418L36.0358 41.886C36.0238 41.826 36.0178 41.778 36.0178 41.742C36.0178 41.694 36.0178 41.64 36.0178 41.58C36.0178 41.052 36.1498 40.596 36.4138 40.212C36.6778 39.816 37.0078 39.45 37.4038 39.114C37.7998 38.766 38.2258 38.43 38.6818 38.106C39.1378 37.782 39.5638 37.434 39.9598 37.062C40.3558 36.678 40.6858 36.246 40.9498 35.766C41.2138 35.286 41.3458 34.722 41.3458 34.074C41.3458 33.642 41.2618 33.258 41.0938 32.922C40.9378 32.574 40.7158 32.28 40.4278 32.04C40.1398 31.788 39.7918 31.596 39.3838 31.464C38.9878 31.332 38.5558 31.266 38.0878 31.266C37.4038 31.266 36.8218 31.344 36.3418 31.5C35.8738 31.644 35.4718 31.812 35.1358 32.004C34.8118 32.184 34.5358 32.352 34.3078 32.508C34.0798 32.652 33.8758 32.724 33.6958 32.724C33.2638 32.724 32.9518 32.544 32.7598 32.184L31.5898 30.33ZM34.9918 51.552C34.9918 51.18 35.0578 50.826 35.1898 50.49C35.3338 50.154 35.5258 49.866 35.7658 49.626C36.0178 49.386 36.3118 49.194 36.6478 49.05C36.9838 48.906 37.3438 48.834 37.7278 48.834C38.0998 48.834 38.4538 48.906 38.7898 49.05C39.1258 49.194 39.4138 49.386 39.6538 49.626C39.8938 49.866 40.0858 50.154 40.2298 50.49C40.3738 50.826 40.4458 51.18 40.4458 51.552C40.4458 51.936 40.3738 52.296 40.2298 52.632C40.0858 52.956 39.8938 53.238 39.6538 53.478C39.4138 53.718 39.1258 53.904 38.7898 54.036C38.4538 54.18 38.0998 54.252 37.7278 54.252C37.3438 54.252 36.9838 54.18 36.6478 54.036C36.3118 53.904 36.0178 53.718 35.7658 53.478C35.5258 53.238 35.3338 52.956 35.1898 52.632C35.0578 52.296 34.9918 51.936 34.9918 51.552Z" fill="#61F0F2"/> -</svg> diff --git a/src/assets/icons/badges/chocolate.svg b/src/assets/icons/badges/chocolate.svg deleted file mode 100644 index 90f58d17d78e4fdee15df4c13be20d8b05512e0c..0000000000000000000000000000000000000000 --- a/src/assets/icons/badges/chocolate.svg +++ /dev/null @@ -1,9 +0,0 @@ -<svg width="80" height="94" viewBox="0 0 80 94" fill="none" xmlns="http://www.w3.org/2000/svg"> -<path fill-rule="evenodd" clip-rule="evenodd" d="M3.72093 3.4087C6.51163 1.70435 27.907 0 40 0C53.0233 0 74.4186 1.70435 76.2791 3.4087C79.0698 5.11304 80 5.96522 80 9.37391V59.6522C80 60.2468 79.9594 60.8531 79.8953 61.4404C77.8605 60.7319 75.396 60.9987 73.2896 62.3605C72.2072 63.0603 71.3497 63.965 70.7461 64.9705C67.9592 62.8087 62.7997 63.1889 58.2466 66.1326C54.9651 68.2543 52.7685 71.2096 52.1074 73.9785C49.2494 73.4848 45.5493 74.3417 42.1505 76.5391C36.8487 79.9669 34.2206 85.402 36.082 88.9027C35.4038 89.2731 34.9159 89.5528 34.6502 89.7246C32.9376 90.8318 31.6708 92.3064 30.9641 93.8471C28.9278 92.5473 26.4078 90.8472 23.2558 88.6261C11.1628 80.1043 2.7907 69.8783 0.930233 65.6174C0.930233 65.3447 0.834972 65.0297 0.70542 64.6013C0.43013 63.691 0 62.2687 0 59.6522V9.37391C0 5.96522 0.930233 5.11304 3.72093 3.4087Z" fill="url(#paint0_linear)"/> -<defs> -<linearGradient id="paint0_linear" x1="40" y1="0" x2="40" y2="98" gradientUnits="userSpaceOnUse"> -<stop offset="0.140625" stop-color="#976507"/> -<stop offset="1" stop-color="#563402"/> -</linearGradient> -</defs> -</svg> diff --git a/src/assets/icons/badges/default.svg b/src/assets/icons/badges/default.svg deleted file mode 100644 index 05a84894d9e9f6faa4e070d3215b0ffcf39e498c..0000000000000000000000000000000000000000 --- a/src/assets/icons/badges/default.svg +++ /dev/null @@ -1,11 +0,0 @@ -<svg width="55" height="67" viewBox="0 0 55 67" fill="none" xmlns="http://www.w3.org/2000/svg"> -<path d="M53.8876 44.6967L53.8855 44.7038C53.2779 46.3511 51.5812 48.7598 48.9622 51.5072C46.3487 54.2487 42.8568 57.2862 38.7247 60.1818C34.5712 63.0924 32.0352 64.6789 30.3869 65.5369C28.7465 66.3909 28.0288 66.5 27.5 66.5C26.9712 66.5 26.2535 66.3909 24.6131 65.5369C22.9648 64.6789 20.4288 63.0924 16.2753 60.1818C12.1496 57.2907 8.65847 54.1101 6.04222 51.2934C3.46589 48.5197 1.76992 46.1331 1.13426 44.7422C1.11824 44.5565 1.06828 44.3735 1.01934 44.2069C1.00039 44.1423 0.980727 44.0777 0.960461 44.0111C0.911304 43.8495 0.858592 43.6762 0.803826 43.4645C0.654021 42.8855 0.5 42.0537 0.5 40.7826V40.738V40.6931V40.6477V40.6019V40.5557V40.5092V40.4623V40.4149V40.3672V40.3191V40.2706V40.2218V40.1726V40.1229V40.0729V40.0226V39.9719V39.9208V39.8693V39.8175V39.7653V39.7127V39.6598V39.6065V39.5529V39.4989V39.4446V39.3899V39.3348V39.2794V39.2237V39.1676V39.1112V39.0545V38.9974V38.9399V38.8822V38.8241V38.7656V38.7069V38.6478V38.5884V38.5286V38.4686V38.4082V38.3475V38.2865V38.2252V38.1636V38.1016V38.0394V37.9768V37.9139V37.8507V37.7873V37.7235V37.6594V37.5951V37.5304V37.4655V37.4002V37.3347V37.2689V37.2027V37.1364V37.0697V37.0027V36.9355V36.868V36.8002V36.7322V36.6639V36.5953V36.5264V36.4573V36.3879V36.3183V36.2483V36.1782V36.1078V36.0371V35.9662V35.895V35.8236V35.7519V35.68V35.6078V35.5354V35.4628V35.3899V35.3168V35.2434V35.1698V35.096V35.022V34.9477V34.8732V34.7985V34.7235V34.6484V34.573V34.4974V34.4216V34.3456V34.2694V34.1929V34.1163V34.0394V33.9624V33.8851V33.8077V33.73V33.6522V33.5741V33.4959V33.4175V33.3389V33.2601V33.1811V33.1019V33.0226V32.9431V32.8633V32.7835V32.7034V32.6232V32.5428V32.4622V32.3815V32.3006V32.2195V32.1383V32.0569V31.9754V31.8937V31.8119V31.7299V31.6477V31.5654V31.483V31.4004V31.3176V31.2348V31.1517V31.0686V30.9853V30.9019V30.8183V30.7347V30.6508V30.5669V30.4828V30.3987V30.3143V30.2299V30.1454V30.0607V29.9759V29.8911V29.8061V29.721V29.6358V29.5504V29.465V29.3795V29.2939V29.2082V29.1224V29.0365V28.9505V28.8644V28.7782V28.6919V28.6056V28.5192V28.4326V28.3461V28.2594V28.1726V28.0858V27.9989V27.912V27.825V27.7379V27.6507V27.5635V27.4762V27.3889V27.3015V27.214V27.1265V27.039V26.9514V26.8637V26.776V26.6882V26.6005V26.5126V26.4248V26.3368V26.2489V26.1609V26.0729V25.9849V25.8968V25.8087V25.7206V25.6325V25.5443V25.4561V25.3679V25.2797V25.1915V25.1033V25.015V24.9268V24.8385V24.7502V24.662V24.5737V24.4854V24.3972V24.3089V24.2206V24.1324V24.0442V23.9559V23.8677V23.7795V23.6914V23.6032V23.5151V23.427V23.3389V23.2508V23.1628V23.0748V22.9868V22.8989V22.811V22.7231V22.6353V22.5475V22.4597V22.372V22.2844V22.1968V22.1092V22.0217V21.9343V21.8469V21.7596V21.6723V21.5851V21.498V21.4109V21.3239V21.2369V21.15V21.0632V20.9765V20.8898V20.8033V20.7168V20.6303V20.544V20.4578V20.3716V20.2855V20.1995V20.1136V20.0278V19.9421V19.8565V19.771V19.6856V19.6003V19.5151V19.4301V19.3451V19.2602V19.1754V19.0908V19.0063V18.9219V18.8376V18.7534V18.6694V18.5854V18.5017V18.418V18.3345V18.2511V18.1678V18.0847V18.0017V17.9188V17.8361V17.7535V17.6711V17.5888V17.5067V17.4247V17.3429V17.2612V17.1797V17.0983V17.0171V16.9361V16.8552V16.7745V16.694V16.6136V16.5334V16.4534V16.3735V16.2938V16.2143V16.135V16.0559V15.9769V15.8981V15.8196V15.7412V15.663V15.5849V15.5071V15.4295V15.3521V15.2749V15.1978V15.121V15.0444V14.968V14.8918V14.8158V14.74V14.6645V14.5891V14.514V14.4391V14.3644V14.2899V14.2157V14.1417V14.0679V13.9944V13.921V13.848V13.7751V13.7025V13.6301V13.558V13.4861V13.4145V13.3431V13.272V13.2011V13.1304V13.06V12.9899V12.92V12.8504V12.7811V12.712V12.6432V12.5746V12.5064V12.4383V12.3706V12.3031V12.2359V12.169V12.1024V12.0361V11.97V11.9042V11.8387V11.7735V11.7086V11.644V11.5797V11.5156V11.4519V11.3885V11.3253V11.2625V11.2V11.1378V11.0759V11.0143V10.953V10.892V10.8314V10.7711V10.7111V10.6514V10.592V10.533V10.4743V10.4159V10.3578V10.3001V10.2427V10.1857V10.129V10.0726V10.0166V9.9609V9.90556V9.85057V9.79593V9.74164V9.6877V9.63412V9.5809V9.52803V9.47552V9.42338V9.3716V9.32018V9.26914V9.21846V9.16815V9.11822V9.06866V9.01948V8.97067V8.92225V8.87421V8.82655V8.77928V8.73239V8.6859V8.63979V8.59408V8.54877V8.50385V8.45932V8.4152V8.37149V8.32817V8.28526V8.24276V8.20067V8.15899V8.11772V8.07687V8.03643V7.99641V7.95682V7.91764V7.87889V7.84057V7.80267V7.7652V7.72816V7.69156V7.65539V7.61966V7.58437V7.54951V7.5151V7.48114V7.44762V7.41454V7.38192V7.34975V7.31803V7.28677V7.25596V7.22561V7.19572V7.1663V7.13734V7.10884V7.08081V7.05325V7.02617V6.99955V6.97342V6.94775V6.92257V6.89787V6.87365V6.84991V6.82666V6.8039V6.78163V6.75985V6.73856V6.71777V6.69747V6.67767V6.65838V6.63958V6.62129V6.60351V6.58623V6.56947V6.55321V6.53747V6.52225V6.50754V6.49335V6.47968V6.46653V6.45391V6.44181V6.43024V6.4192V6.4087C0.5 5.28167 0.656728 4.67484 0.971889 4.21547C1.30203 3.73427 1.84758 3.34696 2.81769 2.75779C2.98339 2.65716 3.35308 2.52562 3.95554 2.38215C4.53917 2.24317 5.28887 2.10444 6.17145 1.96894C7.93542 1.6981 10.2021 1.44432 12.6747 1.22633C17.6203 0.790322 23.3611 0.5 27.5 0.5C31.9596 0.5 37.8604 0.790418 42.8049 1.22633C45.2775 1.44432 47.5027 1.69797 49.1848 1.96839C50.0269 2.10377 50.7231 2.24182 51.2423 2.37913C51.5022 2.44788 51.7086 2.51406 51.8626 2.57606C51.9393 2.60693 51.9978 2.63471 52.0408 2.65852C52.062 2.67028 52.0777 2.68013 52.0888 2.68781C52.0903 2.68883 52.0917 2.68979 52.0929 2.69069C52.0964 2.69315 52.0991 2.69518 52.1011 2.69677C52.1039 2.69895 52.1052 2.70007 52.1051 2.70006L52.1409 2.73266L52.1823 2.75779C53.1524 3.34696 53.698 3.73427 54.0281 4.21547C54.3433 4.67484 54.5 5.28167 54.5 6.4087V6.4192V6.43024V6.44181V6.45391V6.46653V6.47968V6.49335V6.50754V6.52225V6.53747V6.55321V6.56947V6.58623V6.60351V6.62129V6.63958V6.65838V6.67767V6.69747V6.71777V6.73856V6.75985V6.78163V6.8039V6.82666V6.84991V6.87365V6.89787V6.92257V6.94775V6.97342V6.99955V7.02617V7.05325V7.08081V7.10884V7.13734V7.1663V7.19572V7.22561V7.25596V7.28677V7.31803V7.34975V7.38192V7.41454V7.44762V7.48114V7.5151V7.54951V7.58437V7.61966V7.65539V7.69156V7.72816V7.7652V7.80267V7.84057V7.87889V7.91764V7.95682V7.99641V8.03643V8.07687V8.11772V8.15899V8.20067V8.24276V8.28526V8.32817V8.37149V8.4152V8.45932V8.50385V8.54877V8.59408V8.63979V8.6859V8.73239V8.77928V8.82655V8.87421V8.92225V8.97067V9.01948V9.06866V9.11822V9.16815V9.21846V9.26914V9.32018V9.3716V9.42338V9.47552V9.52803V9.5809V9.63412V9.6877V9.74164V9.79593V9.85057V9.90556V9.9609V10.0166V10.0726V10.129V10.1857V10.2427V10.3001V10.3578V10.4159V10.4743V10.533V10.592V10.6514V10.7111V10.7711V10.8314V10.892V10.953V11.0143V11.0759V11.1378V11.2V11.2625V11.3253V11.3885V11.4519V11.5156V11.5797V11.644V11.7086V11.7735V11.8387V11.9042V11.97V12.0361V12.1024V12.169V12.2359V12.3031V12.3706V12.4383V12.5064V12.5746V12.6432V12.712V12.7811V12.8504V12.92V12.9899V13.06V13.1304V13.2011V13.272V13.3431V13.4145V13.4861V13.558V13.6301V13.7025V13.7751V13.848V13.921V13.9944V14.0679V14.1417V14.2157V14.2899V14.3644V14.4391V14.514V14.5891V14.6645V14.74V14.8158V14.8918V14.968V15.0444V15.121V15.1978V15.2749V15.3521V15.4295V15.5071V15.5849V15.663V15.7412V15.8196V15.8981V15.9769V16.0559V16.135V16.2143V16.2938V16.3735V16.4534V16.5334V16.6136V16.694V16.7745V16.8552V16.9361V17.0171V17.0983V17.1797V17.2612V17.3429V17.4247V17.5067V17.5888V17.6711V17.7535V17.8361V17.9188V18.0017V18.0847V18.1678V18.2511V18.3345V18.418V18.5017V18.5854V18.6694V18.7534V18.8376V18.9219V19.0063V19.0908V19.1754V19.2602V19.3451V19.4301V19.5151V19.6003V19.6856V19.771V19.8565V19.9421V20.0278V20.1136V20.1995V20.2855V20.3716V20.4578V20.544V20.6303V20.7168V20.8033V20.8898V20.9765V21.0632V21.15V21.2369V21.3239V21.4109V21.498V21.5851V21.6723V21.7596V21.8469V21.9343V22.0217V22.1092V22.1968V22.2844V22.372V22.4597V22.5475V22.6353V22.7231V22.811V22.8989V22.9868V23.0748V23.1628V23.2508V23.3389V23.427V23.5151V23.6032V23.6914V23.7795V23.8677V23.9559V24.0442V24.1324V24.2206V24.3089V24.3972V24.4854V24.5737V24.662V24.7502V24.8385V24.9268V25.015V25.1033V25.1915V25.2797V25.3679V25.4561V25.5443V25.6325V25.7206V25.8087V25.8968V25.9849V26.0729V26.1609V26.2489V26.3368V26.4248V26.5126V26.6005V26.6882V26.776V26.8637V26.9514V27.039V27.1265V27.214V27.3015V27.3889V27.4762V27.5635V27.6507V27.7379V27.825V27.912V27.9989V28.0858V28.1726V28.2594V28.3461V28.4326V28.5192V28.6056V28.6919V28.7782V28.8644V28.9505V29.0365V29.1224V29.2082V29.2939V29.3795V29.465V29.5504V29.6358V29.721V29.8061V29.8911V29.9759V30.0607V30.1454V30.2299V30.3143V30.3987V30.4828V30.5669V30.6508V30.7347V30.8183V30.9019V30.9853V31.0686V31.1517V31.2348V31.3176V31.4004V31.483V31.5654V31.6477V31.7299V31.8119V31.8937V31.9754V32.0569V32.1383V32.2195V32.3006V32.3815V32.4622V32.5428V32.6232V32.7034V32.7835V32.8633V32.9431V33.0226V33.1019V33.1811V33.2601V33.3389V33.4175V33.4959V33.5741V33.6522V33.73V33.8077V33.8851V33.9624V34.0394V34.1163V34.1929V34.2694V34.3456V34.4216V34.4974V34.573V34.6484V34.7235V34.7985V34.8732V34.9477V35.022V35.096V35.1698V35.2434V35.3168V35.3899V35.4628V35.5354V35.6078V35.68V35.7519V35.8236V35.895V35.9662V36.0371V36.1078V36.1782V36.2483V36.3183V36.3879V36.4573V36.5264V36.5953V36.6639V36.7322V36.8002V36.868V36.9355V37.0027V37.0697V37.1364V37.2027V37.2689V37.3347V37.4002V37.4655V37.5304V37.5951V37.6594V37.7235V37.7873V37.8507V37.9139V37.9768V38.0394V38.1016V38.1636V38.2252V38.2865V38.3475V38.4082V38.4686V38.5286V38.5884V38.6478V38.7069V38.7656V38.8241V38.8822V38.9399V38.9974V39.0545V39.1112V39.1676V39.2237V39.2794V39.3348V39.3899V39.4446V39.4989V39.5529V39.6065V39.6598V39.7127V39.7653V39.8175V39.8693V39.9208V39.9719V40.0226V40.0729V40.1229V40.1726V40.2218V40.2706V40.3191V40.3672V40.4149V40.4623V40.5092V40.5557V40.6019V40.6477V40.6931V40.738V40.7826C54.5 41.7078 54.3472 42.6901 54.1905 43.451C54.1126 43.8292 54.0347 44.1479 53.9765 44.3714C53.9474 44.4831 53.9233 44.5707 53.9067 44.6299C53.8983 44.6595 53.8919 44.6819 53.8876 44.6967Z" fill="#1B1C22"/> -<path d="M53.8876 44.6967L53.8855 44.7038C53.2779 46.3511 51.5812 48.7598 48.9622 51.5072C46.3487 54.2487 42.8568 57.2862 38.7247 60.1818C34.5712 63.0924 32.0352 64.6789 30.3869 65.5369C28.7465 66.3909 28.0288 66.5 27.5 66.5C26.9712 66.5 26.2535 66.3909 24.6131 65.5369C22.9648 64.6789 20.4288 63.0924 16.2753 60.1818C12.1496 57.2907 8.65847 54.1101 6.04222 51.2934C3.46589 48.5197 1.76992 46.1331 1.13426 44.7422C1.11824 44.5565 1.06828 44.3735 1.01934 44.2069C1.00039 44.1423 0.980727 44.0777 0.960461 44.0111C0.911304 43.8495 0.858592 43.6762 0.803826 43.4645C0.654021 42.8855 0.5 42.0537 0.5 40.7826V40.738V40.6931V40.6477V40.6019V40.5557V40.5092V40.4623V40.4149V40.3672V40.3191V40.2706V40.2218V40.1726V40.1229V40.0729V40.0226V39.9719V39.9208V39.8693V39.8175V39.7653V39.7127V39.6598V39.6065V39.5529V39.4989V39.4446V39.3899V39.3348V39.2794V39.2237V39.1676V39.1112V39.0545V38.9974V38.9399V38.8822V38.8241V38.7656V38.7069V38.6478V38.5884V38.5286V38.4686V38.4082V38.3475V38.2865V38.2252V38.1636V38.1016V38.0394V37.9768V37.9139V37.8507V37.7873V37.7235V37.6594V37.5951V37.5304V37.4655V37.4002V37.3347V37.2689V37.2027V37.1364V37.0697V37.0027V36.9355V36.868V36.8002V36.7322V36.6639V36.5953V36.5264V36.4573V36.3879V36.3183V36.2483V36.1782V36.1078V36.0371V35.9662V35.895V35.8236V35.7519V35.68V35.6078V35.5354V35.4628V35.3899V35.3168V35.2434V35.1698V35.096V35.022V34.9477V34.8732V34.7985V34.7235V34.6484V34.573V34.4974V34.4216V34.3456V34.2694V34.1929V34.1163V34.0394V33.9624V33.8851V33.8077V33.73V33.6522V33.5741V33.4959V33.4175V33.3389V33.2601V33.1811V33.1019V33.0226V32.9431V32.8633V32.7835V32.7034V32.6232V32.5428V32.4622V32.3815V32.3006V32.2195V32.1383V32.0569V31.9754V31.8937V31.8119V31.7299V31.6477V31.5654V31.483V31.4004V31.3176V31.2348V31.1517V31.0686V30.9853V30.9019V30.8183V30.7347V30.6508V30.5669V30.4828V30.3987V30.3143V30.2299V30.1454V30.0607V29.9759V29.8911V29.8061V29.721V29.6358V29.5504V29.465V29.3795V29.2939V29.2082V29.1224V29.0365V28.9505V28.8644V28.7782V28.6919V28.6056V28.5192V28.4326V28.3461V28.2594V28.1726V28.0858V27.9989V27.912V27.825V27.7379V27.6507V27.5635V27.4762V27.3889V27.3015V27.214V27.1265V27.039V26.9514V26.8637V26.776V26.6882V26.6005V26.5126V26.4248V26.3368V26.2489V26.1609V26.0729V25.9849V25.8968V25.8087V25.7206V25.6325V25.5443V25.4561V25.3679V25.2797V25.1915V25.1033V25.015V24.9268V24.8385V24.7502V24.662V24.5737V24.4854V24.3972V24.3089V24.2206V24.1324V24.0442V23.9559V23.8677V23.7795V23.6914V23.6032V23.5151V23.427V23.3389V23.2508V23.1628V23.0748V22.9868V22.8989V22.811V22.7231V22.6353V22.5475V22.4597V22.372V22.2844V22.1968V22.1092V22.0217V21.9343V21.8469V21.7596V21.6723V21.5851V21.498V21.4109V21.3239V21.2369V21.15V21.0632V20.9765V20.8898V20.8033V20.7168V20.6303V20.544V20.4578V20.3716V20.2855V20.1995V20.1136V20.0278V19.9421V19.8565V19.771V19.6856V19.6003V19.5151V19.4301V19.3451V19.2602V19.1754V19.0908V19.0063V18.9219V18.8376V18.7534V18.6694V18.5854V18.5017V18.418V18.3345V18.2511V18.1678V18.0847V18.0017V17.9188V17.8361V17.7535V17.6711V17.5888V17.5067V17.4247V17.3429V17.2612V17.1797V17.0983V17.0171V16.9361V16.8552V16.7745V16.694V16.6136V16.5334V16.4534V16.3735V16.2938V16.2143V16.135V16.0559V15.9769V15.8981V15.8196V15.7412V15.663V15.5849V15.5071V15.4295V15.3521V15.2749V15.1978V15.121V15.0444V14.968V14.8918V14.8158V14.74V14.6645V14.5891V14.514V14.4391V14.3644V14.2899V14.2157V14.1417V14.0679V13.9944V13.921V13.848V13.7751V13.7025V13.6301V13.558V13.4861V13.4145V13.3431V13.272V13.2011V13.1304V13.06V12.9899V12.92V12.8504V12.7811V12.712V12.6432V12.5746V12.5064V12.4383V12.3706V12.3031V12.2359V12.169V12.1024V12.0361V11.97V11.9042V11.8387V11.7735V11.7086V11.644V11.5797V11.5156V11.4519V11.3885V11.3253V11.2625V11.2V11.1378V11.0759V11.0143V10.953V10.892V10.8314V10.7711V10.7111V10.6514V10.592V10.533V10.4743V10.4159V10.3578V10.3001V10.2427V10.1857V10.129V10.0726V10.0166V9.9609V9.90556V9.85057V9.79593V9.74164V9.6877V9.63412V9.5809V9.52803V9.47552V9.42338V9.3716V9.32018V9.26914V9.21846V9.16815V9.11822V9.06866V9.01948V8.97067V8.92225V8.87421V8.82655V8.77928V8.73239V8.6859V8.63979V8.59408V8.54877V8.50385V8.45932V8.4152V8.37149V8.32817V8.28526V8.24276V8.20067V8.15899V8.11772V8.07687V8.03643V7.99641V7.95682V7.91764V7.87889V7.84057V7.80267V7.7652V7.72816V7.69156V7.65539V7.61966V7.58437V7.54951V7.5151V7.48114V7.44762V7.41454V7.38192V7.34975V7.31803V7.28677V7.25596V7.22561V7.19572V7.1663V7.13734V7.10884V7.08081V7.05325V7.02617V6.99955V6.97342V6.94775V6.92257V6.89787V6.87365V6.84991V6.82666V6.8039V6.78163V6.75985V6.73856V6.71777V6.69747V6.67767V6.65838V6.63958V6.62129V6.60351V6.58623V6.56947V6.55321V6.53747V6.52225V6.50754V6.49335V6.47968V6.46653V6.45391V6.44181V6.43024V6.4192V6.4087C0.5 5.28167 0.656728 4.67484 0.971889 4.21547C1.30203 3.73427 1.84758 3.34696 2.81769 2.75779C2.98339 2.65716 3.35308 2.52562 3.95554 2.38215C4.53917 2.24317 5.28887 2.10444 6.17145 1.96894C7.93542 1.6981 10.2021 1.44432 12.6747 1.22633C17.6203 0.790322 23.3611 0.5 27.5 0.5C31.9596 0.5 37.8604 0.790418 42.8049 1.22633C45.2775 1.44432 47.5027 1.69797 49.1848 1.96839C50.0269 2.10377 50.7231 2.24182 51.2423 2.37913C51.5022 2.44788 51.7086 2.51406 51.8626 2.57606C51.9393 2.60693 51.9978 2.63471 52.0408 2.65852C52.062 2.67028 52.0777 2.68013 52.0888 2.68781C52.0903 2.68883 52.0917 2.68979 52.0929 2.69069C52.0964 2.69315 52.0991 2.69518 52.1011 2.69677C52.1039 2.69895 52.1052 2.70007 52.1051 2.70006L52.1409 2.73266L52.1823 2.75779C53.1524 3.34696 53.698 3.73427 54.0281 4.21547C54.3433 4.67484 54.5 5.28167 54.5 6.4087V6.4192V6.43024V6.44181V6.45391V6.46653V6.47968V6.49335V6.50754V6.52225V6.53747V6.55321V6.56947V6.58623V6.60351V6.62129V6.63958V6.65838V6.67767V6.69747V6.71777V6.73856V6.75985V6.78163V6.8039V6.82666V6.84991V6.87365V6.89787V6.92257V6.94775V6.97342V6.99955V7.02617V7.05325V7.08081V7.10884V7.13734V7.1663V7.19572V7.22561V7.25596V7.28677V7.31803V7.34975V7.38192V7.41454V7.44762V7.48114V7.5151V7.54951V7.58437V7.61966V7.65539V7.69156V7.72816V7.7652V7.80267V7.84057V7.87889V7.91764V7.95682V7.99641V8.03643V8.07687V8.11772V8.15899V8.20067V8.24276V8.28526V8.32817V8.37149V8.4152V8.45932V8.50385V8.54877V8.59408V8.63979V8.6859V8.73239V8.77928V8.82655V8.87421V8.92225V8.97067V9.01948V9.06866V9.11822V9.16815V9.21846V9.26914V9.32018V9.3716V9.42338V9.47552V9.52803V9.5809V9.63412V9.6877V9.74164V9.79593V9.85057V9.90556V9.9609V10.0166V10.0726V10.129V10.1857V10.2427V10.3001V10.3578V10.4159V10.4743V10.533V10.592V10.6514V10.7111V10.7711V10.8314V10.892V10.953V11.0143V11.0759V11.1378V11.2V11.2625V11.3253V11.3885V11.4519V11.5156V11.5797V11.644V11.7086V11.7735V11.8387V11.9042V11.97V12.0361V12.1024V12.169V12.2359V12.3031V12.3706V12.4383V12.5064V12.5746V12.6432V12.712V12.7811V12.8504V12.92V12.9899V13.06V13.1304V13.2011V13.272V13.3431V13.4145V13.4861V13.558V13.6301V13.7025V13.7751V13.848V13.921V13.9944V14.0679V14.1417V14.2157V14.2899V14.3644V14.4391V14.514V14.5891V14.6645V14.74V14.8158V14.8918V14.968V15.0444V15.121V15.1978V15.2749V15.3521V15.4295V15.5071V15.5849V15.663V15.7412V15.8196V15.8981V15.9769V16.0559V16.135V16.2143V16.2938V16.3735V16.4534V16.5334V16.6136V16.694V16.7745V16.8552V16.9361V17.0171V17.0983V17.1797V17.2612V17.3429V17.4247V17.5067V17.5888V17.6711V17.7535V17.8361V17.9188V18.0017V18.0847V18.1678V18.2511V18.3345V18.418V18.5017V18.5854V18.6694V18.7534V18.8376V18.9219V19.0063V19.0908V19.1754V19.2602V19.3451V19.4301V19.5151V19.6003V19.6856V19.771V19.8565V19.9421V20.0278V20.1136V20.1995V20.2855V20.3716V20.4578V20.544V20.6303V20.7168V20.8033V20.8898V20.9765V21.0632V21.15V21.2369V21.3239V21.4109V21.498V21.5851V21.6723V21.7596V21.8469V21.9343V22.0217V22.1092V22.1968V22.2844V22.372V22.4597V22.5475V22.6353V22.7231V22.811V22.8989V22.9868V23.0748V23.1628V23.2508V23.3389V23.427V23.5151V23.6032V23.6914V23.7795V23.8677V23.9559V24.0442V24.1324V24.2206V24.3089V24.3972V24.4854V24.5737V24.662V24.7502V24.8385V24.9268V25.015V25.1033V25.1915V25.2797V25.3679V25.4561V25.5443V25.6325V25.7206V25.8087V25.8968V25.9849V26.0729V26.1609V26.2489V26.3368V26.4248V26.5126V26.6005V26.6882V26.776V26.8637V26.9514V27.039V27.1265V27.214V27.3015V27.3889V27.4762V27.5635V27.6507V27.7379V27.825V27.912V27.9989V28.0858V28.1726V28.2594V28.3461V28.4326V28.5192V28.6056V28.6919V28.7782V28.8644V28.9505V29.0365V29.1224V29.2082V29.2939V29.3795V29.465V29.5504V29.6358V29.721V29.8061V29.8911V29.9759V30.0607V30.1454V30.2299V30.3143V30.3987V30.4828V30.5669V30.6508V30.7347V30.8183V30.9019V30.9853V31.0686V31.1517V31.2348V31.3176V31.4004V31.483V31.5654V31.6477V31.7299V31.8119V31.8937V31.9754V32.0569V32.1383V32.2195V32.3006V32.3815V32.4622V32.5428V32.6232V32.7034V32.7835V32.8633V32.9431V33.0226V33.1019V33.1811V33.2601V33.3389V33.4175V33.4959V33.5741V33.6522V33.73V33.8077V33.8851V33.9624V34.0394V34.1163V34.1929V34.2694V34.3456V34.4216V34.4974V34.573V34.6484V34.7235V34.7985V34.8732V34.9477V35.022V35.096V35.1698V35.2434V35.3168V35.3899V35.4628V35.5354V35.6078V35.68V35.7519V35.8236V35.895V35.9662V36.0371V36.1078V36.1782V36.2483V36.3183V36.3879V36.4573V36.5264V36.5953V36.6639V36.7322V36.8002V36.868V36.9355V37.0027V37.0697V37.1364V37.2027V37.2689V37.3347V37.4002V37.4655V37.5304V37.5951V37.6594V37.7235V37.7873V37.8507V37.9139V37.9768V38.0394V38.1016V38.1636V38.2252V38.2865V38.3475V38.4082V38.4686V38.5286V38.5884V38.6478V38.7069V38.7656V38.8241V38.8822V38.9399V38.9974V39.0545V39.1112V39.1676V39.2237V39.2794V39.3348V39.3899V39.4446V39.4989V39.5529V39.6065V39.6598V39.7127V39.7653V39.8175V39.8693V39.9208V39.9719V40.0226V40.0729V40.1229V40.1726V40.2218V40.2706V40.3191V40.3672V40.4149V40.4623V40.5092V40.5557V40.6019V40.6477V40.6931V40.738V40.7826C54.5 41.7078 54.3472 42.6901 54.1905 43.451C54.1126 43.8292 54.0347 44.1479 53.9765 44.3714C53.9474 44.4831 53.9233 44.5707 53.9067 44.6299C53.8983 44.6595 53.8919 44.6819 53.8876 44.6967Z" stroke="#F1C017"/> -<path d="M53.8876 44.6967L53.8855 44.7038C53.2779 46.3511 51.5812 48.7598 48.9622 51.5072C46.3487 54.2487 42.8568 57.2862 38.7247 60.1818C34.5712 63.0924 32.0352 64.6789 30.3869 65.5369C28.7465 66.3909 28.0288 66.5 27.5 66.5C26.9712 66.5 26.2535 66.3909 24.6131 65.5369C22.9648 64.6789 20.4288 63.0924 16.2753 60.1818C12.1496 57.2907 8.65847 54.1101 6.04222 51.2934C3.46589 48.5197 1.76992 46.1331 1.13426 44.7422C1.11824 44.5565 1.06828 44.3735 1.01934 44.2069C1.00039 44.1423 0.980727 44.0777 0.960461 44.0111C0.911304 43.8495 0.858592 43.6762 0.803826 43.4645C0.654021 42.8855 0.5 42.0537 0.5 40.7826V40.738V40.6931V40.6477V40.6019V40.5557V40.5092V40.4623V40.4149V40.3672V40.3191V40.2706V40.2218V40.1726V40.1229V40.0729V40.0226V39.9719V39.9208V39.8693V39.8175V39.7653V39.7127V39.6598V39.6065V39.5529V39.4989V39.4446V39.3899V39.3348V39.2794V39.2237V39.1676V39.1112V39.0545V38.9974V38.9399V38.8822V38.8241V38.7656V38.7069V38.6478V38.5884V38.5286V38.4686V38.4082V38.3475V38.2865V38.2252V38.1636V38.1016V38.0394V37.9768V37.9139V37.8507V37.7873V37.7235V37.6594V37.5951V37.5304V37.4655V37.4002V37.3347V37.2689V37.2027V37.1364V37.0697V37.0027V36.9355V36.868V36.8002V36.7322V36.6639V36.5953V36.5264V36.4573V36.3879V36.3183V36.2483V36.1782V36.1078V36.0371V35.9662V35.895V35.8236V35.7519V35.68V35.6078V35.5354V35.4628V35.3899V35.3168V35.2434V35.1698V35.096V35.022V34.9477V34.8732V34.7985V34.7235V34.6484V34.573V34.4974V34.4216V34.3456V34.2694V34.1929V34.1163V34.0394V33.9624V33.8851V33.8077V33.73V33.6522V33.5741V33.4959V33.4175V33.3389V33.2601V33.1811V33.1019V33.0226V32.9431V32.8633V32.7835V32.7034V32.6232V32.5428V32.4622V32.3815V32.3006V32.2195V32.1383V32.0569V31.9754V31.8937V31.8119V31.7299V31.6477V31.5654V31.483V31.4004V31.3176V31.2348V31.1517V31.0686V30.9853V30.9019V30.8183V30.7347V30.6508V30.5669V30.4828V30.3987V30.3143V30.2299V30.1454V30.0607V29.9759V29.8911V29.8061V29.721V29.6358V29.5504V29.465V29.3795V29.2939V29.2082V29.1224V29.0365V28.9505V28.8644V28.7782V28.6919V28.6056V28.5192V28.4326V28.3461V28.2594V28.1726V28.0858V27.9989V27.912V27.825V27.7379V27.6507V27.5635V27.4762V27.3889V27.3015V27.214V27.1265V27.039V26.9514V26.8637V26.776V26.6882V26.6005V26.5126V26.4248V26.3368V26.2489V26.1609V26.0729V25.9849V25.8968V25.8087V25.7206V25.6325V25.5443V25.4561V25.3679V25.2797V25.1915V25.1033V25.015V24.9268V24.8385V24.7502V24.662V24.5737V24.4854V24.3972V24.3089V24.2206V24.1324V24.0442V23.9559V23.8677V23.7795V23.6914V23.6032V23.5151V23.427V23.3389V23.2508V23.1628V23.0748V22.9868V22.8989V22.811V22.7231V22.6353V22.5475V22.4597V22.372V22.2844V22.1968V22.1092V22.0217V21.9343V21.8469V21.7596V21.6723V21.5851V21.498V21.4109V21.3239V21.2369V21.15V21.0632V20.9765V20.8898V20.8033V20.7168V20.6303V20.544V20.4578V20.3716V20.2855V20.1995V20.1136V20.0278V19.9421V19.8565V19.771V19.6856V19.6003V19.5151V19.4301V19.3451V19.2602V19.1754V19.0908V19.0063V18.9219V18.8376V18.7534V18.6694V18.5854V18.5017V18.418V18.3345V18.2511V18.1678V18.0847V18.0017V17.9188V17.8361V17.7535V17.6711V17.5888V17.5067V17.4247V17.3429V17.2612V17.1797V17.0983V17.0171V16.9361V16.8552V16.7745V16.694V16.6136V16.5334V16.4534V16.3735V16.2938V16.2143V16.135V16.0559V15.9769V15.8981V15.8196V15.7412V15.663V15.5849V15.5071V15.4295V15.3521V15.2749V15.1978V15.121V15.0444V14.968V14.8918V14.8158V14.74V14.6645V14.5891V14.514V14.4391V14.3644V14.2899V14.2157V14.1417V14.0679V13.9944V13.921V13.848V13.7751V13.7025V13.6301V13.558V13.4861V13.4145V13.3431V13.272V13.2011V13.1304V13.06V12.9899V12.92V12.8504V12.7811V12.712V12.6432V12.5746V12.5064V12.4383V12.3706V12.3031V12.2359V12.169V12.1024V12.0361V11.97V11.9042V11.8387V11.7735V11.7086V11.644V11.5797V11.5156V11.4519V11.3885V11.3253V11.2625V11.2V11.1378V11.0759V11.0143V10.953V10.892V10.8314V10.7711V10.7111V10.6514V10.592V10.533V10.4743V10.4159V10.3578V10.3001V10.2427V10.1857V10.129V10.0726V10.0166V9.9609V9.90556V9.85057V9.79593V9.74164V9.6877V9.63412V9.5809V9.52803V9.47552V9.42338V9.3716V9.32018V9.26914V9.21846V9.16815V9.11822V9.06866V9.01948V8.97067V8.92225V8.87421V8.82655V8.77928V8.73239V8.6859V8.63979V8.59408V8.54877V8.50385V8.45932V8.4152V8.37149V8.32817V8.28526V8.24276V8.20067V8.15899V8.11772V8.07687V8.03643V7.99641V7.95682V7.91764V7.87889V7.84057V7.80267V7.7652V7.72816V7.69156V7.65539V7.61966V7.58437V7.54951V7.5151V7.48114V7.44762V7.41454V7.38192V7.34975V7.31803V7.28677V7.25596V7.22561V7.19572V7.1663V7.13734V7.10884V7.08081V7.05325V7.02617V6.99955V6.97342V6.94775V6.92257V6.89787V6.87365V6.84991V6.82666V6.8039V6.78163V6.75985V6.73856V6.71777V6.69747V6.67767V6.65838V6.63958V6.62129V6.60351V6.58623V6.56947V6.55321V6.53747V6.52225V6.50754V6.49335V6.47968V6.46653V6.45391V6.44181V6.43024V6.4192V6.4087C0.5 5.28167 0.656728 4.67484 0.971889 4.21547C1.30203 3.73427 1.84758 3.34696 2.81769 2.75779C2.98339 2.65716 3.35308 2.52562 3.95554 2.38215C4.53917 2.24317 5.28887 2.10444 6.17145 1.96894C7.93542 1.6981 10.2021 1.44432 12.6747 1.22633C17.6203 0.790322 23.3611 0.5 27.5 0.5C31.9596 0.5 37.8604 0.790418 42.8049 1.22633C45.2775 1.44432 47.5027 1.69797 49.1848 1.96839C50.0269 2.10377 50.7231 2.24182 51.2423 2.37913C51.5022 2.44788 51.7086 2.51406 51.8626 2.57606C51.9393 2.60693 51.9978 2.63471 52.0408 2.65852C52.062 2.67028 52.0777 2.68013 52.0888 2.68781C52.0903 2.68883 52.0917 2.68979 52.0929 2.69069C52.0964 2.69315 52.0991 2.69518 52.1011 2.69677C52.1039 2.69895 52.1052 2.70007 52.1051 2.70006L52.1409 2.73266L52.1823 2.75779C53.1524 3.34696 53.698 3.73427 54.0281 4.21547C54.3433 4.67484 54.5 5.28167 54.5 6.4087V6.4192V6.43024V6.44181V6.45391V6.46653V6.47968V6.49335V6.50754V6.52225V6.53747V6.55321V6.56947V6.58623V6.60351V6.62129V6.63958V6.65838V6.67767V6.69747V6.71777V6.73856V6.75985V6.78163V6.8039V6.82666V6.84991V6.87365V6.89787V6.92257V6.94775V6.97342V6.99955V7.02617V7.05325V7.08081V7.10884V7.13734V7.1663V7.19572V7.22561V7.25596V7.28677V7.31803V7.34975V7.38192V7.41454V7.44762V7.48114V7.5151V7.54951V7.58437V7.61966V7.65539V7.69156V7.72816V7.7652V7.80267V7.84057V7.87889V7.91764V7.95682V7.99641V8.03643V8.07687V8.11772V8.15899V8.20067V8.24276V8.28526V8.32817V8.37149V8.4152V8.45932V8.50385V8.54877V8.59408V8.63979V8.6859V8.73239V8.77928V8.82655V8.87421V8.92225V8.97067V9.01948V9.06866V9.11822V9.16815V9.21846V9.26914V9.32018V9.3716V9.42338V9.47552V9.52803V9.5809V9.63412V9.6877V9.74164V9.79593V9.85057V9.90556V9.9609V10.0166V10.0726V10.129V10.1857V10.2427V10.3001V10.3578V10.4159V10.4743V10.533V10.592V10.6514V10.7111V10.7711V10.8314V10.892V10.953V11.0143V11.0759V11.1378V11.2V11.2625V11.3253V11.3885V11.4519V11.5156V11.5797V11.644V11.7086V11.7735V11.8387V11.9042V11.97V12.0361V12.1024V12.169V12.2359V12.3031V12.3706V12.4383V12.5064V12.5746V12.6432V12.712V12.7811V12.8504V12.92V12.9899V13.06V13.1304V13.2011V13.272V13.3431V13.4145V13.4861V13.558V13.6301V13.7025V13.7751V13.848V13.921V13.9944V14.0679V14.1417V14.2157V14.2899V14.3644V14.4391V14.514V14.5891V14.6645V14.74V14.8158V14.8918V14.968V15.0444V15.121V15.1978V15.2749V15.3521V15.4295V15.5071V15.5849V15.663V15.7412V15.8196V15.8981V15.9769V16.0559V16.135V16.2143V16.2938V16.3735V16.4534V16.5334V16.6136V16.694V16.7745V16.8552V16.9361V17.0171V17.0983V17.1797V17.2612V17.3429V17.4247V17.5067V17.5888V17.6711V17.7535V17.8361V17.9188V18.0017V18.0847V18.1678V18.2511V18.3345V18.418V18.5017V18.5854V18.6694V18.7534V18.8376V18.9219V19.0063V19.0908V19.1754V19.2602V19.3451V19.4301V19.5151V19.6003V19.6856V19.771V19.8565V19.9421V20.0278V20.1136V20.1995V20.2855V20.3716V20.4578V20.544V20.6303V20.7168V20.8033V20.8898V20.9765V21.0632V21.15V21.2369V21.3239V21.4109V21.498V21.5851V21.6723V21.7596V21.8469V21.9343V22.0217V22.1092V22.1968V22.2844V22.372V22.4597V22.5475V22.6353V22.7231V22.811V22.8989V22.9868V23.0748V23.1628V23.2508V23.3389V23.427V23.5151V23.6032V23.6914V23.7795V23.8677V23.9559V24.0442V24.1324V24.2206V24.3089V24.3972V24.4854V24.5737V24.662V24.7502V24.8385V24.9268V25.015V25.1033V25.1915V25.2797V25.3679V25.4561V25.5443V25.6325V25.7206V25.8087V25.8968V25.9849V26.0729V26.1609V26.2489V26.3368V26.4248V26.5126V26.6005V26.6882V26.776V26.8637V26.9514V27.039V27.1265V27.214V27.3015V27.3889V27.4762V27.5635V27.6507V27.7379V27.825V27.912V27.9989V28.0858V28.1726V28.2594V28.3461V28.4326V28.5192V28.6056V28.6919V28.7782V28.8644V28.9505V29.0365V29.1224V29.2082V29.2939V29.3795V29.465V29.5504V29.6358V29.721V29.8061V29.8911V29.9759V30.0607V30.1454V30.2299V30.3143V30.3987V30.4828V30.5669V30.6508V30.7347V30.8183V30.9019V30.9853V31.0686V31.1517V31.2348V31.3176V31.4004V31.483V31.5654V31.6477V31.7299V31.8119V31.8937V31.9754V32.0569V32.1383V32.2195V32.3006V32.3815V32.4622V32.5428V32.6232V32.7034V32.7835V32.8633V32.9431V33.0226V33.1019V33.1811V33.2601V33.3389V33.4175V33.4959V33.5741V33.6522V33.73V33.8077V33.8851V33.9624V34.0394V34.1163V34.1929V34.2694V34.3456V34.4216V34.4974V34.573V34.6484V34.7235V34.7985V34.8732V34.9477V35.022V35.096V35.1698V35.2434V35.3168V35.3899V35.4628V35.5354V35.6078V35.68V35.7519V35.8236V35.895V35.9662V36.0371V36.1078V36.1782V36.2483V36.3183V36.3879V36.4573V36.5264V36.5953V36.6639V36.7322V36.8002V36.868V36.9355V37.0027V37.0697V37.1364V37.2027V37.2689V37.3347V37.4002V37.4655V37.5304V37.5951V37.6594V37.7235V37.7873V37.8507V37.9139V37.9768V38.0394V38.1016V38.1636V38.2252V38.2865V38.3475V38.4082V38.4686V38.5286V38.5884V38.6478V38.7069V38.7656V38.8241V38.8822V38.9399V38.9974V39.0545V39.1112V39.1676V39.2237V39.2794V39.3348V39.3899V39.4446V39.4989V39.5529V39.6065V39.6598V39.7127V39.7653V39.8175V39.8693V39.9208V39.9719V40.0226V40.0729V40.1229V40.1726V40.2218V40.2706V40.3191V40.3672V40.4149V40.4623V40.5092V40.5557V40.6019V40.6477V40.6931V40.738V40.7826C54.5 41.7078 54.3472 42.6901 54.1905 43.451C54.1126 43.8292 54.0347 44.1479 53.9765 44.3714C53.9474 44.4831 53.9233 44.5707 53.9067 44.6299C53.8983 44.6595 53.8919 44.6819 53.8876 44.6967Z" stroke="url(#paint0_radial)" stroke-opacity="0.5"/> -<defs> -<radialGradient id="paint0_radial" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(27.3226 47.4583) rotate(-90) scale(43.2708 57.8875)"> -<stop stop-color="#E28904"/> -<stop offset="1" stop-color="white" stop-opacity="0"/> -</radialGradient> -</defs> -</svg> diff --git a/src/assets/icons/badges/locked-big.svg b/src/assets/icons/badges/locked-big.svg deleted file mode 100644 index 85b22299e1a48ed269d09d36faa3266d8874ee50..0000000000000000000000000000000000000000 --- a/src/assets/icons/badges/locked-big.svg +++ /dev/null @@ -1,10 +0,0 @@ -<svg width="110" height="110" viewBox="0 0 110 110" fill="none" xmlns="http://www.w3.org/2000/svg"> -<path opacity="0.7" d="M54.5 3.35862C67.6642 11.4865 81.8605 16.4994 97.7391 17.5152C97.806 18.5812 97.8729 19.6371 97.9393 20.683C99.1904 40.4055 100.216 56.5768 95.6133 70.3105C90.7707 84.7589 79.5579 96.7635 54.5 106.846C29.4421 96.7635 18.2293 84.7589 13.3867 70.3105C8.78368 56.5768 9.80956 40.4055 11.0607 20.683C11.1271 19.6371 11.1941 18.5812 11.2609 17.5152C27.1396 16.4994 41.3358 11.4865 54.5 3.35862Z" fill="#1B1C22" stroke="#D25959" stroke-width="4"/> -<path d="M72.2136 51.8408C72.2136 49.4178 70.2432 47.4474 67.8202 47.4474H65.6235V40.8572C65.6235 34.8009 60.6962 29.8737 54.6399 29.8737C48.5835 29.8737 43.6563 34.8009 43.6563 40.8572V47.4474H41.4596C39.0366 47.4474 37.0662 49.4178 37.0662 51.8408V69.4146C37.0662 71.8375 39.0366 73.808 41.4596 73.808H67.8202C70.2432 73.808 72.2136 71.8375 72.2136 69.4146V51.8408ZM48.0497 40.8572C48.0497 37.2239 51.0065 34.2671 54.6399 34.2671C58.2733 34.2671 61.23 37.2239 61.23 40.8572V47.4474H48.0497V40.8572Z" fill="url(#paint0_linear)"/> -<defs> -<linearGradient id="paint0_linear" x1="54.6399" y1="29.8737" x2="55" y2="86" gradientUnits="userSpaceOnUse"> -<stop offset="0.192708" stop-color="#D25959"/> -<stop offset="1" stop-color="#B93434"/> -</linearGradient> -</defs> -</svg> diff --git a/src/assets/icons/badges/locked.svg b/src/assets/icons/badges/locked.svg deleted file mode 100644 index 0f7ec50788bbd1cdc2bef8d178e323af17ffa7ac..0000000000000000000000000000000000000000 --- a/src/assets/icons/badges/locked.svg +++ /dev/null @@ -1,18 +0,0 @@ -<svg width="78" height="78" viewBox="0 0 78 78" fill="none" xmlns="http://www.w3.org/2000/svg"> -<g filter="url(#filter0_d)"> -<path d="M38.5 62C60.2393 53.2431 58.5497 40.7936 57.4233 22.2248C50.4397 21.9083 44.2446 19.6927 38.5 16C32.7554 19.6927 26.5603 21.9083 19.5767 22.2248C18.4503 40.7936 16.7607 53.2431 38.5 62Z" fill="#1B1C22"/> -<path d="M38.5 16.5931C44.1103 20.1459 50.1616 22.3135 56.9515 22.7013C56.9862 23.2681 57.0213 23.8286 57.056 24.383C57.5796 32.7561 58.0149 39.7155 56.0615 45.6352C53.9797 51.9436 49.1513 57.1327 38.5 61.4606C27.8487 57.1327 23.0203 51.9436 20.9385 45.6352C18.9851 39.7155 19.4204 32.7561 19.944 24.383C19.9787 23.8286 20.0138 23.2681 20.0485 22.7013C26.8384 22.3135 32.8898 20.1459 38.5 16.5931Z" stroke="#7B7B7B" stroke-miterlimit="9.56677" stroke-linecap="square"/> -</g> -<path d="M46 38.5C46 37.4521 45.1591 36.6 44.125 36.6H43.1875V33.75C43.1875 31.1309 41.0847 29 38.5 29C35.9153 29 33.8125 31.1309 33.8125 33.75V36.6H32.875C31.8409 36.6 31 37.4521 31 38.5V46.1C31 47.1479 31.8409 48 32.875 48H44.125C45.1591 48 46 47.1479 46 46.1V38.5ZM35.6875 33.75C35.6875 32.1787 36.9494 30.9 38.5 30.9C40.0506 30.9 41.3125 32.1787 41.3125 33.75V36.6H35.6875V33.75Z" fill="#E0E0E0"/> -<defs> -<filter id="filter0_d" x="3" y="0" width="71" height="78" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB"> -<feFlood flood-opacity="0" result="BackgroundImageFix"/> -<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"/> -<feOffset/> -<feGaussianBlur stdDeviation="8"/> -<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.45 0"/> -<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow"/> -<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow" result="shape"/> -</filter> -</defs> -</svg> diff --git a/src/assets/icons/badges/ongoing.svg b/src/assets/icons/badges/ongoing.svg deleted file mode 100644 index 54b7f76e9a736a9f0138fcd2d6a2f4221b445ec2..0000000000000000000000000000000000000000 --- a/src/assets/icons/badges/ongoing.svg +++ /dev/null @@ -1,30 +0,0 @@ -<svg width="78" height="78" viewBox="0 0 78 78" fill="none" xmlns="http://www.w3.org/2000/svg"> -<path d="M38.5 10.591C45.5838 15.0293 53.2239 17.7277 61.804 18.1906C61.85 18.9314 61.8964 19.6636 61.9424 20.3874C62.6 30.7544 63.1485 39.4002 60.6868 46.7573C58.0539 54.6264 51.9418 61.0852 38.5 66.4617C25.0582 61.0852 18.9461 54.6264 16.3132 46.7573C13.8515 39.4002 14.4 30.7544 15.0576 20.3874C15.1036 19.6636 15.15 18.9314 15.196 18.1907C23.7761 17.7277 31.4162 15.0293 38.5 10.591Z" fill="#1B1C22" stroke="#61F0F2"/> -<path d="M55.9842 49.5938C55.5341 49.4423 54.9924 49.306 54.3733 49.1503C52.2468 48.6153 49.2064 47.8504 45.8208 45.4478C44.6222 44.5973 43.6391 43.6206 42.8262 42.5938C43.1596 42.495 43.4028 42.1864 43.4028 41.821C43.4028 41.3758 43.0419 41.015 42.5968 41.015C42.3249 41.015 42.0844 41.1496 41.9385 41.3559C41.5133 40.7015 41.147 40.0394 40.8286 39.3879C40.8792 39.3978 40.9314 39.403 40.9849 39.403C41.43 39.403 41.7908 39.0422 41.7908 38.5971C41.7908 38.1519 41.43 37.7911 40.9849 37.7911C40.6878 37.7911 40.4283 37.9518 40.2885 38.1909C39.7227 36.8321 39.3482 35.5742 39.0577 34.5989C38.8642 33.949 38.708 33.4245 38.5575 33.0792C38.5637 33.0388 38.5669 32.9974 38.5669 32.9553C38.5669 32.5102 38.2061 32.1493 37.761 32.1493C37.3158 32.1493 36.955 32.5102 36.955 32.9553C36.955 33.4004 37.3158 33.7612 37.761 33.7612C37.8302 33.7612 37.8974 33.7525 37.9615 33.7361C37.8347 34.4151 37.7071 35.0502 37.5649 35.6522C37.4171 35.4813 37.1987 35.3732 36.955 35.3732C36.5099 35.3732 36.149 35.734 36.149 36.1792C36.149 36.6243 36.5099 36.9851 36.955 36.9851C37.0472 36.9851 37.1359 36.9696 37.2184 36.9411C36.9142 37.9307 36.5316 38.8412 35.9932 39.7325C35.8465 39.5327 35.6099 39.403 35.3431 39.403C34.8979 39.403 34.5371 39.7639 34.5371 40.209C34.5371 40.5773 34.7841 40.8879 35.1215 40.9842C34.7223 41.4881 34.2611 41.9948 33.7235 42.5154C33.6691 42.123 33.3324 41.821 32.9252 41.821C32.48 41.821 32.1192 42.1818 32.1192 42.6269C32.1192 43.0078 32.3834 43.327 32.7386 43.4112C31.9887 44.0554 31.1187 44.728 30.1044 45.4478C26.8695 47.7434 24.2462 48.4469 22.4371 48.932C21.7165 49.1252 21.1252 49.2838 20.6758 49.4946C21.5994 51.454 23.4625 54.4583 28.4999 58C33.9824 61.8546 37.3206 62.7761 38.164 62.7761C39.0075 62.7761 42.5175 61.8546 47.9999 58C53.4824 54.1454 55.0332 52.3128 55.8766 50C55.8766 50 55.9226 49.8462 55.9842 49.5938Z" fill="url(#paint0_radial)"/> -<path d="M39.3729 17.6418C39.3729 18.087 39.0121 18.4478 38.5669 18.4478C38.1218 18.4478 37.761 18.087 37.761 17.6418C37.761 17.1967 38.1218 16.8359 38.5669 16.8359C39.0121 16.8359 39.3729 17.1967 39.3729 17.6418Z" fill="url(#paint1_radial)"/> -<path d="M38.5669 31.3433C39.0121 31.3433 39.3729 30.9825 39.3729 30.5374C39.3729 30.0922 39.0121 29.7314 38.5669 29.7314C38.1218 29.7314 37.761 30.0922 37.761 30.5374C37.761 30.9825 38.1218 31.3433 38.5669 31.3433Z" fill="url(#paint2_radial)"/> -<path d="M40.1789 36.1792C40.624 36.1792 40.9849 35.8183 40.9849 35.3732C40.9849 34.9281 40.624 34.5672 40.1789 34.5672C39.7338 34.5672 39.3729 34.9281 39.3729 35.3732C39.3729 35.8183 39.7338 36.1792 40.1789 36.1792Z" fill="url(#paint3_radial)"/> -<path d="M39.3729 25.7015C39.3729 26.1467 39.0121 26.5075 38.5669 26.5075C38.1218 26.5075 37.761 26.1467 37.761 25.7015C37.761 25.2564 38.1218 24.8956 38.5669 24.8956C39.0121 24.8956 39.3729 25.2564 39.3729 25.7015Z" fill="url(#paint4_radial)"/> -<defs> -<radialGradient id="paint0_radial" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(38.5671 -0.089496) rotate(90) scale(69.3134 65.656)"> -<stop offset="0.674445" stop-color="#F3C129"/> -<stop offset="1" stop-color="#A93C3C"/> -</radialGradient> -<radialGradient id="paint1_radial" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(38.5671 -0.089496) rotate(90) scale(69.3134 65.656)"> -<stop offset="0.674445" stop-color="#F3C129"/> -<stop offset="1" stop-color="#A93C3C"/> -</radialGradient> -<radialGradient id="paint2_radial" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(38.5671 -0.089496) rotate(90) scale(69.3134 65.656)"> -<stop offset="0.674445" stop-color="#F3C129"/> -<stop offset="1" stop-color="#A93C3C"/> -</radialGradient> -<radialGradient id="paint3_radial" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(38.5671 -0.089496) rotate(90) scale(69.3134 65.656)"> -<stop offset="0.674445" stop-color="#F3C129"/> -<stop offset="1" stop-color="#A93C3C"/> -</radialGradient> -<radialGradient id="paint4_radial" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(38.5671 -0.089496) rotate(90) scale(69.3134 65.656)"> -<stop offset="0.674445" stop-color="#F3C129"/> -<stop offset="1" stop-color="#A93C3C"/> -</radialGradient> -</defs> -</svg> diff --git a/src/assets/icons/tabbar/grand-lyon.svg b/src/assets/icons/tabbar/grand-lyon.svg new file mode 100644 index 0000000000000000000000000000000000000000..2e4c7c0794ba24b5782d7681d93f73630abb5464 --- /dev/null +++ b/src/assets/icons/tabbar/grand-lyon.svg @@ -0,0 +1,22 @@ +<svg width="101" height="23" viewBox="0 0 101 23" fill="none" xmlns="http://www.w3.org/2000/svg"> +<path d="M7.81215 12.9224C7.39405 13.427 6.88879 13.833 6.32645 14.1163C5.76411 14.3995 5.15621 14.5542 4.53892 14.5711C3.92164 14.588 3.30761 14.4667 2.7334 14.2146C2.15919 13.9625 1.63653 13.5846 1.19656 13.1034C0.0191753 11.7958 0 10.5266 0 7.28739C0 4.04822 0.0230104 2.77683 1.19656 1.46924C1.62081 1.00088 2.12406 0.630018 2.6775 0.377874C3.23094 0.125731 3.82371 -0.0027462 4.4219 -0.000207232C6.68846 -0.000207232 8.42769 1.65026 8.8323 4.18665H7.85434C7.47083 2.21461 6.1688 0.966645 4.42765 0.966645C3.97438 0.962018 3.5248 1.05754 3.10507 1.24766C2.68534 1.43777 2.30384 1.71868 1.98276 2.07405C1.05274 3.10905 0.981792 4.20794 0.981792 7.28739C0.981792 10.3668 1.05466 11.4742 1.97893 12.4986C2.29994 12.8541 2.68143 13.135 3.10117 13.3252C3.52092 13.5153 3.97053 13.6107 4.42382 13.606C4.93588 13.6092 5.44221 13.4864 5.90641 13.2463C6.3706 13.0062 6.78111 12.6548 7.10841 12.2175C7.66642 11.4529 7.88502 10.6075 7.88502 9.38081V8.09239H4.4219V7.12554H8.86298V9.46813C8.86298 10.9589 8.57343 12.0237 7.81215 12.9309" fill="white"/> +<path d="M17.0893 1.08766H13.2829V6.88451H17.0893C18.7384 6.88451 19.9349 5.95812 19.9349 3.98609C19.9349 2.01405 18.7384 1.08766 17.0893 1.08766ZM19.9157 14.4532L16.8342 7.85136H13.2829V14.4532H12.3049V0.127197H17.2158C19.3251 0.127197 20.9129 1.47525 20.9129 3.97118C20.9129 6.10081 19.7527 7.49358 17.9406 7.83645L21.0567 14.4596L19.9157 14.4532Z" fill="white"/> +<path d="M27.6724 1.56896L24.9725 10.0023H30.3724L27.6724 1.56896ZM31.8048 14.4511L30.6811 10.9691H24.6638L23.5401 14.4511H22.4893L27.2371 0.127197H28.1077L32.8556 14.4596L31.8048 14.4511Z" fill="white"/> +<path d="M43.5439 14.4508L36.0961 1.99248V14.4508H35.1182V0.118408H36.0961L43.5439 12.5384V0.118408H44.5238V14.4508H43.5439Z" fill="white"/> +<path d="M55.3753 2.19294C54.6332 1.34109 53.6361 1.08766 52.6025 1.08766H49.4846V13.4842H52.6006C53.6342 13.4842 54.6313 13.2223 55.3734 12.3768C56.405 11.2098 56.3322 8.6734 56.3322 7.0847C56.3322 5.49599 56.4031 3.3621 55.3734 2.18655L55.3753 2.19294ZM56.0618 13.1371C55.2948 13.989 54.1788 14.4447 52.8365 14.4447H48.5066V0.127197H52.8384C54.1807 0.127197 55.3024 0.591457 56.0637 1.43692C57.3696 2.88507 57.314 5.15951 57.314 7.09321C57.314 9.02692 57.3696 11.6932 56.0637 13.1435L56.0618 13.1371Z" fill="white"/> +<path d="M60.3035 14.4508V0.118408H62.8231V11.9549H68.6775V14.4508H60.3035Z" fill="white"/> +<path d="M74.202 8.57304V14.4508H71.7015V8.57304L67.8223 0.118408H70.5586L72.969 5.89822L75.3449 0.118408H78.0793L74.202 8.57304Z" fill="white"/> +<path d="M85.3987 3.26031C85.1955 3.01071 84.9458 2.81309 84.6671 2.68109C84.3883 2.54909 84.0871 2.48586 83.7841 2.49577C83.4787 2.48591 83.1749 2.54907 82.8934 2.68098C82.6118 2.81288 82.3591 3.01046 82.1523 3.26031C81.6633 3.86299 81.5368 4.53809 81.5368 7.28531C81.5368 10.0325 81.6633 10.7055 82.1523 11.3103C82.3592 11.56 82.6119 11.7575 82.8934 11.8894C83.175 12.0213 83.4787 12.0846 83.7841 12.0748C84.087 12.0846 84.3882 12.0213 84.667 11.8893C84.9457 11.7573 85.1954 11.5598 85.3987 11.3103C85.8877 10.7055 86.0335 10.0325 86.0335 7.28531C86.0335 4.53809 85.8896 3.86299 85.3987 3.26031ZM87.2722 13.0034C86.3373 14.0107 85.0858 14.5741 83.7832 14.5741C82.4805 14.5741 81.2291 14.0107 80.2942 13.0034C78.9902 11.5552 79.0247 9.76207 79.0247 7.28744C79.0247 4.81281 78.9902 3.02818 80.2942 1.57151C81.2291 0.564137 82.4805 0.000732422 83.7832 0.000732422C85.0858 0.000732422 86.3373 0.564137 87.2722 1.57151C88.5781 3.01966 88.5589 4.81068 88.5589 7.28744C88.5589 9.7642 88.5704 11.5552 87.2722 13.0034Z" fill="white"/> +<path d="M98.7506 14.4508L93.6403 5.65545V14.4508H91.1226V0.118408H93.37L98.4803 8.89461V0.118408H101V14.4508H98.7506Z" fill="white"/> +<path d="M85.6326 18.9751H85.6442C85.7043 18.8383 85.7987 18.7238 85.9161 18.6452C86.0334 18.5666 86.1687 18.5274 86.3057 18.5321C86.7659 18.5321 87.2338 18.7451 87.2338 20.14C87.2338 20.9365 87.2108 21.8543 86.275 21.8543C86.1485 21.8567 86.0236 21.8223 85.9126 21.7547C85.8017 21.6871 85.7085 21.5886 85.6422 21.4689H85.625V23.0001H85.1628V18.596H85.6307L85.6326 18.9751ZM86.7448 20.14C86.7448 19.6587 86.7448 18.9559 86.1581 18.9559C85.5713 18.9559 85.6346 19.8418 85.6346 20.3295C85.6346 20.7555 85.6576 21.4306 86.1753 21.4306C86.6931 21.4306 86.7448 20.9982 86.7448 20.1464V20.14Z" fill="white"/> +<path d="M53.4347 21.3281H53.4232C53.3722 21.4924 53.2736 21.6332 53.1427 21.7284C53.0119 21.8236 52.8562 21.8679 52.7003 21.8541C52.0905 21.8541 51.9141 21.4176 51.9141 20.8042C51.9141 19.8352 52.7693 19.7927 53.4232 19.8097C53.4347 19.3838 53.4405 18.9238 52.9381 18.9238C52.872 18.9179 52.8057 18.9292 52.7443 18.9568C52.6829 18.9844 52.6282 19.0275 52.5844 19.0827C52.5407 19.1379 52.5091 19.2037 52.4923 19.2748C52.4755 19.3459 52.4738 19.4204 52.4874 19.4924H51.9889C52.0119 18.7768 52.3532 18.5298 52.963 18.5298C53.7032 18.5298 53.8968 18.9557 53.8968 19.4924V21.03C53.8988 21.2846 53.918 21.5388 53.9544 21.7902H53.4424L53.4347 21.3281ZM52.382 20.8404C52.382 21.1492 52.5181 21.4282 52.8307 21.4282C53.1432 21.4282 53.4692 21.2323 53.4232 20.1994C52.9802 20.2079 52.382 20.1653 52.382 20.8426V20.8404Z" fill="white"/> +<path d="M61.8415 21.7905V19.5756C61.8415 19.2519 61.761 18.9559 61.3851 18.9559C61.3079 18.9573 61.2318 18.977 61.1621 19.0137C61.0923 19.0505 61.0304 19.1034 60.9805 19.1689C60.9083 19.312 60.8706 19.4734 60.8712 19.6374V21.7883H60.4072V19.2605C60.4072 19.0475 60.3957 18.8175 60.3784 18.596H60.8731V18.9943H60.8847C60.9435 18.8418 61.0451 18.7145 61.1743 18.6312C61.3035 18.548 61.4534 18.5132 61.6018 18.5321C61.7378 18.5209 61.8738 18.5537 61.9933 18.6267C62.1128 18.6996 62.2106 18.8096 62.2749 18.9431C62.3386 18.8061 62.4379 18.6936 62.5601 18.6203C62.6822 18.547 62.8214 18.5162 62.9595 18.5321C63.2624 18.5321 63.7457 18.6088 63.7457 19.3606V21.7905H63.2778V19.5756C63.2778 19.2519 63.1992 18.9559 62.8214 18.9559C62.7583 18.9448 62.6937 18.9498 62.6326 18.9705C62.5715 18.9911 62.5154 19.0269 62.4686 19.0752C62.3557 19.2349 62.2991 19.4347 62.3094 19.6374V21.7883L61.8415 21.7905Z" fill="white"/> +<path d="M67.1493 20.3593C67.1493 21.2516 67.366 21.4241 67.7245 21.4241C68.0429 21.4241 68.2097 21.1387 68.225 20.8172H68.737C68.737 21.5263 68.3382 21.8479 67.7341 21.8479C67.1301 21.8479 66.6411 21.6349 66.6411 20.2336C66.6411 19.2966 66.737 18.5299 67.7341 18.5299C68.5548 18.5299 68.76 19.0304 68.76 20.0867V20.3593H67.1493ZM68.271 19.9674C68.271 19.0368 68.0371 18.9239 67.6958 18.9239C67.4005 18.9239 67.155 19.0815 67.1493 19.9674H68.271ZM68.3861 17.2202L67.6402 18.1125H67.2567L67.7648 17.2202H68.3861Z" fill="white"/> +<path d="M71.9317 18.5959V17.9826L72.3996 17.7483V18.6001H73.0266V18.992H72.3996V20.947C72.3996 21.16 72.3996 21.4091 72.8272 21.4091C72.8617 21.4091 72.9346 21.3963 73.0381 21.3836V21.7818C72.8847 21.7946 72.7294 21.8329 72.576 21.8329C72.1311 21.8329 71.9317 21.62 71.9317 21.2643V18.9877H71.46V18.5959H71.9317Z" fill="white"/> +<path d="M76.5166 19.0814H76.5338C76.7256 18.5937 76.9672 18.5383 77.4217 18.5383V19.0771L77.297 19.058C77.2558 19.0502 77.2142 19.0459 77.1724 19.0452C76.6546 19.0452 76.5223 19.4818 76.5223 19.9119V21.7988H76.0544V18.6043H76.5223L76.5166 19.0814Z" fill="white"/> +<path d="M80.0793 20.2401C80.0793 19.303 80.1752 18.5364 81.1724 18.5364C82.1695 18.5364 82.2654 19.3094 82.2654 20.2401C82.2654 21.652 81.7802 21.8543 81.1724 21.8543C80.5645 21.8543 80.0793 21.652 80.0793 20.2401ZM81.7764 20.0271C81.7764 19.154 81.531 18.9623 81.1724 18.9623C80.8138 18.9623 80.5683 19.1518 80.5683 20.0271C80.5683 21.0642 80.6891 21.4391 81.1724 21.4391C81.6556 21.4391 81.7783 21.0557 81.7783 20.0186L81.7764 20.0271Z" fill="white"/> +<path d="M90.0909 20.2401C90.0909 19.303 90.1868 18.5364 91.184 18.5364C92.1811 18.5364 92.2789 19.3094 92.2789 20.2401C92.2789 21.652 91.7938 21.8543 91.184 21.8543C90.5742 21.8543 90.0909 21.652 90.0909 20.2401ZM91.788 20.0271C91.788 19.154 91.5426 18.9623 91.184 18.9623C90.8254 18.9623 90.5799 19.1518 90.5799 20.0271C90.5799 21.0642 90.6988 21.4391 91.184 21.4391C91.6691 21.4391 91.7899 21.0557 91.7899 20.0186L91.788 20.0271Z" fill="white"/> +<path d="M95.7747 21.7905H95.3068V17.2224H95.7727L95.7747 21.7905Z" fill="white"/> +<path d="M99.2224 20.3591C99.2224 21.2515 99.4391 21.424 99.7977 21.424C100.116 21.424 100.283 21.1386 100.298 20.817H100.81C100.81 21.5262 100.411 21.8477 99.8072 21.8477C99.2032 21.8477 98.7142 21.6348 98.7142 20.2335C98.7142 19.2965 98.8101 18.5298 99.8072 18.5298C100.628 18.5298 100.833 19.0302 100.833 20.0865V20.3591H99.2224ZM100.344 19.9673C100.344 19.0366 100.11 18.9238 99.7689 18.9238C99.4736 18.9238 99.2281 19.0814 99.2224 19.9673H100.344Z" fill="white"/> +<path d="M49.2296 21.7905H48.7617V17.2224H49.2296V21.7905Z" fill="white"/> +</svg> diff --git a/src/assets/icons/visu/challenge/add_challenge.svg b/src/assets/icons/visu/challenge/add_challenge.svg deleted file mode 100644 index 5651c6a5dfc204115da74438629f071daa13eafd..0000000000000000000000000000000000000000 --- a/src/assets/icons/visu/challenge/add_challenge.svg +++ /dev/null @@ -1,3 +0,0 @@ -<svg width="44" height="50" viewBox="0 0 44 50" fill="none" xmlns="http://www.w3.org/2000/svg"> -<path d="M22 0L43.6506 12.5V37.5L22 50L0.349365 37.5V12.5L22 0Z" fill="#C4C4C4"/> -</svg> diff --git a/src/assets/icons/visu/challenge/default_challenge.svg b/src/assets/icons/visu/challenge/default_challenge.svg deleted file mode 100644 index 5651c6a5dfc204115da74438629f071daa13eafd..0000000000000000000000000000000000000000 --- a/src/assets/icons/visu/challenge/default_challenge.svg +++ /dev/null @@ -1,3 +0,0 @@ -<svg width="44" height="50" viewBox="0 0 44 50" fill="none" xmlns="http://www.w3.org/2000/svg"> -<path d="M22 0L43.6506 12.5V37.5L22 50L0.349365 37.5V12.5L22 0Z" fill="#C4C4C4"/> -</svg> diff --git a/src/assets/icons/visu/challenge/star.svg b/src/assets/icons/visu/challenge/star.svg deleted file mode 100644 index 704f5efab44156bab3f7d7328743ff447784260b..0000000000000000000000000000000000000000 --- a/src/assets/icons/visu/challenge/star.svg +++ /dev/null @@ -1,3 +0,0 @@ -<svg width="316" height="316" viewBox="0 0 316 316" fill="none" xmlns="http://www.w3.org/2000/svg"> -<path d="M158 0L158.708 148.547L181.549 1.76472L160.109 148.758L204.571 7.0195L161.463 149.175L226.554 15.6469L162.74 149.79L247.005 27.4543L163.911 150.588L265.467 42.1778L164.949 151.552L281.529 59.4886L165.833 152.66L294.832 79L166.541 153.887L305.078 100.276L167.059 155.206L312.039 122.842L167.374 156.587L315.558 146.193L167.48 158L315.558 169.807L167.374 159.413L312.039 193.158L167.059 160.794L305.078 215.724L166.541 162.113L294.832 237L165.833 163.34L281.529 256.511L164.949 164.448L265.467 273.822L163.911 165.412L247.005 288.546L162.74 166.21L226.554 300.353L161.463 166.825L204.571 308.98L160.109 167.242L181.549 314.235L158.708 167.453L158 316L157.292 167.453L134.451 314.235L155.891 167.242L111.429 308.98L154.537 166.825L89.4464 300.353L153.26 166.21L68.9954 288.546L152.089 165.412L50.5327 273.822L151.051 164.448L34.4706 256.511L150.167 163.34L21.168 237L149.459 162.113L10.922 215.724L148.941 160.794L3.9614 193.158L148.626 159.413L0.441803 169.807L148.52 158L0.441803 146.193L148.626 156.587L3.9614 122.842L148.941 155.206L10.922 100.276L149.459 153.887L21.168 79L150.167 152.66L34.4706 59.4886L151.051 151.552L50.5327 42.1778L152.089 150.588L68.9954 27.4543L153.26 149.79L89.4464 15.6469L154.537 149.175L111.429 7.0195L155.891 148.758L134.451 1.76472L157.292 148.547L158 0Z" fill="#7B7B7B"/> -</svg> diff --git a/src/assets/icons/visu/ecogesture/0032.svg b/src/assets/icons/visu/ecogesture/0032.svg new file mode 100644 index 0000000000000000000000000000000000000000..11c7d4267830726df0537fe252e122d5997016f3 --- /dev/null +++ b/src/assets/icons/visu/ecogesture/0032.svg @@ -0,0 +1,44 @@ +<svg width="51" height="50" viewBox="0 0 51 50" fill="none" xmlns="http://www.w3.org/2000/svg"> +<path fill-rule="evenodd" clip-rule="evenodd" d="M36.0561 36.8783C36.2942 37.0182 36.3738 37.3247 36.2339 37.5627L35.6823 38.5013C35.5424 38.7394 35.236 38.819 34.9979 38.6791C34.7599 38.5392 34.6803 38.2328 34.8202 37.9947L35.3717 37.0561C35.5116 36.818 35.818 36.7384 36.0561 36.8783ZM34.4015 39.694C34.6396 39.8339 34.7192 40.1404 34.5793 40.3784L33.4762 42.2556C33.3363 42.4937 33.0299 42.5733 32.7918 42.4333C32.5537 42.2934 32.4741 41.987 32.6141 41.749L33.7171 39.8718C33.857 39.6337 34.1634 39.5541 34.4015 39.694ZM32.1954 43.4483C32.4335 43.5882 32.5131 43.8946 32.3732 44.1327L31.2701 46.0099C31.1302 46.2479 30.8238 46.3275 30.5857 46.1876C30.3476 46.0477 30.268 45.7413 30.4079 45.5032L31.511 43.6261C31.6509 43.388 31.9573 43.3084 32.1954 43.4483ZM29.9893 47.2026C30.2273 47.3425 30.3069 47.6489 30.167 47.887L29.6155 48.8256C29.4756 49.0637 29.1692 49.1432 28.9311 49.0033C28.693 48.8634 28.6134 48.557 28.7533 48.3189L29.3049 47.3804C29.4448 47.1423 29.7512 47.0627 29.9893 47.2026Z" fill="#80F0FF"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M23.8145 35.0209C24.0526 35.1608 24.1322 35.4672 23.9923 35.7053L23.4408 36.6438C23.3009 36.8819 22.9944 36.9615 22.7564 36.8216C22.5183 36.6817 22.4387 36.3753 22.5786 36.1372L23.1301 35.1986C23.27 34.9605 23.5764 34.881 23.8145 35.0209ZM22.1599 37.8366C22.398 37.9765 22.4776 38.2829 22.3377 38.521L21.2346 40.3981C21.0947 40.6362 20.7883 40.7158 20.5502 40.5759C20.3122 40.436 20.2326 40.1295 20.3725 39.8915L21.4755 38.0143C21.6154 37.7762 21.9219 37.6967 22.1599 37.8366ZM19.9538 41.5908C20.1919 41.7307 20.2715 42.0372 20.1316 42.2752L19.0285 44.1524C18.8886 44.3905 18.5822 44.47 18.3441 44.3301C18.106 44.1902 18.0264 43.8838 18.1664 43.6457L19.2694 41.7686C19.4093 41.5305 19.7157 41.4509 19.9538 41.5908ZM17.7477 45.3451C17.9858 45.485 18.0654 45.7914 17.9255 46.0295L17.3739 46.9681C17.234 47.2062 16.9276 47.2858 16.6895 47.1459C16.4514 47.006 16.3719 46.6995 16.5118 46.4615L17.0633 45.5229C17.2032 45.2848 17.5096 45.2052 17.7477 45.3451Z" fill="#80F0FF"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M33.9056 35.0209C34.1437 35.1608 34.2233 35.4672 34.0834 35.7053L33.5318 36.6438C33.3919 36.8819 33.0855 36.9615 32.8474 36.8216C32.6093 36.6817 32.5298 36.3753 32.6697 36.1372L33.2212 35.1986C33.3611 34.9605 33.6675 34.881 33.9056 35.0209ZM32.251 37.8366C32.4891 37.9765 32.5687 38.2829 32.4288 38.521L31.3257 40.3981C31.1858 40.6362 30.8794 40.7158 30.6413 40.5759C30.4032 40.436 30.3236 40.1295 30.4635 39.8915L31.5666 38.0143C31.7065 37.7762 32.0129 37.6967 32.251 37.8366ZM30.0449 41.5908C30.283 41.7307 30.3625 42.0372 30.2226 42.2752L29.1196 44.1524C28.9797 44.3905 28.6733 44.47 28.4352 44.3301C28.1971 44.1902 28.1175 43.8838 28.2574 43.6457L29.3605 41.7686C29.5004 41.5305 29.8068 41.4509 30.0449 41.5908ZM27.8388 45.3451C28.0768 45.485 28.1564 45.7914 28.0165 46.0295L27.465 46.9681C27.3251 47.2062 27.0187 47.2858 26.7806 47.1459C26.5425 47.006 26.4629 46.6995 26.6028 46.4615L27.1544 45.5229C27.2943 45.2848 27.6007 45.2052 27.8388 45.3451Z" fill="#80F0FF"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M21.664 33.1634C21.9021 33.3033 21.9817 33.6097 21.8418 33.8478L21.2902 34.7863C21.1503 35.0244 20.8439 35.104 20.6058 34.9641C20.3678 34.8242 20.2882 34.5178 20.4281 34.2797L20.9796 33.3411C21.1195 33.1031 21.4259 33.0235 21.664 33.1634ZM20.0094 35.9791C20.2475 36.119 20.3271 36.4254 20.1872 36.6635L19.0841 38.5406C18.9442 38.7787 18.6378 38.8583 18.3997 38.7184C18.1616 38.5785 18.0821 38.2721 18.222 38.034L19.325 36.1568C19.4649 35.9188 19.7713 35.8392 20.0094 35.9791ZM17.8033 39.7334C18.0414 39.8733 18.121 40.1797 17.9811 40.4178L16.878 42.2949C16.7381 42.533 16.4317 42.6126 16.1936 42.4727C15.9555 42.3328 15.8759 42.0263 16.0158 41.7883L17.1189 39.9111C17.2588 39.673 17.5652 39.5935 17.8033 39.7334ZM15.5972 43.4876C15.8353 43.6275 15.9148 43.934 15.7749 44.172L15.2234 45.1106C15.0835 45.3487 14.7771 45.4283 14.539 45.2884C14.3009 45.1485 14.2213 44.8421 14.3612 44.604L14.9128 43.6654C15.0527 43.4273 15.3591 43.3477 15.5972 43.4876Z" fill="#80F0FF"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M27.3092 35.0209C27.5472 35.1608 27.6268 35.4672 27.4869 35.7053L26.9354 36.6438C26.7955 36.8819 26.4891 36.9615 26.251 36.8216C26.0129 36.6817 25.9333 36.3753 26.0732 36.1372L26.6248 35.1986C26.7647 34.9605 27.0711 34.881 27.3092 35.0209ZM25.6546 37.8366C25.8926 37.9765 25.9722 38.2829 25.8323 38.521L24.7293 40.3981C24.5894 40.6362 24.2829 40.7158 24.0449 40.5759C23.8068 40.436 23.7272 40.1295 23.8671 39.8915L24.9702 38.0143C25.1101 37.7762 25.4165 37.6967 25.6546 37.8366ZM23.4484 41.5908C23.6865 41.7307 23.7661 42.0372 23.6262 42.2752L22.5231 44.1524C22.3832 44.3905 22.0768 44.47 21.8387 44.3301C21.6007 44.1902 21.5211 43.8838 21.661 43.6457L22.764 41.7686C22.9039 41.5305 23.2104 41.4509 23.4484 41.5908ZM21.2423 45.3451C21.4804 45.485 21.56 45.7914 21.4201 46.0295L20.8686 46.9681C20.7286 47.2062 20.4222 47.2858 20.1842 47.1459C19.9461 47.006 19.8665 46.6995 20.0064 46.4615L20.5579 45.5229C20.6978 45.2848 21.0042 45.2052 21.2423 45.3451Z" fill="#80F0FF"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M15.0676 33.1634C15.3057 33.3033 15.3852 33.6097 15.2453 33.8478L14.6938 34.7863C14.5539 35.0244 14.2475 35.104 14.0094 34.9641C13.7713 34.8242 13.6917 34.5178 13.8316 34.2797L14.3832 33.3411C14.5231 33.1031 14.8295 33.0235 15.0676 33.1634ZM13.413 35.9791C13.6511 36.119 13.7307 36.4254 13.5907 36.6635L12.4877 38.5406C12.3478 38.7787 12.0414 38.8583 11.8033 38.7184C11.5652 38.5785 11.4856 38.2721 11.6255 38.034L12.7286 36.1568C12.8685 35.9188 13.1749 35.8392 13.413 35.9791ZM11.2069 39.7334C11.4449 39.8733 11.5245 40.1797 11.3846 40.4178L10.2816 42.2949C10.1417 42.533 9.83525 42.6126 9.59717 42.4727C9.35909 42.3328 9.2795 42.0263 9.4194 41.7883L10.5225 39.9111C10.6624 39.673 10.9688 39.5935 11.2069 39.7334ZM9.00074 43.4876C9.23882 43.6275 9.31841 43.934 9.1785 44.172L8.62697 45.1106C8.48707 45.3487 8.18066 45.4283 7.94258 45.2884C7.7045 45.1485 7.62491 44.8421 7.76481 44.604L8.31634 43.6654C8.45624 43.4273 8.76266 43.3477 9.00074 43.4876Z" fill="#80F0FF"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M29.6687 36.8783C29.9067 37.0182 29.9863 37.3247 29.8464 37.5627L29.2949 38.5013C29.155 38.7394 28.8486 38.819 28.6105 38.6791C28.3724 38.5392 28.2928 38.2328 28.4327 37.9947L28.9843 37.0561C29.1242 36.818 29.4306 36.7384 29.6687 36.8783ZM28.0141 39.694C28.2521 39.8339 28.3317 40.1404 28.1918 40.3784L27.0888 42.2556C26.9489 42.4937 26.6424 42.5733 26.4044 42.4333C26.1663 42.2934 26.0867 41.987 26.2266 41.749L27.3297 39.8718C27.4696 39.6337 27.776 39.5541 28.0141 39.694ZM25.8079 43.4483C26.046 43.5882 26.1256 43.8946 25.9857 44.1327L24.8826 46.0099C24.7427 46.2479 24.4363 46.3275 24.1982 46.1876C23.9602 46.0477 23.8806 45.7413 24.0205 45.5032L25.1235 43.6261C25.2634 43.388 25.5699 43.3084 25.8079 43.4483ZM23.6018 47.2026C23.8399 47.3425 23.9195 47.6489 23.7796 47.887L23.228 48.8256C23.0881 49.0637 22.7817 49.1432 22.5437 49.0033C22.3056 48.8634 22.226 48.557 22.3659 48.3189L22.9174 47.3804C23.0573 47.1423 23.3637 47.0627 23.6018 47.2026Z" fill="#80F0FF"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M17.4271 35.0209C17.6652 35.1608 17.7447 35.4672 17.6048 35.7053L17.0533 36.6438C16.9134 36.8819 16.607 36.9615 16.3689 36.8216C16.1308 36.6817 16.0512 36.3753 16.1911 36.1372L16.7427 35.1986C16.8826 34.9605 17.189 34.881 17.4271 35.0209ZM15.7725 37.8366C16.0106 37.9765 16.0901 38.2829 15.9502 38.521L14.8472 40.3981C14.7073 40.6362 14.4009 40.7158 14.1628 40.5759C13.9247 40.436 13.8451 40.1295 13.985 39.8915L15.0881 38.0143C15.228 37.7762 15.5344 37.6967 15.7725 37.8366ZM13.5664 41.5908C13.8044 41.7307 13.884 42.0372 13.7441 42.2752L12.6411 44.1524C12.5012 44.3905 12.1947 44.47 11.9567 44.3301C11.7186 44.1902 11.639 43.8838 11.7789 43.6457L12.882 41.7686C13.0219 41.5305 13.3283 41.4509 13.5664 41.5908ZM11.3602 45.3451C11.5983 45.485 11.6779 45.7914 11.538 46.0295L10.9865 46.9681C10.8466 47.2062 10.5402 47.2858 10.3021 47.1459C10.064 47.006 9.98441 46.6995 10.1243 46.4615L10.6758 45.5229C10.8157 45.2848 11.1222 45.2052 11.3602 45.3451Z" fill="#80F0FF"/> +<path d="M6.55013 17.8336C4.66131 24.0152 9.1973 27.9574 11.3795 29.5314C14.456 29.1379 18.0762 28.2436 13.0966 25.6679C6.87209 22.4483 8.48193 17.9409 9.87704 14.614C11.9203 9.74142 19.9134 7.03278 24.7944 5.16992C13.0966 8.71146 8.43895 11.652 6.55013 17.8336Z" fill="#9BCAE9"/> +<path d="M12.9345 29.1564C10.7524 27.5824 6.21636 23.6402 8.10518 17.4586C9.78707 11.9542 13.6644 9.01967 22.7526 5.94232C23.0895 5.81425 23.4192 5.68995 23.7397 5.56912C24.1041 5.43171 24.4567 5.29879 24.7944 5.16992C13.0966 8.71146 8.43895 11.652 6.55013 17.8336C4.66131 24.0152 9.1973 27.9574 11.3795 29.5314C12.3549 29.4066 13.385 29.2315 14.1784 28.9684C13.7686 29.042 13.3467 29.1037 12.9345 29.1564Z" fill="#6A9DBE"/> +<path d="M16.1012 22.0582L16.1211 22.061C16.1208 21.9182 16.1432 21.7583 16.1656 21.5983C16.5605 18.7787 19.149 16.8168 21.9556 17.2099C22.8315 17.3326 23.6367 17.6696 24.3172 18.1727C25.814 16.1803 28.3302 15.0239 30.9776 15.3947C34.8592 15.9383 37.5816 19.5411 37.0355 23.4405C37.0952 23.4489 37.1748 23.46 37.2346 23.4684C41.1161 24.012 43.8159 27.632 43.2697 31.5314C42.7236 35.4308 39.1361 38.1499 35.2545 37.6063C34.4384 37.492 33.6817 37.2433 33.0015 36.883C31.8049 38.3261 29.9048 39.1406 27.9143 38.8619C26.083 38.6054 24.5939 37.4997 23.772 35.9777C22.8009 36.535 21.6473 36.8016 20.4729 36.6371C18.4625 36.3556 16.8931 34.9532 16.2952 33.1364C15.7325 33.2411 15.164 33.243 14.5668 33.1594C11.5213 32.7328 9.38039 29.9047 9.81168 26.8252C10.2203 23.7629 13.0358 21.6289 16.1012 22.0582Z" fill="#E7F5FE"/> +<path d="M18.394 22.1283C20.9158 22.1283 22.1292 23.1173 23.0971 23.9591L32.0616 22.6964C32.0616 22.6964 32.9454 21.3076 35.9757 23.2646C39.0059 25.2217 40.1738 27.2734 40.016 29.2619C39.4162 27.81 38.9112 27.3049 37.4276 26.863C35.9756 26.4305 33.1138 27.9993 32.0616 28.5044C32.4404 28.5044 34.0186 28.8516 34.7131 32.0396C33.2295 30.0195 32.8823 29.4829 30.5465 29.6723C28.231 29.86 27.9372 32.6289 28.2739 33.9335C27.8951 33.681 27.1754 32.4437 27.0744 31.5346C26.9734 30.6255 26.9902 29.5565 27.4531 29.2619C26.8218 28.7569 26.0517 28.8074 24.7386 30.0195C23.4255 31.2316 23.981 30.9665 23.6969 32.0396C23.4444 30.7771 23.7285 28.2519 21.3296 27.4943C18.394 26.5673 16.7842 27.1155 16.0898 29.2619C16.0898 27.9993 16.5776 26.863 17.668 26.2633C19.6281 25.1853 20.9443 25.7633 21.905 26.2215C21.1058 25.7778 20.4774 23.7539 19.4673 23.5487C17.4471 23.1383 15.6163 23.7381 14.5115 25.0323C15.5217 22.4755 16.6896 22.1283 18.394 22.1283Z" fill="#9BCAE9"/> +<path d="M42.9424 32.8925C41.4167 34.5412 39.1199 36.312 36.7332 35.9777C35.9171 35.8634 33.3804 35.0699 33.0016 33.8704C32.7421 35.4486 30.4538 37.1617 28.4632 36.8829C26.632 36.6265 24.2979 35.3924 23.476 33.8704C22.5049 34.4276 21.6474 34.9187 20.4729 34.7542C18.4625 34.4726 16.8932 32.657 16.2952 30.8402C15.7326 30.9449 14.6037 31.3026 14.0065 31.2189C10.3585 30.1403 10.8804 27.4047 11.3117 24.3252C11.3472 24.0592 11.4009 23.8003 11.4712 23.5494C10.5937 24.39 9.98537 25.5237 9.81173 26.8252C9.38044 29.9047 11.5213 32.7328 14.5668 33.1593C15.164 33.243 15.7326 33.241 16.2952 33.1363C16.8932 34.9532 18.4625 36.3555 20.4729 36.6371C21.6474 36.8016 22.801 36.535 23.772 35.9777C24.594 37.4997 26.0831 38.6054 27.9144 38.8618C29.9049 39.1406 31.805 38.3261 33.0016 36.8829C33.6818 37.2433 34.4385 37.492 35.2546 37.6063C38.666 38.084 41.8504 36.0416 42.9424 32.8925Z" fill="#9BCAE9"/> +<path d="M22.5756 19.7845C23.0024 19.1726 23.6965 18.7565 24.4992 18.713C25.416 18.6634 26.2444 19.1123 26.7209 19.8234C26.603 18.728 25.6465 17.9045 24.5333 17.9647C23.5105 18.0201 22.6996 18.8031 22.5756 19.7845Z" fill="#9BCAE9"/> +<path d="M26.2756 14.9377C27.8577 14.4961 30.1944 15.4206 31.165 15.938L32.3097 20.4262C32.0588 20.7401 30.1225 22.4612 29.1202 22.8469C27.8673 23.3291 23.7907 22.1902 23.2409 21.4859C22.6912 20.7817 22.8048 18.5678 22.7736 17.5296C22.7424 16.4914 24.298 15.4897 26.2756 14.9377Z" fill="#FF8C05"/> +<path d="M30.0475 15.436C28.9204 15.0037 27.4056 14.6223 26.2757 14.9377C24.2981 15.4897 22.7425 16.4914 22.7737 17.5296C22.7793 17.719 22.7802 17.9476 22.7812 18.1989C22.7855 19.3253 22.7915 20.9101 23.241 21.4859C23.5143 21.8361 24.6594 22.2936 25.8958 22.606C25.2801 22.3748 24.8088 22.1284 24.6461 21.92C24.1967 21.3442 24.1906 19.7594 24.1863 18.633C24.1854 18.3816 24.1845 18.1531 24.1788 17.9637C24.1476 16.9255 25.7032 15.9238 27.6808 15.3718C28.3829 15.1758 29.2336 15.2489 30.0475 15.436Z" fill="#BD4400"/> +<path d="M20.7158 22.607C21.1606 21.5797 22.8716 21.2548 23.6714 21.2207C25.7607 21.0538 30.1057 20.661 30.7713 20.4247C31.6034 20.1294 32.8165 19.3242 34.2562 19.2629C35.696 19.2016 36.0299 19.7201 36.7278 21.1587C37.4258 22.5974 36.5273 24.0779 36.3126 24.5289C36.0979 24.9798 34.5411 25.3449 32.9253 25.5437C31.6327 25.7026 30.9487 24.7962 30.7683 24.3231L29.4467 24.7172L28.1285 27.0213C27.737 27.1852 26.8444 27.6269 26.4064 28.0821C25.8589 28.6512 23.8501 28.1649 21.939 27.5316C20.0279 26.8983 20.1597 23.8911 20.7158 22.607Z" fill="#FF8C05"/> +<path d="M22.2686 23.3299C22.7105 23.3088 23.9099 23.2794 25.1726 23.3299C26.0564 23.6455 28.0133 24.3021 28.7709 24.4031C29.7179 24.5293 30.6648 23.9612 31.9274 23.9612C32.9375 23.9612 33.3163 22.6144 33.3794 21.941L34.9577 20.3628C34.5578 20.489 33.5941 20.7794 32.9375 20.9309C32.1168 21.1203 31.4224 21.941 30.6648 22.3198C29.9073 22.6986 29.5285 22.7617 28.7709 22.8248C28.0134 22.8879 26.5614 22.0041 25.1726 21.941C24.0615 21.8905 22.7736 22.8459 22.2686 23.3299Z" fill="#BD4400"/> +<path d="M20.5769 22.9934C20.1526 24.4141 20.2002 26.9554 21.939 27.5317C23.8501 28.165 25.8589 28.6512 26.4064 28.0822C26.8445 27.6269 27.737 27.1852 28.1285 27.0213L29.4467 24.7172L30.7684 24.3231C30.9488 24.7962 31.6327 25.7027 32.9253 25.5437C34.5411 25.345 36.0979 24.9799 36.3126 24.5289C36.3324 24.4874 36.358 24.437 36.3876 24.3788C36.6099 23.942 37.0586 23.06 36.9798 22.0873C36.8562 22.435 36.709 22.7243 36.6083 22.9222C36.5787 22.9804 36.5531 23.0308 36.5333 23.0723C36.3186 23.5233 34.7618 23.8884 33.1461 24.0871C31.8534 24.2461 31.1695 23.3396 30.9891 22.8665L29.6675 23.2606L28.3492 25.5647C27.9577 25.7286 27.0652 26.1703 26.6271 26.6256C26.0796 27.1946 24.0708 26.7084 22.1597 26.0751C20.9293 25.6673 20.5457 24.2757 20.5769 22.9934Z" fill="#BD4400"/> +<path d="M26.7509 19.2896L25.1095 18.1532L25.867 20.9941L27.6346 23.1405H29.1497L28.7709 21.7516L26.7509 19.2896Z" fill="#BD4400"/> +<path d="M23.0418 19.3009C22.654 18.7088 22.8195 17.9145 23.4116 17.5267C24.0036 17.1388 24.798 17.3044 25.1858 17.8964L29.1137 23.8925L26.9697 25.297L23.0418 19.3009Z" fill="#FFDDBD"/> +<path d="M23.4116 17.5266C22.8195 17.9145 22.654 18.7088 23.0418 19.3008L26.9697 25.2969L27.4281 24.9967L24.0506 19.8408C23.6628 19.2488 23.8283 18.4544 24.4204 18.0666C24.6483 17.9173 24.9062 17.85 25.1593 17.8575C24.7627 17.2973 23.9904 17.1474 23.4116 17.5266Z" fill="#EEAF74"/> +<path d="M30.7645 15.6817C30.8011 15.8016 30.8184 15.9448 30.8089 16.1152C30.7662 16.884 30.7947 16.3499 30.8089 16.7558C30.8155 16.9439 30.8089 17.4954 30.8089 17.6933C30.8089 18.0277 31.2373 19.2248 31.4964 19.5995C31.7217 19.9252 31.7799 20.0411 31.8089 20.3027C31.8246 20.4433 31.8558 20.5527 31.8832 20.6484C31.9652 20.9355 32.0121 21.0996 31.4964 21.6152C31.375 21.7367 31.2411 21.8482 31.1026 21.9493L31.8089 23.9927L34.2827 23.7207L32.2206 16.5875C32.0366 15.9512 31.4024 15.5672 30.7645 15.6817Z" fill="#FFDDBD"/> +<path d="M30.8078 16.1349L33.3585 22.8499L31.5604 23.5329L31.1026 21.9494C31.241 21.8482 31.3749 21.7367 31.4964 21.6152C32.012 21.0996 31.9651 20.9355 31.8831 20.6484C31.8558 20.5527 31.8245 20.4433 31.8089 20.3027C31.7798 20.0411 31.4653 19.7245 31.309 19.2558C31.1042 18.6418 30.8089 18.1214 30.8089 17.787C30.8089 17.5892 30.8155 17.4126 30.8089 17.2245C30.7948 16.8221 30.7665 16.8917 30.8078 16.1349Z" fill="#EEAF74"/> +<ellipse cx="29.0058" cy="26.0733" rx="2.05317" ry="2.24389" transform="rotate(17.7439 29.0058 26.0733)" fill="#FFDDBD"/> +<ellipse cx="32.9825" cy="24.7705" rx="1.9793" ry="1.94566" transform="rotate(-26.3191 32.9825 24.7705)" fill="#FFDDBD"/> +<path d="M28.46 25.2869C28.8014 24.613 30.2309 24.59 30.9049 24.9314C31.5788 25.2727 31.8484 26.0958 31.507 26.7697L30.2984 29.1559C29.957 29.8299 29.1339 30.0995 28.46 29.7581C27.7861 29.4168 27.0409 28.1704 27.3822 27.4965L28.46 25.2869Z" fill="#717687"/> +<rect x="30.2129" y="24.5808" width="2.14352" height="4.94477" rx="1.07176" transform="rotate(26.8632 30.2129 24.5808)" fill="#2E313D"/> +<rect x="30.7856" y="26.8074" width="2.94575" height="5.17452" rx="1.47287" transform="rotate(-81.8189 30.7856 26.8074)" fill="#2E313D"/> +<path d="M24.7052 15.7384L25.3257 14.8999L26.6564 14.1091L28.4999 15.291C28.735 15.32 29.2055 15.5053 29.2064 16.0146C29.2073 16.5239 28.7351 17.2561 28.4989 17.5585C28.1543 17.4498 27.2768 17.1454 26.524 16.798C25.7711 16.4506 24.9977 15.9469 24.7052 15.7384Z" fill="#FFDDBD"/> +<path d="M29.309 15.7399C28.8626 15.9197 28.0621 16.3588 27.309 16.3961C26.4663 16.4378 25.5321 16.0845 24.809 15.7399L25.3257 14.8999L26.6564 14.1091L28.4999 15.2911C28.6568 15.3104 29.1519 15.5314 29.309 15.7399Z" fill="#EEAF74"/> +<path d="M30.4965 11.1149C30.6486 14.1894 30.2675 15.2216 27.3898 15.3641C24.5121 15.5065 22.0559 13.1295 21.9038 10.0549C21.7516 6.98039 23.9611 4.37253 26.8388 4.23012C29.7165 4.08771 30.3443 8.04032 30.4965 11.1149Z" fill="#FFDDBD"/> +<circle r="0.5" transform="matrix(-0.7225 0.69137 0.69137 0.7225 26.816 12.132)" fill="#7D4816"/> +<circle r="0.5" transform="matrix(-0.7225 0.69137 0.69137 0.7225 29.3641 11.8755)" fill="#7D4816"/> +<path d="M28.7279 7.19434C29.0196 7.63184 29.6154 8.67559 29.6654 9.35059C29.7154 10.0256 30.2389 10.9027 30.3848 11.1631C30.4297 10.916 30.3005 10.2036 30.3848 9.64003C30.3078 8.91417 30.1928 8.18289 30.0197 7.50279C29.9817 7.67797 29.9573 7.81245 29.9466 7.88184C29.7883 7.24031 29.4235 6.00169 29.0279 5.26291C28.5034 4.58793 27.7954 4.18278 26.8388 4.23012C23.9611 4.37253 21.7516 6.9804 21.9038 10.055C21.9465 10.9176 22.1705 11.7254 22.5344 12.438C22.6509 12.035 22.7324 10.7271 23.1051 10.9756C23.5551 11.2756 24.3737 11.9756 24.4466 12.0381C24.3112 11.9027 24.0404 11.5381 24.0404 11.1631C24.0404 10.7881 24.2322 10.1481 24.3676 9.80433C24.3572 10.1272 24.4591 10.7381 24.6341 11.1631C24.8091 11.5881 25.2279 11.5562 25.3216 11.5562C25.2591 10.8999 25.0216 9.65059 25.3216 9.35059C25.6216 9.05059 25.9675 8.87142 26.1029 8.56934C26.2904 8.93392 26.38 9.24003 26.23 9.64003C26.08 10.04 26.1654 10.7048 26.1029 10.9756C26.4675 10.4964 27.2216 9.42559 27.3216 8.97559C27.4216 8.52559 27.4675 7.60059 27.4779 7.19434C27.6654 7.51726 28.0404 8.24434 28.0404 8.56934V10.5381C28.2696 10.236 28.7279 9.52559 28.7279 9.10059L28.7279 7.19434Z" fill="#EEAF74"/> +<path d="M29.9417 8.84558C29.8917 8.17058 29.2958 7.12683 29.0042 6.68933V8.59558C29.0042 9.02058 28.5458 9.731 28.3167 10.0331V8.06433C28.3167 7.73933 27.9417 7.01225 27.7542 6.68933C27.7437 7.09558 27.6979 8.02058 27.5979 8.47058C27.4979 8.92058 26.7437 9.99141 26.3792 10.4706C26.4417 10.1997 26.6042 9.55808 26.7542 9.15808C26.9042 8.75808 26.5667 7.92891 26.3792 7.56433C26.2437 7.86641 25.8979 8.54558 25.5979 8.84558C25.2979 9.14558 25.3479 10.5331 25.4104 11.1893C25.3167 11.1893 25.0854 11.0831 24.9104 10.6581C24.7354 10.2331 24.7125 9.481 24.7229 9.15808C24.5875 9.50183 24.3167 10.2831 24.3167 10.6581C24.3167 11.0331 24.5875 11.3977 24.7229 11.5331L24.3167 12.0956C24.2437 12.0331 23.9854 11.8331 23.5354 11.5331C22.9729 11.1581 22.7229 11.9081 22.7229 12.6268C22.7229 13.2018 23.9521 13.9706 24.5667 14.2831C24.2646 14.2727 23.5417 14.2581 23.0667 14.2831C22.5917 14.3081 20.3687 13.5018 19.3167 13.0956L21.7229 12.7831C21.3167 12.6685 20.3042 12.3706 19.5042 12.0956C18.7042 11.8206 17.2333 11.0227 16.5979 10.6581L20.2542 10.4706L17.0979 9.65808C17.9937 9.56433 20.1104 9.33308 21.4104 9.15808C21.1292 8.28308 21.9104 6.06433 23.2229 5.47058C23.0354 4.81433 20.9417 3.53308 18.6604 2.97058C19.5667 2.56433 20.5667 2.47058 22.5042 2.47058C24.0542 2.47058 25.0875 2.92891 25.4104 3.15808C25.2229 2.90808 24.6979 2.21433 24.0979 1.43933C26.6292 1.65808 28.3792 3.65808 29.0042 4.31433C29.5042 4.83933 30.025 6.57475 30.2229 7.37683C30.2437 7.24141 30.3167 6.85808 30.4417 6.40808C30.5667 5.95808 30.5979 5.32475 30.5979 5.06433C30.6917 5.87683 30.8542 7.69558 30.7542 8.47058C30.6542 9.24558 30.5042 10.1268 30.4417 10.4706C30.2958 10.2102 29.9917 9.52058 29.9417 8.84558Z" fill="#FFDE2E"/> +<path d="M23.5571 13.6623C23.0146 13.5894 22.3652 13.4977 21.8899 13.4185C21.242 13.3105 20.3873 13.2321 19.5986 13.2034C20.7229 13.629 22.6307 14.3061 23.0666 14.2831C23.5416 14.2581 24.2645 14.2727 24.5666 14.2831C24.2966 14.1459 23.908 13.9205 23.5571 13.6623Z" fill="#FFB800"/> +<path d="M21.4485 12.8188H21.5426L21.5868 12.8008L21.4485 12.8188Z" fill="#FFB800"/> +<path d="M21.6683 12.7677L22.5527 12.4084V11.5562C21.8057 11.4404 20.1601 11.19 19.554 11.1143C18.9495 11.0387 17.3529 10.7894 16.6243 10.6733C17.2732 11.0443 18.715 11.8244 19.5041 12.0956C20.2704 12.359 21.2317 12.6435 21.6683 12.7677Z" fill="#FFB800"/> +<path d="M20.0138 10.483L20.2541 10.4706L17.3532 9.72388L21.8899 10.1042L20.3117 10.483H20.0138Z" fill="#FFB800"/> +<path d="M23.2313 5.47994C22.7877 4.81762 20.8913 3.57027 18.9027 3.03325C19.8833 3.00231 21.6103 3.03519 22.7736 3.44396C23.9415 3.85434 25.504 4.533 26.1668 5.25899C25.1467 5.25899 24.0003 5.4136 23.2313 5.47994Z" fill="#FFB800"/> +<path d="M25.2357 3.12824C25.9361 3.41748 26.3727 3.74788 26.8139 4.29614C27.2652 4.85687 27.6458 4.88441 27.8552 5.19646C27.9695 5.38417 28.0759 5.55934 28.1711 5.71654C28.1326 5.63455 28.0325 5.46058 27.8552 5.19646C27.2271 4.16474 26.3603 2.75417 25.7917 1.86613C25.276 1.64923 24.7098 1.49227 24.0979 1.43939C24.4459 1.88889 24.9894 2.80413 25.2357 3.12824Z" fill="#FFB800"/> +</svg> diff --git a/src/assets/icons/visu/ecogesture/0034.svg b/src/assets/icons/visu/ecogesture/0034.svg new file mode 100644 index 0000000000000000000000000000000000000000..676bd47ba87d2b46c0fb70da1ad5f84460d1572f --- /dev/null +++ b/src/assets/icons/visu/ecogesture/0034.svg @@ -0,0 +1,23 @@ +<svg width="50" height="50" viewBox="0 0 50 50" fill="none" xmlns="http://www.w3.org/2000/svg"> +<path fill-rule="evenodd" clip-rule="evenodd" d="M44.6886 35.8297C45.3382 33.8129 45.689 31.662 45.689 29.4292C45.689 17.9102 36.351 8.5722 24.832 8.5722C13.313 8.5722 3.97498 17.9102 3.97498 29.4292C3.97498 31.7324 4.34829 33.9484 5.0377 36.0199C5.3995 35.9636 5.77671 35.9325 6.16811 35.9325C8.45691 35.9325 9.80063 36.5323 11.2388 37.1743C11.3466 37.2224 11.455 37.2708 11.5644 37.3192C12.5515 37.0991 13.6061 36.971 14.7205 36.971C17.8716 36.971 20.0912 37.5483 22.1128 38.3186H22.3869C23.2738 37.9642 24.1143 37.5978 24.9421 37.237C28.4441 35.7105 31.7162 34.2842 37.2896 34.2842C40.0763 34.2842 42.5676 34.9166 44.6886 35.8297Z" fill="#F3AC59"/> +<path d="M40.0933 29.4292H9.5708C9.5708 21.0007 16.4035 14.168 24.832 14.168C33.2606 14.168 40.0933 21.0007 40.0933 29.4292Z" fill="#FBC689"/> +<path d="M35.0062 29.4292H14.6578C14.6578 23.8102 19.213 19.2551 24.832 19.2551C30.451 19.2551 35.0062 23.8102 35.0062 29.4292Z" fill="#FFE5C7"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M35.5062 29.9292H14.1578V29.4292C14.1578 23.534 18.9368 18.7551 24.832 18.7551C30.7272 18.7551 35.5062 23.534 35.5062 29.4292V29.9292ZM34.9941 28.9292C34.7334 23.5424 30.2834 19.2551 24.832 19.2551C19.3806 19.2551 14.9306 23.5424 14.6699 28.9292C14.6619 29.0949 14.6578 29.2616 14.6578 29.4292H35.0062C35.0062 29.2616 35.0021 29.0949 34.9941 28.9292Z" fill="#F3AC59"/> +<path d="M29.919 29.4292H19.7449C19.7449 26.6197 22.0224 24.3422 24.832 24.3422C27.6415 24.3422 29.919 26.6197 29.919 29.4292Z" fill="#FFF7EE"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M30.419 29.9292H19.2449V29.4292C19.2449 26.3436 21.7463 23.8422 24.832 23.8422C27.9176 23.8422 30.419 26.3436 30.419 29.4292V29.9292ZM29.8948 28.9292C29.6436 26.3544 27.4728 24.3422 24.832 24.3422C22.1911 24.3422 20.0203 26.3544 19.7691 28.9292C19.7531 29.0937 19.7449 29.2605 19.7449 29.4292H29.919C29.919 29.2605 29.9108 29.0937 29.8948 28.9292Z" fill="#F3AC59"/> +<path d="M0.36277 37.5519C1.05006 36.9851 5.03791 35.5668 6.47757 35.5668C7.93805 35.5668 8.79548 35.9307 9.71316 36.3202C10.3428 36.5874 11.0007 36.8666 11.9012 37.0487C13.6717 37.4065 14.7793 37.5333 15.1118 37.5519H12.1215C11.8956 37.5098 11.6559 37.4633 11.4025 37.4121C10.502 37.2301 9.84403 36.9509 9.21444 36.6837C8.29675 36.2942 7.43932 35.9303 5.97884 35.9303C4.84558 35.9303 1.04972 37.11 0.36277 37.5519Z" fill="#FFE9C9"/> +<path d="M49.2499 38.5223C47.5725 37.2205 41.7313 33.9733 38.2178 33.9733C34.6534 33.9733 32.3817 34.4953 30.142 35.3898C28.6055 36.0035 27.4476 36.4612 25.2499 36.8793C29.0652 36.8793 29.0045 37.4752 32.6874 36.0043C34.927 35.1098 36.2431 34.9907 39.8075 34.9907C42.5732 34.9907 47.5733 37.5074 49.2499 38.5223Z" fill="#FFE9C9"/> +<path d="M31.5613 42.0732C31.9129 41.229 32.6242 40.7345 33.2957 40.7345C33.9671 40.7345 34.6784 41.229 35.03 42.0732H36.8949C36.4651 40.3471 35.1072 38.9495 33.2957 38.9495C31.4841 38.9495 30.1262 40.3471 29.6964 42.0732H31.5613Z" fill="#334E50"/> +<path d="M32.7936 40.7345C32.1221 40.7345 31.4108 41.229 31.0592 42.0732H31.5612C31.8692 41.3338 32.4532 40.8626 33.0446 40.757C32.9608 40.7421 32.8769 40.7345 32.7936 40.7345Z" fill="#C9FCFF"/> +<path d="M36.3928 42.0732H36.8948C36.4651 40.3471 35.1071 38.9495 33.2956 38.9495C33.2109 38.9495 33.1272 38.9526 33.0446 38.9586C34.73 39.0809 35.9831 40.4277 36.3928 42.0732Z" fill="#C9FCFF"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M18.5794 15.9374V15.6028C18.5794 14.4321 17.6304 13.4831 16.4598 13.4831C15.2891 13.4831 14.3401 14.4321 14.3401 15.6028V28.5437C14.3401 29.6004 15.1135 30.4766 16.1251 30.637V32.4341C14.1253 32.2643 12.5552 30.5874 12.5552 28.5437V15.6028C12.5552 13.4463 14.3033 11.6982 16.4598 11.6982C18.6162 11.6982 20.3643 13.4463 20.3643 15.6028V15.9374H18.5794Z" fill="#334E50"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M14.6997 14.422C14.4729 14.7595 14.3406 15.1657 14.3406 15.6028V28.5437C14.3406 29.6004 15.1139 30.4766 16.1255 30.637V32.4341C15.8766 32.413 15.6342 32.3685 15.4008 32.3028V31.306C14.3892 31.1456 13.6158 30.2694 13.6158 29.2127V16.2718C13.6158 15.4773 14.0529 14.785 14.6997 14.422ZM19.6259 15.9374H20.3648V15.6028C20.3648 13.4463 18.6167 11.6982 16.4602 11.6982C15.2607 11.6982 14.1874 12.2391 13.4712 13.0904C14.1098 12.635 14.8914 12.3672 15.7354 12.3672C17.7793 12.3672 19.4563 13.9375 19.6259 15.9374Z" fill="#C9FCFF"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M23.2649 18.057C23.2649 18.057 23.2649 18.057 23.2649 18.057C23.2649 16.7016 21.6416 15.6027 19.6392 15.6027C17.6368 15.6027 16.0135 16.7016 16.0135 18.057C16.0135 18.057 16.0135 18.057 16.0135 18.057H23.2649Z" fill="black"/> +<path d="M23.2649 18.057C23.2649 16.7016 21.6416 15.6027 19.6392 15.6027C17.6368 15.6027 16.0135 16.7016 16.0135 18.057H23.2649Z" fill="#334E50"/> +<path d="M19.147 15.6251C20.9166 15.7877 22.2804 16.8146 22.2804 18.057H23.2649C23.2649 16.7016 21.6416 15.6027 19.6392 15.6027C19.4722 15.6027 19.3079 15.6104 19.147 15.6251Z" fill="#C9FCFF"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M8.37887 28.8784C7.50105 28.8784 6.78943 29.59 6.78943 30.4678C6.78943 31.3456 7.50105 32.0572 8.37888 32.0572H9.18611L11.0837 38.6722L15.1326 38.121C15.4159 38.0825 15.7042 38.1051 15.978 38.1874L22.6875 40.2037H36.4139C37.2945 40.2037 38.0716 39.6277 38.3275 38.785L40.3711 32.0572H41.2337C42.1115 32.0572 42.8232 31.3456 42.8232 30.4678C42.8232 29.59 42.1115 28.8784 41.2337 28.8784H8.37887Z" fill="#334E50"/> +<rect x="6.78943" y="28.8784" width="36.0337" height="3.17889" rx="1.58945" fill="#334E50"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M8.379 28.8784C7.50117 28.8784 6.78955 29.59 6.78955 30.4678C6.78955 30.5454 6.79511 30.6217 6.80585 30.6963C6.84998 30.4768 6.94986 30.2615 7.11361 30.0687C7.38405 29.7502 7.78284 29.5696 8.20056 29.5762L40.1211 30.0872C40.3712 30.0912 40.6006 30.2271 40.7243 30.4445C40.9824 30.8982 40.6769 31.4656 40.156 31.4997L31.6507 32.0572H41.2338C42.1117 32.0572 42.8233 31.3456 42.8233 30.4678C42.8233 29.59 42.1116 28.8784 41.2338 28.8784H8.379Z" fill="#C9FCFF"/> +<path d="M36.8802 40.0745C37.9655 39.59 38.3474 38.8128 38.5469 38.156L40.5236 31.6444L39.5255 31.7994C39.2971 31.7994 39.3271 32.1707 39.2971 32.2694L37.2063 39.2433C37.129 39.4978 37.0072 39.8499 36.8802 40.0745Z" fill="#C9FCFF"/> +<path d="M5.46973 41.6132C7.15934 40.0597 11.646 37.5519 15.1853 37.5519C18.7757 37.5519 20.8836 38.5492 23.1396 39.6167C24.6874 40.349 26.3049 41.1143 28.5188 41.6132C32.8713 42.5941 40.0576 43.1364 40.875 43.1875C31.25 43.8125 29.8332 43.1323 26.75 42.4375C24.5362 41.9386 23.4613 41.3452 21.9136 40.6129C19.6575 39.5454 17.5496 38.5481 13.9592 38.5481C11.1732 38.5481 7.15852 40.4021 5.46973 41.6132Z" fill="#FFE9C9"/> +</svg> diff --git a/src/assets/icons/visu/ecogesture/0041.svg b/src/assets/icons/visu/ecogesture/0041.svg new file mode 100644 index 0000000000000000000000000000000000000000..613801379b91a0c58421dc580cc07e6e0c5d6270 --- /dev/null +++ b/src/assets/icons/visu/ecogesture/0041.svg @@ -0,0 +1,102 @@ +<svg width="50" height="50" viewBox="0 0 50 50" fill="none" xmlns="http://www.w3.org/2000/svg"> +<circle r="0.96454" transform="matrix(-1 0 0 1 35.1103 11.8752)" fill="#90C3D3"/> +<path d="M35.3818 12.6062C34.8491 12.6062 34.4173 12.1744 34.4173 11.6417C34.4173 11.414 34.4962 11.2047 34.6281 11.0397C34.3398 11.2065 34.1459 11.5182 34.1459 11.8752C34.1459 12.4079 34.5777 12.8398 35.1104 12.8398C35.4154 12.8398 35.6874 12.6982 35.8641 12.4772C35.7222 12.5592 35.5575 12.6062 35.3818 12.6062Z" fill="#5E8693"/> +<rect x="36.0748" y="28.9985" width="0.5" height="2.5" fill="#A2A2A2"/> +<rect x="37.0748" y="29.2985" width="0.5" height="2.5" fill="#A2A2A2"/> +<rect x="38.0748" y="29.5984" width="0.5" height="2.5" fill="#A2A2A2"/> +<rect x="39.0748" y="29.9985" width="0.5" height="2.5" fill="#A2A2A2"/> +<rect x="40.0748" y="30.2985" width="0.5" height="2.5" fill="#A2A2A2"/> +<rect x="41.0748" y="30.6985" width="0.5" height="2.5" fill="#A2A2A2"/> +<rect x="42.0748" y="30.9985" width="0.5" height="2.5" fill="#A2A2A2"/> +<rect x="43.0748" y="31.2985" width="0.5" height="2.5" fill="#A2A2A2"/> +<rect x="39.6748" y="23.4985" width="0.5" height="2.5" fill="#484848"/> +<rect x="40.6748" y="23.7985" width="0.5" height="2.5" fill="#484848"/> +<rect x="41.6748" y="24.0984" width="0.5" height="2.5" fill="#484848"/> +<rect x="42.6748" y="24.4985" width="0.5" height="2.5" fill="#484848"/> +<rect x="43.6748" y="24.7985" width="0.5" height="2.5" fill="#484848"/> +<rect x="44.6748" y="25.1985" width="0.5" height="2.5" fill="#484848"/> +<rect x="45.6748" y="25.4985" width="0.5" height="2.5" fill="#484848"/> +<rect x="46.6748" y="25.7985" width="0.5" height="2.5" fill="#484848"/> +<path d="M42.1723 14.0188L42.1276 15.2424L42.4374 16.811L46.0311 17.2485C45.9582 17.061 45.8561 16.6172 46.0311 16.3422C46.1783 16.1109 46.3948 15.2149 46.5281 14.5951C46.2846 14.4446 45.9766 14.2983 45.5868 14.1551C45.2281 14.0233 44.8822 13.8971 44.5575 13.779L42.7811 13.3422L42.1723 14.0188Z" fill="#C4C4C4"/> +<path d="M47.4457 16.8503V16.535C47.4457 15.6433 47.4457 14.9211 45.8759 14.2679L45.072 14.702C45.4457 15.1484 45.4457 15.6359 45.4457 16.1885V16.2066L47.4457 16.8503Z" fill="#494949"/> +<path d="M45.4457 24.1926L47.4457 24.8844V26.8844L45.4457 26.1926V24.1926Z" fill="#C4C4C4"/> +<path d="M45.4457 22.1926L47.4457 22.8844V24.8844L45.4457 24.1926V22.1926Z" fill="#494949"/> +<path d="M43.4457 23.5014L45.4457 24.1932V26.1932L43.4457 25.5014V23.5014Z" fill="#494949"/> +<path d="M43.4457 21.5014L45.4457 22.1932V24.1932L43.4457 23.5014V21.5014Z" fill="#C4C4C4"/> +<path d="M45.4457 20.2395L47.4457 20.9313V22.9313L45.4457 22.2395V20.2395Z" fill="#C4C4C4"/> +<path d="M45.4457 16.2302L47.4457 16.922V18.922L45.4457 18.2302V16.2302Z" fill="#C4C4C4"/> +<path d="M45.4457 18.2395L47.4457 18.9313V20.9313L45.4457 20.2395V18.2395Z" fill="#494949"/> +<path d="M43.4457 19.5483L45.4457 20.24V22.24L43.4457 21.5483V19.5483Z" fill="#494949"/> +<path d="M43.4457 15.539L45.4457 16.2308V18.2308L43.4457 17.539V15.539Z" fill="#494949"/> +<path d="M43.4457 17.5483L45.4457 18.24V20.24L43.4457 19.5483V17.5483Z" fill="#C4C4C4"/> +<path opacity="0.35" d="M42.1276 15.2602L42.1723 14.0251L42.7811 13.3422L44.5575 13.7831C44.8822 13.9022 45.2281 14.0297 45.5868 14.1627C45.6886 14.2004 45.7849 14.2384 45.8758 14.2766C47.3922 14.9133 47.4439 15.6151 47.4457 16.4732L47.4457 16.5071V27.0106L43.4457 25.6147V16.9672L42.4374 16.8433L42.1276 15.2602Z" fill="black"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M47.8906 17.0391C47.7895 17.2961 47.4992 17.4225 47.2423 17.3214L37.1875 13.3672C36.9305 13.2662 36.8041 12.9759 36.9052 12.7189C37.0063 12.4619 37.2966 12.3356 37.5536 12.4367L47.6083 16.3908C47.8653 16.4919 47.9917 16.7822 47.8906 17.0391Z" fill="#90C3D3"/> +<path d="M48.7595 17.9101L45.7777 16.7372C45.5207 16.6361 45.3943 16.3458 45.4954 16.0888C45.5801 15.8736 45.7975 15.75 46.0169 15.7749L36.0222 11.843C35.7652 11.7419 35.475 11.8683 35.3739 12.1252C35.2728 12.3822 35.3992 12.6725 35.6561 12.7736L48.6326 17.8785C48.6743 17.8949 48.7169 17.9053 48.7595 17.9101Z" fill="#5E8693"/> +<circle r="0.98053" transform="matrix(-1 0 0 1 47.6555 16.9296)" fill="#90C3D3"/> +<path d="M47.9314 17.6726C47.3899 17.6726 46.9509 17.2336 46.9509 16.6921C46.9509 16.4607 47.0311 16.2479 47.1652 16.0802C46.8721 16.2497 46.6749 16.5666 46.6749 16.9295C46.6749 17.4711 47.1139 17.9101 47.6555 17.9101C47.9655 17.9101 48.242 17.7662 48.4217 17.5415C48.2774 17.6249 48.11 17.6726 47.9314 17.6726Z" fill="#5E8693"/> +<ellipse cx="47.9315" cy="16.4925" rx="0.427733" ry="0.290242" transform="rotate(23.5755 47.9315 16.4925)" fill="white"/> +<ellipse cx="35.3072" cy="11.3269" rx="0.304912" ry="0.206901" transform="rotate(23.5755 35.3072 11.3269)" fill="white"/> +<path d="M41.8993 29.8066L43.8993 30.4984V32.4984L41.8993 31.8066V29.8066Z" fill="white"/> +<path d="M41.8993 27.8066L43.8993 28.4984V30.4984L41.8993 29.8066V27.8066Z" fill="#494949"/> +<path d="M37.8993 28.4119L39.8993 29.1037V31.1037L37.8993 30.4119V28.4119Z" fill="white"/> +<path d="M37.8993 26.4119L39.8993 27.1037V29.1037L37.8993 28.4119V26.4119Z" fill="#494949"/> +<path d="M39.8993 29.1154L41.8993 29.8072V31.8072L39.8993 31.1154V29.1154Z" fill="#494949"/> +<path d="M39.8993 27.1154L41.8993 27.8072V29.8072L39.8993 29.1154V27.1154Z" fill="white"/> +<path d="M35.8993 27.7207L37.8993 28.4125V30.4125L35.8993 29.7207V27.7207Z" fill="#494949"/> +<path d="M35.8993 25.7207L37.8993 26.4125V28.4125L35.8993 27.7207V25.7207Z" fill="white"/> +<path d="M41.8993 25.8066L43.8993 26.4984V28.4984L41.8993 27.8066V25.8066Z" fill="white"/> +<path d="M41.8993 23.8066L43.8993 24.4984V26.4984L41.8993 25.8066V23.8066Z" fill="#494949"/> +<path d="M37.8993 24.4119L39.8993 25.1037V27.1037L37.8993 26.4119V24.4119Z" fill="white"/> +<path d="M37.8993 22.4119L39.8993 23.1037V25.1037L37.8993 24.4119V22.4119Z" fill="#494949"/> +<path d="M39.8993 25.1154L41.8993 25.8072V27.8072L39.8993 27.1154V25.1154Z" fill="#494949"/> +<path d="M39.8993 23.1154L41.8993 23.8072V25.8072L39.8993 25.1154V23.1154Z" fill="white"/> +<path d="M35.8993 23.7207L37.8993 24.4125V26.4125L35.8993 25.7207V23.7207Z" fill="#494949"/> +<path d="M35.8993 21.7207L37.8993 22.4125V24.4125L35.8993 23.7207V21.7207Z" fill="white"/> +<path d="M41.8993 21.8066L43.8993 22.4984V24.4984L41.8993 23.8066V21.8066Z" fill="white"/> +<path d="M41.8993 19.8066L43.8993 20.4984V22.4984L41.8993 21.8066V19.8066Z" fill="#494949"/> +<path d="M37.8993 20.4119L39.8993 21.1037V23.1037L37.8993 22.4119V20.4119Z" fill="white"/> +<path d="M37.8993 18.4119L39.8993 19.1037V21.1037L37.8993 20.4119V18.4119Z" fill="#494949"/> +<path d="M39.8993 21.1154L41.8993 21.8072V23.8072L39.8993 23.1154V21.1154Z" fill="#494949"/> +<path d="M39.8993 19.1154L41.8993 19.8072V21.8072L39.8993 21.1154V19.1154Z" fill="white"/> +<path d="M35.8993 19.7207L37.8993 20.4125V22.4125L35.8993 21.7207V19.7207Z" fill="#494949"/> +<path d="M35.8993 17.7207L37.8993 18.4125V20.4125L35.8993 19.7207V17.7207Z" fill="white"/> +<path d="M41.8993 17.8066L43.8993 18.4984V20.4984L41.8993 19.8066V17.8066Z" fill="white"/> +<path d="M41.8993 15.8066L43.8993 16.4984V18.4984L41.8993 17.8066V15.8066Z" fill="#494949"/> +<path d="M37.8993 16.4119L39.8993 17.1037V19.1037L37.8993 18.4119V16.4119Z" fill="white"/> +<path d="M37.8993 14.4119L39.8993 15.1037V17.1037L37.8993 16.4119V14.4119Z" fill="#494949"/> +<path d="M39.8993 17.1154L41.8993 17.8072V19.8072L39.8993 19.1154V17.1154Z" fill="#494949"/> +<path d="M39.8993 15.1154L41.8993 15.8072V17.8072L39.8993 17.1154V15.1154Z" fill="white"/> +<path d="M35.8993 15.7207L37.8993 16.4125V18.4125L35.8993 17.7207V15.7207Z" fill="#494949"/> +<path d="M35.8993 13.7207L37.8993 14.4125V16.4125L35.8993 15.7207V13.7207Z" fill="white"/> +<path d="M35.8932 13.6596V13.7118L37.8792 14.4119C37.8943 13.1357 38.7214 12.1349 40.2382 12.1678C39.5403 11.8652 38.8969 11.593 38.3212 11.3819C36.7463 11.3163 35.8932 12.3472 35.8932 13.6596Z" fill="#494949"/> +<path d="M39.8993 15.1761V15.2283L41.8853 15.9284C41.9004 14.6522 42.7275 13.6514 44.2443 13.6843C43.5464 13.3817 42.903 13.1095 42.3273 12.8984C40.7524 12.8328 39.8993 13.8636 39.8993 15.1761Z" fill="#494949"/> +<path d="M37.8993 14.3631V14.4153L39.8853 15.1154C39.9004 13.8392 40.7275 12.8384 42.2443 12.8713C41.5464 12.5687 40.903 12.2965 40.3273 12.0854C38.7524 12.0198 37.8993 13.0506 37.8993 14.3631Z" fill="white"/> +<path d="M41.9054 15.8796V15.9318L43.8914 16.6319C43.9066 15.3557 44.7336 14.3549 46.2504 14.3878C45.5525 14.0852 44.9091 13.813 44.3334 13.6019C42.7585 13.5363 41.9054 14.5671 41.9054 15.8796Z" fill="white"/> +<path d="M39.1178 12.3716L37.1078 11.5944C37.4457 11.4404 37.8513 11.3624 38.3212 11.3819C38.8968 11.593 39.7709 11.8303 40.4688 12.1329C40.039 12.1236 39.434 12.2322 39.1178 12.3716Z" fill="white"/> +<path d="M43.0978 13.8998L41.0883 13.1227C41.4312 12.9609 41.8455 12.8783 42.3273 12.8984C42.903 13.1095 43.6928 13.3303 44.3906 13.6329C43.949 13.6233 43.4195 13.7528 43.0978 13.8998Z" fill="white"/> +<path d="M41.0516 13.1086L39.0428 12.3319C39.3944 12.1555 39.824 12.0645 40.3273 12.0854C40.903 12.2965 41.5464 12.5687 42.2443 12.8713C41.7813 12.8612 41.3826 12.9475 41.0516 13.1086Z" fill="#494949"/> +<path d="M43.0128 13.8669C43.371 13.6784 43.8127 13.5802 44.3334 13.6019C44.9091 13.813 45.5525 14.0852 46.2504 14.3878C45.7701 14.3774 45.359 14.4706 45.0209 14.6434L43.0128 13.8669Z" fill="#494949"/> +<g opacity="0.65"> +<path fill-rule="evenodd" clip-rule="evenodd" d="M24.4797 20.5227H30.4292V20.0227H24.4797V20.5227Z" fill="white"/> +<path opacity="0.6" fill-rule="evenodd" clip-rule="evenodd" d="M12.9648 22.6046H20.8367V22.1046H12.9648V22.6046Z" fill="white"/> +<path opacity="0.6" fill-rule="evenodd" clip-rule="evenodd" d="M3.10861 32.7797H12.9647V32.2797H3.10861V32.7797Z" fill="white"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M3.10861 27.0986H10.9805V26.5986H3.10861V27.0986Z" fill="white"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M15.8272 41.6714H23.6991V41.1714H15.8272V41.6714Z" fill="white"/> +<path opacity="0.6" fill-rule="evenodd" clip-rule="evenodd" d="M19.0239 43.6232H24.4797V43.1232H19.0239V43.6232Z" fill="white"/> +</g> +<ellipse rx="2.03674" ry="2.13479" transform="matrix(-0.934997 -0.354657 -0.354657 0.934997 26.3606 24.3802)" fill="#EEAF74"/> +<path d="M27.5129 22.2464C28.3129 22.5964 29.0442 24.1214 28.2942 23.6839C28.2942 25.5839 27.0625 25.3471 26.5625 25.4305C26.2708 25.2013 25.6567 24.6214 25.1067 24.3714C24.4192 24.0589 23.5442 23.8714 22.0442 23.8714C22.7942 23.6214 23.815 23.3506 24.2317 23.2464L22.0442 22.2464H25.1067L23.5442 21.1214C24.5442 21.2464 26.7129 21.8964 27.5129 22.2464Z" fill="#FFEB33"/> +<path d="M28.4965 23.2837C28.6426 23.5795 28.6598 23.8056 28.4547 23.755C28.4785 23.6157 28.493 23.4593 28.4965 23.2837Z" fill="#F0C429"/> +<path d="M28.2192 24.3968C27.9904 25.3334 27.288 25.3775 26.8139 25.4073C26.7191 25.4133 26.6334 25.4187 26.5625 25.4305C26.498 25.3798 26.4178 25.312 26.326 25.2344C26.0024 24.961 25.5351 24.5661 25.1067 24.3714C24.4192 24.0589 23.5442 23.8714 22.0442 23.8714C22.4924 23.722 23.0374 23.5651 23.4923 23.4409C24.2799 23.5175 24.8388 23.6729 25.3098 23.887C25.7382 24.0818 26.239 24.2821 26.5625 24.5555C26.6543 24.6331 26.7763 24.6242 26.8867 24.6805C27.017 24.7469 27.2451 24.7607 27.3398 24.7547C27.7133 24.7312 27.8398 24.7078 28.2192 24.3968Z" fill="#F0C429"/> +<path d="M24.25 23.2508L22.0442 22.2464H22.5156L25.4844 23.0242C25.3056 23.0689 24.582 23.1596 24.25 23.2508Z" fill="#F0C429"/> +<path d="M25.1067 22.2464L26.326 22.3836L24.4531 21.2899C23.981 21.1707 23.8618 21.1611 23.5442 21.1214L25.1067 22.2464Z" fill="#F0C429"/> +<path d="M33.4962 18.9776C33.375 18.9114 33.2231 18.9559 33.1569 19.0771L32.2596 20.7195C32.2109 20.583 32.1615 20.4615 32.1154 20.3776C31.9738 20.1201 31.8636 19.9062 31.8272 19.8333C31.7654 19.7098 31.6153 19.6598 31.4918 19.7215C31.3683 19.7833 31.3182 19.9334 31.38 20.0569C31.4195 20.1359 31.5327 20.3556 31.6773 20.6186C31.7343 20.7222 31.8183 20.9597 31.9041 21.2402C31.9525 21.398 31.9987 21.5603 32.0379 21.7037C31.8557 22.3863 31.6054 22.9367 31.4074 23.3721C31.3172 23.5705 31.2378 23.7451 31.1807 23.8974C31.0245 24.3137 30.3783 25.5455 30.0747 26.1093C29.5759 26.2394 28.3962 26.4216 27.6676 26.1093C27.3306 25.9649 26.869 25.6246 26.3651 25.2531C25.5069 24.6205 24.526 23.8974 23.8292 23.8974C23.5022 23.8974 23.1639 23.8462 22.7873 23.7892C21.89 23.6535 20.7755 23.4849 19.08 23.8974C16.6729 24.4829 15.5669 25.0684 14.9164 25.5888L13.9949 25.8453C13.9459 25.854 13.897 25.8629 13.8487 25.8724L13.1392 25.3831C13.0255 25.3047 12.8698 25.3333 12.7914 25.447C12.713 25.5606 12.7416 25.7163 12.8553 25.7947L13.2585 26.0728C13.2215 26.0954 13.187 26.1193 13.155 26.1444L12.1061 25.992C11.9695 25.9721 11.8426 26.0668 11.8228 26.2034C11.8029 26.34 11.8976 26.4669 12.0342 26.4868L12.4125 26.5417L11.8913 26.5755C11.7535 26.5844 11.6491 26.7033 11.658 26.8411C11.6669 26.9789 11.7858 27.0834 11.9236 27.0744L12.5804 27.0319L12.0058 27.1851C11.8724 27.2207 11.7931 27.3577 11.8287 27.4911C11.8642 27.6245 12.0012 27.7038 12.1346 27.6682L13.6778 27.2567C13.7847 27.2694 13.8969 27.2715 14.0142 27.2618L13.5815 27.9621C13.5089 28.0796 13.5453 28.2336 13.6627 28.3062C13.7802 28.3788 13.9342 28.3424 14.0068 28.225L14.7158 27.0777C15.0023 26.9541 15.3088 26.7658 15.632 26.4996C16.738 25.5888 19.08 25.5888 20.0559 25.5888H21.6173C20.2944 27.5406 17.5187 31.47 16.9982 31.5741C16.3476 31.7042 14.2007 32.615 13.6152 33.0704C13.1468 33.4347 12.2924 34.2631 11.9237 34.6318C11.425 34.6318 10.1672 34.7619 9.12628 35.2824C7.82514 35.9329 6.19871 36.5835 5.67825 36.5835C5.43476 36.5835 5.23398 36.3272 5.03595 36.0744C4.8107 35.7868 4.58901 35.5038 4.31205 35.6076C4.05183 35.7052 3.85666 35.8516 3.62897 36.0224C3.40127 36.1931 3.14102 36.3883 2.75068 36.5835C1.96999 36.9738 0.929073 37.8846 0.929073 38.4051C0.929073 38.8215 0.977867 39.3566 1.25436 39.381C1.34099 39.3886 1.48574 39.2573 1.68851 39.0735C2.1329 38.6705 2.85596 38.0148 3.85665 38.0148C5.67825 38.0148 8.93111 37.6244 9.7118 37.4943C10.0267 37.4418 10.4262 37.4211 10.872 37.398C11.5315 37.3638 12.2922 37.3243 13.0297 37.169C14.0186 36.9608 16.8247 36.0414 18.1042 35.6076C18.7331 35.9329 20.2511 36.5835 21.292 36.5835H23.3738C23.6124 37.516 24.2456 39.6282 24.8701 40.6171C25.4751 41.5749 25.6503 42.5327 25.7591 43.1273C25.7907 43.3 25.8167 43.4421 25.846 43.5446C25.8689 43.625 25.8919 43.7277 25.9174 43.8416C26.0362 44.3729 26.2096 45.1481 26.6917 45.0409C26.9578 44.9818 27.1298 44.8153 27.2993 44.6511C27.5029 44.4539 27.703 44.2603 28.0579 44.2603C28.7085 44.2603 30.3349 44.1952 30.4 43.5446C30.4131 43.4138 30.436 43.2717 30.4589 43.13C30.5271 42.7076 30.5948 42.288 30.4 42.1784C30.3009 42.1227 30.0284 42.2452 29.6944 42.3952C29.151 42.6394 28.4447 42.9568 28.0579 42.6989C27.2772 42.1784 26.6917 41.2026 26.6917 40.2918C26.6917 39.7981 26.4433 38.9415 26.2157 38.1567C26.0234 37.4934 25.846 36.8815 25.846 36.5835C25.846 36.4635 25.8637 36.3192 25.8832 36.1603C25.9694 35.4577 26.0904 34.4707 24.8701 34.0463C23.6731 33.6299 22.2028 32.8752 21.6173 32.55C21.704 32.0512 22.0808 31.3451 22.3411 30.9808C22.5583 30.6766 24.2004 29.7776 25.0129 29.0276C25.8254 28.2776 25.7317 27.9026 25.846 27.6707C26.7568 27.8875 28.8776 28.1911 30.0747 27.6707C31.571 27.0201 32.4818 24.613 32.5469 23.8974C32.5966 23.3501 32.7988 22.9187 32.9928 22.5047C33.0525 22.3773 33.1115 22.2515 33.165 22.1245C33.2023 22.0358 33.2437 21.9337 33.2837 21.827L33.4194 21.6009L34.4969 21.3942C34.6325 21.3682 34.7213 21.2372 34.6953 21.1016C34.6693 20.966 34.5383 20.8771 34.4027 20.9031L33.474 21.0813C33.4739 21.0699 33.4731 21.0589 33.4717 21.0482L34.4748 20.2551C34.5831 20.1694 34.6014 20.0122 34.5158 19.9039C34.4301 19.7956 34.2729 19.7772 34.1646 19.8629L33.5312 20.3637L34.1128 19.5913C34.1958 19.481 34.1737 19.3243 34.0634 19.2412C33.9531 19.1582 33.7964 19.1803 33.7134 19.2906L33.3368 19.7907L33.5957 19.3168C33.6619 19.1956 33.6173 19.0437 33.4962 18.9776Z" fill="#FFDDBD"/> +<path d="M25.1692 27.4651C25.7942 27.3901 26.2629 27.6214 26.4192 27.7464C25.9817 27.7464 24.3879 28.4964 22.7942 29.4339C23.1379 29.0276 24.3879 27.5589 25.1692 27.4651Z" fill="#EEAF74"/> +<path d="M18.2999 35.7052C19.0091 36.0474 20.3471 36.5835 21.292 36.5835H23.2942V36.5589C22.8984 36.3714 21.988 35.7776 21.513 34.9026C21.4724 34.8279 21.4382 34.7567 21.4098 34.6889C21.9397 34.095 21.9403 33.418 21.9403 32.7247C21.815 32.6584 21.7059 32.5992 21.6172 32.5499C21.6345 32.4505 21.6634 32.3427 21.7005 32.2311C21.351 32.6537 20.7526 33.362 20.0347 34.0538C19.3341 34.7289 18.5371 35.3709 17.7605 35.7234C17.8841 35.682 17.9992 35.6432 18.1041 35.6076C18.1048 35.608 18.1055 35.6084 18.1062 35.6087C18.1364 35.624 18.2143 35.6568 18.3198 35.6998L18.2999 35.7052Z" fill="#EEAF74"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M18.5979 34.1186C18.6787 33.9941 18.8451 33.9587 18.9695 34.0395C19.128 34.1423 19.3094 34.3442 19.3769 34.6322C19.4468 34.9309 19.3858 35.2841 19.1213 35.6644C19.0366 35.7862 18.8691 35.8163 18.7473 35.7316C18.6255 35.6468 18.5954 35.4794 18.6801 35.3576C18.8741 35.0786 18.8828 34.8792 18.8536 34.7548C18.822 34.6198 18.7355 34.5282 18.677 34.4903C18.5526 34.4095 18.5171 34.2431 18.5979 34.1186Z" fill="#FFDDBD"/> +<path d="M21.4215 25.8765C21.5572 25.6923 21.6772 25.4953 21.7913 25.3072L21.8002 25.2926C21.957 25.0342 22.1047 24.7909 22.2804 24.5769C22.4569 24.3618 22.6551 24.1851 22.9038 24.0661C23.1515 23.9476 23.4646 23.8789 23.8817 23.9022L23.8819 23.8987C23.8642 23.8978 23.8466 23.8974 23.8292 23.8974C23.5022 23.8974 23.1639 23.8462 22.7873 23.7892C22.6822 23.7733 22.574 23.757 22.4623 23.7411C22.2366 23.8865 21.9909 23.7892 21.6173 23.9022C21.0754 24.0661 20.9973 24.0661 20.3254 24.4183C19.7786 24.6214 19.3581 24.9972 18.9192 25.5888H21.6173C21.5551 25.6806 21.4897 25.7766 21.4215 25.8765Z" fill="#EEAF74"/> +<path d="M17.8013 19.3324C17.8013 19.3324 17.0724 18.8483 16.0526 18.6674C15.6683 18.5993 15.639 18.0129 15.8549 17.6877C16.0708 17.3626 16.5094 17.274 16.8346 17.49C17.5475 17.9634 17.8013 19.3324 17.8013 19.3324Z" fill="#95ECFF"/> +<path d="M4.77642 29.7215C4.77642 29.7215 3.90784 29.8273 3.01528 30.3525C2.67889 30.5505 2.27548 30.1239 2.22828 29.7365C2.18108 29.349 2.45691 28.9967 2.84436 28.9495C3.69386 28.846 4.77642 29.7215 4.77642 29.7215Z" fill="#95ECFF"/> +<path d="M14.2547 19.7113C14.2547 19.7113 13.3861 19.8171 12.4936 20.3423C12.1572 20.5403 11.7538 20.1137 11.7066 19.7263C11.6594 19.3388 11.9352 18.9865 12.3226 18.9393C13.1721 18.8358 14.2547 19.7113 14.2547 19.7113Z" fill="#95ECFF"/> +<path d="M9.75789 40.8234C9.75789 40.8234 8.9942 41.2504 7.96366 41.353C7.57527 41.3917 7.50128 41.9742 7.69179 42.3148C7.8823 42.6555 8.3129 42.7772 8.65357 42.5867C9.40047 42.169 9.75789 40.8234 9.75789 40.8234Z" fill="#95ECFF"/> +</svg> diff --git a/src/assets/icons/visu/ecogesture/0042.svg b/src/assets/icons/visu/ecogesture/0042.svg new file mode 100644 index 0000000000000000000000000000000000000000..b324ff7dcfda259829397c8ade8270b7f8d37a03 --- /dev/null +++ b/src/assets/icons/visu/ecogesture/0042.svg @@ -0,0 +1,26 @@ +<svg width="50" height="50" viewBox="0 0 50 50" fill="none" xmlns="http://www.w3.org/2000/svg"> +<g clip-path="url(#clip0)"> +<path opacity="0.7" fill-rule="evenodd" clip-rule="evenodd" d="M35.4831 27.9531C35.6882 28.138 35.7045 28.4542 35.5196 28.6593C32.958 31.4998 29.2472 33.2865 25.1199 33.2865C24.8437 33.2865 24.6199 33.0626 24.6199 32.7865C24.6199 32.5104 24.8437 32.2865 25.1199 32.2865C28.9524 32.2865 32.397 30.6287 34.777 27.9896C34.9619 27.7845 35.2781 27.7682 35.4831 27.9531Z" fill="#2B98BA"/> +<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M35.9905 24.3038C36.2181 24.4601 36.276 24.7714 36.1197 24.999C34.6212 27.1815 32.5106 28.9362 29.9955 29.9903C29.7408 30.097 29.4478 29.977 29.3411 29.7224C29.2344 29.4677 29.3543 29.1747 29.609 29.068C31.9427 28.09 33.9029 26.461 35.2953 24.433C35.4516 24.2054 35.7628 24.1475 35.9905 24.3038Z" fill="#42ABCC"/> +<path d="M11.9557 24.079C9.96271 19.0542 12.1443 15.0672 15.4805 14.7209C18.8167 14.3746 21.7394 16.5441 22.9061 19.1207C24.0728 21.6973 21.6117 23.976 21.3139 27.6038C21.0161 31.2316 24.2913 32.4654 28.3871 32.9394C22.2981 34.9203 14.6962 30.9884 11.9557 24.079Z" fill="#5FD8FF"/> +<path d="M14.8299 14.866C11.884 15.643 10.1194 19.4224 11.9755 24.102C14.716 31.0114 22.3178 34.9433 28.4069 32.9624C24.3111 32.4884 21.0359 31.2546 21.3336 27.6268C21.4582 26.1092 21.9613 24.8277 22.4191 23.6618C22.4693 23.5338 22.519 23.4073 22.5676 23.282C21.6362 24.2685 20.5153 25.8421 20.3978 27.2743C20.1308 30.5278 21.1353 30.7246 22.1865 32.1891C17.6286 30.105 14.5353 27.8995 12.0776 21.7029C11.0045 18.9975 12.6897 16.0192 14.8299 14.866Z" fill="#2B98BA"/> +<path d="M18.8121 18.3564C17.3317 17.078 14.9289 18.0614 15.4965 16.5545C16.064 15.0477 18.5884 16.1073 20.0688 17.3857C21.5493 18.6642 21.1394 21.7218 21.1394 21.7218C21.1394 21.7218 20.2926 19.6349 18.8121 18.3564Z" fill="white"/> +<path opacity="0.7" fill-rule="evenodd" clip-rule="evenodd" d="M16.3527 9.86998C16.178 9.65613 16.2097 9.34114 16.4236 9.16644C17.9658 7.90657 19.8023 6.95758 21.8595 6.43992C22.1273 6.37254 22.399 6.535 22.4664 6.80279C22.5338 7.07059 22.3713 7.34231 22.1035 7.40969C20.1915 7.89081 18.4872 8.77191 17.0563 9.94088C16.8424 10.1156 16.5274 10.0838 16.3527 9.86998Z" fill="#2B98BA"/> +<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M16.3591 12.722C16.1638 12.5267 16.1639 12.2102 16.3592 12.0149C17.574 10.8006 19.0181 9.80239 20.6361 9.09543C20.8892 8.98488 21.1839 9.10038 21.2945 9.35343C21.4051 9.60647 21.2896 9.90123 21.0365 10.0118C19.5351 10.6678 18.1945 11.5942 17.0662 12.7222C16.8709 12.9174 16.5543 12.9173 16.3591 12.722Z" fill="#42ABCC"/> +<path d="M36.8725 12.1568C40.0315 16.5434 38.8888 20.9421 35.7379 22.0921C32.5871 23.242 29.2232 21.8513 27.4631 19.6373C25.7029 17.4233 27.5336 14.6129 26.9371 11.0221C26.3407 7.43135 22.8634 7.03409 18.7757 7.57382C24.1973 4.16692 32.5288 6.12497 36.8725 12.1568Z" fill="#5FD8FF"/> +<path d="M36.8725 12.1567C40.0315 16.5433 38.8888 20.9421 35.7379 22.092C32.5871 23.2419 29.2232 21.8513 27.4631 19.6373C25.7029 17.4233 27.5336 14.6129 26.9371 11.0221C26.3407 7.43129 22.8634 7.03403 18.7757 7.57376C24.1973 4.16686 32.5288 6.12491 36.8725 12.1567Z" fill="#5FD8FF"/> +<path d="M38.743 17.1371C38.3063 18.5519 37.3291 19.6296 35.9882 20.119C32.8373 21.2689 29.4735 19.8782 27.7133 17.6642C26.6895 16.3764 26.8806 14.8867 27.1023 13.1591C27.2617 11.9167 27.4369 10.5511 27.1874 9.04904C26.9141 7.40379 23.8125 6.375 21.25 6.375C20.375 6.75 20.5445 6.46229 18.7758 7.57375C22.8634 7.03402 26.3407 7.43128 26.9372 11.0221C27.1867 12.5242 27.0115 13.8897 26.8521 15.1321C26.6304 16.8598 26.4392 18.3494 27.4631 19.6373C29.2233 21.8512 32.5871 23.2419 35.7379 22.092C37.6503 21.3941 38.8229 19.4994 38.743 17.1371Z" fill="#2B98BA"/> +<path d="M34.3415 17.0258C36.221 16.4838 36.7095 13.934 37.6618 15.2324C38.6141 16.5308 36.3478 18.0667 34.4683 18.6086C32.5888 19.1506 30.2513 17.1373 30.2513 17.1373C30.2513 17.1373 32.462 17.5677 34.3415 17.0258Z" fill="white"/> +<path d="M7.27229 48.2179L10.4919 46.7653C12.5841 45.8214 14.9811 45.8216 17.0731 46.7659L20.0323 48.1016C21.5466 48.7851 23.2765 48.8102 24.81 48.1708L38.376 42.2034C39.2663 41.7745 41.1991 39.8628 41.6252 38.8566C42.1745 37.5593 41.4655 36.9593 40.9747 36.564C40.3151 36.0328 39.5784 36.0905 38.8457 36.6234L34.9874 39.8537L28.1784 41.5328C26.7841 41.905 25.2974 41.4973 24.2879 40.4659L20.8915 36.9954C18.5454 34.5982 14.953 33.9191 11.8937 35.2944L3.72888 38.9649L7.27229 48.2179Z" fill="#FFD1BD"/> +<path d="M7.2074 48.2473L10.492 46.7654C12.5843 45.8215 14.9812 45.8217 17.0733 46.766L20.0324 48.1017C21.5467 48.7852 23.2766 48.8103 24.8101 48.1708L39.3572 41.5991C40.3981 41.165 42.7476 36.7561 41.4269 37.3068L37.7586 40.9037L26.5066 45.6445C24.9732 46.2839 22.0827 45.3905 20.5684 44.707L16.9279 42.9932C15.2815 42.2501 13.5598 43.1497 11.8813 44.0268C11.4268 44.2643 10.9756 44.5001 10.5298 44.7012L6.53894 46.5017L7.2074 48.2473Z" fill="#E19676"/> +<path d="M7.26086 48.7716L10.6976 47.2211C12.6591 46.3361 14.9062 46.3363 16.8675 47.2217L19.8267 48.5574C21.4671 49.2978 23.3413 49.325 25.0025 48.6323L38.7183 42.6155L38.7263 42.6116C39.2546 42.357 40.0115 41.7174 40.6641 41.0552C41.3151 40.3946 41.9657 39.6072 42.2189 39.0094C42.5395 38.2523 42.5158 37.6278 42.2758 37.1172C42.0513 36.6396 41.6633 36.327 41.4229 36.1334L41.4217 36.1324C41.0088 35.7999 40.5434 35.6327 40.0505 35.6528C39.5669 35.6726 39.1062 35.8704 38.6849 36.1768L38.6711 36.1868L34.8883 39.3539L28.0582 41.0474L28.0495 41.0497C26.8295 41.3754 25.5286 41.0187 24.6454 40.1162L21.2489 36.6457C18.7562 34.0987 14.9393 33.3771 11.6888 34.8384L3.35913 38.583L3.71733 39.5184L12.0988 35.7504C14.9669 34.4611 18.3347 35.0978 20.5342 37.3451L23.9307 40.8156C25.0652 41.9749 26.7357 42.4338 28.303 42.0171L35.3532 40.269L39.2863 36.9759C39.5922 36.7563 39.8618 36.6614 40.0913 36.652C40.3148 36.6429 40.5477 36.7125 40.7944 36.9112C41.0448 37.1129 41.2558 37.2978 41.3708 37.5425C41.4707 37.7551 41.5268 38.0793 41.298 38.6194C41.1251 39.0278 40.5963 39.6993 39.9518 40.3533C39.3132 41.0013 38.6629 41.5292 38.2996 41.7071L24.6135 47.711C23.2088 48.2954 21.6248 48.2719 20.2381 47.6459L17.2789 46.3102C15.0561 45.3069 12.5093 45.3066 10.2863 46.3096L6.90263 47.8362L7.26086 48.7716Z" fill="#A2715B"/> +<path d="M14.5622 37.5627C14.9042 36.0285 16.5443 35.1709 17.9994 35.7654L27.3829 39.5998C28.3928 40.0125 28.8741 41.1681 28.4557 42.1757C28.0733 43.0963 27.0628 43.5855 26.1035 43.3144L16.349 40.5571C15.0535 40.1909 14.2693 38.8767 14.5622 37.5627Z" fill="#FFD1BD"/> +<path d="M14.4374 39.2113C15.4061 39.9925 17.1012 41.548 18.0625 41.7738L26.5663 43.3783C27.3603 43.5648 28.1636 42.9902 28.4362 42.0409C28.6923 41.1488 28.4026 40.2056 27.7828 39.7526C27.7677 39.8783 27.7425 40.0046 27.7066 40.1299C27.434 41.0791 26.6307 41.6537 25.8366 41.4673L18.3437 40.1299C16.6938 39.8698 14.4374 39.2113 14.4374 39.2113Z" fill="#E19676"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M17.4707 34.851C17.5818 34.5982 17.8768 34.4832 18.1296 34.5943L27.7753 38.8312C29.0418 39.3875 29.6311 40.8545 29.1014 42.1324C28.6263 43.2786 27.3932 43.9144 26.184 43.6368L18.1579 41.7942C17.8887 41.7324 17.7206 41.4641 17.7824 41.195C17.8442 40.9258 18.1125 40.7577 18.3816 40.8195L26.4077 42.6621C27.1413 42.8305 27.8894 42.4448 28.1776 41.7495C28.499 40.9742 28.1415 40.0843 27.3731 39.7468L17.7274 35.5099C17.4746 35.3988 17.3597 35.1038 17.4707 34.851Z" fill="#A2715B"/> +</g> +<defs> +<clipPath id="clip0"> +<rect width="50" height="50" fill="white"/> +</clipPath> +</defs> +</svg> diff --git a/src/assets/icons/visu/ecogesture/poings.svg b/src/assets/icons/visu/ecogesture/0043.svg similarity index 100% rename from src/assets/icons/visu/ecogesture/poings.svg rename to src/assets/icons/visu/ecogesture/0043.svg diff --git a/src/assets/icons/visu/ecogesture/vaisselle.svg b/src/assets/icons/visu/ecogesture/0045.svg similarity index 100% rename from src/assets/icons/visu/ecogesture/vaisselle.svg rename to src/assets/icons/visu/ecogesture/0045.svg diff --git a/src/assets/icons/visu/ecogesture/hibernation.svg b/src/assets/icons/visu/ecogesture/0050.svg similarity index 100% rename from src/assets/icons/visu/ecogesture/hibernation.svg rename to src/assets/icons/visu/ecogesture/0050.svg diff --git a/src/assets/icons/visu/ecogesture/0058.svg b/src/assets/icons/visu/ecogesture/0058.svg new file mode 100644 index 0000000000000000000000000000000000000000..8835b18d4df3bc5bc191b944d0b4062a949fc43c --- /dev/null +++ b/src/assets/icons/visu/ecogesture/0058.svg @@ -0,0 +1,42 @@ +<svg width="50" height="50" viewBox="0 0 50 50" fill="none" xmlns="http://www.w3.org/2000/svg"> +<path d="M13.75 6.28125C13.75 4.46907 15.2191 3 17.0312 3H35.625C37.4372 3 38.9062 4.46907 38.9062 6.28125V20.5H13.75V6.28125Z" fill="#AFF1FF"/> +<path d="M13.75 21.5938H5V47.8438C5 48.4478 5.48969 48.9375 6.09375 48.9375H12.6562C13.2603 48.9375 13.75 48.4478 13.75 47.8438V21.5938Z" fill="#AFF1FF"/> +<path d="M13.75 21.5938H6.09375V47.8438C6.09375 48.4478 6.58344 48.9375 7.1875 48.9375H12.6563C13.2603 48.9375 13.75 48.4478 13.75 47.8438V21.5938Z" fill="#3A9DB1"/> +<path d="M13.75 21.5938H38.9062V45.6562C38.9062 47.4684 37.4372 48.9375 35.625 48.9375H17.0313C15.2191 48.9375 13.75 47.4684 13.75 45.6562V21.5938Z" fill="#AFF1FF"/> +<path d="M14.8438 21.5938H37.8125V45.6562C37.8125 46.8644 36.8331 47.8438 35.625 47.8438H17.0312C15.8231 47.8438 14.8438 46.8644 14.8438 45.6562V21.5938Z" fill="#3A9DB1"/> +<rect x="17.0312" y="5.1875" width="2.1875" height="14.2188" rx="1.09375" fill="white"/> +<rect x="34.5312" y="12.8438" width="1.09375" height="5.46875" rx="0.546875" fill="black"/> +<path opacity="0.65" d="M14.8438 48.9317C28.7867 48.6345 40 36.9983 40 22.6875C40 22.3211 39.9927 21.9565 39.9781 21.5938H14.8438V48.9317Z" fill="url(#paint0_radial)"/> +<path d="M37.8125 45.3517V45.6562C37.8125 46.8643 36.8331 47.8437 35.625 47.8437H17.0312C16.0212 47.8437 15.1711 47.1593 14.9194 46.2289C15.5847 45.6915 16.793 44.889 17.6858 44.889C18.2812 44.889 19.1886 45.3686 20.1381 45.8704C21.1954 46.4292 22.3049 47.0155 23.0933 46.9976C23.8955 46.9793 24.815 46.4333 25.6527 45.9358C26.3776 45.5054 27.0412 45.1113 27.5144 45.1271C28.0075 45.1435 28.5005 45.3744 29.0089 45.6124C29.5525 45.867 30.1137 46.1298 30.7113 46.1473C31.2433 46.163 31.9553 45.6171 32.7214 45.0296C33.6204 44.3404 34.5939 43.594 35.4385 43.6307C36.68 43.6847 37.5333 44.7917 37.8125 45.3517Z" fill="#FFDB5A"/> +<path d="M29.419 47.1336L28.7388 47.6097C28.9093 47.6649 29.4696 47.7698 30.1144 47.8437H32.2463C32.2806 47.8346 32.3132 47.8247 32.3437 47.8138C33.398 47.4397 34.8944 46.7255 35.2005 46.3514C35.2987 46.2313 35.3724 46.1007 35.4464 45.9697C35.6028 45.6927 35.7602 45.4138 36.1527 45.2291C36.7146 44.9647 37.3406 45.0536 37.8125 45.4022V45.3517C37.5333 44.7917 36.68 43.6847 35.4385 43.6307C34.5939 43.594 33.6204 44.3404 32.7215 45.0296C31.9553 45.6171 31.2433 46.163 30.7113 46.1473C30.3001 46.1353 29.906 46.007 29.5231 45.8452L29.419 47.1336Z" fill="#F4B741"/> +<path d="M17.6016 44.8914C17.7677 45.0594 17.9493 45.305 18.1249 45.6563C18.6718 46.75 19.2187 47.2969 20.3124 47.2969C20.9116 47.2969 21.8869 47.1259 22.6764 46.9596C21.9384 46.8219 21.0201 46.3366 20.138 45.8704C19.1886 45.3687 18.2811 44.8891 17.6858 44.8891C17.658 44.8891 17.6299 44.8899 17.6016 44.8914Z" fill="#F4B741"/> +<path d="M22.9075 23.5167L33.032 46.3514" stroke="#7D6013"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M35.364 30.8305C35.6342 30.6954 35.9627 30.8049 36.0977 31.075C36.359 31.5975 36.3991 32.091 36.2805 32.5599C36.1684 33.0028 35.9222 33.3902 35.6836 33.7252C35.5905 33.8558 35.4978 33.9808 35.4075 34.1027C35.0001 34.652 34.6407 35.1368 34.5125 35.7796C34.4259 36.2144 34.4099 36.5098 34.4311 36.74C34.4517 36.9643 34.5099 37.1538 34.6081 37.3786C34.6595 37.4962 34.7264 37.6303 34.8039 37.7859C35.017 38.2132 35.3108 38.8023 35.5851 39.6542C36.2963 41.8627 35.6459 43.6224 34.7935 44.8162C34.3709 45.408 33.8981 45.8635 33.514 46.1765C33.3215 46.3333 33.1483 46.4568 33.0104 46.5457C32.9418 46.59 32.8789 46.6276 32.8246 46.6571C32.7867 46.6777 32.7077 46.7201 32.624 46.7429L32.3356 45.6879C32.3099 45.6949 32.2915 45.7024 32.284 45.7057C32.2875 45.704 32.2934 45.701 32.3021 45.6962C32.3272 45.6826 32.3662 45.6597 32.4177 45.6265C32.5202 45.5604 32.6608 45.4608 32.8231 45.3286C33.1485 45.0635 33.5488 44.6772 33.9034 44.1806C34.6053 43.1976 35.1251 41.7939 34.544 39.9894C34.2967 39.2215 34.0667 38.7613 33.8613 38.3505C33.7712 38.1703 33.6858 37.9996 33.6058 37.8165C33.4767 37.5208 33.3764 37.2148 33.3419 36.8402C33.308 36.4717 33.3404 36.0649 33.4399 35.5658C33.621 34.6576 34.1588 33.9405 34.5721 33.3894C34.6514 33.2838 34.726 33.1842 34.7927 33.0906C35.0177 32.7748 35.1608 32.5262 35.2201 32.2917C35.2729 32.0831 35.2664 31.8579 35.1195 31.5642C34.9844 31.294 35.0939 30.9655 35.364 30.8305ZM32.2804 45.7074C32.2804 45.7073 32.2817 45.7067 32.284 45.7057C32.2815 45.7069 32.2803 45.7074 32.2804 45.7074Z" fill="#C4C4C4"/> +<path d="M34.726 42.8145C34.726 46.2424 32.1731 47.7563 28.7452 47.7563C25.3173 47.7563 23.4351 46.2424 23.4351 42.8145C22.6867 38.7061 25.3173 35.3428 28.7452 35.3428C31.7332 39.2096 34.726 39.3866 34.726 42.8145Z" fill="#D2D2D2"/> +<path d="M27.9539 47.7272C30.9697 47.5024 33.1313 45.9687 33.1313 42.8145C33.1313 40.7397 32.0349 39.8559 30.5068 38.624C29.5554 37.8571 28.4368 36.9553 27.3112 35.5472C27.7671 35.4136 28.2477 35.3428 28.7452 35.3428C29.9246 36.8692 31.1049 37.8206 32.1015 38.624C33.6296 39.8559 34.726 40.7397 34.726 42.8145C34.726 46.2424 32.1731 47.7563 28.7452 47.7563C28.4715 47.7563 28.2077 47.7467 27.9539 47.7272Z" fill="#B6B3B3"/> +<path d="M23.5391 28.8489L26.1927 31.4808L24.1562 32.1297L23.5391 28.8489Z" fill="#7D7D7D"/> +<path d="M31.3746 28.68L28.3832 31.4808L31.0427 32.1297L31.3746 28.68Z" fill="#D2D2D2"/> +<path d="M31.2539 29.6571L29.734 31.2252L31.0489 32.0092L31.2539 29.6571Z" fill="#FFBABA"/> +<path d="M31.2773 43.5186C31.8167 46.2609 30.3081 47.3231 28.5298 47.6729C26.7514 48.0226 24.9533 46.4938 24.5136 44.2582C24.0739 42.0225 24.4466 39.5386 26.2249 39.1888C28.0033 38.8391 30.8376 41.283 31.2773 43.5186Z" fill="white"/> +<ellipse cx="27.1935" cy="33.7911" rx="4.65508" ry="3.10339" fill="#D2D2D2"/> +<path d="M26.4874 36.859C28.7233 36.6322 30.4364 35.3451 30.4364 33.7911C30.4364 32.2372 28.7233 30.95 26.4874 30.7232C26.7177 30.6999 26.9535 30.6877 27.1935 30.6877C29.7644 30.6877 31.8486 32.0772 31.8486 33.7911C31.8486 35.5051 29.7644 36.8945 27.1935 36.8945C26.9535 36.8945 26.7177 36.8824 26.4874 36.859Z" fill="#B6B3B3"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M26.2238 34.4185C26.3309 34.4185 26.4178 34.5053 26.4178 34.6124C26.4178 35.4702 25.8454 36.2368 25.0601 36.2368C24.9529 36.2368 24.8661 36.15 24.8661 36.0429C24.8661 35.9358 24.9529 35.8489 25.0601 35.8489C25.5602 35.8489 26.0299 35.3346 26.0299 34.6124C26.0299 34.5053 26.1167 34.4185 26.2238 34.4185Z" fill="#545454"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M26.6115 34.4185C26.5044 34.4185 26.4175 34.5053 26.4175 34.6124C26.4175 35.4702 26.9899 36.2368 27.7753 36.2368C27.8824 36.2368 27.9692 36.15 27.9692 36.0429C27.9692 35.9358 27.8824 35.8489 27.7753 35.8489C27.2752 35.8489 26.8055 35.3346 26.8055 34.6124C26.8055 34.5053 26.7186 34.4185 26.6115 34.4185Z" fill="#545454"/> +<path d="M25.6524 34.64C25.5656 34.8561 26.0329 35.3277 26.4156 35.3277C26.7983 35.3277 27.2845 34.8463 27.1789 34.64C27.0732 34.4337 26.8879 34.2864 26.4156 34.2864C25.9434 34.2864 25.7391 34.4239 25.6524 34.64Z" fill="#040404"/> +<path d="M27.2129 32.1742C27.2002 32.2826 27.1936 32.3935 27.1936 32.5062C27.1936 33.7909 28.0503 34.8324 29.1072 34.8324C30.164 34.8324 31.0207 33.7909 31.0207 32.5062C31.0207 32.3935 31.0142 32.2826 31.0014 32.1742H27.2129Z" fill="black"/> +<path d="M22.196 32.1742C22.1832 32.2826 22.1766 32.3935 22.1766 32.5062C22.1766 33.7909 23.0334 34.8324 24.0902 34.8324C25.147 34.8324 26.0038 33.7909 26.0038 32.5062C26.0038 32.3935 25.9972 32.2826 25.9844 32.1742H22.196Z" fill="black"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M27.9694 32.95H25.6573V32.1742H27.9694V32.95Z" fill="black"/> +<path d="M35.0782 24.989L15.1021 33.5033C15.1352 29.0615 17.8707 24.7834 22.3705 22.8654C26.8703 20.9475 31.8509 21.9368 35.0782 24.989Z" fill="#E6E6E6"/> +<path d="M32.0165 22.9347C29.6736 24.2312 26.8639 25.5714 23.7882 26.8223C20.971 27.9681 18.2612 28.9046 15.8408 29.597C16.9417 26.7001 19.225 24.2062 22.3705 22.8655C25.615 21.4826 29.1095 21.6112 32.0165 22.9347Z" fill="white"/> +<path d="M21.2907 23.3886C21.5007 23.274 21.7152 23.1648 21.9343 23.0614C21.6624 25.4716 22.0779 28.5259 22.4438 30.3742L17.9724 32.28C18.5439 28.1308 20.1297 25.0326 21.2907 23.3886Z" fill="#D32525"/> +<path d="M23.9739 22.3125C23.746 22.3851 23.5189 22.4648 23.2928 22.5517C25.2232 24.0202 27.1445 26.4307 28.228 27.9721L32.6949 26.0558C29.3002 23.6025 25.9646 22.6088 23.9739 22.3125Z" fill="#D32525"/> +<path d="M22.0196 27.6211C20.8951 28.0672 19.7905 28.479 18.7175 28.8543C19.4532 26.4098 20.4764 24.5415 21.2908 23.3886C21.5006 23.274 21.7152 23.1649 21.9343 23.0614C21.7738 24.4837 21.8527 26.1304 22.0196 27.6211Z" fill="#FF8585"/> +<path d="M26.5119 25.7268C27.6096 25.2183 28.6688 24.7006 29.6797 24.1808C27.4002 23.0315 25.3407 22.4875 23.9439 22.2844C23.7163 22.3577 23.4894 22.4382 23.2635 22.5259C24.4056 23.3886 25.5456 24.5795 26.5119 25.7268Z" fill="#FF8585"/> +<defs> +<radialGradient id="paint0_radial" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(14.8438 21.5938) rotate(56.3099) scale(27.605 23.5154)"> +<stop stop-color="#FFC700"/> +<stop offset="0.625" stop-color="#FFC700" stop-opacity="0.536458"/> +<stop offset="1" stop-color="#FFC700" stop-opacity="0"/> +</radialGradient> +</defs> +</svg> diff --git a/src/assets/icons/visu/ecogesture/electro.svg b/src/assets/icons/visu/ecogesture/0064.svg similarity index 100% rename from src/assets/icons/visu/ecogesture/electro.svg rename to src/assets/icons/visu/ecogesture/0064.svg diff --git a/src/assets/icons/visu/ecogesture/0066.svg b/src/assets/icons/visu/ecogesture/0066.svg new file mode 100644 index 0000000000000000000000000000000000000000..ae169c6a919a15db5ccc605caff18bf4d71cbdd3 --- /dev/null +++ b/src/assets/icons/visu/ecogesture/0066.svg @@ -0,0 +1,49 @@ +<svg width="51" height="50" viewBox="0 0 51 50" fill="none" xmlns="http://www.w3.org/2000/svg"> +<g clip-path="url(#clip0)"> +<path d="M29.3848 25.06C27.902 26.8307 25.8717 28.1716 23.4649 28.7927C17.3334 30.3752 11.0801 26.6875 9.49762 20.556C8.15886 15.3687 10.5921 10.0942 15.0859 7.63452C14.324 7.69843 13.5572 7.82721 12.792 8.02471C5.46714 9.91514 1.06167 17.3856 2.9521 24.7104C4.84252 32.0353 12.313 36.4408 19.6378 34.5503C24.5088 33.2932 28.0887 29.5685 29.3848 25.06Z" fill="#FFE27C"/> +<path d="M28.2177 27.887C28.709 26.9938 29.1015 26.0456 29.3848 25.06C27.902 26.8307 25.8718 28.1715 23.4649 28.7927C17.3335 30.3751 11.0801 26.6874 9.49764 20.5559C8.15888 15.3686 10.5921 10.0941 15.0859 7.63447C14.8855 7.65129 14.6847 7.6726 14.4836 7.69847C9.25039 10.2058 6.34036 16.1089 7.83589 21.9036C9.53737 28.4964 16.297 32.4523 22.9339 30.7394C24.9739 30.2129 26.7648 29.2121 28.2177 27.887Z" fill="#FFC700"/> +<path d="M45.6763 6.2973L45.725 6.88389L45.9181 6.32786L45.8195 6.90814L46.1448 6.4176L45.9049 6.95512L46.342 6.56089L45.976 7.02187L46.4974 6.74873L46.0283 7.1042L46.6012 6.96931L46.0584 7.19694L46.6469 7.20877L46.0645 7.29426L46.6316 7.45207L46.0462 7.39005L46.5562 7.68392L46.0047 7.47828L46.4256 7.88975L45.9426 7.55341L46.2479 8.05663L45.8637 7.61073L46.0343 8.17407L45.773 7.64662L45.7982 8.2347L45.6763 7.65885L45.5544 8.2347L45.5795 7.64662L45.3183 8.17407L45.4889 7.61073L45.1046 8.05663L45.41 7.55341L44.9269 7.88975L45.3478 7.47828L44.7963 7.68392L45.3063 7.39005L44.721 7.45207L45.288 7.29426L44.7057 7.20877L45.2941 7.19694L44.7513 6.96931L45.3243 7.1042L44.8551 6.74873L45.3765 7.02187L45.0105 6.56089L45.4476 6.95512L45.2077 6.4176L45.5331 6.90814L45.4344 6.32786L45.6275 6.88389L45.6763 6.2973Z" fill="#FFDA7C"/> +<path d="M39.171 19.5066L39.2216 20.1148L39.4218 19.5383L39.3195 20.14L39.6568 19.6313L39.4081 20.1887L39.8613 19.7799L39.4818 20.2579L40.0224 19.9747L39.536 20.3433L40.1301 20.2034L39.5672 20.4394L40.1774 20.4517L39.5736 20.5403L40.1616 20.704L39.5546 20.6397L40.0834 20.9444L39.5116 20.7311L39.948 21.1578L39.4471 20.809L39.7637 21.3308L39.3653 20.8685L39.5422 21.4526L39.2713 20.9057L39.2974 21.5155L39.171 20.9184L39.0446 21.5155L39.0707 20.9057L38.7998 21.4526L38.9767 20.8685L38.5783 21.3308L38.8949 20.809L38.394 21.1578L38.8304 20.7311L38.2586 20.9444L38.7874 20.6397L38.1805 20.704L38.7684 20.5403L38.1646 20.4517L38.7748 20.4394L38.212 20.2034L38.806 20.3433L38.3196 19.9747L38.8602 20.2579L38.4807 19.7799L38.9339 20.1887L38.6852 19.6313L39.0225 20.14L38.9202 19.5383L39.1205 20.1148L39.171 19.5066Z" fill="#FFDA7C"/> +<path d="M23.701 22.2147L23.7499 22.8023L23.9433 22.2453L23.8445 22.8266L24.1704 22.3352L23.9301 22.8737L24.368 22.4788L24.0013 22.9406L24.5236 22.6669L24.0536 23.023L24.6276 22.8879L24.0838 23.1159L24.6734 23.1278L24.09 23.2134L24.658 23.3715L24.0717 23.3094L24.5826 23.6038L24.0301 23.3978L24.4517 23.81L23.9678 23.473L24.2737 23.9771L23.8888 23.5304L24.0597 24.0948L23.798 23.5664L23.8231 24.1555L23.701 23.5787L23.5789 24.1555L23.6041 23.5664L23.3424 24.0948L23.5133 23.5304L23.1284 23.9771L23.4343 23.473L22.9504 23.81L23.372 23.3978L22.8195 23.6038L23.3304 23.3094L22.7441 23.3715L23.3121 23.2134L22.7287 23.1278L23.3183 23.1159L22.7745 22.8879L23.3484 23.023L22.8785 22.6669L23.4008 22.9406L23.0341 22.4788L23.472 22.8737L23.2317 22.3352L23.5576 22.8266L23.4588 22.2453L23.6522 22.8023L23.701 22.2147Z" fill="#FFDA7C"/> +<path d="M19.1711 13.3869L19.2469 14.2986L19.547 13.4344L19.3937 14.3363L19.8993 13.5739L19.5265 14.4093L20.2058 13.7966L19.6369 14.513L20.4473 14.0885L19.7182 14.641L20.6086 14.4313L19.765 14.7851L20.6796 14.8035L19.7745 14.9364L20.6558 15.1817L19.7461 15.0853L20.5388 15.542L19.6816 15.2224L20.3357 15.8619L19.585 15.3392L20.0595 16.1213L19.4624 15.4283L19.7275 16.3038L19.3214 15.4841L19.3605 16.3981L19.1711 15.5031L18.9816 16.3981L19.0207 15.4841L18.6146 16.3038L18.8798 15.4283L18.2826 16.1213L18.7572 15.3392L18.0064 15.8619L18.6606 15.2224L17.8034 15.542L18.5961 15.0853L17.6863 15.1817L18.5677 14.9364L17.6625 14.8035L18.5772 14.7851L17.7335 14.4313L18.624 14.641L17.8948 14.0885L18.7052 14.513L18.1364 13.7966L18.8157 14.4093L18.4429 13.5739L18.9485 14.3363L18.7952 13.4344L19.0953 14.2986L19.1711 13.3869Z" fill="#FFDA7C"/> +<path d="M48.7645 33.418L48.8402 34.3297L49.1404 33.4655L48.987 34.3674L49.4927 33.605L49.1198 34.4404L49.7992 33.8277L49.2303 34.5442L50.0407 34.1196L49.3115 34.6721L50.202 34.4625L49.3584 34.8163L50.273 34.8347L49.3679 34.9675L50.2492 35.2128L49.3395 35.1164L50.1321 35.5731L49.275 35.2535L49.9291 35.8931L49.1784 35.3703L49.6529 36.1524L49.0557 35.4594L49.3209 36.335L48.9148 35.5152L48.9539 36.4292L48.7645 35.5342L48.575 36.4292L48.6141 35.5152L48.208 36.335L48.4732 35.4594L47.876 36.1524L48.3506 35.3703L47.5998 35.8931L48.254 35.2535L47.3968 35.5731L48.1894 35.1164L47.2797 35.2128L48.161 34.9675L47.2559 34.8347L48.1706 34.8163L47.3269 34.4625L48.2174 34.6721L47.4882 34.1196L48.2986 34.5442L47.7297 33.8277L48.4091 34.4404L48.0363 33.605L48.5419 34.3674L48.3886 33.4655L48.6887 34.3297L48.7645 33.418Z" fill="#FFDA7C"/> +<path d="M10.0352 45.5038L10.0699 45.9209L10.2072 45.5255L10.1371 45.9382L10.3684 45.5893L10.1978 45.9716L10.5086 45.6912L10.2484 46.019L10.6191 45.8248L10.2855 46.0776L10.693 45.9817L10.307 46.1435L10.7254 46.1519L10.3113 46.2127L10.7146 46.325L10.2983 46.2809L10.661 46.4898L10.2688 46.3436L10.5681 46.6362L10.2246 46.397L10.4417 46.7549L10.1685 46.4378L10.2898 46.8384L10.104 46.4633L10.1219 46.8815L10.0352 46.472L9.94854 46.8815L9.96642 46.4633L9.78063 46.8384L9.90195 46.4378L9.62871 46.7549L9.84585 46.397L9.50234 46.6362L9.80165 46.3436L9.40945 46.4898L9.77212 46.2809L9.35588 46.325L9.75913 46.2127L9.34499 46.1519L9.76348 46.1435L9.37748 45.9817L9.78491 46.0776L9.45129 45.8248L9.82207 46.019L9.56179 45.6912L9.87261 45.9716L9.70204 45.5893L9.93338 45.9382L9.86323 45.5255L10.0005 45.9209L10.0352 45.5038Z" fill="#FFDA7C"/> +<path d="M20.6827 38.3436L20.7585 39.2553L21.0586 38.3911L20.9053 39.2929L21.4109 38.5305L21.0381 39.366L21.7174 38.7532L21.1485 39.4697L21.9589 39.0452L21.2297 39.5977L22.1202 39.388L21.2766 39.7418L22.1912 39.7602L21.2861 39.8931L22.1674 40.1383L21.2577 40.0419L22.0504 40.4987L21.1932 40.1791L21.8473 40.8186L21.0966 40.2958L21.5711 41.078L20.974 40.3849L21.2391 41.2605L20.833 40.4407L20.8721 41.3547L20.6827 40.4597L20.4932 41.3547L20.5323 40.4407L20.1262 41.2605L20.3914 40.3849L19.7942 41.078L20.2688 40.2958L19.518 40.8186L20.1722 40.1791L19.315 40.4987L20.1077 40.0419L19.1979 40.1383L20.0793 39.8931L19.1741 39.7602L20.0888 39.7418L19.2451 39.388L20.1356 39.5977L19.4064 39.0452L20.2168 39.4697L19.648 38.7532L20.3273 39.366L19.9545 38.5305L20.4601 39.2929L20.3068 38.3911L20.6069 39.2553L20.6827 38.3436Z" fill="#FFDA7C"/> +<path d="M42.6229 44.5161L42.6696 45.0781L42.8547 44.5453L42.7601 45.1014L43.0719 44.6313L42.842 45.1464L43.2608 44.7686L42.9101 45.2103L43.4097 44.9486L42.9602 45.2892L43.5092 45.16L42.9891 45.3781L43.553 45.3894L42.9949 45.4713L43.5383 45.6226L42.9774 45.5631L43.4661 45.8447L42.9377 45.6477L43.341 46.0419L42.8781 45.7197L43.1707 46.2018L42.8025 45.7746L42.966 46.3144L42.7156 45.809L42.7397 46.3725L42.6229 45.8207L42.5061 46.3725L42.5302 45.809L42.2799 46.3144L42.4433 45.7746L42.0752 46.2018L42.3678 45.7197L41.9049 46.0419L42.3082 45.6477L41.7797 45.8447L42.2684 45.5631L41.7075 45.6226L42.2509 45.4713L41.6929 45.3894L42.2568 45.3781L41.7366 45.16L42.2856 45.2892L41.8361 44.9486L42.3357 45.2103L41.985 44.7686L42.4038 45.1464L42.174 44.6313L42.4857 45.1014L42.3912 44.5453L42.5762 45.0781L42.6229 44.5161Z" fill="#FFDA7C"/> +<path d="M51.3646 0.733582L51.4337 1.56439L51.7072 0.776856L51.5675 1.59874L52.0282 0.903962L51.6885 1.66527L52.3075 1.10691L51.7892 1.75982L52.5276 1.37295L51.8632 1.87643L52.6746 1.68537L51.9058 2.00778L52.7393 2.02453L51.9145 2.14562L52.7177 2.36913L51.8886 2.28128L52.611 2.69751L51.8298 2.40625L52.426 2.98904L51.7418 2.51267L52.1743 3.2254L51.6301 2.59385L51.8717 3.39174L51.5016 2.64469L51.5373 3.4776L51.3646 2.662L51.192 3.4776L51.2276 2.64469L50.8576 3.39174L51.0992 2.59385L50.555 3.2254L50.9875 2.51267L50.3033 2.98904L50.8994 2.40625L50.1183 2.69751L50.8406 2.28128L50.0116 2.36913L50.8147 2.14562L49.9899 2.02453L50.8234 2.00778L50.0546 1.68537L50.8661 1.87643L50.2016 1.37295L50.9401 1.75982L50.4217 1.10691L51.0408 1.66527L50.701 0.903962L51.1618 1.59874L51.0221 0.776856L51.2956 1.56439L51.3646 0.733582Z" fill="#FFDA7C"/> +<path d="M8.08165 28.6488L8.13848 29.3326L8.36358 28.6844L8.24858 29.3608L8.62779 28.789L8.34819 29.4156L8.85769 28.9561L8.43105 29.4934L9.03882 29.175L8.49195 29.5894L9.15982 29.4321L8.52708 29.6975L9.21306 29.7113L8.53422 29.8109L9.19522 29.9949L8.51292 29.9226L9.10741 30.2651L8.46452 30.0254L8.95514 30.5051L8.39207 30.113L8.74799 30.6996L8.30011 30.1798L8.49897 30.8365L8.19442 30.2217L8.22373 30.9072L8.08165 30.2359L7.93957 30.9072L7.96888 30.2217L7.66432 30.8365L7.86319 30.1798L7.41531 30.6996L7.77123 30.113L7.20816 30.5051L7.69878 30.0254L7.05589 30.2651L7.65038 29.9226L6.96808 29.9949L7.62908 29.8109L6.95024 29.7113L7.63622 29.6975L7.00348 29.4321L7.67135 29.5894L7.12448 29.175L7.73225 29.4934L7.30561 28.9561L7.81511 29.4156L7.53551 28.789L7.91472 29.3608L7.79972 28.6844L8.02482 29.3326L8.08165 28.6488Z" fill="#FFDA7C"/> +<path d="M35.0482 34.1082L35.0894 34.6036L35.2525 34.134L35.1692 34.6241L35.4439 34.2098L35.2413 34.6637L35.6105 34.3308L35.3014 34.7201L35.7417 34.4894L35.3455 34.7897L35.8294 34.6757L35.3709 34.868L35.868 34.878L35.3761 34.9502L35.8551 35.0835L35.3607 35.0311L35.7914 35.2793L35.3256 35.1056L35.6811 35.4531L35.2731 35.1691L35.531 35.5941L35.2065 35.2175L35.3506 35.6933L35.1299 35.2478L35.1512 35.7445L35.0482 35.2581L34.9453 35.7445L34.9665 35.2478L34.7458 35.6933L34.8899 35.2175L34.5654 35.5941L34.8233 35.1691L34.4153 35.4531L34.7708 35.1056L34.305 35.2793L34.7357 35.0311L34.2414 35.0835L34.7203 34.9502L34.2284 34.878L34.7255 34.868L34.267 34.6757L34.7509 34.7897L34.3547 34.4894L34.795 34.7201L34.4859 34.3308L34.8551 34.6637L34.6525 34.2098L34.9273 34.6241L34.8439 34.134L35.007 34.6036L35.0482 34.1082Z" fill="#FFDA7C"/> +<path d="M4.81383 36.7007L4.85501 37.1962L5.0181 36.7266L4.93478 37.2167L5.20954 36.8023L5.00695 37.2563L5.37612 36.9234L5.06699 37.3127L5.50736 37.082L5.11112 37.3822L5.59503 37.2683L5.13657 37.4606L5.63361 37.4706L5.14174 37.5428L5.62068 37.6761L5.12631 37.6237L5.55705 37.8719L5.09124 37.6982L5.44673 38.0457L5.03875 37.7617L5.29664 38.1867L4.97212 37.8101L5.11621 38.2859L4.89554 37.8404L4.91678 38.3371L4.81383 37.8507L4.71088 38.3371L4.73212 37.8404L4.51145 38.2859L4.65555 37.8101L4.33102 38.1867L4.58892 37.7617L4.18093 38.0457L4.53642 37.6982L4.07061 37.8719L4.50135 37.6237L4.00698 37.6761L4.48592 37.5428L3.99405 37.4706L4.49109 37.4606L4.03263 37.2683L4.51654 37.3822L4.1203 37.082L4.56067 37.3127L4.25154 36.9234L4.62071 37.2563L4.41812 36.8023L4.69288 37.2167L4.60956 36.7266L4.77265 37.1962L4.81383 36.7007Z" fill="#FFDA7C"/> +<path d="M6.94803 3.75665L6.98592 4.2125L7.13598 3.7804L7.05932 4.23134L7.31212 3.85014L7.12572 4.26785L7.46539 3.96149L7.18096 4.31972L7.58614 4.10746L7.22156 4.3837L7.66681 4.27888L7.24498 4.45577L7.70231 4.46497L7.24974 4.5314L7.69041 4.65404L7.23554 4.60584L7.63187 4.83421L7.20327 4.6744L7.53036 4.99417L7.15497 4.73279L7.39226 5.12385L7.09367 4.77733L7.22625 5.21512L7.02321 4.80523L7.04275 5.26223L6.94803 4.81473L6.85331 5.26223L6.87285 4.80523L6.66981 5.21512L6.80239 4.77733L6.5038 5.12385L6.74109 4.73279L6.3657 4.99417L6.69278 4.6744L6.26419 4.83421L6.66052 4.60584L6.20565 4.65404L6.64632 4.5314L6.19375 4.46497L6.65108 4.45577L6.22925 4.27888L6.67449 4.3837L6.30991 4.10746L6.7151 4.31972L6.43067 3.96149L6.77034 4.26785L6.58393 3.85014L6.83674 4.23134L6.76008 3.7804L6.91014 4.2125L6.94803 3.75665Z" fill="#FFDA7C"/> +<path d="M40.1795 3.48846L40.2553 4.40015L40.5554 3.53595L40.4021 4.43784L40.9077 3.67543L40.5349 4.51086L41.2142 3.89814L40.6454 4.6146L41.4557 4.19008L40.7266 4.74257L41.6171 4.53291L40.7734 4.88671L41.6881 4.90509L40.7829 5.03796L41.6643 5.28323L40.7545 5.18684L41.5472 5.64358L40.69 5.32397L41.3442 5.96349L40.5934 5.44074L41.068 6.22286L40.4708 5.52983L40.7359 6.40539L40.3299 5.58562L40.369 6.49962L40.1795 5.60461L39.9901 6.49962L40.0291 5.58562L39.6231 6.40539L39.8882 5.52983L39.291 6.22286L39.7656 5.44074L39.0148 5.96349L39.669 5.32397L38.8118 5.64358L39.6045 5.18684L38.6947 5.28323L39.5761 5.03796L38.671 4.90509L39.5856 4.88671L38.7419 4.53291L39.6324 4.74257L38.9033 4.19008L39.7136 4.6146L39.1448 3.89814L39.8241 4.51086L39.4513 3.67543L39.9569 4.43784L39.8036 3.53595L40.1037 4.40015L40.1795 3.48846Z" fill="#FFDA7C"/> +<path d="M28.2268 16H30.2268V17.6681C30.2268 17.8524 30.0029 18.0018 29.7268 18.0018H28.7268C28.4507 18.0018 28.2268 17.8524 28.2268 17.6681V16Z" fill="#FFDDBD"/> +<rect x="28.2268" y="17" width="2" height="1" fill="#F4BA84"/> +<path d="M28.7424 46H27.2737V47.0469H26.2268C25.1222 47.0469 24.2268 47.8281 24.2268 48.5469C24.2268 49.1531 25.6051 49.0924 26.3742 49.0585C26.517 49.0522 26.6387 49.0469 26.7268 49.0469C27.0081 49.0469 27.1174 48.9219 27.2268 48.7969C27.3362 48.6719 27.4456 48.5469 27.7268 48.5469C28.0029 48.5469 28.2268 48.7707 28.2268 49.0469H28.7424V46Z" fill="#545F7C"/> +<path d="M29.7112 46H31.1799V47.0469H32.2268C33.3314 47.0469 34.2268 47.8281 34.2268 48.5469C34.2268 49.1531 32.9959 49.0924 32.2268 49.0585C32.084 49.0522 31.9622 49.0469 31.8742 49.0469C31.5929 49.0469 31.4835 48.9219 31.3742 48.7969C31.2648 48.6719 31.1554 48.5469 30.8742 48.5469C30.598 48.5469 30.3742 48.7707 30.3742 49.0469H29.7112V46Z" fill="#6E7B9D"/> +<path d="M29.7672 38.629V46H30.9598L31.4626 38.857C30.9004 38.7766 30.3352 38.6997 29.7672 38.629Z" fill="#B67D55"/> +<path d="M26.955 38.3436L27.4939 46H28.6865V38.5029C28.1121 38.4408 27.5349 38.3868 26.955 38.3436Z" fill="#9A5624"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M12.6316 16.7518L12.6018 17L12.3518 17.002L12.3496 16.718L12.6316 16.7518ZM45.6018 17L45.8518 17.0018L45.8538 16.725L45.5782 16.7511L45.6018 17ZM12.853 17.2812C12.8533 17.3892 12.8534 17.5268 12.8533 17.6915C12.8528 18.1373 12.8498 18.7823 12.8401 19.5793C12.8205 21.173 12.7736 23.375 12.6641 25.8081C12.4497 30.5697 11.9947 36.2428 11.0275 39.9665C11.21 40.0156 11.4361 40.0429 11.7077 40.0471C12.0849 40.0529 12.5318 40.0142 13.0393 39.9416C14.0417 39.7981 15.2504 39.527 16.5787 39.2291L16.6332 39.2168C19.3183 38.6146 22.473 37.9108 25.2349 38.0002C28.1709 38.0952 31.0495 38.5337 33.8317 38.9575C34.9015 39.1205 35.9571 39.2813 36.9962 39.4195C40.6515 39.9059 44.1169 40.1167 47.3839 39.2132C46.8637 37.9448 46.4818 36.0237 46.1977 33.8548C45.8918 31.5193 45.696 28.8674 45.5709 26.3719C45.4457 23.8758 45.3909 21.5328 45.3675 19.814C45.3557 18.9545 45.3518 18.2509 45.3508 17.762C45.3504 17.5624 45.3505 17.3985 45.3508 17.2745C45.2806 17.281 45.1977 17.2886 45.1029 17.2973C44.7664 17.3281 44.2792 17.3721 43.6763 17.4248C42.4706 17.5304 40.8016 17.6711 38.9489 17.8118C35.2461 18.093 30.7999 18.375 27.8518 18.375C24.9023 18.375 21.0803 18.0928 18.0009 17.8115C16.4601 17.6707 15.1032 17.5299 14.1314 17.4243C13.6455 17.3715 13.2559 17.3275 12.9876 17.2967C12.9386 17.2911 12.8937 17.2859 12.853 17.2812ZM45.6018 17C45.5782 16.7511 45.5783 16.7511 45.5782 16.7511L45.4438 16.7637C45.3555 16.772 45.2252 16.784 45.0573 16.7994C44.7214 16.8301 44.2349 16.8741 43.6327 16.9268C42.4283 17.0322 40.7614 17.1727 38.911 17.3132C35.2075 17.5945 30.7787 17.875 27.8518 17.875C24.9263 17.875 21.1233 17.5947 18.0464 17.3136C16.5091 17.1731 15.1551 17.0326 14.1854 16.9273C13.7007 16.8746 13.312 16.8307 13.0446 16.8C12.911 16.7846 12.8076 16.7726 12.7377 16.7644L12.6316 16.7518L12.6018 17C12.3518 17.002 12.3518 17.0019 12.3518 17.002L12.3521 17.0469L12.3527 17.1796C12.3531 17.2964 12.3535 17.4688 12.3533 17.6909C12.3528 18.1352 12.3499 18.7783 12.3401 19.5731C12.3206 21.163 12.2738 23.3594 12.1646 25.7857C11.9457 30.6463 11.4774 36.402 10.4855 40.0596L10.4297 40.2655L10.6242 40.353C10.92 40.4861 11.2888 40.5407 11.6999 40.547C12.1139 40.5534 12.5896 40.511 13.1101 40.4365C14.1322 40.2902 15.3571 40.0155 16.6738 39.7202L16.7426 39.7047C19.4428 39.0991 22.5325 38.413 25.2187 38.4999C28.1229 38.5939 30.9559 39.0255 33.7278 39.4477C34.8043 39.6117 35.8716 39.7743 36.9303 39.9152C40.6993 40.4167 44.3446 40.6393 47.7979 39.6147L48.0748 39.5325L47.9538 39.2703C47.4087 38.0893 46.998 36.1153 46.6934 33.7898C46.39 31.473 46.1951 28.8358 46.0702 26.3469C45.9454 23.8586 45.8908 21.522 45.8674 19.8072C45.8557 18.9498 45.8518 18.2482 45.8508 17.761C45.8503 17.5174 45.8506 17.3274 45.8509 17.1985L45.8515 17.0516L45.8518 17.0018C45.8518 17.0017 45.8518 17.0018 45.6018 17Z" fill="#9D9D9D"/> +<path d="M46.3596 18.4266C46.3049 18.2241 46.1383 18.093 45.9875 18.1338L44.8137 18.4511C44.663 18.4919 44.5851 18.6891 44.6398 18.8915C44.6946 19.094 44.8612 19.2251 45.012 19.1843L46.1857 18.867C46.3365 18.8262 46.4143 18.6291 46.3596 18.4266Z" fill="#FFDDBD"/> +<path d="M46.2084 21.35C46.0814 21.1831 45.8752 21.1264 45.7478 21.2233L45.47 21.4348C45.3426 21.5318 45.3424 21.7457 45.4694 21.9125C45.5964 22.0794 45.8027 22.1361 45.93 22.0392L46.2079 21.8277C46.3352 21.7307 46.3355 21.5168 46.2084 21.35Z" fill="#FFDDBD"/> +<path d="M46.2348 20.2083C46.1111 20.0389 45.9019 19.9811 45.7674 20.0793L45.1836 20.5055C45.0491 20.6036 45.0404 20.8205 45.164 20.9899C45.2877 21.1593 45.497 21.2171 45.6314 21.1189L46.2152 20.6927C46.3497 20.5946 46.3584 20.3777 46.2348 20.2083Z" fill="#FFDDBD"/> +<path d="M46.4564 19.2901C46.3842 19.0932 46.1984 18.9803 46.0413 19.0379L44.6967 19.5308C44.5396 19.5884 44.4708 19.7947 44.543 19.9916C44.6152 20.1886 44.8011 20.3015 44.9581 20.2439L46.3028 19.7509C46.4598 19.6934 46.5286 19.4871 46.4564 19.2901Z" fill="#FFDDBD"/> +<path d="M11.6185 18.4266C11.6733 18.2241 11.8399 18.093 11.9906 18.1338L13.1644 18.4511C13.3152 18.4919 13.393 18.6891 13.3383 18.8915C13.2836 19.094 13.117 19.2251 12.9662 19.1843L11.7924 18.867C11.6417 18.8262 11.5638 18.6291 11.6185 18.4266Z" fill="#FFDDBD"/> +<path d="M11.7697 21.35C11.8968 21.1831 12.103 21.1264 12.2303 21.2233L12.5082 21.4348C12.6355 21.5318 12.6358 21.7457 12.5088 21.9125C12.3817 22.0794 12.1755 22.1361 12.0481 22.0392L11.7703 21.8277C11.6429 21.7307 11.6427 21.5168 11.7697 21.35Z" fill="#FFDDBD"/> +<path d="M11.7434 20.2083C11.867 20.0389 12.0763 19.9811 12.2108 20.0793L12.7945 20.5055C12.929 20.6036 12.9378 20.8205 12.8141 20.9899C12.6904 21.1593 12.4812 21.2171 12.3467 21.1189L11.7629 20.6927C11.6285 20.5946 11.6197 20.3777 11.7434 20.2083Z" fill="#FFDDBD"/> +<path d="M11.5217 19.2901C11.5939 19.0932 11.7798 18.9803 11.9368 19.0379L13.2815 19.5308C13.4385 19.5884 13.5073 19.7947 13.4351 19.9916C13.3629 20.1886 13.1771 20.3015 13.02 20.2439L11.6754 19.7509C11.5183 19.6934 11.4495 19.4871 11.5217 19.2901Z" fill="#FFDDBD"/> +<path d="M21.7365 3.36456C21.7365 2.81228 22.1842 2.36456 22.7365 2.36456H35.2268C35.7791 2.36456 36.2268 2.81228 36.2268 3.36456V16C36.2268 16.5523 35.7791 17 35.2268 17H22.7364C22.1842 17 21.7365 16.5523 21.7365 16V3.36456Z" fill="white"/> +<path d="M36.2422 3.35388V3.85052C36.2422 3.29823 35.7945 2.85051 35.2422 2.85051L23.2697 2.85053C22.7174 2.85053 22.2697 3.29825 22.2697 3.85054L22.2698 16C22.2698 16.5523 22.7175 17 23.2698 17H22.7365C22.1842 17 21.7365 16.5523 21.7365 16L21.7365 3.3539C21.7365 3.31938 21.7382 3.28527 21.7416 3.25166C21.7928 2.7474 22.2187 2.3539 22.7365 2.3539L35.2422 2.35388C35.7945 2.35388 36.2422 2.8016 36.2422 3.35388Z" fill="#BDBDBD"/> +<circle cx="29.2268" cy="10" r="5" fill="#E8E8E8"/> +<path d="M33.7009 10.5C33.7156 10.3496 33.7232 10.197 33.7232 10.0426C33.7232 7.51643 31.6978 5.46857 29.1993 5.46857C26.7007 5.46857 24.6753 7.51643 24.6753 10.0426C24.6753 10.197 24.6829 10.3496 24.6976 10.5C24.9246 8.1886 26.8534 6.84078 29.1993 6.84078C31.5451 6.84078 33.4739 8.1886 33.7009 10.5Z" fill="#939393"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M29.2268 14.5C31.7121 14.5 33.7268 12.4853 33.7268 10C33.7268 7.51472 31.7121 5.5 29.2268 5.5C26.7415 5.5 24.7268 7.51472 24.7268 10C24.7268 12.4853 26.7415 14.5 29.2268 14.5ZM29.2268 15C31.9882 15 34.2268 12.7614 34.2268 10C34.2268 7.23858 31.9882 5 29.2268 5C26.4654 5 24.2268 7.23858 24.2268 10C24.2268 12.7614 26.4654 15 29.2268 15Z" fill="#BDBDBD"/> +<circle cx="26.9538" cy="10" r="0.693444" fill="black"/> +<circle cx="31.2796" cy="10" r="0.693444" fill="black"/> +<path d="M30.6522 12.6935C30.6522 13.0764 30.0776 13.1626 29.6946 13.1626C29.3116 13.1626 28.5059 12.383 28.5059 12C28.5059 11.617 28.8163 11.3066 29.1993 11.3066C29.5823 11.3066 30.6522 12.3105 30.6522 12.6935Z" fill="#847A60"/> +<circle cx="29.9202" cy="12.6934" r="0.693444" fill="#ACA38A"/> +</g> +<defs> +<clipPath id="clip0"> +<rect width="50" height="50" fill="white" transform="translate(0.355591)"/> +</clipPath> +</defs> +</svg> diff --git a/src/assets/icons/visu/ecogesture/accelerateur.svg b/src/assets/icons/visu/ecogesture/0071.svg similarity index 100% rename from src/assets/icons/visu/ecogesture/accelerateur.svg rename to src/assets/icons/visu/ecogesture/0071.svg diff --git a/src/assets/icons/visu/ecogesture/0082.svg b/src/assets/icons/visu/ecogesture/0082.svg new file mode 100644 index 0000000000000000000000000000000000000000..32c86841fa0074af875a3e4f6f864a79d7434d64 --- /dev/null +++ b/src/assets/icons/visu/ecogesture/0082.svg @@ -0,0 +1,44 @@ +<svg width="51" height="50" viewBox="0 0 51 50" fill="none" xmlns="http://www.w3.org/2000/svg"> +<path d="M11.7846 22.0572L11.7957 22.0637C12.0196 22.127 12.2705 22.185 12.5341 22.2458C12.6027 22.2617 12.6722 22.2778 12.7424 22.2942C13.0915 22.3758 13.4629 22.4676 13.7548 22.5834C13.9002 22.6411 14.0534 22.7152 14.1808 22.8151C14.3066 22.9139 14.4566 23.0777 14.4876 23.3197C14.5254 23.615 14.571 23.996 14.312 24.3798C14.085 24.716 13.6613 24.9965 13.0257 25.3218C12.6872 25.4951 12.3264 25.6458 11.9872 25.7828C11.9105 25.8137 11.8352 25.8439 11.7616 25.8733C11.5027 25.977 11.2632 26.0729 11.0457 26.171C10.7632 26.2983 10.5595 26.4117 10.4311 26.5182C10.3693 26.5695 10.3388 26.608 10.3248 26.6317C10.3138 26.6503 10.3141 26.6592 10.3141 26.6592C10.3141 26.82 10.3285 26.9507 10.3737 27.0719C10.4168 27.1878 10.4976 27.3204 10.6679 27.4662C11.0265 27.7734 11.7665 28.1267 13.2891 28.4417C13.5583 28.4974 13.8296 28.5515 14.1003 28.6055C15.3445 28.8536 16.5764 29.0993 17.5393 29.487C18.1331 29.7261 18.6695 30.0352 19.0596 30.4684C19.4606 30.9137 19.6864 31.4679 19.6864 32.1428C19.6864 32.7178 19.4225 33.2136 19.052 33.6271C18.6837 34.0381 18.1854 34.3967 17.6475 34.7119C16.6892 35.2736 15.5193 35.7451 14.5445 36.138C14.4281 36.185 14.3144 36.2308 14.2043 36.2755C13.8741 36.4095 13.517 36.5389 13.1465 36.6732C12.2657 36.9924 11.3088 37.3393 10.4555 37.8407C9.96387 38.1296 9.53361 38.4556 9.19868 38.8375L8.06274 38.8375C8.52169 38.0718 9.22719 37.4954 9.98938 37.0475C10.9202 36.5005 12.016 36.103 12.9224 35.7742C13.2686 35.6486 13.5872 35.533 13.8583 35.423C13.97 35.3777 14.0839 35.3317 14.1994 35.2851C15.1838 34.888 16.2868 34.443 17.1823 33.9182C17.6813 33.6258 18.0886 33.3236 18.3668 33.0131C18.6429 32.705 18.7664 32.4185 18.7664 32.1428C18.7664 31.6937 18.6238 31.3593 18.3759 31.084C18.1171 30.7966 17.724 30.5532 17.1956 30.3404C16.3204 29.988 15.197 29.7634 13.956 29.5153L13.9549 29.515C13.6763 29.4593 13.3917 29.4024 13.1027 29.3426C11.5416 29.0197 10.6107 28.6286 10.0694 28.1649C9.78958 27.9253 9.61309 27.6658 9.51149 27.393C9.41183 27.1254 9.39404 26.8706 9.39404 26.6592C9.39404 26.2782 9.61516 25.9996 9.84378 25.81C10.0714 25.6213 10.3689 25.4669 10.6675 25.3323C10.9048 25.2252 11.1691 25.1195 11.431 25.0146C11.502 24.9862 11.5728 24.9579 11.6428 24.9296C11.9786 24.7941 12.307 24.6562 12.6065 24.5029C13.2468 24.1751 13.4687 23.9847 13.5494 23.8651C13.593 23.8005 13.6097 23.746 13.585 23.5198C13.5513 23.4988 13.497 23.471 13.4154 23.4386C13.1965 23.3517 12.8901 23.2736 12.5329 23.19C12.4696 23.1752 12.4048 23.1603 12.3391 23.1451C12.0496 23.0783 11.7428 23.0075 11.4749 22.9287C11.3873 22.903 11.3618 22.8524 11.3358 22.8009C11.3125 22.7548 11.2888 22.7079 11.2198 22.6771C11.2074 22.6716 11.1953 22.6662 11.1833 22.6609C11.0593 22.6062 10.9575 22.5613 10.8458 22.4527C10.5733 22.188 10.4044 21.9859 10.3759 21.9517C10.375 21.9507 10.3743 21.9498 10.3737 21.9491C11.0403 21.6174 11.3348 21.7914 11.7846 22.0572Z" fill="#E4A400"/> +<path d="M13.5497 21.7948C13.4131 21.8432 13.2217 21.8992 12.9862 21.968C12.8434 22.0097 12.6846 22.0561 12.5119 22.1084C12.0752 22.2408 11.5758 22.4044 11.1509 22.5997C10.9384 22.6974 10.7315 22.8089 10.5557 22.9364C10.3846 23.0604 10.2105 23.2228 10.1058 23.4334C9.99052 23.6655 9.97325 23.9313 10.0886 24.1922C10.1934 24.4291 10.3906 24.6237 10.6257 24.7892C11.0959 25.12 11.6889 25.3352 12.2901 25.4937C12.8829 25.65 13.5221 25.7605 14.1137 25.8627L14.1489 25.8688C14.7619 25.9747 15.3144 26.0716 15.7619 26.2014C16.2299 26.3373 16.4731 26.4807 16.5702 26.6077C16.6622 26.728 16.6741 26.8299 16.6219 26.9714C16.557 27.1471 16.3894 27.375 16.0879 27.6484C15.49 28.1907 14.5326 28.7664 13.484 29.3356C13.0273 29.5835 12.4319 29.8222 11.7538 30.0941L11.5849 30.1618C10.8506 30.4567 10.0442 30.7871 9.30356 31.1905C8.34962 31.71 7.43751 32.3885 6.93603 33.3301L8.16113 33.017C8.5522 32.5979 9.13377 32.3306 9.74357 31.9985C10.4311 31.624 11.191 31.3114 11.9278 31.0156L12.11 30.9425C12.7705 30.6779 13.4164 30.4191 13.923 30.1441C14.9693 29.5761 16.017 28.9548 16.706 28.3299C17.0479 28.0198 17.3441 27.6717 17.485 27.29C17.6385 26.8741 17.598 26.4373 17.301 26.0488C17.0091 25.6671 16.5041 25.4589 16.0183 25.3179C15.5118 25.1709 14.9046 25.0658 14.3056 24.9622L14.2894 24.9594C13.6842 24.8548 13.0785 24.7501 12.5246 24.6041C11.9625 24.4559 11.4931 24.2745 11.1552 24.0368C11.0093 23.9341 10.9544 23.8629 10.9361 23.8317C10.9534 23.8047 10.9976 23.7524 11.0958 23.6811C11.2051 23.6019 11.3532 23.5193 11.5352 23.4356C11.8997 23.268 12.3486 23.1192 12.7788 22.9888C12.921 22.9457 13.0651 22.9036 13.2028 22.8633C13.4614 22.7876 13.6977 22.7185 13.8573 22.6618L13.5497 21.7948Z" fill="#E4A400"/> +<path d="M13.8423 21.559L13.2178 22.0772L12.9294 22.19C12.9457 22.168 12.9569 22.1476 12.9647 22.1303L12.9691 22.1182C12.8957 22.0756 12.7962 22.0269 12.6767 21.9765C12.4376 21.8756 12.1505 21.7813 11.898 21.7219C11.6179 21.656 11.2448 21.566 10.8806 21.4175C10.5176 21.2695 10.1261 21.0491 9.83071 20.6991C9.76278 20.6186 9.70352 20.5057 9.69355 20.3657C9.69297 20.3575 9.69257 20.3494 9.69234 20.3414L11.0972 20.42C11.1485 20.4449 11.2022 20.4687 11.2581 20.4915C11.5419 20.6072 11.8457 20.6823 12.127 20.7485C12.4358 20.8211 12.7762 20.9332 13.0654 21.0552C13.2101 21.1162 13.35 21.1831 13.4706 21.253C13.5794 21.3161 13.717 21.4065 13.8165 21.526C13.8256 21.5368 13.8341 21.5479 13.8423 21.559Z" fill="#E4A400"/> +<path d="M13.9391 19.839L13.3146 20.3572L13.0262 20.47C13.0425 20.448 13.0537 20.4275 13.0615 20.4103L13.0659 20.3981C12.9925 20.3556 12.893 20.3069 12.7735 20.2565C12.5344 20.1556 12.2473 20.0613 11.9948 20.0018C11.7147 19.9359 11.3416 19.8459 10.9774 19.6975C10.6144 19.5495 10.2229 19.3291 9.92751 18.979C9.85958 18.8985 9.80032 18.7856 9.79036 18.6456C9.78977 18.6375 9.78937 18.6294 9.78914 18.6213L11.194 18.7C11.2453 18.7249 11.299 18.7487 11.3549 18.7715C11.6387 18.8872 11.9425 18.9622 12.2238 19.0284C12.5326 19.1011 12.873 19.2131 13.1622 19.3351C13.3069 19.3962 13.4468 19.4631 13.5674 19.533C13.6762 19.5961 13.8138 19.6865 13.9133 19.806C13.9224 19.8168 13.931 19.8278 13.9391 19.839Z" fill="#E4A400"/> +<path d="M13.7272 21.4005C13.6539 21.6391 13.4771 21.8072 13.3483 21.9088C13.1786 22.0425 12.97 22.1552 12.7675 22.2477C12.3685 22.4298 11.9079 22.5712 11.5835 22.6493L10.4155 23.0387C10.3832 23.0494 10.3505 23.0567 10.3179 23.0607C10.0909 23.1666 9.97438 23.4284 10.0555 23.6718C10.1429 23.9338 10.426 24.0753 10.688 23.988L11.856 23.5986C12.1804 23.5205 12.641 23.3791 13.0399 23.197C13.2424 23.1046 13.451 22.9919 13.6207 22.8581C13.7719 22.7389 13.9891 22.5281 14.0277 22.2192C14.0731 21.8556 13.9097 21.583 13.7272 21.4005Z" fill="#FFDC5F"/> +<path d="M12.6055 20.7076C12.2479 20.8561 11.8636 20.9716 11.5819 21.0394L10.451 21.4165C10.2331 21.5264 10.123 21.7823 10.2025 22.0207C10.2898 22.2827 10.573 22.4243 10.835 22.3369L12.003 21.9476C12.3273 21.8695 12.7879 21.728 13.1869 21.5459C13.3894 21.4535 13.598 21.3408 13.7677 21.2071C13.9189 21.0879 14.1361 20.8771 14.1747 20.5681C14.2299 20.1262 13.9766 19.8187 13.7555 19.644C13.755 19.6493 13.7543 19.6547 13.7537 19.66C13.7151 19.9689 13.4978 20.1797 13.3467 20.2989C13.2222 20.397 13.0769 20.4838 12.9283 20.5595C12.8809 20.5846 12.8286 20.6102 12.7717 20.6362C12.7179 20.6608 12.6622 20.6846 12.6055 20.7076Z" fill="#FFDC5F"/> +<path d="M9.73843 20.4302C9.65409 20.1673 9.79888 19.8857 10.0618 19.8014L11.8306 19.2341L11.8497 19.2296C12.1339 19.1624 12.561 19.0369 12.9138 18.8836C13.0633 18.8186 13.1838 18.7554 13.2702 18.6982L13.9976 18.4968C14.1076 18.4663 14.2004 18.4005 14.2651 18.3137C14.3316 18.4565 14.3674 18.6254 14.343 18.8205C14.3031 19.1403 14.0683 19.3522 13.915 19.4668C13.7389 19.5985 13.5222 19.7096 13.3122 19.8008C12.8969 19.9812 12.4203 20.1211 12.0991 20.1981L10.3672 20.7536C10.1043 20.838 9.82277 20.6932 9.73843 20.4302Z" fill="#FFDC5F"/> +<path d="M14.3641 18.0149C14.3641 18.2397 14.2142 18.4368 13.9976 18.4968L9.99756 19.6043C9.67905 19.6925 9.36414 19.4529 9.36414 19.1225C9.36414 19.1225 9.36414 17.2948 9.36414 16.783C9.36414 16.2712 10.1166 15.3961 10.3478 15.3961C10.5789 15.3961 13.0885 15.3961 13.2867 15.3961C13.4848 15.3961 14.3641 16.2712 14.3641 16.783C14.3641 17.2948 14.3641 18.0149 14.3641 18.0149Z" fill="#F4F4F4"/> +<path d="M13.9552 15.9634C13.6972 15.6496 13.3933 15.3961 13.2867 15.3961L10.3478 15.3961C10.1166 15.3961 9.36413 16.2712 9.36413 16.783L9.36413 19.1225C9.36413 19.4529 9.67905 19.6925 9.99755 19.6043L10.0297 19.5954L10.0297 17.3503C10.0297 16.8384 10.7821 15.9634 11.0133 15.9634L13.9522 15.9634L13.9552 15.9634Z" fill="#DDDDDD"/> +<rect x="13.3362" y="15.1484" width="3.05447" height="1" rx="0.5" transform="rotate(180 13.3362 15.1484)" fill="#C4C4C4"/> +<path d="M13.3053 14.8218C13.3253 14.7678 13.3362 14.7094 13.3362 14.6484C13.3362 14.3723 13.1123 14.1484 12.8362 14.1484L10.7817 14.1484C10.5056 14.1484 10.2817 14.3723 10.2817 14.6484C10.2817 14.7094 10.2926 14.7678 10.3126 14.8218C10.3831 14.6311 10.5665 14.4952 10.7817 14.4952L12.8362 14.4952C13.0514 14.4952 13.2348 14.6311 13.3053 14.8218Z" fill="#9C9C9C"/> +<ellipse cx="12.4033" cy="14.8017" rx="0.470556" ry="0.214635" transform="rotate(180 12.4033 14.8017)" fill="white"/> +<rect x="13.3362" y="14.0587" width="3.05447" height="1" rx="0.5" transform="rotate(180 13.3362 14.0587)" fill="#C4C4C4"/> +<path d="M13.3053 13.7321C13.3253 13.678 13.3362 13.6197 13.3362 13.5587C13.3362 13.2826 13.1123 13.0587 12.8362 13.0587L10.7817 13.0587C10.5056 13.0587 10.2817 13.2826 10.2817 13.5587C10.2817 13.6197 10.2926 13.678 10.3126 13.7321C10.3831 13.5414 10.5665 13.4054 10.7817 13.4054L12.8362 13.4054C13.0514 13.4054 13.2348 13.5414 13.3053 13.7321Z" fill="#9C9C9C"/> +<ellipse cx="12.4033" cy="13.712" rx="0.470556" ry="0.214635" transform="rotate(180 12.4033 13.712)" fill="white"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M11.6064 12.7678L11.6064 -2.82467e-08L12.2526 0L12.2526 12.7678L11.6064 12.7678Z" fill="white"/> +<path d="M14.4365 23.1343C14.4038 23.186 14.3698 23.2328 14.335 23.2719C14.1691 23.4586 13.8333 23.7302 13.4242 23.9998C13.2895 24.1169 13.047 24.2774 12.6064 24.5029C12.307 24.6562 11.9785 24.7941 11.6427 24.9297C11.5732 24.9577 11.5028 24.9859 11.4324 25.0141L11.431 25.0147C11.169 25.1195 10.9048 25.2253 10.6674 25.3323C10.3689 25.467 10.0713 25.6213 9.84372 25.8101C9.6151 25.9997 9.39397 26.2783 9.39397 26.6593C9.39397 26.8706 9.41177 27.1254 9.51142 27.393C9.58766 27.5977 9.70608 27.7949 9.87866 27.9819C9.85777 27.9253 9.83596 27.8725 9.81324 27.8245C9.5439 27.2559 9.57386 27.1961 10.2023 26.6873C10.2652 26.6364 10.3354 26.5856 10.4106 26.5357C10.417 26.5301 10.4238 26.5242 10.431 26.5182C10.5594 26.4118 10.7632 26.2984 11.0456 26.171C11.2632 26.0729 11.5027 25.977 11.7615 25.8734C11.8352 25.8439 11.9104 25.8138 11.9871 25.7828C12.3263 25.6459 12.6871 25.4952 13.0257 25.3219C13.6613 24.9965 14.085 24.716 14.3119 24.3799C14.571 23.996 14.5254 23.615 14.4875 23.3197C14.4788 23.2518 14.4608 23.1901 14.4365 23.1343Z" fill="#FFDC5F"/> +<path d="M17.1823 33.9182C16.8561 34.1094 16.5024 34.2899 16.1369 34.4614C15.7265 34.667 15.3812 34.8269 15.2 34.8872C15.1726 34.8964 15.1444 34.9043 15.1153 34.9111C14.8052 35.0407 14.4968 35.1651 14.1993 35.2851C14.0838 35.3317 13.97 35.3777 13.8583 35.423C13.5871 35.533 13.2685 35.6486 12.9224 35.7742C12.016 36.103 10.9202 36.5006 9.98932 37.0476C8.67297 37.8211 7.52569 38.9778 7.52563 40.8316C7.52561 41.6232 7.89241 42.3985 8.49606 43.0824C8.19236 42.4579 8.31155 41.5588 8.37685 41.0661C8.39079 40.9609 8.40228 40.8743 8.40667 40.8128C8.41183 40.7405 8.42946 40.6424 8.45955 40.526C8.57242 39.3089 9.36219 38.4832 10.4554 37.8408C11.3088 37.3393 12.2657 36.9925 13.1464 36.6732C13.517 36.5389 13.874 36.4095 14.2042 36.2755C14.3144 36.2308 14.428 36.185 14.5445 36.1381C15.5192 35.7452 16.6891 35.2736 17.6475 34.7119C18.1853 34.3967 18.6836 34.0381 19.052 33.6271C19.4224 33.2136 19.6863 32.7178 19.6863 32.1429C19.6863 31.942 19.6663 31.7517 19.6276 31.5719C19.6182 31.612 19.6087 31.6499 19.5992 31.6851C19.3898 32.4632 19.3299 32.553 18.881 32.9121C18.6686 33.082 17.974 33.4863 17.2344 33.8874L17.1823 33.9182Z" fill="#FFDC5F"/> +<path d="M42.9453 16.705C42.8627 16.5176 42.7757 16.3202 42.6741 16.1318C42.1458 15.6208 41.6456 15.2243 41.2248 14.9743C36.4776 12.1539 31.2725 14.3181 27.3542 18.224C25.7221 19.8509 25.3725 21.6447 25.7212 23.3414C25.5924 23.9718 26.5366 25.6668 27.296 26.8692C27.5993 27.3494 28.089 27.8197 28.6279 28.2344C28.9782 28.5804 29.3335 28.8921 29.6784 29.1626C30.0394 29.3319 30.4311 29.449 30.831 29.535C30.8923 29.5601 30.9502 29.5823 31.0042 29.6016C31.7329 29.8619 34.3005 29.9269 35.4932 29.9269L43.0398 23.8115C42.9637 23.4122 42.8573 22.9072 42.7253 22.3461C43.7048 20.3606 43.9269 18.303 43.2698 17.3469C43.154 17.1783 43.0534 16.9502 42.9453 16.705Z" fill="#FFDC5F"/> +<path d="M35.7299 40.5883C35.6911 40.488 35.6558 40.3965 35.5663 40.4581C35.4913 40.2484 35.808 39.4813 36.2287 38.4621C37.1295 36.2799 38.5073 32.9425 37.5377 31.4477C37.0437 30.6863 36.5433 30.3001 36.0277 30.126C36.7476 29.8002 37.481 29.3852 38.2181 28.8787C42.2768 26.0894 45.4891 21.0369 44.2807 17.9616C46.2709 20.5995 47.94 24.3886 46.6142 27.6625C45.5631 30.2581 41.3189 34.8265 38.6298 37.721C37.5068 38.9298 36.655 39.8467 36.4202 40.206C35.8935 41.0121 35.8053 40.7836 35.7299 40.5883Z" fill="#FFDC5F"/> +<path d="M38.8363 14.998C38.7206 14.829 38.5987 14.6511 38.4641 14.4846C37.9445 14.1416 37.4597 13.8756 37.0442 13.7001C38.4479 13.762 39.8553 14.1608 41.2247 14.9743C41.6455 15.2243 42.1457 15.6208 42.674 16.1318C42.7756 16.3202 42.8626 16.5176 42.9453 16.705C43.0533 16.9502 43.1539 17.1783 43.2697 17.3469C43.6586 17.9127 43.7395 18.8642 43.5378 19.9583C42.7365 18.4401 41.5708 17.0722 40.3804 15.9871C40.4636 16.12 40.5379 16.2591 40.6035 16.4039C40.0787 15.7595 39.5007 15.2763 38.8554 15.0259C38.849 15.0166 38.8427 15.0073 38.8363 14.998Z" fill="#E4A400"/> +<path d="M35.5662 40.4581C35.5086 40.2973 35.6815 39.8085 35.9551 39.1296C35.9157 39.4192 35.9111 39.6204 35.9601 39.7041C36.0367 39.6271 36.0883 39.7105 36.1448 39.8019C36.2549 39.98 36.3838 40.1884 36.7529 39.299C36.9174 38.9026 37.5857 37.8445 38.4667 36.4496C40.5764 33.1091 43.9064 27.8368 44.4612 25.092C44.7117 23.8528 44.573 22.6195 44.1795 21.4445C44.599 20.1716 44.6737 18.962 44.2806 17.9617C46.2708 20.5995 47.9399 24.3886 46.6141 27.6625C45.563 30.2581 41.3187 34.8266 38.6296 37.7211C37.5067 38.9299 36.6549 39.8467 36.4201 40.206C35.8934 41.0122 35.8052 40.7836 35.7298 40.5883C35.691 40.488 35.6557 40.3966 35.5662 40.4581Z" fill="#E4A400"/> +<path d="M34.7015 15.6551C35.9089 19.6596 33.3927 23.3334 30.0082 23.5536C26.6237 23.7739 22.6785 20.0377 22.4452 16.4527C22.2118 12.8678 24.7664 9.78311 28.1509 9.56284C31.5353 9.34257 34.4681 12.0702 34.7015 15.6551Z" fill="#FFDDBD"/> +<path d="M30.4839 23.4992C33.623 22.9838 35.8514 19.4695 34.7013 15.6551C34.468 12.0701 31.5352 9.34254 28.1507 9.56281C27.2878 9.61897 26.4789 9.86132 25.7563 10.2507C25.9951 10.2046 26.2391 10.173 26.4875 10.1568C29.872 9.93653 32.8048 12.6641 33.0381 16.2491C33.9712 19.3437 32.6805 22.2408 30.4839 23.4992Z" fill="#EEAF74"/> +<path d="M26.7537 8.91332C27.1892 10.3308 27.182 11.6552 27.398 13.0531C27.657 14.7286 27.8956 14.9836 27.8924 14.9863C27.889 14.9892 27.6028 14.697 26.7538 15.5872C25.2919 17.12 24.1783 19.1187 25.6059 22.1742C23.3288 21.2048 21.6158 19.2012 21.2269 16.6848C20.6847 13.1762 23.3235 10.106 26.7537 8.91332Z" fill="#FFDC5F"/> +<path d="M24.8246 20.4717L24.8381 20.4891L25.2335 21.9389L26.6725 22.7606L25.8042 20.2471C25.4204 19.136 25.4644 18.3385 25.6677 17.733C25.8774 17.108 26.2931 16.5783 26.8366 16.0712C26.8998 16.0122 26.9513 15.9689 26.9913 15.9376C27.0198 15.9395 27.0499 15.9403 27.0814 15.9396C27.239 15.9359 27.4567 15.8923 27.6613 15.7377C28.0448 15.4479 28.0589 15.0364 28.0585 14.9354C28.0579 14.8003 28.0294 14.6978 28.0201 14.6653C27.9989 14.591 27.9731 14.5348 27.9679 14.5236L27.9674 14.5225L27.9627 14.5124C27.9586 14.4988 27.9513 14.4728 27.9419 14.4317C27.9057 14.2736 27.8472 13.9315 27.8046 13.2768C27.8017 13.2322 27.7986 13.1874 27.7953 13.1424C27.4865 13.4587 27.1759 13.7786 26.8741 14.0907C26.9528 14.7378 27.0426 14.909 27.0566 14.9358C27.058 14.9384 27.0587 14.9397 27.0585 14.9398C27.0583 14.9399 27.0575 14.9392 27.0561 14.9379C27.0316 14.9158 26.8172 14.7217 26.1544 15.34L26.1457 15.3481C25.1879 16.2443 24.3797 17.3946 24.5332 19.1172C24.5704 19.5337 24.6637 19.9837 24.8246 20.4717Z" fill="#C65F00"/> +<path d="M21.35 14.3006C22.5862 15.2571 23.9183 16.0016 25.1904 16.1925C26.8521 16.4419 27.9702 16.1114 29.1631 15.7587C30.6089 15.3313 32.1646 14.8714 34.9309 15.3721C34.9305 15.3094 34.9292 15.2465 34.927 15.1835C34.7982 11.4104 31.635 8.45624 27.862 8.5851C24.5493 8.69824 21.8678 11.1503 21.35 14.3006Z" fill="#FFDC5F"/> +<path d="M33.0093 15.1592C33.5817 15.1774 34.216 15.2426 34.9312 15.372C34.9307 15.3094 34.9294 15.2465 34.9273 15.1835C34.7984 11.4104 31.6353 8.4562 27.8622 8.58506C26.7648 8.62254 25.7366 8.91675 24.8334 9.40801C25.2127 9.32884 25.6041 9.28096 26.0046 9.26728C29.5387 9.14658 32.5377 11.7308 33.0093 15.1592Z" fill="#E4A400"/> +<path d="M22.4014 14.8335L22.2865 14.8335C22.039 14.7288 21.6628 14.543 21.2834 14.3059C21.2675 14.3971 21.2534 14.4888 21.2411 14.5811L21.1626 15.1722L21.6452 15.5223C22.7939 16.3556 24.1333 17.08 25.4896 17.241C27.1551 17.4386 28.2898 17.0647 29.3231 16.7242L29.3616 16.7115C30.538 16.3239 31.6967 15.9421 33.8698 16.2665L35.0624 16.4446L35.0242 15.4373L34.0113 15.1506C34.0138 15.193 34.0158 15.2353 34.0174 15.2775C33.6925 15.229 33.3871 15.195 33.0989 15.1736C33.0692 15.1714 33.0397 15.1693 33.0103 15.1674C31.2143 15.0482 30.0904 15.4185 29.0349 15.7663C28.0116 16.1034 27.0525 16.4194 25.6075 16.248C24.5578 16.1234 23.4482 15.5689 22.4014 14.8335Z" fill="#C65F00"/> +<path d="M41.2182 22.8356C42.103 21.7426 42.6278 19.6477 42.7797 18.7369L44.211 19.0623C44.211 19.5394 43.9247 21.027 42.7797 23.1609C41.6346 25.2948 38.6594 27.8233 37.3149 28.8209C36.8161 29.2763 36.3954 29.6523 35.2656 29.8455C34.0295 30.057 31.7525 29.9756 30.7441 29.4877C29.8983 29.4877 31.9672 29.3674 32.9561 29.2112C34.1922 29.0161 36.0137 27.7149 37.3149 26.9342C38.616 26.1535 40.1123 24.2018 41.2182 22.8356Z" fill="#E4A400"/> +<path d="M42.9452 16.705C42.8626 16.5176 42.7756 16.3202 42.6739 16.1318C42.5601 16.0216 42.4475 15.9168 42.3368 15.8176C43.6524 16.8381 44.8229 18.4464 45.3166 19.2575V19.502C44.9925 18.9572 44.6418 18.4405 44.2806 17.9616C45.4889 21.0369 42.2767 26.0894 38.2179 28.8787C37.4809 29.3852 36.7474 29.8002 36.0275 30.126C36.1475 30.1665 36.2667 30.2185 36.3851 30.2841C35.6185 30.1177 34.4815 30.1821 33.6554 29.9594C34.3095 29.843 35.3151 29.3507 36.0671 28.9857C35.5621 28.7389 35.07 28.3112 34.6862 27.7409C34.2929 27.1564 34.0813 26.523 34.0507 25.9512C33.05 26.5363 32.09 26.9208 31.1834 27.1248L30.3315 26.4078C29.8249 25.8866 28.8542 24.6761 29.0415 24.6174C29.1418 24.586 29.656 24.9255 30.1927 25.2799C30.7827 25.6694 31.3998 26.0769 31.524 26.0292C32.4519 25.6722 33.5321 25.1392 34.3661 24.5661C36.4235 23.1522 38.248 21.118 39.3052 19.1208C39.3774 18.9844 39.164 16.9511 39.164 16.9511C39.164 16.9511 40.151 18.944 40.4546 19.0558C39.404 21.3049 37.4221 23.6192 35.1505 25.2377C35.1199 25.4272 35.0953 25.6638 35.0944 25.7968C35.0918 26.1722 35.2268 26.6678 35.5553 27.156C35.8838 27.6443 36.292 27.956 36.6408 28.095C36.8205 28.1666 37.0923 28.2451 37.3005 28.2882C37.4166 28.2134 37.5336 28.1356 37.6515 28.0545C39.7089 26.6406 41.5334 24.6065 42.5906 22.6093C43.6833 20.5449 43.9558 18.3453 43.2697 17.3469C43.1538 17.1783 43.0533 16.9502 42.9452 16.705Z" fill="#C65F00"/> +<path d="M17.1154 26.1786C17.0506 25.9934 16.9915 25.8397 16.9311 25.7104C17.0736 25.8054 17.2002 25.9167 17.3012 26.0489C17.5983 26.4373 17.6387 26.8741 17.4852 27.29C17.3443 27.6717 17.0481 28.0199 16.7062 28.33C16.0172 28.9548 14.9695 29.5762 13.9232 30.1442C13.4166 30.4192 12.7707 30.678 12.1102 30.9426L11.928 31.0156C11.1912 31.3115 10.4313 31.6241 9.74378 31.9985C9.29246 32.2443 8.87344 32.5061 8.49433 32.8013C7.55927 33.4247 5.27648 36.7567 8.27601 41.9059C12.0322 48.354 19.1891 49.326 23.7793 48.6885C28.1484 48.0817 31.3466 45.36 33.6014 42.5349C34.7265 41.1251 35.6077 39.7005 36.2741 38.5226C36.6026 37.9419 36.878 37.4229 37.106 36.993L37.1202 36.9663C37.3431 36.5461 37.5314 36.1913 37.6744 35.9679L38.5167 36.5069C38.4004 36.6886 38.234 37.0007 37.9992 37.4432L37.988 37.4643C37.7604 37.8934 37.4796 38.4225 37.1444 39.015C36.463 40.2195 35.5527 41.6931 34.383 43.1587C32.048 46.0843 28.6428 49.0226 23.9168 49.679C19.1387 50.3426 11.4626 49.3629 7.41192 42.4093C4.16599 36.8371 6.58955 32.9926 7.9965 32.0546C8.44835 31.7022 8.90491 31.4078 9.30376 31.1905C10.0444 30.7872 10.8508 30.4567 11.5851 30.1619L11.754 30.0941C12.4321 29.8223 13.0275 29.5836 13.4843 29.3356C14.5328 28.7664 15.4902 28.1907 16.0881 27.6485C16.2267 27.5228 16.337 27.4067 16.4221 27.3008C16.4827 27.248 16.5426 27.1977 16.6006 27.1492C16.9718 26.8381 17.2613 26.5954 17.1154 26.1786Z" fill="#FFDC5F"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M32.7435 19.285C32.5642 19.5872 32.282 20.0183 31.585 20.3053C31.1301 20.4927 30.7993 20.6041 30.5648 20.6662C30.4481 20.6972 30.3476 20.7179 30.2629 20.7287C30.2208 20.7341 30.1756 20.7379 30.1301 20.7377C30.0938 20.7376 30.0186 20.7354 29.9353 20.7076C29.6733 20.6202 29.5318 20.337 29.6192 20.0751C29.6947 19.8489 29.9162 19.7125 30.1439 19.7357C30.173 19.7316 30.226 19.7215 30.3086 19.6996C30.4872 19.6523 30.7745 19.5576 31.2043 19.3807C31.6133 19.2122 31.7541 18.9928 31.8837 18.7745C31.89 18.7639 31.8969 18.7521 31.9043 18.7392C31.9649 18.6353 32.0643 18.4645 32.2006 18.3398C32.4004 18.1568 32.6513 18.0804 32.9408 18.1094C33.1751 18.1328 33.3921 18.2326 33.5682 18.3378C33.7504 18.4466 33.9262 18.5839 34.084 18.7233C34.3991 19.0016 34.7983 19.3497 35.1192 19.9568C35.2786 20.2583 36.0137 21.5608 36.0137 22.185L34.0524 20.1432C33.9148 19.9671 33.6783 19.6991 33.4221 19.4729C33.2925 19.3585 33.1674 19.2632 33.0555 19.1963C32.9524 19.1348 32.8857 19.1126 32.8532 19.1062C32.8494 19.1116 32.8452 19.1178 32.8404 19.1251C32.819 19.1573 32.7988 19.1916 32.7697 19.2408C32.7617 19.2543 32.7531 19.269 32.7435 19.285Z" fill="black"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M28.9182 21.3576C29.2502 20.9309 29.5393 20.3746 29.6383 20.1566L30.5487 20.5703C30.431 20.8295 30.1043 21.4615 29.7076 21.9716C29.6434 22.0541 29.5825 22.1262 29.5305 22.1871C29.5225 22.1965 29.5148 22.2055 29.5075 22.2141C29.4645 22.2644 29.4317 22.3028 29.4026 22.3395C29.3673 22.3838 29.351 22.4097 29.3438 22.4224C29.3471 22.4352 29.3546 22.4581 29.3715 22.4936C29.4185 22.5931 29.5157 22.7441 29.7033 22.9787C29.986 23.332 31.0735 24.7385 31.2699 25.3645C30.8742 25.1777 29.5943 24.4432 28.9225 23.6034C28.7198 23.35 28.5649 23.127 28.4676 22.9215C28.3665 22.7079 28.3118 22.4795 28.3584 22.237C28.4023 22.0084 28.5251 21.8364 28.6194 21.7176C28.6608 21.6655 28.7071 21.6114 28.7492 21.5621C28.7562 21.5539 28.7631 21.5459 28.7698 21.538C28.8197 21.4796 28.8685 21.4215 28.9182 21.3576ZM29.3415 22.4093C29.3415 22.4093 29.3418 22.4106 29.3418 22.4128L29.3415 22.4093Z" fill="black"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M26.5184 10.8923C25.9624 11.1775 25.4966 11.5445 25.248 11.7846C25.0493 11.9764 24.7328 11.9709 24.541 11.7723C24.3491 11.5736 24.3547 11.2571 24.5533 11.0653C24.8661 10.7632 25.4109 10.3365 26.062 10.0025C26.7069 9.67174 27.5131 9.40268 28.3267 9.49698C29.761 9.66321 31.0092 10.2536 31.4794 10.5442C31.7143 10.6894 31.7871 10.9975 31.6419 11.2324C31.4967 11.4673 31.1886 11.5401 30.9537 11.3949C30.5818 11.165 29.4721 10.6364 28.2116 10.4903C27.6778 10.4285 27.0805 10.604 26.5184 10.8923Z" fill="white"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M37.4223 15.0945C36.8084 15.1039 36.3014 15.2142 36.085 15.3261C35.8701 15.4372 35.6204 15.3456 35.5272 15.1216C35.4341 14.8976 35.5328 14.6259 35.7477 14.5148C36.1387 14.3127 36.7977 14.1991 37.4538 14.1891C38.1199 14.1789 38.8765 14.2737 39.4655 14.5639C39.9959 14.8252 40.5506 15.1575 41.0068 15.4686C41.2351 15.6242 41.4423 15.7771 41.6118 15.9156C41.774 16.0483 41.9247 16.1864 42.0201 16.3127C42.1634 16.5024 42.1293 16.7882 41.944 16.9511C41.7588 17.1141 41.4924 17.0924 41.3491 16.9027C41.3161 16.8589 41.2289 16.7711 41.0746 16.6449C40.9274 16.5246 40.7395 16.3855 40.5246 16.239C40.0944 15.9457 39.5713 15.6326 39.0781 15.3897C38.6438 15.1757 38.0263 15.0853 37.4223 15.0945Z" fill="white"/> +<circle cx="30.3966" cy="17.7959" r="0.5" fill="#7D4816"/> +<circle cx="27.5586" cy="20.1566" r="0.5" fill="#7D4816"/> +<path d="M34.2167 4.15179L34.3779 5.13051C34.4929 5.82853 35.0399 6.37561 35.738 6.49058L36.7167 6.65179L35.738 6.813C35.0399 6.92798 34.4929 7.47506 34.3779 8.17308L34.2167 9.15179L34.0555 8.17308C33.9405 7.47506 33.3934 6.92798 32.6954 6.813L31.7167 6.65179L32.6954 6.49058C33.3934 6.37561 33.9405 5.82853 34.0555 5.13051L34.2167 4.15179Z" fill="#FFDC5F"/> +<path d="M22.1576 23.7104L22.2866 24.4934C22.3785 25.0518 22.8162 25.4894 23.3746 25.5814L24.1576 25.7104L23.3746 25.8394C22.8162 25.9313 22.3785 26.369 22.2866 26.9274L22.1576 27.7104L22.0286 26.9274C21.9366 26.369 21.499 25.9313 20.9406 25.8394L20.1576 25.7104L20.9406 25.5814C21.499 25.4894 21.9366 25.0518 22.0286 24.4934L22.1576 23.7104Z" fill="#FFDC5F"/> +<path d="M45.7109 9.20142L45.8077 9.78865C45.8766 10.2075 46.2049 10.5357 46.6237 10.6047L47.2109 10.7014L46.6237 10.7981C46.2049 10.8671 45.8766 11.1954 45.8077 11.6142L45.7109 12.2014L45.6142 11.6142C45.5452 11.1954 45.217 10.8671 44.7982 10.7981L44.2109 10.7014L44.7982 10.6047C45.217 10.5357 45.5452 10.2075 45.6142 9.78865L45.7109 9.20142Z" fill="#FFDC5F"/> +<path d="M44.2109 38.8375L44.3077 39.4248C44.3766 39.8436 44.7049 40.1718 45.1237 40.2408L45.7109 40.3375L45.1237 40.4343C44.7049 40.5032 44.3766 40.8315 44.3077 41.2503L44.2109 41.8375L44.1142 41.2503C44.0452 40.8315 43.717 40.5032 43.2982 40.4343L42.7109 40.3375L43.2982 40.2408C43.717 40.1718 44.0452 39.8436 44.1142 39.4248L44.2109 38.8375Z" fill="#FFDC5F"/> +</svg> diff --git a/src/assets/icons/visu/ecogesture/frerots.svg b/src/assets/icons/visu/ecogesture/0085.svg similarity index 100% rename from src/assets/icons/visu/ecogesture/frerots.svg rename to src/assets/icons/visu/ecogesture/0085.svg diff --git a/src/assets/icons/visu/ecogesture/cymbal.svg b/src/assets/icons/visu/ecogesture/0092.svg similarity index 100% rename from src/assets/icons/visu/ecogesture/cymbal.svg rename to src/assets/icons/visu/ecogesture/0092.svg diff --git a/src/assets/icons/visu/ecogesture/casque.svg b/src/assets/icons/visu/ecogesture/0093.svg similarity index 100% rename from src/assets/icons/visu/ecogesture/casque.svg rename to src/assets/icons/visu/ecogesture/0093.svg diff --git a/src/assets/icons/visu/ecogesture/default.svg b/src/assets/icons/visu/ecogesture/default.svg new file mode 100644 index 0000000000000000000000000000000000000000..392b6f60ec4213eeb61c2a3596302dd87c88990f --- /dev/null +++ b/src/assets/icons/visu/ecogesture/default.svg @@ -0,0 +1,33 @@ +<svg width="50" height="50" viewBox="0 0 50 50" fill="none" xmlns="http://www.w3.org/2000/svg"> +<path d="M22.8937 40C18.3785 40 14.1073 39.3404 10.8666 38.1462C9.18077 37.5268 7.83388 36.7781 6.86214 35.9314C5.32542 34.5901 5 33.2265 5 32.3174C5 31.4084 5.3209 30.0448 6.86214 28.7034C7.8384 27.8523 9.18529 27.1081 10.8666 26.4887C14.1073 25.2944 18.3785 24.6349 22.8937 24.6349C27.4089 24.6349 31.6801 25.2944 34.9207 26.4887C36.6066 27.1081 37.9535 27.8567 38.9252 28.7034C40.4619 30.0448 40.7874 31.4084 40.7874 32.3174C40.7874 33.2265 40.4665 34.5901 38.9252 35.9314C37.949 36.7826 36.6021 37.5268 34.9207 38.1462C31.6801 39.3404 27.4089 40 22.8937 40ZM22.8937 28.0974C18.7897 28.0974 14.9525 28.6767 12.096 29.7328C9.63274 30.6419 8.50732 31.7114 8.50732 32.3219C8.50732 32.9324 9.62822 34.0019 12.096 34.911C14.9525 35.9626 18.7852 36.5464 22.8937 36.5464C27.0021 36.5464 30.8349 35.9671 33.6914 34.911C36.1546 34.0019 37.28 32.9324 37.28 32.3219C37.28 31.7114 36.1591 30.6419 33.6914 29.7328C30.8349 28.6767 27.0021 28.0974 22.8937 28.0974Z" fill="#E7A423"/> +<path d="M8.54754 32.9034C9.94783 30.6761 15.8389 29.0043 22.8937 29.0043C29.9486 29.0043 35.8397 30.6761 37.24 32.9034C37.4469 32.5742 37.5558 32.2328 37.5558 31.8829C37.5558 29.1659 30.9914 26.9633 22.8937 26.9633C14.7961 26.9633 8.23169 29.1659 8.23169 31.8829C8.23169 32.2328 8.34055 32.5742 8.54754 32.9034Z" fill="#C2732F"/> +<path d="M27.6068 37.6979C26.6651 38.2612 25.4873 38.7395 24.14 39.1026C24.2064 39.1029 24.273 39.1031 24.3396 39.1031C28.49 39.1031 32.416 38.4968 35.3948 37.3991C36.9403 36.8297 38.1783 36.1457 39.0757 35.3633C40.4924 34.1304 40.7873 32.8769 40.7873 32.0413L40.7872 32.0156C39.4687 34.2802 38.5065 36.3612 27.6068 37.6979Z" fill="#C2732F"/> +<path d="M9.28732 27.4907C8.72443 27.7221 8.21003 27.9721 7.74628 28.2393C6.24066 29.1986 5.3725 30.3275 5.3725 31.5357C5.3725 34.5886 11.309 36.8782 18.6731 37.4622C17.8536 37.2206 16.8665 37.2041 16.5574 36.9104C10.6396 35.9757 6.22676 33.8079 6.22676 31.1582C6.22676 29.8343 7.50624 28.5053 9.28732 27.4907Z" fill="#FBDF5A"/> +<path d="M22.8937 36.7907C18.3785 36.7907 14.1073 36.1312 10.8666 34.9369C9.18077 34.3175 7.83388 33.5688 6.86214 32.7221C5.32542 31.3808 5 30.0172 5 29.1081C5 28.1991 5.3209 26.8355 6.86214 25.4941C7.8384 24.643 9.18529 23.8988 10.8666 23.2794C14.1073 22.0851 18.3785 21.4256 22.8937 21.4256C27.4089 21.4256 31.6801 22.0851 34.9207 23.2794C36.6066 23.8988 37.9535 24.6475 38.9252 25.4941C40.4619 26.8355 40.7874 28.1991 40.7874 29.1081C40.7874 30.0172 40.4665 31.3808 38.9252 32.7221C37.949 33.5733 36.6021 34.3175 34.9207 34.9369C31.6801 36.1312 27.4089 36.7907 22.8937 36.7907ZM22.8937 24.8881C18.7897 24.8881 14.9525 25.4674 12.096 26.5235C9.63274 27.4326 8.50732 28.5021 8.50732 29.1126C8.50732 29.7231 9.62822 30.7926 12.096 31.7017C14.9525 32.7533 18.7852 33.3371 22.8937 33.3371C27.0021 33.3371 30.8349 32.7578 33.6914 31.7017C36.1546 30.7926 37.28 29.7231 37.28 29.1126C37.28 28.5021 36.1591 27.4326 33.6914 26.5235C30.8349 25.4674 27.0021 24.8881 22.8937 24.8881Z" fill="#C2732F"/> +<path d="M22.8937 35.8616C18.3785 35.8616 14.1073 35.2021 10.8666 34.0078C9.18077 33.3884 7.83388 32.6397 6.86214 31.7931C5.32542 30.4517 5 29.0881 5 28.1791C5 27.27 5.3209 25.9064 6.86214 24.5651C7.8384 23.7139 9.18529 22.9697 10.8666 22.3503C14.1073 21.156 18.3785 20.4965 22.8937 20.4965C27.4089 20.4965 31.6801 21.156 34.9207 22.3503C36.6066 22.9697 37.9535 23.7184 38.9252 24.5651C40.4619 25.9064 40.7874 27.27 40.7874 28.1791C40.7874 29.0881 40.4665 30.4517 38.9252 31.7931C37.949 32.6442 36.6021 33.3884 34.9207 34.0078C31.6801 35.2021 27.4089 35.8616 22.8937 35.8616ZM22.8937 23.959C18.7897 23.959 14.9525 24.5383 12.096 25.5944C9.63274 26.5035 8.50732 27.573 8.50732 28.1835C8.50732 28.794 9.62822 29.8635 12.096 30.7726C14.9525 31.8243 18.7852 32.408 22.8937 32.408C27.0021 32.408 30.8349 31.8287 33.6914 30.7726C36.1546 29.8635 37.28 28.794 37.28 28.1835C37.28 27.573 36.1591 26.5035 33.6914 25.5944C30.8349 24.5383 27.0021 23.959 22.8937 23.959Z" fill="#E7A423"/> +<path d="M8.54754 28.7649C9.94783 26.5376 15.8389 24.8658 22.8937 24.8658C29.9486 24.8658 35.8397 26.5376 37.24 28.7649C37.4469 28.4357 37.5558 28.0943 37.5558 27.7444C37.5558 25.0274 30.9914 22.8248 22.8937 22.8248C14.7961 22.8248 8.23169 25.0274 8.23169 27.7444C8.23169 28.0943 8.34055 28.4357 8.54754 28.7649Z" fill="#C2732F"/> +<path d="M27.6068 33.5595C26.6651 34.1228 25.4873 34.6011 24.14 34.9642C24.2064 34.9646 24.273 34.9647 24.3396 34.9647C28.49 34.9647 32.416 34.3585 35.3948 33.2607C36.9403 32.6914 38.1783 32.0073 39.0757 31.2249C40.4924 29.992 40.7873 28.7386 40.7873 27.903L40.7872 27.8772C39.4687 30.1419 38.5065 32.2228 27.6068 33.5595Z" fill="#C2732F"/> +<path d="M9.28732 23.3522C8.72443 23.5837 8.21003 23.8336 7.74628 24.1009C6.24066 25.0602 5.3725 26.1891 5.3725 27.3973C5.3725 30.4502 11.309 32.7397 18.6731 33.3238C17.8536 33.0822 16.8665 33.0657 16.5574 32.772C10.6396 31.8372 6.22676 29.6695 6.22676 27.0197C6.22676 25.6959 7.50624 24.3669 9.28732 23.3522Z" fill="#FBDF5A"/> +<path d="M22.8937 32.6523C18.3785 32.6523 14.1073 31.9927 10.8666 30.7985C9.18077 30.179 7.83388 29.4304 6.86214 28.5837C5.32542 27.2424 5 25.8788 5 24.9697C5 24.0606 5.3209 22.697 6.86214 21.3557C7.8384 20.5046 9.18529 19.7604 10.8666 19.141C14.1073 17.9467 18.3785 17.2872 22.8937 17.2872C27.4089 17.2872 31.6801 17.9467 34.9207 19.141C36.6066 19.7604 37.9535 20.509 38.9252 21.3557C40.4619 22.697 40.7874 24.0606 40.7874 24.9697C40.7874 25.8788 40.4665 27.2424 38.9252 28.5837C37.949 29.4349 36.6021 30.179 34.9207 30.7985C31.6801 31.9927 27.4089 32.6523 22.8937 32.6523ZM22.8937 20.7497C18.7897 20.7497 14.9525 21.329 12.096 22.3851C9.63274 23.2942 8.50732 24.3637 8.50732 24.9742C8.50732 25.5847 9.62822 26.6542 12.096 27.5632C14.9525 28.6149 18.7852 29.1987 22.8937 29.1987C27.0021 29.1987 30.8349 28.6194 33.6914 27.5632C36.1546 26.6542 37.28 25.5847 37.28 24.9742C37.28 24.3637 36.1591 23.2942 33.6914 22.3851C30.8349 21.329 27.0021 20.7497 22.8937 20.7497Z" fill="#C2732F"/> +<path d="M22.8937 31.7232C18.3785 31.7232 14.1073 31.0637 10.8666 29.8694C9.18077 29.25 7.83388 28.5013 6.86214 27.6546C5.32542 26.3133 5 24.9497 5 24.0406C5 23.1316 5.3209 21.768 6.86214 20.4266C7.8384 19.5755 9.18529 18.8313 10.8666 18.2119C14.1073 17.0176 18.3785 16.3581 22.8937 16.3581C27.4089 16.3581 31.6801 17.0176 34.9207 18.2119C36.6066 18.8313 37.9535 19.5799 38.9252 20.4266C40.4619 21.768 40.7874 23.1316 40.7874 24.0406C40.7874 24.9497 40.4665 26.3133 38.9252 27.6546C37.949 28.5058 36.6021 29.25 34.9207 29.8694C31.6801 31.0637 27.4089 31.7232 22.8937 31.7232ZM22.8937 19.8206C18.7897 19.8206 14.9525 20.3999 12.096 21.456C9.63274 22.3651 8.50732 23.4346 8.50732 24.0451C8.50732 24.6556 9.62822 25.7251 12.096 26.6342C14.9525 27.6858 18.7852 28.2696 22.8937 28.2696C27.0021 28.2696 30.8349 27.6903 33.6914 26.6342C36.1546 25.7251 37.28 24.6556 37.28 24.0451C37.28 23.4346 36.1591 22.3651 33.6914 21.456C30.8349 20.3999 27.0021 19.8206 22.8937 19.8206Z" fill="#E7A423"/> +<path d="M8.54754 24.6266C9.94783 22.3993 15.8389 20.7275 22.8937 20.7275C29.9486 20.7275 35.8397 22.3993 37.24 24.6266C37.4469 24.2974 37.5558 23.956 37.5558 23.6061C37.5558 20.8891 30.9914 18.6865 22.8937 18.6865C14.7961 18.6865 8.23169 20.8891 8.23169 23.6061C8.23169 23.956 8.34055 24.2974 8.54754 24.6266Z" fill="#C2732F"/> +<path d="M27.6068 29.421C26.6651 29.9844 25.4873 30.4626 24.14 30.8258C24.2064 30.8261 24.273 30.8262 24.3396 30.8262C28.49 30.8262 32.416 30.22 35.3948 29.1222C36.9403 28.5529 38.1783 27.8688 39.0757 27.0864C40.4924 25.8535 40.7873 24.6001 40.7873 23.7645L40.7872 23.7387C39.4687 26.0034 38.5065 28.0843 27.6068 29.421Z" fill="#C2732F"/> +<path d="M9.28732 19.2139C8.72443 19.4453 8.21003 19.6953 7.74628 19.9625C6.24066 20.9218 5.3725 22.0507 5.3725 23.2589C5.3725 26.3118 11.309 28.6014 18.6731 29.1854C17.8536 28.9438 16.8665 28.9274 16.5574 28.6336C10.6396 27.6989 6.22676 25.5311 6.22676 22.8814C6.22676 21.5575 7.50624 20.2285 9.28732 19.2139Z" fill="#FBDF5A"/> +<path d="M22.8937 28.5139C18.3785 28.5139 14.1073 27.8544 10.8666 26.6601C9.18077 26.0407 7.83388 25.292 6.86214 24.4453C5.32542 23.104 5 21.7404 5 20.8313C5 19.9223 5.3209 18.5587 6.86214 17.2173C7.8384 16.3662 9.18529 15.622 10.8666 15.0026C14.1073 13.8083 18.3785 13.1488 22.8937 13.1488C27.4089 13.1488 31.6801 13.8083 34.9207 15.0026C36.6066 15.622 37.9535 16.3707 38.9252 17.2173C40.4619 18.5587 40.7874 19.9223 40.7874 20.8313C40.7874 21.7404 40.4665 23.104 38.9252 24.4453C37.949 25.2965 36.6021 26.0407 34.9207 26.6601C31.6801 27.8544 27.4089 28.5139 22.8937 28.5139ZM22.8937 16.6113C18.7897 16.6113 14.9525 17.1906 12.096 18.2467C9.63274 19.1558 8.50732 20.2253 8.50732 20.8358C8.50732 21.4463 9.62822 22.5158 12.096 23.4249C14.9525 24.4765 18.7852 25.0603 22.8937 25.0603C27.0021 25.0603 30.8349 24.481 33.6914 23.4249C36.1546 22.5158 37.28 21.4463 37.28 20.8358C37.28 20.2253 36.1591 19.1558 33.6914 18.2467C30.8349 17.1906 27.0021 16.6113 22.8937 16.6113Z" fill="#C2732F"/> +<path d="M22.8937 27.5857C18.3785 27.5857 14.1073 26.9262 10.8666 25.7319C9.18077 25.1125 7.83388 24.3639 6.86214 23.5172C5.32542 22.1759 5 20.8123 5 19.9032C5 18.9941 5.3209 17.6305 6.86214 16.2892C7.8384 15.438 9.18529 14.6939 10.8666 14.0744C14.1073 12.8802 18.3785 12.2206 22.8937 12.2206C27.4089 12.2206 31.6801 12.8802 34.9207 14.0744C36.6066 14.6939 37.9535 15.4425 38.9252 16.2892C40.4619 17.6305 40.7874 18.9941 40.7874 19.9032C40.7874 20.8123 40.4665 22.1759 38.9252 23.5172C37.949 24.3683 36.6021 25.1125 34.9207 25.7319C31.6801 26.9262 27.4089 27.5857 22.8937 27.5857ZM22.8937 15.6831C18.7897 15.6831 14.9525 16.2624 12.096 17.3186C9.63274 18.2276 8.50732 19.2971 8.50732 19.9076C8.50732 20.5181 9.62822 21.5876 12.096 22.4967C14.9525 23.5484 18.7852 24.1321 22.8937 24.1321C27.0021 24.1321 30.8349 23.5528 33.6914 22.4967C36.1546 21.5876 37.28 20.5181 37.28 19.9076C37.28 19.2971 36.1591 18.2276 33.6914 17.3186C30.8349 16.2624 27.0021 15.6831 22.8937 15.6831Z" fill="#E7A423"/> +<path d="M27.6068 25.2825C26.6651 25.8458 25.4873 26.3241 24.14 26.6872C24.2064 26.6875 24.273 26.6877 24.3396 26.6877C28.49 26.6877 32.416 26.0814 35.3948 24.9837C36.9403 24.4143 38.1783 23.7303 39.0757 22.9479C40.4924 21.715 40.7873 20.4615 40.7873 19.6259L40.7872 19.6002C39.4687 21.8648 38.5065 23.9458 27.6068 25.2825Z" fill="#C2732F"/> +<path d="M9.28732 15.0754C8.72443 15.3069 8.21003 15.5568 7.74628 15.824C6.24066 16.7833 5.3725 17.9122 5.3725 19.1204C5.3725 22.1733 11.309 24.4629 18.6731 25.0469C17.8536 24.8053 16.8665 24.7889 16.5574 24.4951C10.6396 23.5604 6.22676 21.3926 6.22676 18.7429C6.22676 17.4191 7.50624 16.09 9.28732 15.0754Z" fill="#FBDF5A"/> +<path d="M22.8937 15.7427C16.0274 15.7427 10.2138 17.5337 8.23169 20.0012C10.2091 22.4687 16.0274 24.2598 22.8937 24.2598C29.7601 24.2598 35.5737 22.4687 37.5558 20.0012C35.5784 17.5337 29.7601 15.7427 22.8937 15.7427Z" fill="#61D8F2"/> +<path d="M37.5443 19.8097C37.5518 19.6538 37.5555 19.5329 37.5555 19.4677C37.5555 16.7507 30.9911 14.548 22.8935 14.548C14.7958 14.548 8.05792 16.9057 8.05792 19.2314C8.05793 20.1495 8.27836 20.4197 8.52351 20.5856C8.76866 20.7514 9.1148 20.9624 9.50121 21.1899C11.742 19.4355 16.8448 18.2088 22.8935 18.2088C28.8656 18.2088 34.0038 19.4069 36.2897 21.1258C36.829 20.7557 37.2355 20.2927 37.5443 19.8097Z" fill="#C2732F"/> +<path d="M30.5881 18.8997C31.0072 18.1499 31.9569 16.4607 32.4039 15.7017C32.9626 14.7531 34.9956 11.7694 36.6096 12.0142C38.2236 12.259 39.1547 14.5542 40.0393 16.6045C40.747 18.2448 43.8104 29.5186 45.2537 34.9505" stroke="#61F0F2" stroke-linecap="round"/> +<path d="M43.333 20.0679L39.7941 18.0759L41.6426 17.5768L45.1861 19.5688L43.333 20.0679Z" fill="#5BBEBF"/> +<path d="M45.1862 19.5688V19.8852L43.3331 20.3843V20.0679L45.1862 19.5688Z" fill="#107274"/> +<path d="M39.7941 18.076L43.333 20.0679V20.3843L39.7941 18.3924V18.076Z" fill="#509FA0"/> +<path d="M44.6366 24.9429L41.0976 22.951L42.9462 22.4519L46.4897 24.4438L44.6366 24.9429Z" fill="#5BBEBF"/> +<path d="M46.4898 24.4438V24.7602L44.6367 25.2593V24.9429L46.4898 24.4438Z" fill="#107274"/> +<path d="M41.0976 22.951L44.6366 24.943V25.2594L41.0976 23.2674V22.951Z" fill="#509FA0"/> +<path d="M45.9403 29.818L42.4014 27.8261L44.2499 27.327L47.7934 29.3189L45.9403 29.818Z" fill="#5BBEBF"/> +<path d="M47.7932 29.319V29.6354L45.9401 30.1345V29.8181L47.7932 29.319Z" fill="#107274"/> +<path d="M42.4013 27.8262L45.9403 29.8181V30.1345L42.4013 28.1426V27.8262Z" fill="#509FA0"/> +<path d="M34.3344 21.0855C34.7534 20.3357 35.7032 18.6464 36.1501 17.8875C36.7088 16.9389 38.7418 13.9552 40.3558 14.2C41.9698 14.4448 42.901 16.74 43.7856 18.7903C44.4932 20.4306 47.5567 31.7044 49 37.1363" stroke="#61F0F2" stroke-linecap="round"/> +</svg> diff --git a/src/assets/icons/visu/egl-logo.svg b/src/assets/icons/visu/egl-logo.svg new file mode 100644 index 0000000000000000000000000000000000000000..05ed2017f87f4fc2a75afb21aadf006160546abd --- /dev/null +++ b/src/assets/icons/visu/egl-logo.svg @@ -0,0 +1,3 @@ +<svg width="48" height="23" viewBox="0 0 48 23" fill="none" xmlns="http://www.w3.org/2000/svg"> +<path fill-rule="evenodd" clip-rule="evenodd" d="M45.4113 0.55753C46.0263 0.611478 46.8248 0.438849 47.3642 0.654638C47.5369 0.816481 47.4937 1.07542 47.4937 1.37753V6.93412C47.5153 8.11018 47.5153 9.34018 47.0729 10.4191V10.4515H47.0621C47.0514 10.4947 47.0406 10.5486 47.0298 10.5918H47.019V10.6241H47.0082V10.6673H46.9974C46.9974 10.6889 46.9866 10.7212 46.9866 10.7428H46.9758V10.7752H46.965V10.8183C46.9219 10.8076 46.9542 10.8939 46.9219 10.8831V10.9262C46.8787 10.9154 46.9111 11.0018 46.8787 10.991V11.0233H46.8679V11.0665H46.8571V11.0989C46.814 11.0881 46.8464 11.1744 46.814 11.1636V11.196H46.8032V11.2283H46.7924V11.2607H46.7816V11.2931H46.7708V11.3254H46.76V11.3578H46.7492V11.3902H46.7385V11.4226H46.7277C46.6953 11.5412 46.5874 11.6383 46.555 11.7462H46.5442C46.5227 11.8326 46.4364 11.8757 46.4148 11.962C46.3932 11.9728 46.35 12.0268 46.35 12.0591C45.8429 12.8036 45.0337 13.5912 44.3 14.0876C44.149 14.1415 44.0195 14.2818 43.8577 14.3357V14.3465C43.8145 14.3357 43.8037 14.3897 43.7605 14.3789C43.7498 14.4005 43.739 14.4112 43.7174 14.4112C43.7066 14.4328 43.685 14.4544 43.6527 14.4436V14.4544H43.6203V14.4652H43.5879V14.476H43.5556C43.5663 14.5191 43.48 14.4868 43.4908 14.5191H43.4585V14.5299H43.4261V14.5407H43.3937V14.5515H43.3613C43.3721 14.5947 43.2858 14.5623 43.2966 14.5947H43.2642V14.6055H43.2211V14.6162H43.1887C43.1995 14.6594 43.1132 14.627 43.124 14.6594H43.0808V14.6702H43.0484V14.681H43.0053C43.0161 14.7241 42.9298 14.6918 42.9406 14.7241C42.9082 14.7241 42.8758 14.7349 42.8434 14.7349V14.7457H42.8111V14.7565C42.7787 14.7565 42.7463 14.7673 42.714 14.7673V14.7781H42.6816V14.7889C42.6492 14.7889 42.6169 14.7997 42.5845 14.7997V14.8105H42.5413V14.8212H42.4982V14.832H42.455V14.8428H42.4119V14.8536H42.3687V14.8644H42.304V14.8752H42.2608V14.886C42.2285 14.886 42.1853 14.8968 42.1529 14.8968V14.9076H42.0882V14.9183C42.045 14.9183 42.0019 14.9291 41.9587 14.9291V14.9399H41.894V14.9507H41.8292V14.9615H41.7537V14.9723H41.6782V14.9831H41.6026V14.9939H41.5271V15.0047C41.4624 15.0047 41.3869 15.0155 41.3221 15.0155V15.0262H41.2142V15.037H41.0848V15.0478H40.9445V15.0586H40.7611V15.0694H40.459V15.0802H39.9734V15.0694C39.5634 15.0802 39.1858 15.0047 38.8298 14.9615V14.9507H38.7542V14.9399H38.6787V14.9291H38.614V14.9183H38.5384V14.9076H38.4737V14.8968H38.409V14.886H38.3442V14.8752H38.2795V14.8644H38.2363V14.8536C38.0098 14.8105 37.7292 14.7133 37.535 14.6162H37.5026V14.6055H37.4595V14.5947H37.4271V14.5839H37.384C37.3947 14.5407 37.3084 14.5731 37.3192 14.5407H37.2761C37.2869 14.4976 37.2005 14.5299 37.2113 14.4976H37.179V14.4868H37.1358V14.476H37.1034C37.1142 14.4328 37.0279 14.4652 37.0387 14.4328H37.0063V14.422H36.974V14.4112H36.9416V14.4005H36.9092V14.3897H36.8769V14.3789H36.8445V14.3681H36.8121V14.3573C36.7905 14.3681 36.769 14.3465 36.7474 14.3249C36.7042 14.3357 36.715 14.2818 36.6719 14.2926V14.2818C36.4561 14.1955 36.2726 14.0336 36.0784 13.9365C35.7979 13.7099 35.4526 13.4941 35.1721 13.1812C34.514 12.5986 34.0824 11.9728 33.7047 11.2715H33.694V11.2391H33.6832V11.2068H33.6724V11.1744H33.6616V11.142H33.6508V11.1097H33.64V11.0773H33.6292V11.0449C33.5861 11.0449 33.6076 10.9478 33.5645 10.9478C33.5645 10.9262 33.5537 10.8939 33.5537 10.8723C33.5105 10.8831 33.5429 10.7968 33.5105 10.8076V10.7644C33.4242 10.6997 33.435 10.4947 33.3595 10.4191V10.3868H33.3487V10.3436H33.3379V10.3004H33.3271V10.2573H33.3163V10.2141H33.3055V10.171H33.2947V10.1278H33.284V10.0847H33.2732V10.0415H33.2624V9.99834H33.2516V9.95518H33.2408C33.2408 9.92281 33.23 9.87965 33.23 9.84729H33.2192C33.2192 9.80413 33.2084 9.76097 33.2084 9.71782H33.1976V9.65308H33.1868V9.58834H33.1761V9.5236H33.1653V9.45887H33.1545C33.1329 9.21071 33.0466 8.96255 33.0466 8.7036H33.0358V8.55255H33.025V8.34755H33.0142V1.03227C32.9926 0.816481 33.0358 0.589898 33.2516 0.53595V0.525163H33.2947V0.51437H33.3703V0.503583H34.7297C35.0318 0.492793 35.2692 0.492796 35.3987 0.708586C35.485 3.12543 35.3987 5.57465 35.4311 7.9915H35.4418V8.2936H35.4526V8.44465H35.4634V8.55255H35.4742C35.485 8.67123 35.5066 8.78992 35.5174 8.9086H35.5282V8.97334H35.539V9.03807H35.5497V9.10281H35.5605V9.16755H35.5713V9.23229H35.5821V9.27544H35.5929V9.3186H35.6037V9.36176H35.6145V9.40492H35.6253V9.44808H35.6361V9.49123H35.6469C35.6469 9.5236 35.6576 9.55597 35.6576 9.58834H35.6684V9.62071H35.6792V9.66387H35.69V9.69624H35.7008V9.73939C35.744 9.7286 35.7116 9.81492 35.744 9.80413V9.84729H35.7547V9.87966C35.7979 9.86887 35.7655 9.95518 35.7979 9.94439V9.97676H35.8087V10.0091H35.8195V10.0415H35.8303V10.0739H35.8411V10.1062H35.8519V10.1386H35.8626V10.171H35.8734C35.9166 10.322 36.0569 10.4515 36.1108 10.5918C36.4129 10.991 36.8445 11.5197 37.2976 11.811C37.3948 11.8973 37.5134 11.9728 37.6213 12.0268V12.0376C37.6753 12.0376 37.7184 12.1131 37.7724 12.1131V12.1239H37.8048V12.1347C37.8263 12.1239 37.8479 12.1454 37.8695 12.167C37.9342 12.1994 38.0205 12.2318 38.0745 12.2749H38.1176V12.2857H38.15C38.15 12.3289 38.2471 12.3073 38.2471 12.3504H38.2903V12.3612H38.3227V12.372H38.3658V12.3828H38.3982C38.6032 12.4799 38.8837 12.5662 39.1211 12.5986V12.6094H39.1858V12.6202H39.2613V12.631H39.3584V12.6418H39.4556V12.6526H39.5634V12.6633H39.7037V12.6741C40.0598 12.7065 40.5021 12.6957 40.8582 12.6633V12.6526H40.9661V12.6418H41.0632V12.631H41.1603V12.6202H41.2358V12.6094H41.3006V12.5986H41.3761V12.5878C41.4192 12.5878 41.4624 12.577 41.5056 12.577V12.5662C41.5379 12.5662 41.5811 12.5555 41.6134 12.5555V12.5447H41.6566V12.5339H41.6998V12.5231H41.7429V12.5123H41.7861V12.5015H41.8292V12.4907H41.8724V12.4799H41.9155V12.4691H41.9479V12.4583C41.9803 12.4583 42.0127 12.4476 42.045 12.4476C42.0342 12.4044 42.1206 12.4368 42.1098 12.4044H42.1529V12.3936H42.1853V12.3828H42.2177V12.372H42.25V12.3612H42.2932C42.2932 12.3181 42.3903 12.3397 42.3903 12.2965H42.4227V12.2857H42.455V12.2749C42.6492 12.2102 42.8111 12.0591 42.9837 11.9728C43.4477 11.6491 43.9871 11.0881 44.3108 10.6241C44.3108 10.5702 44.3863 10.527 44.3863 10.4731H44.3971C44.4187 10.3868 44.505 10.3112 44.5266 10.2249H44.5374V10.1926H44.5482V10.1602H44.559V10.1278H44.5698V10.0954H44.5806V10.0631H44.5913V10.0307H44.6021V9.99834H44.6129V9.96597C44.6561 9.97676 44.6237 9.89044 44.6561 9.90123V9.86887H44.6669V9.82571C44.71 9.8365 44.6777 9.75018 44.71 9.76097V9.71782H44.7208V9.68544H44.7316C44.7316 9.65307 44.7424 9.62071 44.7424 9.58834H44.7532V9.55597C44.8287 9.39413 44.9042 9.14597 44.9258 8.94097H44.9366V8.87623H44.9474V8.80071H44.9582V8.7036H44.969V8.60649H44.9798V8.47702H44.9906V8.33676H45.0013C45.0445 5.97386 45.0014 3.58938 45.0121 1.21569C44.9906 0.956739 44.9798 0.600691 45.2495 0.546744V0.53595C45.2819 0.53595 45.325 0.525163 45.3574 0.525163C45.4113 0.568321 45.4113 0.55753 45.4113 0.55753ZM31.2339 13.7423C31.2124 11.5844 31.2771 9.40492 31.2016 7.24702H31.1908C31.18 6.80465 31.0505 6.37307 30.975 5.95228H30.9642C30.9642 5.91991 30.9534 5.87675 30.9534 5.84438H30.9426C30.9318 5.79044 30.921 5.73649 30.9103 5.69333H30.8995V5.65017H30.8887V5.60701H30.8779C30.8779 5.57465 30.8671 5.54228 30.8671 5.50991H30.8563V5.47754H30.8455C30.8347 5.43438 30.8239 5.38043 30.8132 5.33728H30.8024V5.30491H30.7916V5.26175H30.7808C30.7808 5.24017 30.77 5.20781 30.77 5.18623H30.7592V5.15385H30.7484V5.1107C30.7053 5.12149 30.7376 5.03517 30.7053 5.04596V5.0028C30.6621 5.01359 30.6945 4.92727 30.6621 4.93806V4.89491H30.6513V4.86254C30.6082 4.87333 30.6405 4.78701 30.6082 4.7978V4.76543H30.5974V4.73307H30.5866V4.7007H30.5758V4.66833H30.565V4.63596H30.5542V4.60359H30.5434V4.57122H30.5326V4.53886H30.5218C30.5326 4.51728 30.511 4.4957 30.4895 4.47412C30.4895 4.44175 30.4787 4.43096 30.4571 4.43096C30.4679 4.3878 30.4139 4.37701 30.4247 4.33385H30.4139C30.3276 4.12885 30.1658 3.94543 30.0687 3.75122C29.5724 3.02832 28.7308 2.24069 28.0403 1.76596C28.0079 1.76596 27.9647 1.72279 27.9431 1.70121C27.7813 1.63648 27.6303 1.49621 27.4576 1.43148V1.42069H27.4253V1.4099H27.3929V1.39911H27.3605V1.38832H27.3282V1.37753H27.2958V1.36674H27.2634V1.35596H27.231C27.2203 1.3128 27.1232 1.32359 27.1016 1.28043H27.0692V1.26963H27.026C27.0368 1.22648 26.9505 1.25885 26.9613 1.22648H26.9289V1.21569H26.8858C26.8966 1.17253 26.8102 1.2049 26.821 1.17253H26.7779V1.16174H26.7455V1.15095H26.7024V1.14017H26.67V1.12937C26.6376 1.12937 26.6053 1.11859 26.5729 1.11859V1.10779H26.5405V1.09701C26.5081 1.09701 26.4758 1.08622 26.4434 1.08622V1.07542H26.411V1.06464C26.3787 1.06464 26.3463 1.05384 26.3139 1.05384V1.04306H26.2708V1.03227H26.2276V1.02148H26.1845V1.01069H26.1197V0.999897H26.0766V0.98911H26.0334V0.978323C25.9795 0.967534 25.9147 0.956739 25.8608 0.94595V0.935163C25.796 0.924373 25.7313 0.913585 25.6774 0.902796V0.892002C25.4939 0.892002 25.2889 0.784111 25.0947 0.794901V0.784107H24.9868V0.77332H24.8789V0.762533H24.7279V0.75174C24.415 0.740951 24.1345 0.708583 23.8 0.719373C23.746 0.78411 23.5195 0.687003 23.4763 0.75174H23.2929V0.762533H23.1418V0.77332H23.0339V0.784107H22.926V0.794901C22.6671 0.794901 22.4189 0.892005 22.16 0.935163V0.94595C22.106 0.956739 22.0413 0.967534 21.9874 0.978323V0.98911C21.9334 0.9999 21.8795 1.01069 21.8363 1.02148V1.03227H21.7931V1.04306H21.75V1.05384H21.7068V1.06464C21.6745 1.06464 21.6421 1.07542 21.6097 1.07542V1.08622H21.5773V1.09701C21.5342 1.10779 21.4802 1.11858 21.4371 1.12937V1.14017H21.4047V1.15095H21.3616V1.16174C21.34 1.16174 21.3076 1.17253 21.286 1.17253V1.18332H21.2537V1.19411H21.2105V1.2049H21.1781V1.21569H21.135C21.1458 1.25885 21.0595 1.22648 21.0702 1.25885H21.0271C21.0271 1.30201 20.93 1.28042 20.93 1.32358H20.8976V1.33438H20.8652V1.34516H20.8221C20.8221 1.38832 20.725 1.36675 20.725 1.4099H20.6926V1.42069H20.6602V1.43148H20.6279V1.44227H20.5955V1.45306C20.5739 1.44227 20.5523 1.46385 20.5308 1.48542C20.4984 1.48542 20.4876 1.49622 20.4876 1.5178C20.4013 1.52859 20.3581 1.60411 20.2826 1.6149C20.1423 1.74437 19.9481 1.80911 19.8187 1.93858C19.1605 2.34859 18.4268 3.13622 17.9844 3.75122C17.9305 3.88069 17.8118 3.98859 17.7687 4.10728H17.7579C17.7255 4.21517 17.6176 4.32307 17.5852 4.43096H17.5744V4.46333C17.5313 4.48491 17.5205 4.58201 17.4773 4.60359V4.63596C17.4342 4.63596 17.4558 4.73307 17.4126 4.73307V4.77622C17.3694 4.77622 17.391 4.87333 17.3479 4.87333V4.9057H17.3371V4.93806H17.3263V4.98122H17.3155V5.01359H17.3047V5.04596H17.2939V5.07833H17.2831V5.12149H17.2723V5.15385H17.2615V5.19701H17.2508C17.2508 5.21859 17.24 5.25096 17.24 5.27254H17.2292V5.30491H17.2184V5.34807H17.2076V5.38044H17.1968C17.1968 5.41281 17.186 5.44517 17.186 5.47754H17.1752V5.50991C16.981 6.00623 16.8516 6.59965 16.7976 7.14991H16.7868C16.7436 7.62465 16.7436 8.14254 16.776 8.60649H16.7868V8.75755H16.7976V8.88702H16.8084V9.0165H16.8192V9.1136H16.83C16.83 9.36176 16.9487 9.62071 16.9702 9.86887H16.981C16.9918 9.94439 17.0134 10.0199 17.0242 10.0847H17.035V10.1278H17.0458V10.171H17.0565V10.2141H17.0673V10.2573H17.0781V10.322H17.0889V10.3544H17.0997V10.3976H17.1105C17.1213 10.4407 17.1321 10.4947 17.1429 10.5378H17.1537C17.1537 10.5594 17.1644 10.5918 17.1644 10.6133H17.1752V10.6457H17.186C17.186 10.6781 17.1968 10.7105 17.1968 10.7428C17.24 10.732 17.2076 10.8183 17.24 10.8076V10.8507H17.2508V10.8831H17.2615V10.9262C17.3047 10.9154 17.2723 11.0018 17.3047 10.991V11.0233H17.3155V11.0665C17.3587 11.0665 17.3371 11.1636 17.3802 11.1636V11.196H17.391V11.2283H17.4018V11.2607H17.4126V11.2931H17.4234C17.4126 11.3147 17.4342 11.3362 17.4558 11.3578C17.4558 11.3902 17.4665 11.401 17.4881 11.401C17.4773 11.4441 17.5313 11.4549 17.5205 11.4981H17.5313C18.006 12.4368 18.9231 13.397 19.8187 14.0336C19.9913 14.1199 20.1316 14.2602 20.315 14.3357V14.3465C20.3581 14.3357 20.3473 14.3897 20.3905 14.3789C20.4013 14.4005 20.4229 14.422 20.4552 14.4112V14.422H20.4876V14.4328C20.5308 14.422 20.52 14.476 20.5631 14.4652C20.5739 14.4868 20.5955 14.5084 20.6279 14.4976V14.5083H20.6602V14.5191H20.6926V14.5299H20.725C20.725 14.5731 20.8221 14.5515 20.8221 14.5947H20.8652C20.8652 14.6378 20.9623 14.6162 20.9623 14.6594H20.9947V14.6702H21.0379C21.0271 14.7133 21.1134 14.681 21.1026 14.7134H21.1458C21.135 14.7565 21.2213 14.7241 21.2105 14.7565H21.2537V14.7673H21.286V14.7781C21.3076 14.7781 21.34 14.7889 21.3616 14.7889V14.7997C21.3939 14.7997 21.4263 14.8105 21.4587 14.8105V14.8212H21.491V14.832C21.5342 14.8428 21.5881 14.8536 21.6313 14.8644V14.8752H21.6745V14.886H21.7176V14.8968H21.7608V14.9076H21.8039V14.9183H21.8471V14.9291C21.8794 14.9291 21.9226 14.9399 21.955 14.9399V14.9507C21.9873 14.9507 22.0305 14.9615 22.0629 14.9615V14.9723C22.4729 15.0478 22.8829 15.1665 23.3037 15.1773V15.1881C25.7529 15.2312 28.2453 15.1881 30.7053 15.1989C30.9642 15.2097 31.1476 15.2097 31.2879 15.0478C31.3095 14.7349 31.2016 14.1739 31.2339 13.7423ZM28.7955 12.8468H23.4655C23.0339 12.7928 22.5592 12.7173 22.1816 12.5447H22.1492V12.5339H22.106V12.5231C22.0845 12.5231 22.0521 12.5123 22.0305 12.5123V12.5015H21.9981V12.4907H21.955C21.9658 12.4476 21.8795 12.4799 21.8902 12.4476H21.8471C21.8471 12.4044 21.75 12.426 21.75 12.3828H21.7176V12.372H21.6852V12.3612H21.6529V12.3504C21.6313 12.3612 21.6097 12.3397 21.5881 12.3181C21.5558 12.3181 21.545 12.3073 21.545 12.2857C21.5018 12.2965 21.491 12.2426 21.4479 12.2533V12.2426C21.3076 12.1994 21.1997 12.0699 21.0702 12.0268C20.7466 11.811 20.4121 11.4657 20.0992 11.1528C20.0021 11.0018 19.8834 10.8615 19.7863 10.732C19.7647 10.6457 19.6784 10.6026 19.6568 10.5162H19.646C19.4842 10.171 19.2144 9.78255 19.1497 9.36176H19.1389V9.3186H19.1281V9.27544H19.1173V9.21071H19.1065V9.14597H19.0958V9.08123H19.085C19.085 9.03808 19.0742 8.98413 19.0742 8.94097H19.0634V8.84386H19.0526V8.74676H19.0418V8.64965H19.031C18.9879 8.2936 18.9879 7.7757 19.0202 7.40886H19.031C19.0418 7.11755 19.1281 6.84781 19.1821 6.56728H19.1929V6.52412H19.2037V6.48097H19.2144V6.43781H19.2252V6.39465H19.236V6.35149H19.2468V6.30833H19.2576C19.2576 6.27596 19.2684 6.2436 19.2684 6.21123H19.2792V6.17886H19.29V6.1357H19.3008V6.10333H19.3116V6.06017C19.3547 6.07096 19.3223 5.98465 19.3547 5.99544V5.96307H19.3655V5.91991C19.4087 5.91991 19.3871 5.8228 19.4302 5.8228V5.79044C19.4626 5.76886 19.495 5.68254 19.5058 5.65017C19.5273 5.63938 19.5489 5.6178 19.5381 5.58543H19.5489C19.5381 5.54228 19.5921 5.55307 19.5813 5.50991H19.5921C19.6137 5.41281 19.7108 5.34806 19.7323 5.26175C20.056 4.80859 20.5847 4.24754 21.0595 3.91306C21.2105 3.84832 21.3508 3.70806 21.5234 3.64332V3.63254H21.5558V3.62175H21.5881V3.61096H21.6205V3.60017H21.6529V3.58938H21.6852V3.57859H21.7176V3.5678H21.75V3.55701H21.7823C21.7716 3.51385 21.8579 3.54622 21.8471 3.51386H21.8795V3.50306H21.9226C21.9118 3.4599 21.9981 3.49228 21.9874 3.45991H22.0305V3.44911H22.0629V3.43833H22.106V3.42753H22.1384V3.41675C22.1708 3.41675 22.2031 3.40596 22.2355 3.40596V3.39517H22.2787V3.38438H22.3218V3.37359H22.365V3.3628H22.4081V3.35201H22.4513V3.34122C22.4944 3.34122 22.5376 3.33043 22.5808 3.33043V3.31964H22.6239V3.30885C22.6671 3.30885 22.721 3.29807 22.7642 3.29807V3.28727H22.8289V3.27648H22.926V3.26569H23.0016V3.2549H23.0987V3.24412H23.2281V3.23332H23.3684V3.22254C23.5518 3.25491 23.9187 3.14701 24.0913 3.22254H24.3071V3.23332H24.4473V3.24412C24.8142 3.27649 25.2242 3.37359 25.5371 3.51386H25.5695V3.52464H25.6126V3.53543H25.645V3.54622H25.6881C25.6774 3.58938 25.7637 3.55701 25.7529 3.58938H25.796C25.796 3.63253 25.8931 3.61096 25.8931 3.65412H25.9255V3.6649H25.9579V3.6757H25.9903C26.1629 3.7728 26.3679 3.8807 26.5189 3.9778C27.0584 4.36622 27.7058 4.95964 28.0079 5.53149H28.0187C28.0187 5.58543 28.0942 5.62859 28.0942 5.68254C28.1158 5.69333 28.1374 5.71491 28.1266 5.74728H28.1374C28.1589 5.80122 28.1913 5.87675 28.2345 5.91991V5.96307C28.2776 5.95228 28.2453 6.0386 28.2776 6.02781V6.06017H28.2884V6.09254C28.3316 6.09254 28.31 6.18965 28.3532 6.18965V6.2328H28.3639V6.26518C28.4503 6.42702 28.5366 6.67517 28.5689 6.88017H28.5797V6.94491H28.5905V7.00965H28.6013V7.08518H28.6121C28.6121 7.23623 28.6876 7.39807 28.6768 7.54912H28.6876V7.70018H28.6984C28.8171 9.28623 28.7847 11.0773 28.7955 12.8468ZM15.0497 9.09202C15.2008 8.91939 15.2115 8.8007 15.2008 8.4986V7.07439H15.19C15.19 7.04202 15.1792 6.99886 15.1792 6.96649H15.1684V6.93412H15.1576C15.1576 6.70754 15.0605 6.49175 15.0497 6.27596H15.0389C15.0281 6.21123 15.0173 6.14649 15.0065 6.09254H14.9958C14.985 6.03859 14.9742 5.97386 14.9634 5.91991H14.9526V5.87675H14.9418V5.8336H14.931V5.79044H14.9202V5.7257H14.9094V5.68254H14.8986V5.63938H14.8879V5.59623H14.8771V5.55307H14.8663V5.5207H14.8555C14.8447 5.47754 14.8339 5.42359 14.8231 5.38044H14.8123V5.34807H14.8015V5.30491H14.7907V5.27254H14.78V5.22938H14.7692V5.19701H14.7584V5.15385H14.7476V5.12149H14.7368V5.07833H14.726V5.04596H14.7152V5.01359H14.7044V4.98122H14.6937V4.93806C14.6505 4.93806 14.6721 4.84096 14.6289 4.84096V4.80859H14.6181V4.77622H14.6073V4.73307C14.5642 4.73307 14.5858 4.63596 14.5426 4.63596V4.60359C14.4994 4.57122 14.4779 4.45254 14.4347 4.43096V4.39859H14.4239C14.3808 4.25833 14.2621 4.15043 14.2189 4.02096H14.2081C14.1758 3.92385 14.0786 3.85911 14.0571 3.75122C13.8736 3.51385 13.6794 3.22253 13.4313 2.99595C13.0429 2.49964 12.4926 2.1328 12.0502 1.78754H12.0179C11.9423 1.71201 11.8236 1.63648 11.7373 1.60411V1.59332C11.6726 1.57174 11.5971 1.51779 11.5539 1.48542H11.5215V1.47464H11.4892V1.46385H11.4568V1.45306H11.4244V1.44227H11.3921C11.4028 1.39911 11.3165 1.43148 11.3273 1.39911H11.295V1.38832H11.2626V1.37753H11.2302C11.2302 1.33437 11.1331 1.35595 11.1331 1.3128C11.1115 1.3128 11.0792 1.30201 11.0576 1.30201C11.0684 1.25885 10.9821 1.29122 10.9928 1.25885H10.9497V1.24806H10.9173V1.23727C10.8957 1.23727 10.8634 1.22648 10.8418 1.22648V1.21569H10.7986C10.8094 1.17253 10.7231 1.2049 10.7339 1.17253H10.6907V1.16174H10.6476V1.15095H10.6152V1.14017C10.5828 1.14017 10.5505 1.12937 10.5181 1.12937V1.11859H10.4857C10.421 1.04306 10.216 1.06464 10.1621 0.98911H10.0973V0.978323H10.0542V0.96753H10.011V0.956743C9.85995 0.956743 9.70889 0.859635 9.55784 0.859635V0.848848H9.49311V0.838055H9.41759V0.827268H9.32048V0.816481H9.24496V0.805687H9.14785V0.794901C8.89969 0.794901 8.64074 0.71937 8.39258 0.73016V0.719373C7.99337 0.708583 7.59416 0.719372 7.20574 0.75174V0.762533C7.02232 0.751744 6.8389 0.827268 6.65548 0.827268V0.838055C6.60153 0.838055 6.54758 0.848848 6.50442 0.848848V0.859635H6.42889V0.870428C6.36415 0.881218 6.28863 0.892006 6.2239 0.902796V0.913582H6.15915V0.924376H6.09441V0.935163H6.05125V0.94595C6.0081 0.94595 5.96494 0.956743 5.92179 0.956743V0.96753H5.87862V0.978323H5.83546V0.98911H5.77073V0.999897H5.72757V1.01069H5.68442V1.02148H5.64126V1.03227C5.60889 1.03227 5.57652 1.04306 5.54415 1.04306V1.05384H5.51178V1.06464C5.47941 1.06464 5.44705 1.07542 5.41468 1.07542V1.08622H5.38231V1.09701C5.34994 1.09701 5.31757 1.10779 5.2852 1.10779V1.11859H5.25284V1.12937H5.20968V1.14017H5.17731V1.15095H5.13415V1.16174H5.10179V1.17253H5.05863C5.06941 1.21569 4.9831 1.18332 4.99389 1.21569H4.95073C4.96152 1.25885 4.87521 1.22648 4.886 1.25885H4.85362V1.26963H4.81046V1.28043H4.7781C4.78889 1.32359 4.70258 1.29121 4.71337 1.32358H4.68099V1.33438H4.64862V1.34516H4.61626V1.35596H4.58388V1.36674H4.55152V1.37753H4.51915V1.38832H4.48678V1.39911C4.22783 1.51779 4.00126 1.67964 3.79626 1.84148C3.12731 2.26227 2.43678 2.99596 1.96204 3.62175C1.96204 3.65412 1.91888 3.69727 1.8973 3.71885C1.81098 3.90227 1.64914 4.07491 1.57361 4.27991H1.56283C1.33625 4.75464 1.04493 5.29412 0.926242 5.85517H0.915456C0.915456 5.88754 0.904669 5.9307 0.904669 5.96307H0.893882V6.00623H0.883095V6.07096H0.872295C0.872295 6.11412 0.861508 6.15728 0.861508 6.20044H0.850721V6.27596H0.839934V6.3407H0.829147V6.41623H0.818347V6.49175H0.807561V6.56728H0.796774C0.796774 6.63202 0.785987 6.69676 0.785987 6.7507H0.7752C0.7752 6.82623 0.7644 6.90175 0.7644 6.98807H0.753613V7.11754H0.742826V7.30097H0.732039V7.61386H0.721252V8.14255C0.785989 8.26123 0.732034 8.48781 0.753613 8.62807H0.7644V8.76834H0.7752V8.89781H0.785987C0.775197 9.10281 0.883095 9.30781 0.883095 9.51281H0.893882C0.904671 9.57755 0.915453 9.64229 0.926242 9.69624H0.937042C0.937042 9.73939 0.947829 9.78255 0.947829 9.82571H0.958616C0.958616 9.85808 0.969403 9.90124 0.969403 9.93361H0.98019V9.97676H0.99099V10.0199H1.00178V10.0847H1.01256V10.1278H1.02335V10.171H1.03414V10.2141H1.04494V10.2573H1.05572C1.05572 10.2897 1.06651 10.322 1.06651 10.3544H1.0773V10.3868H1.08808C1.08808 10.4191 1.09888 10.4515 1.09888 10.4839H1.10967V10.5162H1.12046V10.5594H1.13125C1.13125 10.581 1.14203 10.6133 1.14203 10.6349H1.15283V10.6673H1.16362V10.7104H1.17441V10.7428H1.18519V10.786C1.22835 10.7752 1.19599 10.8615 1.22835 10.8507V10.8939C1.27151 10.8939 1.24993 10.991 1.29309 10.991V11.0233H1.30387V11.0557H1.31467V11.0989C1.35783 11.0989 1.33625 11.196 1.37941 11.196V11.2283H1.3902V11.2607C1.42256 11.2823 1.45493 11.3686 1.46572 11.401C1.4873 11.4118 1.50888 11.4333 1.49809 11.4657H1.50888C1.99441 12.3936 2.9223 13.3539 3.82862 13.9797C4.00125 14.0552 4.15231 14.2062 4.34652 14.2818V14.2926C4.42205 14.3465 4.57309 14.3789 4.64862 14.4436H4.68099V14.4544H4.71337V14.4652H4.74573V14.476H4.7781C4.78889 14.5191 4.88599 14.5084 4.90757 14.5515H4.93994V14.5623H4.9831C4.97231 14.6055 5.05863 14.5731 5.04784 14.6055H5.091C5.08021 14.6486 5.16652 14.6162 5.15573 14.6486H5.19889V14.6594H5.23125V14.6702H5.27442V14.681H5.30679C5.80311 14.8968 6.40731 15.0478 6.96836 15.1018V15.1126H7.09784V15.1234H7.2381V15.1341H7.41074V15.1449H7.71284V15.1557H8.23074V15.1449C8.39258 15.1449 8.54363 15.1341 8.69468 15.1341V15.1234C9.0831 15.1126 9.46075 15.0047 9.83838 14.9399V14.9291C9.89233 14.9184 9.95706 14.9076 10.011 14.8968V14.886C10.065 14.8752 10.1189 14.8644 10.1621 14.8536V14.8428H10.2052V14.832H10.2484V14.8212H10.2915V14.8105H10.3347V14.7997C10.3779 14.7889 10.4318 14.7781 10.4749 14.7673V14.7565H10.5073V14.7457C10.5397 14.7457 10.5721 14.7349 10.6044 14.7349V14.7241H10.6368V14.7134C10.6692 14.7134 10.7015 14.7026 10.7339 14.7026V14.6918H10.7663V14.681H10.8094C10.7986 14.6378 10.885 14.6702 10.8742 14.6378H10.9173V14.627H10.9497V14.6162H10.9928C10.9821 14.5731 11.0684 14.6055 11.0576 14.5731H11.09V14.5623C11.1331 14.5623 11.1871 14.5299 11.2194 14.4976H11.2518V14.4868H11.2842V14.476C11.6078 14.3465 11.8884 14.1091 12.1581 13.9581C12.2121 13.8934 12.32 13.8502 12.3739 13.7855C12.6113 13.6344 12.8379 13.4294 13.0429 13.2028C13.1615 13.1597 13.2263 12.9978 13.291 12.9223V12.8899H13.3018C13.4205 12.3612 12.8594 12.1347 12.5789 11.8002C12.3847 11.6276 12.2336 11.3794 12.0286 11.2715C12.0394 11.2283 11.9531 11.2607 11.9639 11.2283H11.9207V11.2176H11.8452V11.2068H11.7697V11.2176H11.6942C11.3057 11.4333 10.9713 11.8433 10.6152 12.0591C10.5181 12.0807 10.4534 12.1778 10.3455 12.1994V12.2102H10.3131V12.221C10.2484 12.2533 10.1621 12.2857 10.1081 12.3289H10.065V12.3397H10.0326C10.0326 12.3828 9.93547 12.3612 9.93547 12.4044H9.89233C9.90312 12.4476 9.81679 12.4152 9.82758 12.4476H9.78443V12.4583H9.75206V12.4691C9.71969 12.4691 9.68732 12.4799 9.65495 12.4799V12.4907H9.62259C9.32048 12.6202 8.93205 12.7065 8.58679 12.7389V12.7497H8.45732V12.7604C8.15521 12.782 7.75599 12.782 7.45389 12.7604V12.7497H7.31363V12.7389H7.18415V12.7281H7.08706V12.7173C6.78495 12.6849 6.45047 12.5986 6.19152 12.4799H6.15915V12.4691H6.116V12.4583C6.09442 12.4583 6.06205 12.4476 6.04047 12.4476V12.4368H6.00811V12.426H5.96495C5.97574 12.3828 5.88942 12.4152 5.90021 12.3828H5.85705C5.85705 12.3397 5.75994 12.3612 5.75994 12.3181H5.72757V12.3073H5.69521V12.2965H5.66283V12.2857H5.63047V12.2749C5.42547 12.1994 5.25283 12.0483 5.0802 11.962C4.4652 11.5089 3.86099 10.8615 3.5481 10.1926H3.53731V10.1602H3.52652V10.1278H3.51572V10.0954H3.50494V10.0631H3.49415V10.0307H3.48336V9.99834H3.47257V9.96597H3.46177C3.46177 9.9444 3.45099 9.91202 3.45099 9.89045C3.40783 9.90124 3.4402 9.81492 3.40783 9.82571V9.78255H3.39704V9.75018H3.38625C3.38625 9.7286 3.37547 9.69623 3.37547 9.67466H3.36468V9.6315H3.35388V9.59913H3.34309C3.32151 9.44808 3.2352 9.32939 3.21362 9.15676C7.0439 9.09202 11.1115 9.3186 15.0497 9.09202ZM3.14889 6.44859V6.40544H3.15968C3.15968 6.37307 3.17046 6.3407 3.17046 6.30833H3.18125C3.19204 6.26517 3.20283 6.21123 3.21362 6.16807H3.22441V6.1357H3.2352C3.2352 6.10333 3.24598 6.07096 3.24598 6.03859C3.28914 6.04938 3.25678 5.96307 3.28914 5.97386V5.9307C3.3323 5.9307 3.31072 5.8336 3.35388 5.8336V5.80122H3.36468V5.76886H3.37547V5.73649H3.38625V5.70412H3.39704V5.67175H3.40783V5.63938H3.41863C3.44021 5.55306 3.52652 5.47754 3.5481 5.39122H3.55888C3.8502 4.84096 4.44362 4.25833 4.96152 3.86991C5.14494 3.78359 5.30678 3.63254 5.51178 3.55701V3.54622H5.54415V3.53543H5.57653V3.52464H5.60889V3.51386H5.64126V3.50306H5.67362V3.49227H5.706C5.706 3.44912 5.8031 3.47069 5.8031 3.42753H5.84626C6.57995 3.07148 7.54021 2.9528 8.39258 3.0499V3.06069H8.50048V3.07148H8.59759V3.08228H8.69468V3.09306H8.77022V3.10385H8.83495V3.11464H8.91047V3.12543H8.97522V3.13622H9.03995V3.14701C9.0939 3.1578 9.15863 3.16859 9.21258 3.17938V3.19017H9.25574V3.20096H9.2989V3.21174H9.34205V3.22254H9.38521V3.23332H9.42837V3.24412C9.47153 3.25491 9.52548 3.2657 9.56864 3.27648V3.28727H9.601V3.29807H9.64416C9.63337 3.34122 9.71969 3.30885 9.7089 3.34122H9.75206V3.35201H9.78443C9.77364 3.39517 9.85995 3.3628 9.84916 3.39517H9.88153V3.40596H9.9139V3.41675H9.94627V3.42753H9.97863V3.43833H10.011V3.44911H10.0434V3.45991H10.0757V3.47069H10.1081V3.48148C10.9389 3.89148 11.7157 4.66833 12.1257 5.49912H12.1365C12.1689 5.56386 12.2013 5.65017 12.2444 5.70412V5.74728H12.2552V5.77965C12.2984 5.77965 12.2768 5.87675 12.32 5.87675V5.91991H12.3307V5.95228H12.3415C12.3415 5.98465 12.3523 6.01702 12.3523 6.04939H12.3631V6.08175H12.3739C12.3739 6.11412 12.3847 6.14649 12.3847 6.17886H12.3955C12.3955 6.21122 12.4063 6.2436 12.4063 6.27596H12.4171V6.31912H12.4279V6.36228H12.4386V6.40544H12.4494V6.47017H12.4602C12.4602 6.50254 12.471 6.5457 12.471 6.57807H12.4818V6.58886H2.9223C3.10572 6.64281 3.09494 6.50254 3.14889 6.44859ZM12.5897 20.4965C11.6079 20.4642 11.6726 20.7555 11.6942 19.6873H13.55C13.55 20.1944 13.5715 20.7123 13.4852 21.2086H13.4744C13.4744 21.241 13.4636 21.2842 13.4636 21.3165H13.4529V21.3597H13.4421V21.4028H13.4313V21.446C13.3881 21.446 13.4097 21.5431 13.3665 21.5431V21.5755H13.3558V21.6078C13.1939 21.9099 12.8379 22.1905 12.5465 22.3415C12.525 22.3415 12.4926 22.3523 12.471 22.3523V22.3631H12.4279V22.3739H12.3847V22.3847H12.3415V22.3955H12.2984V22.4063H12.2336V22.417C11.9747 22.4602 11.6078 22.4818 11.3273 22.4278V22.417H11.2626V22.4063H11.1979V22.3955H11.1547V22.3847H11.09V22.3739H11.0576V22.3631H11.0144V22.3523H10.9821V22.3415H10.9389C10.1944 21.9855 9.85995 21.2949 9.90311 20.2807C9.87074 19.1802 9.85996 18.2415 10.7015 17.7128C10.7771 17.6697 10.8957 17.6157 10.9713 17.5726H11.0036V17.5618H11.0468V17.551H11.0792V17.5402C11.7913 17.3136 12.7623 17.4755 13.2694 18.0689C13.0429 18.2847 12.8379 18.5328 12.6005 18.727C12.3415 18.3926 11.8776 18.2307 11.446 18.3494V18.3602H11.4136V18.371H11.3705V18.3818H11.3381V18.3926C11.1655 18.4465 11.0684 18.6407 10.9821 18.781V18.8241H10.9713V18.8889H10.9605V18.9644H10.9497V19.0723H10.9389C10.9281 19.3097 10.9173 19.5686 10.9281 19.8276H10.9173C10.9389 20.2484 10.9173 20.7015 10.9928 21.0792H11.0036V21.1223C11.09 21.2734 11.2086 21.4676 11.3921 21.5323V21.5431H11.4352V21.5539H11.4784V21.5647H11.5215V21.5755H11.5971C12.1905 21.7373 12.6544 21.2518 12.5897 20.4965ZM5.99731 17.4647C6.05125 18.7163 5.86784 20.1081 6.09441 21.3165C6.13757 21.3057 6.10521 21.392 6.13758 21.3813V21.4136H6.14836C6.24547 21.6726 6.55836 21.9531 6.90363 21.9963V22.007H6.97916V22.0178H7.18415V22.0286C7.21652 22.0286 7.21653 22.0178 7.21653 22.0178H7.42153V22.007H7.51864V21.9963H7.58337V21.9855H7.62653V21.9747H7.66968V21.9639H7.71284C7.961 21.8452 8.18758 21.6294 8.30626 21.3813V21.3381H8.31705V21.3057H8.32785V21.2626C8.53285 20.1189 8.33863 18.7055 8.40337 17.497H8.93206V21.0144H8.92127V21.1439H8.91047V21.241H8.89968V21.3057H8.8889V21.3705H8.87811V21.4136H8.86732V21.4568H8.85652V21.4999C8.81336 21.4892 8.84574 21.5755 8.81338 21.5647V21.6078H8.80258V21.6402H8.79179C8.79179 21.6942 8.71627 21.7373 8.71627 21.7913H8.70548C8.61916 21.9747 8.41415 22.1257 8.2631 22.2444C8.19836 22.2552 8.13363 22.3307 8.07968 22.3415V22.3523H8.03652C8.04731 22.3955 7.961 22.3631 7.97179 22.3955H7.92863V22.4063H7.88547V22.417H7.84232V22.4278H7.79916V22.4386H7.73443V22.4494H7.65889V22.4602H7.58337V22.471H7.45389C7.30284 22.5465 7.01152 22.4494 6.83889 22.4602V22.4494C6.79573 22.4494 6.75258 22.4386 6.70942 22.4386V22.4278H6.66626V22.417H6.6231V22.4063H6.57994V22.3955H6.53678C6.54757 22.3523 6.46126 22.3847 6.47205 22.3523C6.14836 22.2444 5.88941 21.9531 5.71678 21.6834V21.651C5.67362 21.651 5.69521 21.5539 5.65205 21.5539V21.5107H5.64126V21.4784H5.63047C5.61968 21.4352 5.60889 21.3813 5.5981 21.3381H5.58731C5.43626 20.1189 5.56574 18.7594 5.52258 17.5078C5.57653 17.4323 5.84625 17.4647 5.99731 17.4647ZM23.131 17.4647C23.4223 17.497 23.8108 17.3891 24.0374 17.5078C24.0589 17.5941 24.156 17.6589 24.1776 17.756C24.2423 17.8315 24.3071 17.9286 24.3503 18.0257C24.415 18.1013 24.4797 18.1984 24.5229 18.2955C24.5876 18.371 24.6524 18.4681 24.6955 18.5652C24.8142 18.7163 24.9221 18.8781 25.0084 19.0507C25.0731 19.1263 25.1379 19.2234 25.181 19.3205C25.2458 19.396 25.3105 19.4931 25.3537 19.5902C25.591 19.8815 25.7313 20.2052 25.9795 20.5289V17.4755H26.9505V22.4602C26.3679 22.4171 26.0766 22.6544 25.8392 22.0718C25.7205 21.9207 25.6126 21.7589 25.5263 21.5863C25.4076 21.4352 25.2997 21.2734 25.2134 21.1007C25.0947 20.9497 24.9868 20.7878 24.9005 20.6152C24.6092 20.2376 24.4042 19.7952 24.1021 19.4284V22.4602H23.131V17.4647ZM32.4532 17.4647H33.4242V21.597H35.69V22.4602H32.4532V17.4647ZM35.2261 17.4647C35.4742 17.5186 36.305 17.3136 36.3374 17.6049H36.3482V17.6373H36.359V17.6697C36.4129 17.702 36.4129 17.8423 36.4669 17.8747V17.9178C36.51 17.9178 36.4884 18.0149 36.5316 18.0149V18.0473H36.5424V18.0797H36.5532V18.1228C36.5963 18.1228 36.5747 18.2199 36.6179 18.2199V18.2523C36.6611 18.2415 36.6287 18.3278 36.6611 18.317V18.3602C36.7042 18.3602 36.6826 18.4573 36.7258 18.4573V18.4897H36.7366V18.522H36.7474V18.5652C36.8013 18.5868 36.7905 18.6947 36.8445 18.7163V18.7486H36.8553V18.7918C36.8984 18.7918 36.8769 18.8889 36.92 18.8889V18.9213H36.9308V18.9536H36.9416V18.9968C36.9847 18.9968 36.9632 19.0939 37.0063 19.0939V19.1263H37.0171V19.1586H37.0279V19.2018H37.0387C37.0495 19.2989 37.1358 19.3528 37.1466 19.4715H37.179C37.1897 19.3744 37.2545 19.342 37.2545 19.2557H37.2653V19.2234H37.2761V19.191H37.2868V19.1586H37.2976V19.1263H37.3084V19.0939H37.3192V19.0507C37.3624 19.0507 37.3408 18.9536 37.384 18.9536V18.9213C37.4379 18.9105 37.4163 18.7918 37.4595 18.781V18.7486H37.4703C37.4703 18.727 37.4811 18.6947 37.4811 18.6731C37.5242 18.6731 37.5026 18.576 37.5458 18.576V18.5328C37.589 18.5328 37.5674 18.4357 37.6105 18.4357V18.4034H37.6213V18.371H37.6321V18.3278C37.6753 18.3278 37.6537 18.2307 37.6969 18.2307V18.1984H37.7076C37.7076 18.1768 37.7184 18.1444 37.7184 18.1228C37.7616 18.1228 37.74 18.0257 37.7832 18.0257V17.9826C37.8263 17.9826 37.8048 17.8855 37.8479 17.8855V17.8531H37.8587V17.8099C37.9019 17.8099 37.8803 17.7128 37.9234 17.7128V17.6805H37.9342V17.6481H37.945V17.6049C37.9774 17.6049 37.999 17.4755 38.0205 17.4647H39.0671C38.9808 17.6913 38.8405 17.8962 38.7542 18.1012H38.7434V18.1336H38.7326V18.166C38.6895 18.1552 38.7219 18.2415 38.6895 18.2307V18.2631C38.6463 18.2523 38.6787 18.3386 38.6463 18.3278V18.3602H38.6355V18.3926H38.6248V18.4249H38.614V18.4573H38.6032V18.4897C38.5276 18.5976 38.4413 18.781 38.3874 18.9105H38.3766V18.9428C38.3334 18.9536 38.3442 19.0507 38.3011 19.0723V19.1047H38.2903V19.137H38.2795V19.1694H38.2687V19.2018H38.2579V19.2341C38.204 19.2665 38.204 19.3852 38.15 19.4176V19.4499H38.1392V19.4823H38.1284V19.5147H38.1176V19.547C38.0961 19.5686 38.0637 19.6226 38.0529 19.6549C38.0313 19.6657 38.0098 19.6873 38.0205 19.7197H38.0098V19.752C37.945 19.7952 37.945 19.9247 37.8803 19.9678V20.0002H37.8695V20.0326H37.8587V20.0649H37.8479V20.0973C37.8048 20.0973 37.8263 20.1944 37.7832 20.1944V20.2268H37.7724V20.2591H37.7616V20.2915H37.7508V20.3239C37.7076 20.3131 37.74 20.3994 37.7076 20.3886V20.421H37.6969V20.4534H37.6861V22.4818H36.7366V20.4534H36.7258C36.7258 20.4102 36.6934 20.3455 36.6611 20.3239V20.2915H36.6503V20.2591H36.6395V20.2268H36.6287V20.1944H36.6179V20.162C36.5424 20.0865 36.5208 19.9247 36.4453 19.8491V19.8168H36.4345V19.7844H36.4237V19.752H36.4129V19.7197H36.4021V19.6873H36.3913C36.4021 19.6657 36.3805 19.6442 36.359 19.6226C36.3482 19.5902 36.3266 19.5255 36.2942 19.5147V19.4823H36.2834V19.4499H36.2726V19.4176H36.2618V19.3852C36.1755 19.2773 36.1324 19.0831 36.0461 18.9752V18.9428H36.0353V18.9105H36.0245V18.8781H36.0137V18.8457C35.9705 18.8134 35.949 18.6947 35.9058 18.6731V18.6407H35.895V18.6084H35.8842V18.576H35.8734V18.5436H35.8626V18.5113H35.8519V18.4789C35.8087 18.4681 35.8195 18.371 35.7763 18.3494V18.317H35.7655V18.2847H35.7547V18.2523H35.744V18.2199C35.7008 18.2307 35.7332 18.1444 35.7008 18.1552V18.1228H35.69V18.0905H35.6792V18.0581H35.6684V18.0257H35.6576V17.9934C35.3987 17.8639 35.3124 17.6481 35.2261 17.4647ZM43.9548 17.4647C44.2353 17.5186 44.8179 17.3136 44.9042 17.6157C44.969 17.6912 45.0337 17.7884 45.0769 17.8855C45.1416 17.961 45.2063 18.0581 45.2495 18.1552C45.3142 18.2307 45.379 18.3278 45.4221 18.4249C45.4869 18.5005 45.5516 18.5976 45.5948 18.6947C45.6595 18.7702 45.7242 18.8673 45.7674 18.9644C45.8321 19.0399 45.8969 19.137 45.94 19.2341C46.0048 19.3097 46.0695 19.4068 46.1127 19.5039C46.3608 19.8276 46.5335 20.1836 46.8032 20.5397V17.4863H47.7743V22.471C47.0082 22.4494 46.9111 22.6544 46.5658 21.9423C46.4471 21.7913 46.3392 21.6294 46.2529 21.4568C46.1882 21.3813 46.1234 21.2842 46.0803 21.187C45.9616 21.036 45.8537 20.8742 45.7674 20.7015C45.4545 20.3023 45.2603 19.8815 44.9258 19.4391V22.471H43.9548V17.4647ZM4.40047 18.9644H4.38968V18.8565H4.37888V18.781H4.36809V18.7055H4.35731V18.6407H4.34652V18.5976H4.33573V18.5544H4.32493V18.5113H4.31415C4.31415 18.4789 4.30336 18.4465 4.30336 18.4141C4.24941 18.3602 4.21705 18.2523 4.17389 18.1768C3.64521 17.3352 2.47993 17.4755 1.57361 17.4755C1.41177 17.4755 1.12046 17.4431 0.99099 17.4863V22.4602C1.71389 22.4386 2.52309 22.5034 3.22441 22.417V22.4063H3.28914V22.3955C3.3323 22.3847 3.38626 22.3739 3.42941 22.3631V22.3523H3.46177V22.3415H3.50494C3.50494 22.2984 3.60204 22.3199 3.60204 22.2768H3.63442C3.7531 22.2013 3.87178 22.1042 3.99046 22.007C4.08757 21.8668 4.18467 21.7481 4.2602 21.597V21.5539H4.27099V21.5215H4.28179V21.4784H4.29257V21.4352H4.30336V21.392H4.31415V21.3489H4.32493C4.32493 21.3057 4.33573 21.2626 4.33573 21.2194H4.34652V21.1439H4.35731V21.0468H4.36809V20.9173H4.37888C4.43283 20.2592 4.44363 19.5902 4.40047 18.9644ZM3.89335 20.1836H3.88257C3.89336 20.4642 3.86099 20.7663 3.83941 21.0252H3.82862V21.0899H3.81783V21.1547H3.80705V21.2194H3.79626V21.2626H3.78546V21.3057C3.7423 21.2949 3.77468 21.3813 3.74231 21.3705C3.66679 21.5971 3.45099 21.7805 3.22441 21.856V21.8668H3.19204V21.8776H3.14889V21.8884H3.10573V21.8992H3.06257V21.9099H2.98705V21.9207H2.91151V21.9315C2.46914 21.9639 1.98362 21.9423 1.53046 21.9423V17.907C2.29652 17.9286 3.36468 17.7236 3.7531 18.4681V18.5005C3.79626 18.5005 3.77468 18.5976 3.81783 18.5976V18.6407H3.82862V18.6839H3.83941V18.7486H3.85021V18.8134H3.86099V18.9105H3.87178V19.0076H3.88257V19.1586H3.89335C3.87178 19.5255 3.90414 19.8492 3.89335 20.1836ZM42.2932 17.7128C42.2392 17.7128 42.1961 17.6373 42.1421 17.6373C41.84 17.4431 41.4192 17.4215 41.02 17.4323C40.815 17.4755 40.5345 17.5186 40.3834 17.6373H40.3511C40.049 17.8099 39.7361 18.1013 39.585 18.4465V18.4789H39.5742V18.522H39.5634V18.5544H39.5526C39.3908 19.2341 39.4448 20.162 39.4556 20.8957H39.4663C39.4771 20.9928 39.4879 21.0899 39.4987 21.1978H39.5095V21.2626H39.5203V21.3057H39.5311V21.3489H39.5419V21.392H39.5526V21.4352C39.5958 21.4352 39.5742 21.5323 39.6174 21.5323V21.5647H39.6282V21.597C39.6498 21.6186 39.6821 21.6726 39.6929 21.7049C39.8871 21.9531 40.1353 22.2121 40.4482 22.3199C40.6855 22.4602 41.1603 22.5357 41.4516 22.471H41.5811V22.4602H41.6782V22.4494H41.7537V22.4386C41.7861 22.4386 41.8292 22.4278 41.8616 22.4278V22.417H41.9048V22.4063C42.919 22.0934 43.1563 21.0899 43.0916 20.0865C43.1456 19.1586 43.07 18.1984 42.2932 17.7128ZM41.689 21.5107C41.689 21.5539 41.5919 21.5323 41.5919 21.5755H41.5487V21.5863C41.5055 21.5863 41.4624 21.597 41.4192 21.597C41.3977 21.6402 41.0092 21.6186 41.0092 21.5863H40.9661V21.5755H40.9229C40.7395 21.4892 40.5777 21.3381 40.4806 21.1547V21.1115H40.4698V21.0468H40.459V20.982H40.4482V20.8849H40.4374V20.7555H40.4266C40.405 20.1728 40.3726 19.4176 40.4698 18.8673H40.4806V18.8241H40.4913V18.781H40.5021V18.7486C40.5777 18.5976 40.7287 18.4573 40.8798 18.371H40.9121V18.3602H40.9553V18.3494H40.9984V18.3386H41.0632V18.3278H41.1927V18.317C41.5271 18.317 41.6998 18.4249 41.894 18.5868C42.0127 18.7594 42.1206 18.986 42.099 19.2449H42.1098C42.0666 19.9463 42.3471 21.1115 41.689 21.5107ZM17.9629 22.0934H17.9521V22.061H17.9413V22.0286H17.9305V21.9963H17.9197V21.9639H17.9089V21.9315H17.8981V21.8992C17.8118 21.802 17.7579 21.5863 17.6608 21.4784V21.446H17.65C17.596 21.3273 17.5205 21.1655 17.445 21.0576V21.0252H17.4342V20.9928H17.4234C17.4342 20.9713 17.4126 20.9497 17.391 20.9281C17.391 20.8957 17.3802 20.8849 17.3587 20.8849C17.3587 20.831 17.3047 20.8094 17.3155 20.7555H17.3047V20.7231H17.2939V20.6907C17.2292 20.572 17.1321 20.4426 17.0889 20.2807C17.4234 20.1836 17.6823 19.9247 17.8442 19.6549V19.6226C17.8873 19.6226 17.8658 19.5255 17.9089 19.5255C17.9089 19.4931 17.9197 19.4607 17.9197 19.4284H17.9305C18.006 19.1047 17.9952 18.7378 17.8981 18.4141H17.8873V18.3818H17.8766V18.3386C17.7579 18.112 17.5744 17.8639 17.3479 17.7128C17.3155 17.702 17.2508 17.6805 17.24 17.6481H17.2076V17.6373H17.1752C17.1752 17.5941 17.0781 17.6157 17.0781 17.5726H17.035V17.5618H16.9918V17.551H16.9486V17.5402H16.9055V17.5294C16.1071 17.4215 15.2223 17.4539 14.4347 17.4863V22.4602H15.4165V20.4749H16.1071C16.1287 20.4857 16.1502 20.6152 16.1826 20.6152V20.6476H16.1934V20.6799H16.2042V20.7123H16.215V20.7447C16.2689 20.7878 16.2797 20.9173 16.3444 20.9605V20.9928H16.3552V21.0252H16.366V21.0576H16.3768V21.0899H16.3876V21.1223H16.3984V21.1655C16.4415 21.1655 16.42 21.2626 16.4631 21.2626V21.2949H16.4739V21.3273H16.4847V21.3597H16.4955V21.392H16.5063V21.4244C16.5602 21.446 16.5494 21.5539 16.6034 21.5755V21.6078H16.6142V21.6402H16.625V21.6726H16.6358V21.7049H16.6465V21.7373H16.6573V21.7697H16.6681V21.8021H16.6789V21.8344C16.7329 21.8452 16.7113 21.9639 16.7544 21.9747V22.007H16.7652V22.0394H16.776V22.0718H16.7868V22.1042C16.8515 22.2013 16.9163 22.3415 16.9702 22.4818H18.0923C18.0923 22.3199 17.9952 22.2013 17.9629 22.0934ZM16.9271 19.2449C16.8947 19.2881 16.8515 19.3744 16.8192 19.4284C16.7652 19.4499 16.7329 19.5363 16.6681 19.5363C16.6681 19.5794 16.571 19.5578 16.571 19.601H16.5279C16.215 19.7197 15.7187 19.6118 15.3518 19.6442V18.3278C15.7402 18.3386 16.2042 18.2955 16.571 18.371V18.3818H16.6034C16.6358 18.4141 16.7113 18.4573 16.7544 18.4789C16.776 18.5328 16.8623 18.5652 16.8623 18.6299C16.9055 18.6299 16.8839 18.727 16.9271 18.727V18.7702H16.9379V18.8349C17.0026 18.8889 16.9379 19.2126 16.9271 19.2449ZM30.6297 17.6157H30.5866V17.6049H30.5542V17.5941H30.5111V17.5834H30.4679V17.5726C30.4355 17.5726 30.3924 17.5618 30.36 17.5618V17.551C30.3061 17.551 30.2521 17.5402 30.2089 17.5402V17.5294C29.5076 17.4647 28.72 17.5078 28.0079 17.497V22.4818C28.72 22.471 29.4753 22.5142 30.1766 22.471V22.4602H30.2737V22.4494H30.3384V22.4386H30.4032V22.4278C30.8671 22.3307 31.2663 21.9963 31.4174 21.597H31.4282V21.5647C31.4713 21.5755 31.439 21.4892 31.4713 21.4999V21.4568H31.4821V21.4136H31.4929V21.3705H31.5037C31.5037 21.3381 31.5145 21.2949 31.5145 21.2626H31.5253V21.187H31.5361V21.1115H31.5468V20.982H31.5576C31.6008 19.7089 31.8382 18.1336 30.6297 17.6157ZM28.9574 21.5863V18.3278C29.7018 18.3063 30.2953 18.2739 30.5326 18.8241C30.5326 18.8565 30.5434 18.8889 30.5434 18.9213H30.5542V18.9968H30.565V19.0723H30.5758V19.2126H30.5866C30.6297 20.7015 30.9211 21.8021 28.9574 21.5863ZM22.57 22.1797H22.5592V22.1473H22.5484C22.5376 22.1042 22.5268 22.0502 22.516 22.007H22.5052V21.9747H22.4945C22.4945 21.9423 22.4837 21.9099 22.4837 21.8776H22.4729V21.8452H22.4621C22.4621 21.8128 22.4513 21.7805 22.4513 21.7481H22.4405V21.7049H22.4297V21.6726H22.4189C22.4189 21.6402 22.4081 21.6078 22.4081 21.5755H22.3973C22.3434 21.3057 22.1708 21.036 22.1168 20.7663H22.106V20.7231H22.0952V20.6907H22.0845C22.0845 20.6584 22.0737 20.626 22.0737 20.5936H22.0629C22.0089 20.3023 21.8255 20.0218 21.7608 19.7305H21.75V19.6981H21.7392C21.7284 19.6549 21.7176 19.601 21.7068 19.5578H21.696V19.5255H21.6852C21.6744 19.4823 21.6637 19.4284 21.6529 19.3852H21.6421V19.3528H21.6313C21.6205 19.3097 21.6097 19.2557 21.5989 19.2126H21.5881V19.1802H21.5773C21.5773 19.1478 21.5666 19.1155 21.5666 19.0831H21.5558V19.0507H21.545V19.0076H21.5342C21.5342 18.9752 21.5234 18.9428 21.5234 18.9105H21.5126V18.8781H21.5018V18.8349H21.491C21.491 18.8026 21.4802 18.7702 21.4802 18.7378H21.4694V18.7055H21.4587C21.4479 18.6623 21.4371 18.6084 21.4263 18.5652H21.4155V18.5328H21.4047C21.3939 18.4897 21.3831 18.4357 21.3723 18.3926H21.3616V18.3602H21.3508C20.9516 17.3568 21.3076 17.4215 20.261 17.4323C20.2502 17.5186 20.1855 17.5726 20.1963 17.6481H20.1855V17.6805H20.1747C20.1639 17.7236 20.1531 17.7776 20.1423 17.8207H20.1315V17.8531H20.1208C20.056 18.1768 19.8618 18.4897 19.7971 18.8026H19.7863V18.8457H19.7755V18.8781H19.7647C19.7647 18.9105 19.7539 18.9428 19.7539 18.9752H19.7431V19.0184H19.7323V19.0507H19.7216C19.7216 19.0831 19.7108 19.1155 19.7108 19.1478H19.7V19.1802H19.6892C19.6784 19.2234 19.6676 19.2773 19.6568 19.3205H19.646V19.3528H19.6352C19.5058 19.8492 19.2576 20.3347 19.1173 20.8202H19.1065V20.8634H19.0958V20.8957H19.085V20.9389H19.0742C19.0742 20.9713 19.0634 21.0036 19.0634 21.036H19.0526V21.0684H19.0418C18.9663 21.4136 18.7721 21.7265 18.6966 22.0718H18.6858V22.1042H18.675C18.675 22.2228 18.5887 22.2876 18.5779 22.417H19.5921C19.6352 22.3199 19.6352 22.1581 19.7 22.0934V22.0502H19.7108V22.007H19.7216V21.9639H19.7323V21.9207H19.7431V21.8884H19.7539C19.7647 21.7697 19.8294 21.6834 19.851 21.5647H21.6313C21.9658 22.7084 21.8039 22.4063 22.926 22.4386C22.6347 22.3415 22.5808 22.2876 22.57 22.1797ZM19.851 20.7447C19.9158 20.572 19.9913 20.4102 20.0237 20.2268H20.0345V20.1944H20.0452C20.0452 20.162 20.056 20.1297 20.056 20.0973H20.0668V20.0542H20.0776V20.011H20.0884V19.9678H20.0992V19.9247H20.11V19.8815H20.1208V19.8491H20.1315V19.806C20.2071 19.7413 20.1855 19.5363 20.261 19.4823V19.4499H20.2718C20.2718 19.4176 20.2826 19.3852 20.2826 19.3528H20.2934V19.3097H20.3042V19.2665H20.315V19.2234H20.3258V19.1802H20.3366V19.137H20.3473V19.1047H20.3581C20.3581 19.0723 20.3689 19.0399 20.3689 19.0076H20.3797V18.9752H20.3905C20.3905 19.0076 20.4013 19.0399 20.4013 19.0723H20.4121V19.1155H20.4229V19.1586H20.4337V19.2018H20.4444V19.2449H20.4552V19.2881H20.466V19.3313H20.4768V19.3744H20.4876C20.5308 19.6442 20.6926 19.9031 20.7358 20.1728H20.7466V20.216H20.7573V20.2591H20.7681V20.3023H20.7789C20.7897 20.3455 20.8005 20.3994 20.8113 20.4426H20.8221V20.4749H20.8329V20.5181H20.8437C20.8437 20.6044 20.8868 20.6584 20.9084 20.7339C20.671 20.7447 20.261 20.7447 19.851 20.7447Z" fill="#020304"/> +</svg> diff --git a/src/assets/icons/visu/grdf-logo.svg b/src/assets/icons/visu/grdf-logo.svg new file mode 100644 index 0000000000000000000000000000000000000000..be7f04a50d26f12d2d009ef6bc4fa52096e8d286 --- /dev/null +++ b/src/assets/icons/visu/grdf-logo.svg @@ -0,0 +1,9 @@ +<svg width="64" height="25" viewBox="0 0 64 25" fill="none" xmlns="http://www.w3.org/2000/svg"> +<path d="M16.1324 8.8727C17.0911 8.91653 17.2224 9.75822 17.2382 9.97886V14.3432C17.2165 14.3706 17.1946 14.3985 17.1725 14.4267C17.0777 14.5475 16.979 14.6734 16.8767 14.7865C16.6891 14.9902 16.3895 15.3044 16.2769 15.41C14.2171 17.3424 11.7967 18.0462 9.53916 18.0462C7.68361 18.0462 5.13046 17.4664 2.95551 15.406C-0.734287 11.8958 -0.771297 6.27491 2.95348 2.79806C3.64348 2.15858 3.91066 1.91952 5.00878 1.30294C6.52415 0.448792 8.24179 0.152954 9.6294 0.152954C10.8477 0.152954 12.1815 0.413432 13.1803 0.82133C13.413 0.914464 13.6756 1.02553 14.0056 1.21379C14.8893 1.7188 16.0488 2.60433 16.6283 4.00433V4.0108H5.73021V10.5516C5.81285 11.7175 6.06938 12.6429 6.79386 13.2933C7.37891 13.8208 8.27272 14.1664 9.6294 14.3024C10.0639 14.3487 10.5506 14.3711 11.091 14.3711L13.4596 14.3656C13.4373 14.3582 13.3476 14.3024 13.0191 13.899C12.6104 13.3915 12.5187 12.5229 12.5187 11.8739H12.5166V8.87171L16.1324 8.8727Z" fill="#121212"/> +<path d="M50.5735 0.189338V8.9569C51.3725 8.30894 52.6415 8.09279 54.6293 7.96579L54.6248 4.01431H57.7995C59.469 3.9401 63.1816 3.44903 63.174 0.189338H50.5735Z" fill="#121212"/> +<path d="M37.0946 24.3327C37.0946 24.6186 36.8558 24.8472 36.5678 24.8472H26.8521C26.5661 24.8472 26.3334 24.6186 26.3334 24.3327V22.8565C26.3334 22.5721 26.5661 22.341 26.8521 22.341H36.5678C36.8558 22.341 37.0946 22.5721 37.0946 22.8565V24.3327Z" fill="#121212"/> +<path d="M60.1744 7.8654H61.0155C61.0155 7.8654 61.0135 8.45808 61.0135 8.68967C61.0135 10.51 59.3896 11.4329 56.1946 11.4329H54.625V14.448C54.625 15.5094 54.3685 17.9588 51.9334 18.01H50.5732V13.5934C50.9585 8.49643 57.7916 7.92019 60.1744 7.8654Z" fill="#121212"/> +<path d="M41.6872 0.19375L32.848 0.190762V18.0098C35.9289 17.6352 37.0554 16.1984 37.2187 14.0802V4.01225H41.1042C41.152 4.01536 41.2063 4.01834 41.2608 4.02132C41.3548 4.02647 41.4495 4.03166 41.5133 4.03765C43.3567 4.2538 44.5314 5.04967 44.6505 8.70282C44.6642 8.84585 44.6599 9.00661 44.6559 9.1527C44.6542 9.21713 44.6525 9.27891 44.6525 9.33484C44.5577 15.2531 39.9736 17.0655 37.4341 17.7269L37.421 17.7314C37.3905 17.7438 37.3687 17.7588 37.3687 17.7891V17.9485C37.3687 17.9809 37.3946 18.0053 37.421 18.0088L37.4296 18.0098H37.7272C41.4286 18.0098 48.8676 17.1257 48.8676 9.13961V8.99368C48.824 2.07237 45.7882 0.19375 41.6872 0.19375Z" fill="#121212"/> +<path d="M25.1347 4.02886L23.0454 4.01192C22.9121 4.01192 22.7823 4.00644 22.6495 3.99698C20.0745 3.81619 18.6033 1.88826 18.0035 0.877235C17.8661 0.670049 17.7353 0.457385 17.6116 0.232767C17.6116 0.232767 17.599 0.189437 17.6203 0.189437H23.596C25.5956 0.189437 26.4285 0.31096 27.3137 0.651622C27.5226 0.728321 27.7401 0.822949 27.9708 0.928036C29.2539 1.52071 30.1234 2.58254 30.4712 3.94469C30.5229 4.13245 30.5558 4.33316 30.5842 4.53387C30.6233 4.79833 30.6456 5.07375 30.6456 5.35863C30.6496 7.47681 29.5758 8.68457 28.0904 9.53025C28.0884 9.53373 28.064 9.54768 28.064 9.54768C28.0438 9.55515 28.0438 9.55515 28.0321 9.56461C28.0157 9.57253 28.0011 9.58119 27.9875 9.58934C27.9788 9.59452 27.9704 9.59951 27.9621 9.60396C27.9576 9.60396 27.9358 9.61989 27.9358 9.61989C27.7624 9.70556 27.592 9.75835 27.4334 9.7967C27.4084 9.80175 27.3845 9.80809 27.3621 9.81403C27.3426 9.8192 27.3241 9.82411 27.3071 9.82758V5.65547C27.2524 4.36952 26.1005 4.03334 25.4379 4.03334C25.4169 4.03334 25.3953 4.03356 25.373 4.03379C25.3005 4.03452 25.2212 4.03533 25.1347 4.02886Z" fill="#121212"/> +<path d="M20.695 8.87273C19.6881 8.91108 19.5908 9.823 19.5791 10.0018V12.6922H23.3607C23.6794 13.1524 23.9965 13.6079 24.2914 14.0314L24.6266 14.5131C25.0525 15.1152 25.4611 15.6835 25.631 15.9011C25.6425 15.9162 25.656 15.935 25.6718 15.957C25.8865 16.2559 26.5331 17.1565 28.7661 17.6951C29.5831 17.8911 30.4832 17.9494 30.9867 17.982C31.0779 17.9879 31.1566 17.993 31.2189 17.9979L31.443 18.0088L31.4192 17.966C31.4192 17.966 31.0146 17.4152 30.5035 16.5466L30.3922 16.3571C29.6886 15.16 27.3022 11.0997 26.8442 10.3071C26.4315 9.5924 25.7744 9.27415 25.1022 9.08091H25.0956C24.614 8.94943 24.0852 8.89913 23.6892 8.8792C23.6717 8.87848 23.6546 8.87743 23.6375 8.87638C23.6076 8.87455 23.5779 8.87273 23.5473 8.87273H20.695Z" fill="#121212"/> +</svg> diff --git a/src/assets/png/badges/CHA00000001-1.png b/src/assets/png/badges/CHA00000001-1.png new file mode 100644 index 0000000000000000000000000000000000000000..bfe6fb3c24e6cfa36b612e68e75681c03e738e51 Binary files /dev/null and b/src/assets/png/badges/CHA00000001-1.png differ diff --git a/src/assets/png/badges/CHA00000002-0.png b/src/assets/png/badges/CHA00000002-0.png new file mode 100644 index 0000000000000000000000000000000000000000..bad09c3516c15277abd6b9adc44b4653ec40abb2 Binary files /dev/null and b/src/assets/png/badges/CHA00000002-0.png differ diff --git a/src/assets/png/badges/CHA00000002-1.png b/src/assets/png/badges/CHA00000002-1.png new file mode 100644 index 0000000000000000000000000000000000000000..e16bba433ca3ece0ba70d5f0435443e57bcba00b Binary files /dev/null and b/src/assets/png/badges/CHA00000002-1.png differ diff --git a/src/assets/png/badges/CHA00000003-0.png b/src/assets/png/badges/CHA00000003-0.png new file mode 100644 index 0000000000000000000000000000000000000000..bad09c3516c15277abd6b9adc44b4653ec40abb2 Binary files /dev/null and b/src/assets/png/badges/CHA00000003-0.png differ diff --git a/src/assets/png/badges/CHA00000003-1.png b/src/assets/png/badges/CHA00000003-1.png new file mode 100644 index 0000000000000000000000000000000000000000..e16bba433ca3ece0ba70d5f0435443e57bcba00b Binary files /dev/null and b/src/assets/png/badges/CHA00000003-1.png differ diff --git a/src/assets/png/badges/available-big.png b/src/assets/png/badges/available-big.png new file mode 100644 index 0000000000000000000000000000000000000000..69cd35624d3fdb34afc66462f3019718ce2dd11d Binary files /dev/null and b/src/assets/png/badges/available-big.png differ diff --git a/src/assets/png/badges/available.png b/src/assets/png/badges/available.png new file mode 100644 index 0000000000000000000000000000000000000000..62cf953e58d199ff75e2e1d404cb6f114e3d1d20 Binary files /dev/null and b/src/assets/png/badges/available.png differ diff --git a/src/assets/png/badges/default.png b/src/assets/png/badges/default.png new file mode 100644 index 0000000000000000000000000000000000000000..eb5b58b0cdcab03bad8c2bd4bfa236e3440744cb Binary files /dev/null and b/src/assets/png/badges/default.png differ diff --git a/src/assets/png/badges/locked-big.png b/src/assets/png/badges/locked-big.png new file mode 100644 index 0000000000000000000000000000000000000000..00b793f6fdc6d1cd000ff53b9fa793305456140d Binary files /dev/null and b/src/assets/png/badges/locked-big.png differ diff --git a/src/assets/png/badges/locked.png b/src/assets/png/badges/locked.png new file mode 100644 index 0000000000000000000000000000000000000000..eb5b58b0cdcab03bad8c2bd4bfa236e3440744cb Binary files /dev/null and b/src/assets/png/badges/locked.png differ diff --git a/src/assets/png/badges/ongoing.png b/src/assets/png/badges/ongoing.png new file mode 100644 index 0000000000000000000000000000000000000000..461d35a370577017a270088cd71cf3d611eccb99 Binary files /dev/null and b/src/assets/png/badges/ongoing.png differ diff --git a/src/assets/png/challenge/star.png b/src/assets/png/challenge/star.png new file mode 100644 index 0000000000000000000000000000000000000000..c2335b8ccdfd7eb670e9f2585bffd79307e41d50 Binary files /dev/null and b/src/assets/png/challenge/star.png differ diff --git a/src/components/ContentComponents/KonnectorViewer/picto-failure.png b/src/assets/png/picto/picto-failure.png similarity index 100% rename from src/components/ContentComponents/KonnectorViewer/picto-failure.png rename to src/assets/png/picto/picto-failure.png diff --git a/src/components/CommonKit/Button/StyledOauthButton.tsx b/src/components/CommonKit/Button/StyledAuthButton.tsx similarity index 85% rename from src/components/CommonKit/Button/StyledOauthButton.tsx rename to src/components/CommonKit/Button/StyledAuthButton.tsx index 9e3e6ebec877d7a900ecaf5aa700404893b6f067..fd8a20d8bad972173014f480e29f7d1a02e5e9a5 100644 --- a/src/components/CommonKit/Button/StyledOauthButton.tsx +++ b/src/components/CommonKit/Button/StyledAuthButton.tsx @@ -36,6 +36,9 @@ const BaseButton = withStyles({ fontSize: '1rem', lineHeight: '120%', }, + disabled: { + opacity: '0.6', + }, })(MuiButton) const PrimaryButton = withStyles({ @@ -46,6 +49,9 @@ const PrimaryButton = withStyles({ color: '#000000', fontWeight: 'bold', }, + disabled: { + background: 'var(--multiColorRadialGradient) !important', + }, })(BaseButton) const SecondaryButton = withStyles({ @@ -71,7 +77,7 @@ function MyButton(props: ButtonProps) { ) } -const StyledOauthButton: React.ComponentType<ButtonProps> = props => { +const StyledAuthButton: React.ComponentType<ButtonProps> = props => { return ( <> <MuiThemeProvider theme={theme}> @@ -81,8 +87,8 @@ const StyledOauthButton: React.ComponentType<ButtonProps> = props => { ) } -StyledOauthButton.defaultProps = { +StyledAuthButton.defaultProps = { color: 'primary', } -export default StyledOauthButton +export default StyledAuthButton diff --git a/src/components/CommonKit/Button/StyledButton.tsx b/src/components/CommonKit/Button/StyledButton.tsx index 645119f8931c0d59e320aa137be9de04eff400d3..a460cc4f76c47539cd0f81538bfea522450211ed 100644 --- a/src/components/CommonKit/Button/StyledButton.tsx +++ b/src/components/CommonKit/Button/StyledButton.tsx @@ -36,6 +36,9 @@ const BaseButton = withStyles({ fontSize: '1rem', lineHeight: '120%', }, + disabled: { + opacity: '0.6', + }, })(MuiButton) const PrimaryButton = withStyles({ @@ -46,6 +49,9 @@ const PrimaryButton = withStyles({ color: '#000000', fontWeight: 'bold', }, + disabled: { + background: 'var(--multiColorRadialGradient) !important', + }, })(BaseButton) const SecondaryButton = withStyles({ diff --git a/src/components/CommonKit/Button/StyledClearGreyButton.tsx b/src/components/CommonKit/Button/StyledClearGreyButton.tsx index 687772a66cd9c8538702edf29aecb78927bd6176..a825276ceeb564cccb66ad1e522c151ceb3f9eb9 100644 --- a/src/components/CommonKit/Button/StyledClearGreyButton.tsx +++ b/src/components/CommonKit/Button/StyledClearGreyButton.tsx @@ -13,6 +13,9 @@ const color = window .trim() const theme = createMuiTheme({ + typography: { + useNextVariants: true, + }, shape: { borderRadius: 2, }, diff --git a/src/components/CommonKit/SVG/EcogesturesSVG.tsx b/src/components/CommonKit/SVG/EcogesturesSVG.tsx deleted file mode 100644 index 7d173550bfcc931ada022a46c4e8302cb27f4e4a..0000000000000000000000000000000000000000 --- a/src/components/CommonKit/SVG/EcogesturesSVG.tsx +++ /dev/null @@ -1,32 +0,0 @@ -import { EcogesturesIcon } from 'enum/ecogestureIcon.enum' -import AccelerateurSVG from 'assets/icons/visu/ecogesture/accelerateur.svg' -import CasqueSVG from 'assets/icons/visu/ecogesture/casque.svg' -import CymbalSVG from 'assets/icons/visu/ecogesture/cymbal.svg' -import ElectroSVG from 'assets/icons/visu/ecogesture/electro.svg' -import FrerotsSVG from 'assets/icons/visu/ecogesture/frerots.svg' -import HibernationSVG from 'assets/icons/visu/ecogesture/hibernation.svg' -import PoingsSVG from 'assets/icons/visu/ecogesture/poings.svg' -import VaisselleSVG from 'assets/icons/visu/ecogesture/vaisselle.svg' - -export const getEcogestureIconSVG = (iconName: string) => { - switch (iconName) { - case EcogesturesIcon.ACCELEREATEUR: - return AccelerateurSVG - case EcogesturesIcon.CASQUE: - return CasqueSVG - case EcogesturesIcon.CYMBAL: - return CymbalSVG - case EcogesturesIcon.ELECTRO: - return ElectroSVG - case EcogesturesIcon.FREROTS: - return FrerotsSVG - case EcogesturesIcon.HIBERNATION: - return HibernationSVG - case EcogesturesIcon.POINGS: - return PoingsSVG - case EcogesturesIcon.VAISSELLE: - return VaisselleSVG - default: - return null - } -} diff --git a/src/components/ContainerComponents/FluidChartContainer/FluidChartContainer.tsx b/src/components/ContainerComponents/FluidChartContainer/FluidChartContainer.tsx index 9ba4a0a1788f6c25519ccde22bad6da27e593862..679caa1b4021a3b570cd626d5206f16de97060aa 100644 --- a/src/components/ContainerComponents/FluidChartContainer/FluidChartContainer.tsx +++ b/src/components/ContainerComponents/FluidChartContainer/FluidChartContainer.tsx @@ -7,6 +7,7 @@ import { TimeStep } from 'services/dataConsumptionContracts' import { TypeChallenge, UserChallenge } from 'services/dataChallengeContracts' import ConsumptionDataManager from 'services/consumptionDataManagerService' import FluidChartContent from 'components/ContentComponents/FluidChart/FluidChartContent' +import ActivateHalfHourLoad from 'components/ContentComponents/ConsumptionNavigator/ActivateHalfHourLoad' interface FluidChartContainerProps { timeStep: TimeStep @@ -32,6 +33,7 @@ const FluidChartContainer: React.FC<FluidChartContainerProps> = ({ const [lastDateWithAllData, setLastDateWithAllData] = useState<DateTime>( DateTime.local() ) + const [isMinuteBlocked, setMinuteBlocked] = useState<boolean>(false) const [referenceDate, setReferenceDate] = useState<DateTime>(DateTime.local()) const [isLoaded, setIsLoaded] = useState<boolean>(false) const [challenge, setChallenge] = useState<UserChallenge | null>(null) @@ -46,6 +48,11 @@ const FluidChartContainer: React.FC<FluidChartContainerProps> = ({ useEffect(() => { let subscribed = true async function loadData() { + const activateHalfHourLoad = !(await consumptionDataManager.checkDoctypeEntries( + FluidType.ELECTRICITY, + TimeStep.HALF_AN_HOUR + )) + const data = await consumptionDataManager.fetchLastDateData(fluidTypes) const dataWithAllFluids = await consumptionDataManager.fetchLastDateData( fluidTypes, @@ -58,6 +65,9 @@ const FluidChartContainer: React.FC<FluidChartContainerProps> = ({ if (subscribed && dataWithAllFluids) { setLastDateWithAllData(dataWithAllFluids) } + if (subscribed && activateHalfHourLoad) { + setMinuteBlocked(true) + } if (subscribed && currentChallenge) { if ( currentChallenge.challengeType && @@ -103,22 +113,27 @@ const FluidChartContainer: React.FC<FluidChartContainerProps> = ({ return ( <> {isLoaded ? ( - <div className="fc-root"> - <div className="fc-content"> - <FluidChartContent - referenceDate={referenceDate} - lastDataDate={lastDataDate} - lastDateWithAllData={lastDateWithAllData} - fluidTypes={fluidTypes} - timeStep={timeStep} - multiFluid={multiFluid} - currentChallenge={challenge} - consumptionDataManager={consumptionDataManager} - isDataLoaded={isLoaded} - handleDetailedDate={handleDetailedDate} - ></FluidChartContent> + <> + {isMinuteBlocked && timeStep === TimeStep.HALF_AN_HOUR && ( + <ActivateHalfHourLoad /> + )} + <div className="fc-root"> + <div className="fc-content"> + <FluidChartContent + referenceDate={referenceDate} + lastDataDate={lastDataDate} + lastDateWithAllData={lastDateWithAllData} + fluidTypes={fluidTypes} + timeStep={timeStep} + multiFluid={multiFluid} + currentChallenge={challenge} + consumptionDataManager={consumptionDataManager} + isDataLoaded={isLoaded} + handleDetailedDate={handleDetailedDate} + ></FluidChartContent> + </div> </div> - </div> + </> ) : null} </> ) diff --git a/src/components/ContainerComponents/Header/Header.tsx b/src/components/ContainerComponents/Header/Header.tsx index 4a480d809febb585e8ea728ba2f8a68477200f7c..e0d487f600c86ebdecc9bf87be06f7f6f2abc11f 100644 --- a/src/components/ContainerComponents/Header/Header.tsx +++ b/src/components/ContainerComponents/Header/Header.tsx @@ -4,7 +4,6 @@ import { history } from 'components/ContainerComponents/ViewContainer/ViewContai import { withClient, Client } from 'cozy-client' import { ScreenType } from 'enum/screen.enum' import { AppContext } from 'components/Contexts/AppContextProvider' -import useInstanceSettings from 'components/Hooks/userInstanceSettings' import BackArrowIcon from 'assets/icons/ico/back-arrow.svg' import StyledIconButton from 'components/CommonKit/IconButton/StyledIconButton' @@ -29,7 +28,6 @@ const Header: React.FC<HeaderProps> = ({ }: HeaderProps) => { const header = useRef(null) const { screenType } = useContext(AppContext) - const { data: instanceSettings } = useInstanceSettings(client) const cozyBarHeight = 48 const headerBottomHeight = 8 diff --git a/src/components/ContainerComponents/ViewContainer/AvailableChallengeDetailsViewContainer.tsx b/src/components/ContainerComponents/ViewContainer/AvailableChallengeDetailsViewContainer.tsx index 4167ee49f1cb88cf9bdb4897a842b51d3ea96e41..a2244366c2bb8f76a0cb1c2ae7b7d3016f6e14a1 100644 --- a/src/components/ContainerComponents/ViewContainer/AvailableChallengeDetailsViewContainer.tsx +++ b/src/components/ContainerComponents/ViewContainer/AvailableChallengeDetailsViewContainer.tsx @@ -8,12 +8,11 @@ import { history } from 'components/ContainerComponents/ViewContainer/ViewContai import { ChallengeType, UserChallenge } from 'services/dataChallengeContracts' import { Redirect } from 'react-router-dom' import StyledSpinner from 'components/CommonKit/Spinner/StyledSpinner' -import StyledIconButton from 'components/CommonKit/IconButton/StyledIconButton' -import AvailableChallengeIcon from 'assets/icons/badges/available-big.svg' import ChallengeManager from 'services/challengeDataManagerService' import { Client, withClient } from 'cozy-client' import StyledButtonValid from 'components/CommonKit/Button/StyledButtonValid' import { ScreenType } from 'enum/screen.enum' +import AvailableChallengeIcon from 'assets/png/badges/available.png' interface AvailableChallengeDetailsViewProps { location: any @@ -96,11 +95,11 @@ const AvailableChallengeDetailsViewContainer: React.FC<AvailableChallengeDetails <div className="cp-content"> <div className="cp-info --available"> <div className="cp-title text-22-bold">{challenge.title}</div> - <StyledIconButton + <img className="cp-icon" - icon={AvailableChallengeIcon} - size={screenType === ScreenType.MOBILE ? 150 : 220} - /> + src={AvailableChallengeIcon} + width={screenType === ScreenType.MOBILE ? 180 : 300} + ></img> <div className="cp-description text-16-bold"> {challenge.description} </div> diff --git a/src/components/ContainerComponents/ViewContainer/FinishedChallengeDetailsViewContainer.tsx b/src/components/ContainerComponents/ViewContainer/FinishedChallengeDetailsViewContainer.tsx index d2950a971658fefee61bb962b04552e54ddc310c..8be12a7ec3835b5dfed627bff6ad3143bb26e2b8 100644 --- a/src/components/ContainerComponents/ViewContainer/FinishedChallengeDetailsViewContainer.tsx +++ b/src/components/ContainerComponents/ViewContainer/FinishedChallengeDetailsViewContainer.tsx @@ -9,9 +9,7 @@ import { BadgeState, } from 'services/dataChallengeContracts' import StyledSpinner from 'components/CommonKit/Spinner/StyledSpinner' -import StyledIconButton from 'components/CommonKit/IconButton/StyledIconButton' -import DefaultChallengeIcon from 'assets/icons/badges/default.svg' -import StarIcon from 'assets/icons/visu/challenge/star.svg' +import StarIcon from 'assets/png/challenge/star.png' import EcogestureModal from 'components/ContentComponents/EcogestureModal/EcogestureModal' import EcogestureCard from 'components/ContentComponents/EcogestureCard/EcogestureCard' import { Client, withClient } from 'cozy-client' @@ -19,7 +17,6 @@ import { Redirect } from 'react-router-dom' import { formatNumberValues } from 'utils/utils' import { AppContext } from 'components/Contexts/AppContextProvider' import { ScreenType } from 'enum/screen.enum' -import StyledIcon from 'components/CommonKit/Icon/StyledIcon' interface FinishedChallengeDetailsViewProps { location: any @@ -40,10 +37,15 @@ const FinishedChallengeDetailsViewContainer: React.FC<FinishedChallengeDetailsVi const { screenType } = useContext(AppContext) async function importRightBadge(id: string, badgeStatus: number) { - // Les svg doivent être au format idchallenge-badgestate.svg - const importedBadge = await import( - /* webpackMode: "eager" */ `assets/icons/badges/${id}-${badgeStatus}.svg` - ) + // Les png doivent être au format idchallenge-badgestate.png + const importedBadge = + id === 'CHA00000001' + ? await import( + /* webpackMode: "eager" */ `assets/png/badges/${id}-1.png` + ) + : await import( + /* webpackMode: "eager" */ `assets/png/badges/${id}-${badgeStatus}.png` + ) setBadgeIcon(importedBadge.default) } @@ -114,20 +116,26 @@ const FinishedChallengeDetailsViewContainer: React.FC<FinishedChallengeDetailsVi </div> ) ) : null} - <div className="cp-win-badge-star"> - <StyledIcon - className="cp-win-badge" - icon={badgeIcon ? badgeIcon : DefaultChallengeIcon} - size={screenType === ScreenType.MOBILE ? 150 : 200} - /> - {challenge.badge === BadgeState.SUCCESS ? ( - <StyledIcon + {challenge.badge === BadgeState.SUCCESS ? ( + <div className="cp-win-badge-star"> + <img + className="cp-win-badge" + src={badgeIcon} + width={screenType === ScreenType.MOBILE ? 200 : 300} + ></img> + <img className="cp-win-star" - icon={StarIcon} - size={screenType === ScreenType.MOBILE ? 220 : 300} - /> - ) : null} - </div> + src={StarIcon} + width={screenType === ScreenType.MOBILE ? 380 : 480} + ></img> + </div> + ) : ( + <img + className="cp-win-badge" + src={badgeIcon} + width={screenType === ScreenType.MOBILE ? 200 : 300} + ></img> + )} <div className="cp-description text-16-bold"> {challenge.challengeType && challenge.challengeType.description} diff --git a/src/components/ContainerComponents/ViewContainer/LockedChallengeDetailsViewContainer.tsx b/src/components/ContainerComponents/ViewContainer/LockedChallengeDetailsViewContainer.tsx index b30b34814519907c9d8b35d389e503ea56671453..36ee470b0237383ca94810b6ee5b4227c7bf15ca 100644 --- a/src/components/ContainerComponents/ViewContainer/LockedChallengeDetailsViewContainer.tsx +++ b/src/components/ContainerComponents/ViewContainer/LockedChallengeDetailsViewContainer.tsx @@ -7,12 +7,11 @@ import { history } from 'components/ContainerComponents/ViewContainer/ViewContai import { ChallengeType } from 'services/dataChallengeContracts' import { Redirect } from 'react-router-dom' import StyledSpinner from 'components/CommonKit/Spinner/StyledSpinner' -import StyledIconButton from 'components/CommonKit/IconButton/StyledIconButton' -import LockedChallengeIcon from 'assets/icons/badges/locked-big.svg' import { Client, withClient } from 'cozy-client' import StyledButtonValid from 'components/CommonKit/Button/StyledButtonValid' import { AppContext } from 'components/Contexts/AppContextProvider' import { ScreenType } from 'enum/screen.enum' +import LockedChallengeIcon from 'assets/png/badges/locked-big.png' interface LockedChallengeDetailsViewProps { location: any @@ -60,14 +59,15 @@ const LockedChallengeDetailsViewContainer: React.FC<LockedChallengeDetailsViewPr <div className="cp-content --locked"> <div className="cp-info"> <div className="cp-title text-22-bold">{challenge.title}</div> - - <StyledIconButton + <img className="cp-icon" - icon={LockedChallengeIcon} - size={screenType === ScreenType.MOBILE ? 150 : 250} - /> + src={LockedChallengeIcon} + width={screenType === ScreenType.MOBILE ? 180 : 220} + ></img> <div className="cp-description text-16-bold"> - {t('CHALLENGE.LOCKED')} + {challenge.level < 900 + ? t('CHALLENGE.LOCKED') + : t('CHALLENGE.FULLY_LOCKED')} </div> </div> <div className="cp-valid-locked"> diff --git a/src/components/ContainerComponents/ViewContainer/OngoingChallengeDetailsViewContainer.tsx b/src/components/ContainerComponents/ViewContainer/OngoingChallengeDetailsViewContainer.tsx index a84750094db7d75a37506ac9bb518b1adb7a6973..a1e1417e3012ff763bc55b35a01fbc90e57544f9 100644 --- a/src/components/ContainerComponents/ViewContainer/OngoingChallengeDetailsViewContainer.tsx +++ b/src/components/ContainerComponents/ViewContainer/OngoingChallengeDetailsViewContainer.tsx @@ -5,7 +5,11 @@ import CozyBar from 'components/ContainerComponents/CozyBar/CozyBar' import Header from 'components/ContainerComponents/Header/Header' import Content from 'components/ContainerComponents/Content/Content' import { history } from 'components/ContainerComponents/ViewContainer/ViewContainer' -import { UserChallenge, ChallengeState } from 'services/dataChallengeContracts' +import { + UserChallenge, + ChallengeState, + TypeChallenge, +} from 'services/dataChallengeContracts' import { Redirect } from 'react-router-dom' import StyledSpinner from 'components/CommonKit/Spinner/StyledSpinner' import EcogestureModal from 'components/ContentComponents/EcogestureModal/EcogestureModal' @@ -14,11 +18,11 @@ import ChallengeManager from 'services/challengeDataManagerService' import { Client, withClient } from 'cozy-client' import StyledStopButton from 'components/CommonKit/Button/StyledStopButton' import { formatCompareChallengeDate } from 'utils/utils' -import AvailableChallengeIcon from 'assets/icons/badges/available-big.svg' import OngoingChallengePile from 'components/ContentComponents/Challenge/OngoingChallengePile' import OngoingChallengeViewingDate from 'components/ContentComponents/Challenge/OngoingChallengeViewingDate' import FollowChallengeTimeline from 'components/ContentComponents/Challenge/FollowChallengeTimeline' -import StyledIcon from 'components/CommonKit/Icon/StyledIcon' +import AvailableChallengeIcon from 'assets/png/badges/available.png' +import { ScreenType } from 'enum/screen.enum' interface OngoingChallengeDetailsViewProps { location: any @@ -34,7 +38,7 @@ const OngoingChallengeDetailsViewContainer: React.FC<OngoingChallengeDetailsView const client = props.client const challengeManager = new ChallengeManager(client) - const { refreshCurrentChallenge } = useContext(AppContext) + const { refreshCurrentChallenge, screenType } = useContext(AppContext) const [challengeEcogesture, setChallengeEcogesture] = useState<number>(0) const [openEcogestureModal, setOpenEcogestureModal] = useState(false) const [challenge, setChallenge] = useState<UserChallenge | null>(null) @@ -96,12 +100,12 @@ const OngoingChallengeDetailsViewContainer: React.FC<OngoingChallengeDetailsView {challenge.challengeType && challenge.challengeType.title} </div> {challenge.challengeType && - challenge.challengeType.type === 1 ? ( - <StyledIcon + challenge.challengeType.type === TypeChallenge.ACHIEVEMENT ? ( + <img className="cp-icon-available" - icon={AvailableChallengeIcon} - size={100} - /> + src={AvailableChallengeIcon} + width={screenType === ScreenType.MOBILE ? 180 : 250} + ></img> ) : ( <div className="cp-follow"> {maxEnergy && maxEnergy === -1 && ( diff --git a/src/components/ContainerComponents/WelcomeModalContainer/WelcomeModalContainer.tsx b/src/components/ContainerComponents/WelcomeModalContainer/WelcomeModalContainer.tsx index 9acb933822ab33313210e9efe5152d0e4adb1669..c96bd78edca5cfaec7529b1652eec5936b6df271 100644 --- a/src/components/ContainerComponents/WelcomeModalContainer/WelcomeModalContainer.tsx +++ b/src/components/ContainerComponents/WelcomeModalContainer/WelcomeModalContainer.tsx @@ -3,7 +3,7 @@ import { withClient, Client } from 'cozy-client' import Modal from 'components/CommonKit/Modal/Modal' import StyledButton from 'components/CommonKit/Button/StyledButton' import { translate } from 'cozy-ui/react/I18n' -import useInstanceSettings from 'components/Hooks/userInstanceSettings' +import userInstanceSettings from 'components/Hooks/userInstanceSettings' interface WelcomeModalContainerProps { handleClose: () => void @@ -16,7 +16,7 @@ const WelcomeModalContainer: React.FC<WelcomeModalContainerProps> = ({ t, client, }: WelcomeModalContainerProps) => { - const { data: instanceSettings } = useInstanceSettings(client) + const { data: instanceSettings } = userInstanceSettings(client) return ( <React.Fragment> diff --git a/src/components/ContentComponents/Challenge/FollowChallengeTimeline.tsx b/src/components/ContentComponents/Challenge/FollowChallengeTimeline.tsx index ff67a7123da8c8b3d31e1909f4e8784fbc667969..9dd90d335fda5b9adbf18bf4369d962595f0e860 100644 --- a/src/components/ContentComponents/Challenge/FollowChallengeTimeline.tsx +++ b/src/components/ContentComponents/Challenge/FollowChallengeTimeline.tsx @@ -35,12 +35,42 @@ const FollowChallengeTimeline: React.FC<FollowChallengeTimelineViewProps> = ({ const startingDate = DateTime.fromISO(challenge.startingDate.toString()) const listOfChallengeDays = [] let i = 0 - while (challenge.challengeType.duration.days > i) { + if (challenge.challengeType.duration.days === 7) { + while (challenge.challengeType.duration.days > i) { + listOfChallengeDays.push({ + letter: startingDate + .plus({ days: i }) + .weekdayShort[0].toUpperCase(), + date: startingDate.plus({ days: i }).day, + }) + i++ + } + } else { + while (challenge.challengeType.duration.days >= i) { + listOfChallengeDays.push({ + letter: '', + date: startingDate.plus({ days: i }).toFormat('dd/MM'), + }) + i += 7 + } + } + return listOfChallengeDays + } else { + return [] + } + } + + const getListOfWeeks = () => { + if (challenge && challenge.challengeType) { + const startingDate = DateTime.fromISO(challenge.startingDate.toString()) + const listOfChallengeDays = [] + let i = 0 + while (challenge.challengeType.duration.days >= i) { listOfChallengeDays.push({ - letter: startingDate.plus({ days: i }).weekdayShort[0].toUpperCase(), - date: startingDate.plus({ days: i }).day, + letter: '', + date: startingDate.plus({ days: i }).toFormat('dd/MM'), }) - i++ + i += 7 } return listOfChallengeDays } else { @@ -58,36 +88,75 @@ const FollowChallengeTimeline: React.FC<FollowChallengeTimelineViewProps> = ({ return 0 } } else { - return 0 + if (challenge) { + return -Interval.fromDateTimes(DateTime.local(), viewingDate()).count( + 'days' + ) + } else { + return 0 + } } } + const generateTimelinePart = ( + index: number, + dayCount: number, + className: string + ) => { + return ( + <div + className={`${className} ${ + (index === 0 && dayCount > 0) || + (index === getListOfWeeks().length - 1 && dayCount < 0) + ? 'none' + : index * 7 < getListOfPastDays() + dayCount + ? 'past' + : 'futur' + }`} + ></div> + ) + } + + const monthChallenge = () => { + return getListOfWeeks().map((day, index) => ( + <div key={index} className="day-solo"> + <div className="day-line-label"> + {generateTimelinePart(index, 3, 'date-dash')} + {generateTimelinePart(index, 2, 'date-dash')} + {generateTimelinePart(index, 1, 'date-dash')} + {generateTimelinePart(index, 0, 'date-label')} + {generateTimelinePart(index, -1, 'date-dash')} + {generateTimelinePart(index, -2, 'date-dash')} + {generateTimelinePart(index, -3, 'date-dash')} + </div> + <div className="day-letter">{day.letter}</div> + <div className="day-date">{day.date}</div> + </div> + )) + } + + const weekChallenge = () => { + return getListOfDays().map((day, index) => ( + <div key={index} className="day-solo"> + <div className="day-line-label"> + {generateTimelinePart(index, 0, 'date-dash')} + {generateTimelinePart(index, 0, 'date-label')} + {generateTimelinePart(index + 1, 0, 'date-dash')} + </div> + <div className="day-letter">{day.letter}</div> + <div className="day-date">{day.date}</div> + </div> + )) + } + return ( <React.Fragment> <div className="list-of-days-duration"> - {getListOfDays().map((day, index) => ( - <div key={index} className="day-solo"> - <div className="day-line-label"> - <div - className={`date-dash ${ - index < getListOfPastDays() ? 'past' : 'futur' - }`} - ></div> - <div - className={`date-label ${ - index < getListOfPastDays() ? 'past' : 'futur' - }`} - ></div> - <div - className={`date-dash ${ - index + 1 < getListOfPastDays() ? 'past' : 'futur' - }`} - ></div> - </div> - <div className="day-letter">{day.letter}</div> - <div className="day-date">{day.date}</div> - </div> - ))} + {challenge && + challenge.challengeType && + challenge.challengeType.duration.days === 7 + ? weekChallenge() + : monthChallenge()} </div> </React.Fragment> ) diff --git a/src/components/ContentComponents/ChallengeList/ChallengeListItem.tsx b/src/components/ContentComponents/ChallengeList/ChallengeListItem.tsx index e7a632ec05426dbfaaadcbad04f5ceddee7efa59..c533747de344be36a566cd18369ac85e98fc9061 100644 --- a/src/components/ContentComponents/ChallengeList/ChallengeListItem.tsx +++ b/src/components/ContentComponents/ChallengeList/ChallengeListItem.tsx @@ -9,10 +9,10 @@ import StyledIcon from 'components/CommonKit/Icon/StyledIcon' import ChevronGrey from 'assets/icons/ico/chevron-right-grey.svg' import ChevronBlue from 'assets/icons/ico/chevron-right-blue.svg' import ChevronDarkBlue from 'assets/icons/ico/chevron-right-darkblue.svg' -import LockedChallengeIcon from 'assets/icons/badges/locked.svg' -import AvailableChallengeIcon from 'assets/icons/badges/available.svg' -import OngoingChallengeIcon from 'assets/icons/badges/ongoing.svg' -import DefaultChallengeIcon from 'assets/icons/badges/default.svg' +import LockedChallengeIcon from 'assets/png/badges/locked.png' +import AvailableChallengeIcon from 'assets/png/badges/available.png' +import OngoingChallengeIcon from 'assets/png/badges/ongoing.png' +import DefaultChallengeIcon from 'assets/png/badges/default.png' import { NavLink } from 'react-router-dom' interface ChallengeListItemProps { @@ -33,12 +33,18 @@ const ChallengeListItem: React.FC<ChallengeListItemProps> = ({ const [badgeIcon, setBadgeIcon] = useState<any | null>(null) async function importRightBadge(id: string, badgeStatus: number) { - // Les svg doivent être au format idchallenge-badgestate.svg - const importedBadge = await import( - /* webpackMode: "eager" */ `assets/icons/badges/${id}-${badgeStatus}.svg` - ) + // Les png doivent être au format idchallenge-badgestate.png + const importedBadge = + id === 'CHA00000001' + ? await import( + /* webpackMode: "eager" */ `assets/png/badges/${id}-1.png` + ) + : await import( + /* webpackMode: "eager" */ `assets/png/badges/${id}-${badgeStatus}.png` + ) setBadgeIcon(importedBadge.default) } + const defineBadge = () => { return challengeState === 'locked' ? LockedChallengeIcon @@ -71,11 +77,11 @@ const ChallengeListItem: React.FC<ChallengeListItemProps> = ({ <div className={`cli cli-${challengeState}`}> <div className="cli-left"> <div className="cli-content"> - <StyledIcon + <img className="cli-content-icon" - icon={defineBadge() ? defineBadge() : DefaultChallengeIcon} - size={62} - /> + src={defineBadge() ? defineBadge() : DefaultChallengeIcon} + width={62} + ></img> <div className={`cli-content-title`}> {challengeState === 'available' && ( <div className={`subtitle-${challengeState} text-16-normal`}> diff --git a/src/components/ContentComponents/ChallengeList/ChallengesList.tsx b/src/components/ContentComponents/ChallengeList/ChallengesList.tsx index 22db63076d0bfb249077eb6e4620ef19fc4922e0..46c71e6a2a1b9d196c22ba3ec965492e0fbc1269 100644 --- a/src/components/ContentComponents/ChallengeList/ChallengesList.tsx +++ b/src/components/ContentComponents/ChallengeList/ChallengesList.tsx @@ -1,4 +1,4 @@ -import React, { useState, useEffect, useContext, useRef } from 'react' +import React, { useState, useEffect, useContext } from 'react' import { withClient, Client } from 'cozy-client' import { ChallengeType, @@ -36,10 +36,11 @@ const ChallengesList: React.FC<ChallengesListProps> = ({ const [openChallengeModal, setOpenChallengeModal] = useState(false) const [scroll, setScroll] = useState(0) const [paddingBottom, setPaddingBottom] = useState(0) + const [userLevel, setUserLevel] = useState<null | number>(null) const handleCloseClick = () => { - setOpenChallengeModal(false) setOngoingChallenge(null) + setOpenChallengeModal(false) } const setRightChallengeInTheMiddle = ( @@ -87,8 +88,8 @@ const ChallengesList: React.FC<ChallengesListProps> = ({ fluidTypes ) const dataAllUC = await challengeManager.getAllUserChallenges() - - if (subscribed && dataAllCT && dataAllUC) { + const levelOfUser = await challengeManager.getUserLevel() + if (subscribed && dataAllCT && dataAllUC && levelOfUser) { const ongoingChallengeTmp = dataAllUC.filter( challenge => challenge.state === ChallengeState.ONGOING )[0] @@ -96,7 +97,7 @@ const ChallengesList: React.FC<ChallengesListProps> = ({ setChallengesType(dataAllCT) setUserChallenges(dataAllUC) setOngoingChallenge(ongoingChallengeTmp) - + setUserLevel(levelOfUser) if ( await challengeManager.isChallengeOver( ongoingChallengeTmp, @@ -122,10 +123,12 @@ const ChallengesList: React.FC<ChallengesListProps> = ({ fluidTypes ) const dataAllUC = await challengeManager.getAllUserChallenges() - if (subscribed && dataAllCT && dataAllUC) { + const levelOfUser = await challengeManager.getUserLevel() + if (subscribed && dataAllCT && dataAllUC && levelOfUser) { setChallengesType(dataAllCT) setUserChallenges(dataAllUC) setRightChallengeInTheMiddle(dataAllCT, dataAllUC) + setUserLevel(levelOfUser) } } loadNewChallengesType() @@ -154,7 +157,10 @@ const ChallengesList: React.FC<ChallengesListProps> = ({ style={{ paddingBottom: paddingBottom }} > {challengesType.map((challenge, index) => - index === challengesType.length - 1 && !ongoingChallenge ? ( + index === challengesType.length - 1 && + !ongoingChallenge && + userLevel === + challengesType[challengesType.length - 1].level ? ( <ChallengeListItem key={index} challenge={challenge} diff --git a/src/components/ContentComponents/ChallengeModal/ChallengeModal.tsx b/src/components/ContentComponents/ChallengeModal/ChallengeModal.tsx index b94b8cd4a63cc6f1430f60383372a9add6cb4b7c..b1456acf4026379b6d6a5219d18a65ece2cdee6d 100644 --- a/src/components/ContentComponents/ChallengeModal/ChallengeModal.tsx +++ b/src/components/ContentComponents/ChallengeModal/ChallengeModal.tsx @@ -3,7 +3,7 @@ import { translate } from 'cozy-ui/react/I18n' import { UserChallenge } from 'services/dataChallengeContracts' import Modal from 'components/CommonKit/Modal/Modal' import StyledSpinner from 'components/CommonKit/Spinner/StyledSpinner' -import StarIcon from 'assets/icons/visu/challenge/star.svg' +import StarIcon from 'assets/png/challenge/star.png' import StyledButtonValid from 'components/CommonKit/Button/StyledButtonValid' import StyledIcon from 'components/CommonKit/Icon/StyledIcon' import { formatNumberValues } from 'utils/utils' @@ -29,14 +29,24 @@ const ChallengeModal: React.FC<ChallengeModalProps> = ({ const { screenType } = useContext(AppContext) async function importRightBadge(id: string, badgeStatus: number) { - // Les svg doivent être au format idchallenge-badgestate.svg - const importedBadge = await import( - /* webpackMode: "eager" */ `assets/icons/badges/${id}-${badgeStatus}.svg` - ) + // Les png doivent être au format idchallenge-badgestate.png + const importedBadge = + id === 'CHA00000001' + ? await import( + /* webpackMode: "eager" */ `assets/png/badges/${id}-1.png` + ) + : await import( + /* webpackMode: "eager" */ `assets/png/badges/${id}-${badgeStatus}.png` + ) setBadgeIcon(importedBadge.default) } const showTheRightBadge = (badgeStatus: number | null) => { + const result = + challenge && + formatNumberValues( + Math.abs(challenge.maxEnergy - challenge.currentEnergy) + ) const challengeId = challenge.challengeType ? challenge.challengeType.id : '' @@ -50,13 +60,31 @@ const ChallengeModal: React.FC<ChallengeModalProps> = ({ {' '} {t('CHALLENGE.CONGRATULATION')} </div> - <div className="cm-win-badge-star"> - <StyledIcon + <div className="cm-result text-18-bold"> + {challengeId !== 'CHA00000001' ? ( + <> + <div>{t('CHALLENGE.RESULT_POSITIF')}</div> + <div className="cm-result-positif text-18-normal">{`${result} €`}</div> + </> + ) : null} + </div> + <div + className={ + challengeId !== 'CHA00000001' + ? 'cm-win-badge-star' + : 'cm-win-badge-star --ecolyo-royal' + } + > + <img className="cm-win-badge" - icon={badgeIcon} - size={screenType === ScreenType.MOBILE ? 180 : 200} - /> - <StyledIcon className="cm-win-star" icon={StarIcon} size={300} /> + src={badgeIcon} + width={screenType === ScreenType.MOBILE ? 160 : 180} + ></img> + <img + className="cm-win-star" + src={StarIcon} + width={screenType === ScreenType.MOBILE ? 300 : 400} + ></img> </div> <div className="cm-txt"> {' '} @@ -88,17 +116,19 @@ const ChallengeModal: React.FC<ChallengeModalProps> = ({ <> <div className="cm-title defeat text-24-bold "> {t('CHALLENGE.DEFEAT')} + </div> + <div className="cm-result text-18-bold"> + <div>{t('CHALLENGE.DEFEAT_RESULT')}</div> <div> - {t('CHALLENGE.DEFEAT2')} - <span className="cm-overspent-value"> - {formatNumberValues( - challenge.currentEnergy - challenge.maxEnergy - )} - € - </span> + {t('CHALLENGE.DEFEAT_RESULT2')} + <span className="cm-result-negatif text-18-normal">{`${result} €`}</span> </div> </div> - <StyledIcon className="cm-badge" icon={badgeIcon} size={100} /> + <img + className="cm-badge" + src={badgeIcon} + width={screenType === ScreenType.MOBILE ? 160 : 180} + ></img> <div className="cm-txt text-18-bold "> {' '} {t('CHALLENGE.CONSOLATION')} diff --git a/src/components/ContentComponents/ConsumptionNavigator/ActivateHalfHourLoad.tsx b/src/components/ContentComponents/ConsumptionNavigator/ActivateHalfHourLoad.tsx new file mode 100644 index 0000000000000000000000000000000000000000..958cb0db6b07440c029edc66911ba14e62a6959a --- /dev/null +++ b/src/components/ContentComponents/ConsumptionNavigator/ActivateHalfHourLoad.tsx @@ -0,0 +1,38 @@ +import React from 'react' +import { translate } from 'cozy-ui/react/I18n' +import StyledAuthButton from 'components/CommonKit/Button/StyledAuthButton' +import StyledIcon from 'components/CommonKit/Icon/StyledIcon' +import iconEnedisLogo from 'assets/icons/visu/enedis-logo.svg' +import Config from '../../../../config.json' + +interface ActivateHalfHourLoadProps { + t: Function // translation service +} +const ActivateHalfHourLoad = ({ t }: ActivateHalfHourLoadProps) => { + const siteLink = Config.fluidConfig[0].siteLink //TODO change here + + return ( + <div className="cta-box"> + <div className="cta-box-header header-text text-16-normal"> + {t('timestep.activate.enedis.info')} + </div> + <StyledAuthButton + className="cta-box-button" + type="button" + color="primary" + onClick={() => window.open(siteLink, '_blank')} + > + <div className="oauthform-button-content"> + <div className="oauthform-button-content-icon"> + <StyledIcon icon={iconEnedisLogo} size={48} /> + </div> + <div className="oauthform-button-text text-18-bold"> + <div> {t('timestep.activate.enedis.label1')}</div> + </div> + </div> + </StyledAuthButton> + </div> + ) +} + +export default translate()(ActivateHalfHourLoad) diff --git a/src/components/ContentComponents/EcogestureCard/EcogestureCard.tsx b/src/components/ContentComponents/EcogestureCard/EcogestureCard.tsx index f639613b2bec76aa67cf8927873848b392a648fa..f6ff64f40476cd6925470b88c75cb7c2893b39b4 100644 --- a/src/components/ContentComponents/EcogestureCard/EcogestureCard.tsx +++ b/src/components/ContentComponents/EcogestureCard/EcogestureCard.tsx @@ -1,9 +1,9 @@ -import React from 'react' +import React, { useState, useEffect } from 'react' import { translate } from 'cozy-ui/react/I18n' import { EcogestureType } from 'services/dataChallengeContracts' import StyledEcogestureCard from 'components/CommonKit/Card/StyledEcogestureCard' import Icon from 'cozy-ui/react/Icon' -import { getEcogestureIconSVG } from '../../CommonKit/SVG/EcogesturesSVG' +import def from 'assets/icons/visu/ecogesture/default.svg' interface EcogestureCardProps { ecogesture: EcogestureType @@ -21,6 +21,26 @@ const EcogestureCard: React.FC<EcogestureCardProps> = ({ const handleCardclick = () => { handleClick && ecogesture ? handleClick(ecogesture) : null } + const [ecogestureIcon, setEcogestureIcon] = useState(def) + + async function importEcogestureIcon(id: string) { + // Les svg doivent être au format id.svg + let importedEcogesture + try { + importedEcogesture = await import( + /* webpackMode: "eager" */ `assets/icons/visu/ecogesture/${id}.svg` + ) + } catch (e) {} + if (importedEcogesture) { + setEcogestureIcon(importedEcogesture.default) + } + } + + useEffect(() => { + if (ecogesture) { + importEcogestureIcon(ecogesture.id) + } + }, []) return ( <> @@ -29,15 +49,9 @@ const EcogestureCard: React.FC<EcogestureCardProps> = ({ <StyledEcogestureCard border={true} onClick={handleCardclick}> <div className="ec"> <div className="ec-content ec-content-challenge"> - {ecogesture.iconName && ( - <div> - <Icon - className="Icon" - icon={getEcogestureIconSVG(ecogesture.iconName)} - size={64} - /> - </div> - )} + <div> + <Icon className="Icon" icon={ecogestureIcon} size={64} /> + </div> <div className="ec-content-challenge-text"> {ecogesture.shortName} </div> @@ -57,12 +71,8 @@ const EcogestureCard: React.FC<EcogestureCardProps> = ({ }`} > <div className="ec-content-icon"> - {ecogesture.unlocked && ecogesture.iconName && ( - <Icon - className="Icon" - icon={getEcogestureIconSVG(ecogesture.iconName)} - size={50} - /> + {ecogesture.unlocked && ( + <Icon className="Icon" icon={ecogestureIcon} size={50} /> )} </div> <div className="ec-content-short-name text-16-bold"> diff --git a/src/components/ContentComponents/EcogestureList/EcogestureList.tsx b/src/components/ContentComponents/EcogestureList/EcogestureList.tsx index f81a02ff2f55d6c8e97ea6b993b5595e09b5acd4..9b7b21f4d1800e772c7b87db9b192cc1bfc053d0 100644 --- a/src/components/ContentComponents/EcogestureList/EcogestureList.tsx +++ b/src/components/ContentComponents/EcogestureList/EcogestureList.tsx @@ -102,11 +102,13 @@ const EcogesturesList: React.FC<EcogesturesListProps> = ({ </div> </> )} - <EcogestureModal - opened={openEcogestureModal} - ecogesture={selectedEcogesture} - handleCloseClick={handleCloseClick} - /> + {openEcogestureModal && ( + <EcogestureModal + opened={openEcogestureModal} + ecogesture={selectedEcogesture} + handleCloseClick={handleCloseClick} + /> + )} </div> ) } diff --git a/src/components/ContentComponents/EcogestureModal/EcogestureModal.tsx b/src/components/ContentComponents/EcogestureModal/EcogestureModal.tsx index 40876f4c03c3209edfcfebded59fc0b847567568..6e9c2496fd3e5d807afbd8e7691fd9882c747c08 100644 --- a/src/components/ContentComponents/EcogestureModal/EcogestureModal.tsx +++ b/src/components/ContentComponents/EcogestureModal/EcogestureModal.tsx @@ -1,11 +1,11 @@ -import React from 'react' +import React, { useState, useEffect } from 'react' import { translate } from 'cozy-ui/react/I18n' import Modal from 'components/CommonKit/Modal/Modal' import { getPicto } from 'utils/utils' import { EcogestureType } from 'services/dataChallengeContracts' import StyledIcon from 'components/CommonKit/Icon/StyledIcon' import Icon from 'cozy-ui/react/Icon' -import { getEcogestureIconSVG } from 'components/CommonKit/SVG/EcogesturesSVG' +import def from 'assets/icons/visu/ecogesture/default.svg' interface EcogestureModalProps { opened: boolean @@ -21,9 +21,30 @@ const EcogestureModal: React.FC<EcogestureModalProps> = ({ t, handleCloseClick, }: EcogestureModalProps) => { + const [ecogestureIcon, setEcogestureIcon] = useState(def) + + async function importEcogestureIcon(id: string) { + // Les svg doivent être au format id.svg + let importedEcogesture + try { + importedEcogesture = await import( + /* webpackMode: "eager" */ `assets/icons/visu/ecogesture/${id}.svg` + ) + } catch (e) {} + if (importedEcogesture) { + setEcogestureIcon(importedEcogesture.default) + } + } + + useEffect(() => { + if (ecogesture) { + importEcogestureIcon(ecogesture.id) + } + }, [ecogesture]) + return ( <> - {!ecogesture ? null : ( + {ecogesture && ( <Modal open={opened} border={ecogesture.unlocked} @@ -35,13 +56,9 @@ const EcogestureModal: React.FC<EcogestureModalProps> = ({ <div className="em-content-box"> <div className="em-content-box-text"> <div className="em-content-box-text-header"> - {ecogesture.iconName !== '' && ( + {ecogesture.unlocked && ecogestureIcon && ( <div> - <Icon - className="icon" - icon={getEcogestureIconSVG(ecogesture.iconName)} - size={100} - /> + <Icon className="icon" icon={ecogestureIcon} size={100} /> </div> )} <div className="em-title text-24-bold "> diff --git a/src/components/ContentComponents/FluidChart/FluidChartContent.tsx b/src/components/ContentComponents/FluidChart/FluidChartContent.tsx index 35844b1d21eb91779a5505a8a59a12a8675c3df5..92019ef5881866eeb162e365fc43dfc1cfa2a201 100644 --- a/src/components/ContentComponents/FluidChart/FluidChartContent.tsx +++ b/src/components/ContentComponents/FluidChart/FluidChartContent.tsx @@ -59,13 +59,11 @@ const FluidChartContent: React.FC<FluidChartContentProps> = ({ >() const [showCompare, setShowCompare] = useState<boolean>(false) const [isLoaded, setIsLoaded] = useState<boolean>(true) - const challengePeriod: ITimePeriod | null = currentChallenge && currentChallenge.startingDate && currentChallenge.endingDate && new TimePeriod(currentChallenge.startingDate, currentChallenge.endingDate) - const handleChangeIndex = (index: number) => { const date = index === 0 @@ -140,6 +138,7 @@ const FluidChartContent: React.FC<FluidChartContentProps> = ({ handleChangeIndex={handleChangeIndex} /> </div> + {isDataLoaded && ( <FluidChartSwipe fluidTypes={fluidTypes} diff --git a/src/components/ContentComponents/Konnector/KonnectorForm.tsx b/src/components/ContentComponents/Konnector/KonnectorForm.tsx index 9a36bc472d656e6586f03dc195583147f6204ff6..e02336b889dd2542fbf802cfea2a5e30e5a0dbe9 100644 --- a/src/components/ContentComponents/Konnector/KonnectorForm.tsx +++ b/src/components/ContentComponents/Konnector/KonnectorForm.tsx @@ -2,105 +2,49 @@ import React from 'react' import { translate } from 'cozy-ui/react/I18n' import IFluidConfig from 'services/IFluidConfig' +import { Konnector, Trigger } from 'doctypes' -import StyledIconButton from 'components/CommonKit/IconButton/StyledIconButton' -import StyledButton from 'components/CommonKit/Button/StyledButton' -import TrailingIcon from 'assets/icons/ico/trailing-icon.svg' +import KonnectorLoginForm from 'components/ContentComponents/Konnector/KonnectorLoginForm' +import KonnectorOAuthForm from 'components/ContentComponents/Konnector/KonnectorOAuthForm' interface KonnectorFormProps { fluidConfig: IFluidConfig - login: string - setLogin: Function - password: string - setPassword: Function - loading: boolean - error: string - handleSubmit: Function - t: Function + konnector: Konnector + account: Account | null + trigger: Trigger | null + handleSuccessForm: Function } const KonnectorForm: React.FC<KonnectorFormProps> = ({ fluidConfig, - login, - setLogin, - password, - setPassword, - loading, - error, - handleSubmit, - t, + konnector, + account, + trigger, + handleSuccessForm, }: KonnectorFormProps) => { - const konnectorName: string = fluidConfig.konnectorConfig.name - const konnectorType: string = fluidConfig.konnectorConfig.type - const siteLink: string = fluidConfig.siteLink + const oAuth: boolean = fluidConfig.konnectorConfig.oauth - function revealPassword(idInput: string) { - const input = document.getElementById(idInput) - if (input) { - if (input.getAttribute('type') === 'password') { - input.setAttribute('type', 'text') - } else { - input.setAttribute('type', 'password') - } - } + const handleSuccess = (_account: Account, _trigger: Trigger) => { + handleSuccessForm(_account, _trigger) } return ( - <form - className="form" - onSubmit={(e: React.FormEvent<HTMLFormElement>) => handleSubmit(e)} - > - {t('KONNECTORCONFIG.LABEL_FILLIN')} {konnectorName} - <div className="form-group"> - <div className="form-message">{error}</div> - <input - id={'idFieldLogin' + konnectorType} - type="text" - className="form-control form-input" - aria-describedby="emailHelp" - placeholder="Adresse e-mail" - name="login" - onChange={(e: React.ChangeEvent<HTMLInputElement>) => - setLogin(e.target.value) - } - value={login} - ></input> - </div> - <div className="form-group"> - <div className="form-message">{error}</div> - <input - id={'idFieldPassword' + konnectorType} - type="password" - className="form-control form-input" - aria-describedby="PasswordHelp" - placeholder="Mot de passe" - name="password" - onChange={(e: React.ChangeEvent<HTMLInputElement>) => - setPassword(e.target.value) - } - value={password} + <> + {!oAuth ? ( + <KonnectorLoginForm + fluidConfig={fluidConfig} + onSuccess={handleSuccess} + account={account} + trigger={trigger} /> - <span> - <StyledIconButton - icon={TrailingIcon} - className="form-trailing-icon" - size={22} - onClick={() => revealPassword('idFieldPassword' + konnectorType)} - /> - </span> - </div> - <StyledButton type="submit" color="primary" disabled={loading}> - {t('KONNECTORCONFIG.BTN_CONNECTION')} - </StyledButton> - <StyledButton - type="button" - color="secondary" - disabled={loading} - onClick={() => window.open(siteLink, '_blank')} - > - {t('KONNECTORCONFIG.BTN_NOACCOUNT')} - </StyledButton> - </form> + ) : ( + <KonnectorOAuthForm + konnector={konnector} + siteLink={fluidConfig.siteLink} + onSuccess={handleSuccess} + /> + )} + </> ) } diff --git a/src/components/ContentComponents/Konnector/KonnectorLaunch.tsx b/src/components/ContentComponents/Konnector/KonnectorLaunch.tsx new file mode 100644 index 0000000000000000000000000000000000000000..8b0c24dea2d95ef6768c265a09c0e15898c8c297 --- /dev/null +++ b/src/components/ContentComponents/Konnector/KonnectorLaunch.tsx @@ -0,0 +1,101 @@ +import React, { useEffect, useState } from 'react' +import { withClient, Client } from 'cozy-client' +import { translate } from 'cozy-ui/react/I18n' + +import { isKonnectorRunning } from 'cozy-harvest-lib/dist/helpers/triggers' +import { + KonnectorJob, + ERROR_EVENT, + LOGIN_SUCCESS_EVENT, + SUCCESS_EVENT, +} from 'cozy-harvest-lib/dist/models/KonnectorJob' +import { Trigger } from 'doctypes' + +import Lottie from 'react-lottie' +import * as loadingData from 'assets/anims/bounceloading.json' +import StyledButton from 'components/CommonKit/Button/StyledButton' + +const loadingOptions = { + loop: true, + autoplay: true, + animationData: loadingData, + rendererSettings: { + preserveAspectRatio: 'xMidYMid slice', + }, +} + +interface KonnectorLaunchProps { + trigger: Trigger + handleKonnectorLaunch: Function + client: Client + t: Function +} + +const KonnectorLaunch: React.FC<KonnectorLaunchProps> = ({ + trigger, + handleKonnectorLaunch, + client, + t, +}: KonnectorLaunchProps) => { + const [state, setState] = useState<string | null>(null) + + const callbackResponse = (_state: string) => { + setState(_state) + } + + const handleClick = () => { + handleKonnectorLaunch() + } + + useEffect(() => { + let subscribed = true + async function getData() { + if (subscribed && !isKonnectorRunning(trigger)) { + const konnectorJob = new KonnectorJob(client, trigger) + await konnectorJob.launch() + konnectorJob.jobWatcher.on(ERROR_EVENT, () => { + callbackResponse(ERROR_EVENT) + }) + konnectorJob.jobWatcher.on(LOGIN_SUCCESS_EVENT, () => { + callbackResponse(LOGIN_SUCCESS_EVENT) + }) + konnectorJob.jobWatcher.on(SUCCESS_EVENT, () => { + callbackResponse(SUCCESS_EVENT) + }) + } + } + getData() + return () => { + subscribed = false + } + }, []) + + return ( + <div className="klaunch-content"> + {!state ? ( + <> + <Lottie options={loadingOptions} height={50} width={50} /> + <div className="klaunch-content-text klaunch-content-text-center text-16-normal"> + <div>{t('KONNECTORCONFIG.PLZ_WAIT')}</div> + </div> + <div className="klaunch-content-text text-16-normal"> + <div>{t('KONNECTORCONFIG.LOADING_DATA')}</div> + </div> + </> + ) : ( + <> + <div className="klaunch-info-txt"> + {state === ERROR_EVENT + ? t('KONNECTORCONFIG.ERROR_DATA') + : t('KONNECTORCONFIG.SUCCESS')} + <StyledButton type="button" color="primary" onClick={handleClick}> + <div>{t('KONNECTORCONFIG.OK')}</div> + </StyledButton> + </div> + </> + )} + </div> + ) +} + +export default translate()(withClient(KonnectorLaunch)) diff --git a/src/components/ContentComponents/Konnector/KonnectorLoading.tsx b/src/components/ContentComponents/Konnector/KonnectorLoading.tsx deleted file mode 100644 index e502a959adf95d7626d29dad1a0c217b69925a6e..0000000000000000000000000000000000000000 --- a/src/components/ContentComponents/Konnector/KonnectorLoading.tsx +++ /dev/null @@ -1,36 +0,0 @@ -import React from 'react' -import { translate } from 'cozy-ui/react/I18n' -import Lottie from 'react-lottie' - -import * as loadingData from 'assets/anims/bounceloading.json' - -const loadingOptions = { - loop: true, - autoplay: true, - animationData: loadingData, - rendererSettings: { - preserveAspectRatio: 'xMidYMid slice', - }, -} - -interface KonnectorLoadingProps { - t: Function -} - -const KonnectorLoading: React.FC<KonnectorLoadingProps> = ({ - t, -}: KonnectorLoadingProps) => { - return ( - <div className="kload-content"> - <Lottie options={loadingOptions} height={50} width={50} /> - <div className="kload-content-text kload-content-text-center text-16-normal"> - <div>{t('KONNECTORCONFIG.PLZ_WAIT')}</div> - </div> - <div className="kload-content-text text-16-normal"> - <div>{t('KONNECTORCONFIG.LOADING_DATA')}</div> - </div> - </div> - ) -} - -export default translate()(KonnectorLoading) diff --git a/src/components/ContentComponents/Konnector/KonnectorLoginForm.tsx b/src/components/ContentComponents/Konnector/KonnectorLoginForm.tsx new file mode 100644 index 0000000000000000000000000000000000000000..49124b24ab96342e3ae8d31758a2535eb1140f6c --- /dev/null +++ b/src/components/ContentComponents/Konnector/KonnectorLoginForm.tsx @@ -0,0 +1,208 @@ +import React, { useState, useEffect } from 'react' +import { withClient, Client } from 'cozy-client' +import { translate } from 'cozy-ui/react/I18n' + +import IFluidConfig from 'services/IFluidConfig' + +import StyledIconButton from 'components/CommonKit/IconButton/StyledIconButton' +import StyledButton from 'components/CommonKit/Button/StyledButton' +import TrailingIcon from 'assets/icons/ico/trailing-icon.svg' +import { ConnectionService } from 'services/connectionService' +import { AccountService } from 'services/accountService' +import { Account, AuthLoginData, Trigger } from 'doctypes' + +import iconGRDFLogo from 'assets/icons/visu/grdf-logo.svg' +import iconEGLLogo from 'assets/icons/visu/egl-logo.svg' +import StyledAuthButton from 'components/CommonKit/Button/StyledAuthButton' +import StyledIcon from 'components/CommonKit/Icon/StyledIcon' + +interface KonnectorLoginFormProps { + fluidConfig: IFluidConfig + onSuccess: Function + account: Account + trigger: Trigger + client: Client + t: Function +} + +const KonnectorLoginForm: React.FC<KonnectorLoginFormProps> = ({ + fluidConfig, + onSuccess, + account, + trigger, + client, + t, +}: KonnectorLoginFormProps) => { + const konnectorName: string = fluidConfig.konnectorConfig.name + const konnectorType: string = fluidConfig.konnectorConfig.type + const siteLink: string = fluidConfig.siteLink + + const [login, setLogin] = useState<string>('') + const [password, setPassword] = useState<string>('') + const [error, setError] = useState<string>('') + const [loading, setLoading] = useState<boolean>(false) + + const getIcon = (fluidName: string) => { + switch (fluidName) { + case 'grdf': + return iconGRDFLogo + case 'egl': + return iconEGLLogo + default: + return null + } + } + + const icon = getIcon(fluidConfig.name) + + function revealPassword(idInput: string) { + const input = document.getElementById(idInput) + if (input) { + if (input.getAttribute('type') === 'password') { + input.setAttribute('type', 'text') + } else { + input.setAttribute('type', 'password') + } + } + } + + const connect = async () => { + const connectionService = new ConnectionService( + client, + fluidConfig.konnectorConfig.slug, + login, + password + ) + const { account, trigger } = await connectionService.connectNewUser() + if (!trigger) { + setError(t('KONNECTORCONFIG.ERROR_ACCOUNT_CREATION')) + setLoading(false) + return null + } + onSuccess(account, trigger) + } + + const update = async () => { + const auth = { + login: login, + password: password, + } + account.auth = auth + const updatedAccount = await AccountService.updateAccount(client, account) + onSuccess(updatedAccount, trigger) + } + + const handleSubmit = async (e: React.FormEvent<HTMLFormElement>) => { + e.preventDefault() + try { + setError('') + setLoading(true) + if (!login || !password) { + setError(t('KONNECTORCONFIG.ERROR_NO_LOGIN_PASSWORD')) + setLoading(false) + return null + } + if (!account) { + await connect() + } else { + await update() + } + } catch (error) { + setLoading(false) + } + } + + useEffect(() => { + if (account) { + const auth: AuthLoginData = account.auth + if (auth.login) { + setLogin(auth.login) + } + setError(t('KONNECTORCONFIG.ERROR_LOGIN_FAILED')) + } + }, []) + + return ( + <form + className="form" + onSubmit={(e: React.FormEvent<HTMLFormElement>) => handleSubmit(e)} + > + {t('KONNECTORCONFIG.LABEL_FILLIN')} {konnectorName} + <div className="form-group"> + <input + id={'idFieldLogin' + konnectorType} + type="text" + className="form-control form-input" + aria-describedby="emailHelp" + placeholder="Adresse e-mail" + name="login" + onChange={(e: React.ChangeEvent<HTMLInputElement>) => + setLogin(e.target.value) + } + value={login} + ></input> + </div> + <div className="form-group"> + <input + id={'idFieldPassword' + konnectorType} + type="password" + className="form-control form-input" + aria-describedby="PasswordHelp" + placeholder="Mot de passe" + name="password" + onChange={(e: React.ChangeEvent<HTMLInputElement>) => + setPassword(e.target.value) + } + value={password} + /> + <span> + <StyledIconButton + icon={TrailingIcon} + className="form-trailing-icon" + size={22} + onClick={() => revealPassword('idFieldPassword' + konnectorType)} + /> + </span> + </div> + <div className="form-message">{error}</div> + <div className="kloginauthform"> + <div className="kloginauthform-button"> + <StyledAuthButton + className="form-button" + type="submit" + color="primary" + disabled={loading} + > + <div className="authform-button-content"> + <div className="authform-button-content-icon"> + {icon && <StyledIcon icon={icon} size={48} />} + </div> + <div className="authform-button-text text-18-bold"> + <div>{t('auth.' + fluidConfig.name + '.connect.label1')}</div> + <div>{t('auth.' + fluidConfig.name + '.connect.label2')}</div> + </div> + </div> + </StyledAuthButton> + </div> + <div className="kloginauthform-text text-16-bold"> + <div className="text-16-bold"> + {t('auth.' + fluidConfig.name + '.no_account.title')} + </div> + <div className="text-16-normal"> + {t('auth.' + fluidConfig.name + '.no_account.text')} + </div> + </div> + <StyledButton + type="button" + color="secondary" + disabled={loading} + onClick={() => window.open(siteLink, '_blank')} + > + {t('auth.' + fluidConfig.name + '.create_account')} + </StyledButton> + </div> + </form> + ) +} + +export default translate()(withClient(KonnectorLoginForm)) diff --git a/src/components/ContentComponents/Konnector/KonnectorNotFound.tsx b/src/components/ContentComponents/Konnector/KonnectorNotFound.tsx new file mode 100644 index 0000000000000000000000000000000000000000..cfe6ea899b5ee56d2abe54f461583039fd254c1c --- /dev/null +++ b/src/components/ContentComponents/Konnector/KonnectorNotFound.tsx @@ -0,0 +1,37 @@ +import React from 'react' +import { translate } from 'cozy-ui/react/I18n' + +import StyledButton from 'components/CommonKit/Button/StyledButton' + +interface KonnectorNotFoundProps { + konnectorSlug: string + t: Function +} + +const KonnectorNotFound: React.FC<KonnectorNotFoundProps> = ({ + konnectorSlug, + t, +}: KonnectorNotFoundProps) => { + const openKonnectorURL = () => { + // TODO - Use getstoreinstallationurl from client - https://docs.cozy.io/en/cozy-client/api/cozy-client/#getstoreinstallationurl-string + const hostname = window.location.origin.replace('ecolyo', 'store') + const url = hostname + '/#/discover/' + konnectorSlug + window.open(url, '_blank') + } + + return ( + <div className="knotfound"> + <div className="knotfound-text"> + {' '} + {t('KONNECTORCONFIG.NOT_INSTALLED')} + </div> + <div className="knotfound-button"> + <StyledButton type="button" color="primary" onClick={openKonnectorURL}> + {t('KONNECTORCONFIG.BTN_INSTALL')} + </StyledButton> + </div> + </div> + ) +} + +export default translate()(KonnectorNotFound) diff --git a/src/components/ContentComponents/Konnector/KonnectorOAuthForm.tsx b/src/components/ContentComponents/Konnector/KonnectorOAuthForm.tsx index 19381bb90596d91d588578eb669002210338c0b9..589d9c58b5eda0cc06ee470ca504ce2e573c5b20 100644 --- a/src/components/ContentComponents/Konnector/KonnectorOAuthForm.tsx +++ b/src/components/ContentComponents/Konnector/KonnectorOAuthForm.tsx @@ -1,15 +1,19 @@ import React from 'react' +import { Client, withClient } from 'cozy-client' import { translate } from 'cozy-ui/react/I18n' -import { Konnector } from 'doctypes' +import { Konnector, Trigger } from 'doctypes' import OAuthForm from 'components/ContentComponents/OAuth/OAuthForm' import StyledButton from 'components/CommonKit/Button/StyledButton' +import { AccountService } from 'services/accountService' +import { TriggerService } from 'services/triggersService' interface KonnectorOAuthFormProps { konnector: Konnector siteLink: string onSuccess: Function loading: boolean + client: Client t: Function } @@ -18,22 +22,32 @@ const KonnectorOAuthForm: React.FC<KonnectorOAuthFormProps> = ({ siteLink, onSuccess, loading, + client, t, }: KonnectorOAuthFormProps) => { + const handleSuccess = async (accountId: string) => { + const account = await AccountService.getAccount(client, accountId) + if (!account) { + onSuccess(null, null) + } + const triggersServices = new TriggerService(client, account, konnector) + const trigger: Trigger = await triggersServices.createTrigger() + onSuccess(account, trigger) + } return ( <div className="koauthform"> <div className="koauthform-text text-16-normal"> - {t('oauth.connect.' + konnector.slug + '.info')} + {t('auth.' + konnector.slug + '.connect.info')} </div> <div className="koauthform-button"> - <OAuthForm konnector={konnector} onSuccess={onSuccess} /> + <OAuthForm konnector={konnector} onSuccess={handleSuccess} /> </div> <div className="koauthform-text text-16-bold"> <div className="text-16-bold"> - {t('oauth.no_account.' + konnector.slug + '.title')} + {t('auth.' + konnector.slug + '.no_account.title')} </div> <div className="text-16-normal"> - {t('oauth.no_account.' + konnector.slug + '.text')} + {t('auth.' + konnector.slug + '.no_account.text')} </div> </div> <div className="koauthform-button"> @@ -43,11 +57,11 @@ const KonnectorOAuthForm: React.FC<KonnectorOAuthFormProps> = ({ disabled={loading} onClick={() => window.open(siteLink, '_blank')} > - {t('oauth.create_account.' + konnector.slug)} + {t('auth.' + konnector.slug + '.create_account')} </StyledButton> </div> </div> ) } -export default translate()(KonnectorOAuthForm) +export default translate()(withClient(KonnectorOAuthForm)) diff --git a/src/components/ContentComponents/Konnector/KonnectorResult.tsx b/src/components/ContentComponents/Konnector/KonnectorResult.tsx index d6cf0f8708e150568496004999e21a9fac35de8c..c0b54a0a55371b89b2168b1ddac1bd80fc1f90c3 100644 --- a/src/components/ContentComponents/Konnector/KonnectorResult.tsx +++ b/src/components/ContentComponents/Konnector/KonnectorResult.tsx @@ -1,42 +1,135 @@ -import React from 'react' +import React, { useState, useContext, useEffect } from 'react' +import { withClient, Client } from 'cozy-client' import { translate } from 'cozy-ui/react/I18n' +import { AppContext } from 'components/Contexts/AppContextProvider' + import StyledButton from 'components/CommonKit/Button/StyledButton' import StyledBlackSpinner from 'components/CommonKit/Spinner/StyledBlackSpinner' +import { Account, Trigger } from 'doctypes' +import { TriggerService } from 'services/triggersService' +import { AccountService } from 'services/accountService' + +import { isKonnectorRunning } from 'cozy-harvest-lib/dist/helpers/triggers' +import { + KonnectorJob, + ERROR_EVENT, + LOGIN_SUCCESS_EVENT, + SUCCESS_EVENT, +} from 'cozy-harvest-lib/dist/models/KonnectorJob' + interface KonnectorResultProps { - date: string - updating: boolean - errored: boolean - updateKonnector: (event: any) => void - deleteAccount: (event: any) => void + account: Account + handleJobState: Function + client: Client t: Function } const KonnectorResult: React.FC<KonnectorResultProps> = ({ - date, - updating, - errored, - updateKonnector, - deleteAccount, + account, + handleJobState, + client, t, }: KonnectorResultProps) => { + const [trigger, setTrigger] = useState<Trigger | null>(null) + const [updating, setUpdating] = useState<boolean>(false) + const [lastExecutionDate, setLastExecutionDate] = useState<string>('-') + const [status, setStatus] = useState<string>('') + + const context = useContext(AppContext) + + const updateState = async (trigger: Trigger) => { + const triggerState = await TriggerService.fetchTriggerState(client, trigger) + if (triggerState) { + setLastExecutionDate( + new Date(triggerState.last_execution).toLocaleString() + ) + setStatus(triggerState.status) + handleJobState(triggerState.status) + await context.refreshFluidTypes() + } + } + + const callbackResponse = async () => { + if (trigger) { + await updateState(trigger) + } + setUpdating(false) + } + + const updateKonnector = async () => { + setUpdating(true) + setStatus('') + setLastExecutionDate('-') + handleJobState('') + + if (trigger && !isKonnectorRunning(trigger)) { + const konnectorJob = new KonnectorJob(client, trigger) + await konnectorJob.launch() + konnectorJob.jobWatcher.on(ERROR_EVENT, () => { + callbackResponse() + }) + konnectorJob.jobWatcher.on(LOGIN_SUCCESS_EVENT, () => { + callbackResponse() + }) + konnectorJob.jobWatcher.on(SUCCESS_EVENT, () => { + callbackResponse() + }) + } + } + + const deleteAccount = async () => { + setUpdating(true) + try { + if (account) { + await AccountService.deleteAccount(client, account) + await context.refreshFluidTypes() + } + } catch (error) { + setUpdating(false) + } + } + + useEffect(() => { + let subscribed = true + async function getData() { + const _trigger = await TriggerService.fetchTriggerFromAccount( + client, + account + ) + if (subscribed && _trigger) { + setTrigger(_trigger) + await updateState(_trigger) + } + } + getData() + return () => { + subscribed = false + } + }, []) + return ( <div className="accordion-update-result"> <div className="accordion-update"> <div className={ - errored + status === 'errored' ? 'accordion-caption-red text-16-normal' : 'accordion-caption text-16-normal' } > {t('KONNECTORCONFIG.LABEL_UPDATEDAT')} </div> - <div>{date}</div> + <div>{lastExecutionDate}</div> </div> <div className="inline-buttons"> - <StyledButton type="button" color="primary" onClick={updateKonnector}> + <StyledButton + type="button" + color="primary" + onClick={updateKonnector} + disabled={updating} + > {updating ? ( <StyledBlackSpinner size="2em" /> ) : ( @@ -56,4 +149,4 @@ const KonnectorResult: React.FC<KonnectorResultProps> = ({ ) } -export default translate()(KonnectorResult) +export default translate()(withClient(KonnectorResult)) diff --git a/src/components/ContentComponents/KonnectorViewer/KonnectorViewer.tsx b/src/components/ContentComponents/KonnectorViewer/KonnectorViewer.tsx index 25c75055bcbecfff530f6a0b8af9e192599e245b..5f9c8ec19cfd61f79d1926303fa6fb8e3ca0e9a4 100644 --- a/src/components/ContentComponents/KonnectorViewer/KonnectorViewer.tsx +++ b/src/components/ContentComponents/KonnectorViewer/KonnectorViewer.tsx @@ -3,7 +3,6 @@ import { withClient, Client } from 'cozy-client' import { Konnector } from 'doctypes' import KonnectorService from 'services/konnectorService' -import KonnectorStatusService from 'services/konnectorStatusService' import KonnectorViewerCard from 'components/ContentComponents/KonnectorViewer/KonnectorViewerCard' import IFluidConfig from 'services/IFluidConfig' @@ -20,7 +19,7 @@ const KonnectorViewer: React.FC<KonnectorViewerProps> = ({ isParam = false, }: KonnectorViewerProps) => { const [konnector, setKonnector] = useState<Konnector | null>(null) - const [lastTrigger, setLastTrigger] = useState<any>(null) + const [loaded, setLoaded] = useState<boolean>(false) useEffect(() => { let subscribed = true @@ -28,35 +27,15 @@ const KonnectorViewer: React.FC<KonnectorViewerProps> = ({ client, fluidConfig.konnectorConfig.slug ) - const kss = new KonnectorStatusService(client) - async function getData() { const _konnector: Konnector = await konnectorService.fetchKonnector() - if (!_konnector || !_konnector.slug) { - throw new Error( - `Could not find konnector for ${fluidConfig.konnectorConfig.slug}` - ) - } if (subscribed && _konnector) { setKonnector(_konnector) } - - const allTriggers = await kss.getAllTriggers() - if (allTriggers) { - const lastTrigger = allTriggers - .filter( - trigger => - trigger.worker === 'konnector' && - trigger.message.konnector === fluidConfig.konnectorConfig.slug - ) - .sort((a, b) => (new Date(a) > new Date(b) ? 1 : -1)) - .shift() - if (subscribed && lastTrigger) { - setLastTrigger(lastTrigger) - } + if (subscribed) { + setLoaded(true) } } - getData() return () => { subscribed = false @@ -65,11 +44,10 @@ const KonnectorViewer: React.FC<KonnectorViewerProps> = ({ return ( <> - {!konnector ? null : ( + {!loaded ? null : ( <KonnectorViewerCard fluidConfig={fluidConfig} konnector={konnector} - trigger={lastTrigger} isParam={isParam} /> )} diff --git a/src/components/ContentComponents/KonnectorViewer/KonnectorViewerCard.tsx b/src/components/ContentComponents/KonnectorViewer/KonnectorViewerCard.tsx index 5a196ab0d35e78ab2f0507750c083b9d339e5dbf..8ea145a2b6b44152e929e640653828e89e62aebd 100644 --- a/src/components/ContentComponents/KonnectorViewer/KonnectorViewerCard.tsx +++ b/src/components/ContentComponents/KonnectorViewer/KonnectorViewerCard.tsx @@ -1,11 +1,6 @@ -import React, { useState, useEffect, useRef, useContext } from 'react' -import { ConnectionService } from 'services/connectionService' -import { TriggerService } from 'services/triggersService' +import React, { useState, useEffect, useRef } from 'react' import { AccountService } from 'services/accountService' -import { AppContext } from 'components/Contexts/AppContextProvider' - -import { JobService, JobState } from 'services/jobsService' import { FluidType } from 'enum/fluid.enum' import { withClient, Client } from 'cozy-client' @@ -18,21 +13,21 @@ import chevronUp from 'assets/icons/ico/chevron-up.svg' import StyledIcon from 'components/CommonKit/Icon/StyledIcon' import StyledIconButton from 'components/CommonKit/IconButton/StyledIconButton' -import failurePicto from 'components/ContentComponents/KonnectorViewer/picto-failure.png' -import KonnectorStatusService from 'services/konnectorStatusService' +import failurePicto from 'assets/png/picto/picto-failure.png' import IFluidConfig from 'services/IFluidConfig' +import KonnectorNotFound from 'components/ContentComponents/Konnector/KonnectorNotFound' import KonnectorForm from 'components/ContentComponents/Konnector/KonnectorForm' -import KonnectorOAuthForm from 'components/ContentComponents/Konnector/KonnectorOAuthForm' -import KonnectorLoading from 'components/ContentComponents/Konnector/KonnectorLoading' import KonnectorResult from 'components/ContentComponents/Konnector/KonnectorResult' +import KonnectorLaunch from 'components/ContentComponents/Konnector/KonnectorLaunch' -import { Konnector, Trigger } from 'doctypes' +import { Konnector, Trigger, TriggerState } from 'doctypes' +import { JobState } from 'services/jobsService' +import { TriggerService } from 'services/triggersService' interface KonnectorViewerCardProps { fluidConfig: IFluidConfig konnector: Konnector - trigger: any | null client: Client isParam: boolean t: Function @@ -41,34 +36,32 @@ interface KonnectorViewerCardProps { const KonnectorViewerCard: React.FC<KonnectorViewerCardProps> = ({ fluidConfig, konnector, - trigger, client, isParam, t, }: KonnectorViewerCardProps) => { - const [login, setLogin] = useState<string>('') - const [password, setPassword] = useState<string>('') - const [loading, setLoading] = useState<boolean>(false) - const [updating, setUpdating] = useState<boolean>(false) - const [konnectorAccountId, setAccountId] = useState<string>('') - const [isKonnectorAcc, setAccount] = useState<boolean>(false) + const [account, setAccount] = useState<Account | null>(null) + const [trigger, setTrigger] = useState<Trigger | null>(null) + const [triggerState, setTriggerState] = useState<TriggerState | null>(null) + const [shouldLaunch, setLaunch] = useState<boolean>(false) + const [setActive, setActiveState] = useState('') const [setHeight, setHeightState] = useState('0px') - const [updateTrigger, setUpdateTrigger] = useState<any>(null) - const [updateDate, setUpdateDate] = useState<string>( - new Date('0001-01-01T00:00:00Z').toDateString() - ) - // const [frequency, setFrequency] = useState<string>('daily') - const [error, setError] = useState<string>('') + const [jobState, setJobState] = useState<string>('') - const [launchedJob, setlaunchedJob] = useState<any>(null) + + const [isLoading, setLoading] = useState<boolean>(true) + const content: React.MutableRefObject<null> = useRef<null>(null) const type: string = fluidConfig.konnectorConfig.type const fluid: FluidType = getFuildType(type) const iconType = getPicto(fluid) - const context = useContext(AppContext) const iconAddType = isParam ? getParamPicto(fluid) : getAddPicto(fluid) + const loginFailed: boolean = + triggerState != null && + triggerState.last_error != undefined && + triggerState.last_error === 'LOGIN_FAILED' const toggleAccordion = () => { setActiveState(setActive === '' ? 'active' : '') @@ -82,260 +75,126 @@ const KonnectorViewerCard: React.FC<KonnectorViewerCardProps> = ({ ) } - const handleSubmit = async (e: React.FormEvent<HTMLFormElement>) => { - try { - e.preventDefault() - setError('') - setLoading(true) - if (!login || !password) { - setError('Please enter a login and password') - setLoading(false) - return null - } - setJobState(JobState.Running) - const connectionService = new ConnectionService( - client, - fluidConfig.konnectorConfig.slug, - login, - password - ) - const data = await connectionService.connectNewUser() - setLoading(false) - if (!data) { - setError('Error during the user connection') - setLoading(false) - setJobState(JobState.Errored) - return null - } - trigger = await KonnectorStatusService.getSingleTrigger( - client, - data.trigger_id - ) - setUpdateTrigger(trigger) - setlaunchedJob(data) - setUpdateDate(new Date(data.queued_at).toDateString()) - setAccountId(data.message.account) - setError('Connected') - setAccount(true) - return data - } catch (error) { - setLoading(false) - setError(error.message) - } + const getKonnectorStateMarkup = () => { + return jobState === JobState.Errored ? ( + <img className="state-icon" src={failurePicto}></img> + ) : ( + '' + ) } - const deleteAccount = async () => { - try { - const account = await AccountService.getAccount( - client, - konnectorAccountId - ) - if (!account) { - setError('Error fetching account') - setLoading(false) - } - const delAccount = await AccountService.deleteAccount(client, account) - if (!delAccount) { - setError('Error during deletion account') - setLoading(false) - } - setError('') - setJobState('') - toggleAccordion() - trigger = null - setAccount(false) - await context.refreshFluidTypes() - } catch (error) { - setLoading(false) - setError(error.message) + const updateState = async (trigger: Trigger) => { + const triggerState = await TriggerService.fetchTriggerState(client, trigger) + if (triggerState) { + setTriggerState(triggerState) } } - const updateKonnector = async () => { - setError('') - setJobState('') - setUpdating(true) - try { - const account = await AccountService.getAccount( - client, - konnectorAccountId - ) - const triggersServices = new TriggerService(client, account, konnector) - if (updateTrigger !== null) { - triggersServices.setTrigger(updateTrigger) - } else { - triggersServices.setTrigger(trigger) - } - const job = await triggersServices.launchTrigger() - if (!job) { - throw new Error(`Error during trigger launching`) - } - setlaunchedJob(job) - setUpdateDate(new Date(job.queued_at).toDateString()) - } catch (error) { - setUpdating(false) - setError(error.message) - } + const handleSuccessForm = (_account: Account, _trigger: Trigger) => { + setAccount(_account) + setTrigger(_trigger) + setLaunch(true) } - const initOauthAccount = async (oauthAccountId: string) => { - setError('') - setJobState('') - setLoading(true) - try { - const account = await AccountService.getAccount(client, oauthAccountId) - const triggersServices = new TriggerService(client, account, konnector) - const trigger: Trigger = await triggersServices.createTrigger() - if (!trigger) { - throw new Error(`Error during trigger creation`) - } - //Launch the creation trigger - const job = await triggersServices.launchTrigger() - if (!job) { - throw new Error(`Error during trigger launching`) - } - setUpdateTrigger(trigger) - setlaunchedJob(job) - setUpdateDate(new Date(job.queued_at).toDateString()) - setAccountId(job.message.account) - setError('Connected') - setAccount(true) - } catch (error) { - setLoading(false) - setError(error.message) + const handleKonnectorLaunch = async () => { + if (trigger) { + await updateState(trigger) } + setLaunch(false) } - const getIcon = (jobState: string) => { - switch (jobState) { - case JobState.Errored: - return failurePicto - // case JobState.Running: - // return pendingPicto - // case JobState.Done: - // return successPicto - default: - return '' - } - } - - const getKonnectorStateMarkup = (jobState: string) => { - const iconSrc = getIcon(jobState) - if (iconSrc === '') return '' - return <img className="state-icon" src={iconSrc}></img> - } - - const jobStateCallBack = async (state: string) => { - setJobState(state) - if (state !== JobState.Running) { - setLoading(false) - setUpdating(false) - setJobState(state) - context.refreshFluidTypes() - } + const handleJobState = (_jobState: JobState) => { + setJobState(_jobState) } useEffect(() => { let subscribed = true - async function getTriggerData() { - if (trigger || launchedJob) { - const jobService = new JobService(client) - let runningJob = null - - if (trigger) { - let triggerState = null - triggerState = TriggerService.fetchStateFromTrigger(trigger) - const konnectorAcc = TriggerService.fetchKonnectorAccountFromTrigger( - trigger + async function getData() { + setLoading(true) + if (konnector) { + const _account = await AccountService.getAccountByType( + client, + konnector.slug + ) + if (subscribed && _account) { + setAccount(_account) + const _trigger = await TriggerService.fetchTriggerFromAccount( + client, + _account ) - if (subscribed && konnectorAcc.konnector === konnector.slug) { - setAccountId(konnectorAcc.account) - setAccount(true) + if (subscribed && _trigger) { + setTrigger(_trigger) + await updateState(_trigger) } - if (subscribed && !launchedJob) setJobState(triggerState.status) - if (triggerState.status === JobState.Running) - runningJob = jobService.fetchJob(triggerState.last_executed_job_id) } - if (launchedJob) runningJob = launchedJob - if (runningJob) jobService.watch(runningJob, jobStateCallBack) } + setLoading(false) } - getTriggerData() + getData() return () => { subscribed = false } - }, [trigger, launchedJob]) + }, []) return ( <> - <div className={`accordion ${setActive}`}> - <div> - <div - className={`accordion-header ${setActive}`} - onClick={toggleAccordion} - > - <div className="accordion-icon"> - {!isKonnectorAcc ? ( - <StyledIcon className="icon" icon={iconAddType} size={49} /> - ) : ( - <StyledIcon className="icon" icon={iconType} size={49} /> - )} - </div> - <div className="state-picto"> - {getKonnectorStateMarkup(jobState)} - </div> - <div className="accordion-info"> - <div className="accordion-title text-16-normal"> - {!isKonnectorAcc - ? t('KONNECTORCONFIG.LABEL_CONNECTTO_' + FluidType[fluid]) - : t('FLUID.' + FluidType[fluid] + '.LABEL')} + {isLoading ? null : ( + <div className={`accordion ${setActive}`}> + <div> + <div + className={`accordion-header ${setActive}`} + onClick={toggleAccordion} + > + <div className="accordion-icon"> + {account && !loginFailed ? ( + <StyledIcon className="icon" icon={iconType} size={49} /> + ) : ( + <StyledIcon className="icon" icon={iconAddType} size={49} /> + )} + </div> + <div className="state-picto">{getKonnectorStateMarkup()}</div> + <div className="accordion-info"> + <div className="accordion-title text-16-normal"> + {account && !loginFailed + ? t('FLUID.' + FluidType[fluid] + '.LABEL') + : t('KONNECTORCONFIG.LABEL_CONNECTTO_' + FluidType[fluid])} + </div> </div> + <StyledIconButton icon={setActive ? chevronUp : chevronDown} /> </div> - <StyledIconButton icon={setActive ? chevronUp : chevronDown} /> - </div> - <div - ref={content} - style={{ maxHeight: `${setHeight}` }} - className={`accordion-content ${setActive}`} - > - {!isKonnectorAcc ? ( - !fluidConfig.konnectorConfig.oauth ? ( - <KonnectorForm - fluidConfig={fluidConfig} - login={login} - setLogin={setLogin} - password={password} - setPassword={setPassword} - loading={loading} - error={error} - handleSubmit={handleSubmit} + + <div + ref={content} + style={{ maxHeight: `${setHeight}` }} + className={`accordion-content ${setActive}`} + > + {!konnector ? ( + <KonnectorNotFound + konnectorSlug={fluidConfig.konnectorConfig.slug} + /> + ) : shouldLaunch && trigger ? ( + <KonnectorLaunch + trigger={trigger} + handleKonnectorLaunch={handleKonnectorLaunch} + /> + ) : account && !loginFailed ? ( + <KonnectorResult + account={account} + handleJobState={handleJobState} /> ) : ( - <KonnectorOAuthForm + <KonnectorForm + fluidConfig={fluidConfig} konnector={konnector} - siteLink={fluidConfig.siteLink} - onSuccess={initOauthAccount} - loading={loading} + account={account} + trigger={trigger} + handleSuccessForm={handleSuccessForm} /> - ) - ) : loading ? ( - <KonnectorLoading /> - ) : ( - <KonnectorResult - date={ - trigger - ? TriggerService.fetchDateFromTrigger(trigger) - : updateDate - } - updating={updating} - errored={jobState === JobState.Errored} - updateKonnector={updateKonnector} - deleteAccount={deleteAccount} - /> - )} + )} + </div> </div> </div> - </div> + )} </> ) } diff --git a/src/components/ContentComponents/Navbar/Navbar.tsx b/src/components/ContentComponents/Navbar/Navbar.tsx index 3b20f0257caa7a2e1603d396dd92f1dcc296f0e0..d4fc5e1f71849db51a41528f28859624ba317868 100644 --- a/src/components/ContentComponents/Navbar/Navbar.tsx +++ b/src/components/ContentComponents/Navbar/Navbar.tsx @@ -11,6 +11,7 @@ import ChallengeIconOffNotif from 'assets/icons/tabbar/defi/off-notif.svg' import ParameterIconOff from 'assets/icons/tabbar/parametre/off.svg' import ConsoIconOn from 'assets/icons/tabbar/conso/on.svg' import ParameterIconOn from 'assets/icons/tabbar/parametre/on.svg' +import logoGrandLyon from 'assets/icons/tabbar/grand-lyon.svg' interface NavbarProps { t: Function @@ -39,14 +40,10 @@ export const Navbar = ({ t }: NavbarProps) => { className="c-nav-link" activeClassName="is-active" > - <Icon - className="c-nav-icon off" - icon={ - challengeNotification - ? ChallengeIconOffNotif - : ChallengeIconOff - } - /> + {challengeNotification && ( + <div className="nb-challenge-notif">1</div> + )} + <Icon className="c-nav-icon off" icon={ChallengeIconOff} /> <Icon className="c-nav-icon on" icon={ChallengeIconOn} /> {t('Nav.challenges')} </NavLink> @@ -65,6 +62,7 @@ export const Navbar = ({ t }: NavbarProps) => { </li> </ul> </nav> + <Icon className="logo-grand-lyon" icon={logoGrandLyon} size={100} /> </aside> ) } diff --git a/src/components/ContentComponents/OAuth/OAuthForm.tsx b/src/components/ContentComponents/OAuth/OAuthForm.tsx index fb8b91c0fde9a58722dd04abcb34d7277793ab24..aae44d9b810140423e3b4e6af23d42e01156b7da 100644 --- a/src/components/ContentComponents/OAuth/OAuthForm.tsx +++ b/src/components/ContentComponents/OAuth/OAuthForm.tsx @@ -6,13 +6,14 @@ import { Konnector } from 'doctypes' import { OAuthWindow } from 'cozy-harvest-lib/dist/components/OAuthWindow' import iconEnedisLogo from 'assets/icons/visu/enedis-logo.svg' -import StyledOauthButton from 'components/CommonKit/Button/StyledOauthButton' +import StyledAuthButton from 'components/CommonKit/Button/StyledAuthButton' import StyledIcon from 'components/CommonKit/Icon/StyledIcon' import StyledBlackSpinner from 'components/CommonKit/Spinner/StyledBlackSpinner' interface OAuthFormProps { konnector: Konnector onSuccess: Function + loginFailed: boolean client: Client t: Function } @@ -48,26 +49,26 @@ const OAuthForm: React.FC<OAuthFormProps> = ({ const isWaiting = status === WAITING return !konnector ? null : ( <> - <StyledOauthButton + <StyledAuthButton type="button" color="primary" onClick={handleSubmit} disabled={isWaiting} > - <div className="oauthform-button-content"> - <div className="oauthform-button-content-icon"> + <div className="authform-button-content"> + <div className="authform-button-content-icon"> {isWaiting ? ( <StyledBlackSpinner size={48} /> ) : ( <StyledIcon icon={iconEnedisLogo} size={48} /> )} </div> - <div className="oauthform-button-text text-18-bold"> - <div>{t('oauth.connect.' + konnector.slug + '.label1')}</div> - <div>{t('oauth.connect.' + konnector.slug + '.label2')}</div> + <div className="authform-button-text text-18-bold"> + <div>{t('auth.' + konnector.slug + '.connect.label1')}</div> + <div>{t('auth.' + konnector.slug + '.connect.label2')}</div> </div> </div> - </StyledOauthButton> + </StyledAuthButton> {isWaiting && ( <OAuthWindow client={client} diff --git a/src/components/Hooks/userInstanceSettings.tsx b/src/components/Hooks/userInstanceSettings.tsx index f261ad4a50efe8b950724c10dbc7d435da31d67d..eb05ff8b973ea275f12537a16fe28ea3c88122d1 100644 --- a/src/components/Hooks/userInstanceSettings.tsx +++ b/src/components/Hooks/userInstanceSettings.tsx @@ -2,7 +2,7 @@ import { useState, useEffect } from 'react' import get from 'lodash/get' import { Client } from 'cozy-client' -const useInstanceSettings = (client: Client) => { +const userInstanceSettings = (client: Client) => { const [settings, setSettings] = useState({}) const [fetchStatus, setFetchStatus] = useState('idle') @@ -12,9 +12,6 @@ const useInstanceSettings = (client: Client) => { const response = await client .getStackClient() .fetchJSON('GET', '/settings/instance') - // const response = await client.query( - // client.all('io.cozy.settings').getById('instance') - // ) setSettings(get(response, 'data.attributes'), {}) setFetchStatus('loaded') } catch (error) { @@ -30,4 +27,4 @@ const useInstanceSettings = (client: Client) => { } } -export default useInstanceSettings +export default userInstanceSettings diff --git a/src/custom.d.ts b/src/custom.d.ts index a97fbda7848346e1600bfe2624dddde0cf8a2004..9c3a50175ffad9a357b86574d04428527d0ee49e 100644 --- a/src/custom.d.ts +++ b/src/custom.d.ts @@ -1,3 +1,7 @@ +declare module '*.png' { + const content: string + export default content +} declare module '*.svg' { const content: string export default content diff --git a/src/db/challengeTypeData.json b/src/db/challengeTypeData.json index 7ab6a42b4ffd0e61aebefeb5fcdc7b213a649d9c..028b6669bd4a9523990f224d345dcd5be39eb5f1 100644 --- a/src/db/challengeTypeData.json +++ b/src/db/challengeTypeData.json @@ -48,10 +48,10 @@ { "_id": "CHA00000003", "type": 0, - "title": "Winter is leaving", - "description": "Et si dans les 7 prochains jours vous réussissiez à consommer moins que dans les 7 derniers", + "title": "Méga Coques en stock", + "description": "Et si dans les 4 prochaines semaines vous réussissiez à consommer moins que dans les 4 dernières", "level": 3, - "duration": { "days": 7 }, + "duration": { "days": 28 }, "fluidTypes": [0, 1, 2], "relationships": { "availableEcogestures": { @@ -77,9 +77,9 @@ { "_id": "CHA00000004", "type": 0, - "title": "Mega Coques en stock", + "title": "Winter is leaving", "description": "Et si dans les 7 prochains jours vous réussissiez à consommer moins que dans les 7 derniers", - "level": 4, + "level": 901, "duration": { "days": 7 }, "fluidTypes": [0, 1, 2], "relationships": { @@ -106,9 +106,9 @@ { "_id": "CHA00000005", "type": 0, - "title": "Giga Coques en stock", + "title": "Méga Winter is leaving", "description": "Et si dans les 7 prochains jours vous réussissiez à consommer moins que dans les 7 derniers", - "level": 5, + "level": 902, "duration": { "days": 7 }, "fluidTypes": [0, 1, 2], "relationships": { diff --git a/src/db/ecogestureData.json b/src/db/ecogestureData.json index 066087fc058ebe417639b2cbb91579b4b0d24b8a..4f793dadf1143503725a8a885cdc62c5b0d224b2 100644 --- a/src/db/ecogestureData.json +++ b/src/db/ecogestureData.json @@ -8,20 +8,18 @@ "usage": "Eau chaude sanitaire", "fluidTypes": [0], "pack": 8, - "nwh": 6, - "iconName" : "" + "nwh": 6 }, { "_id": "0034", "shortName": "Vague de sécheresse", "longName": "Je décide de supprimer une douche ou 1 bain par semaine.", "shortDescription": "", - "longDescription": "Si on n'a pas transpiré la journée et qu'on ne sent pas sale, aucune obligation de se laver tous les jours. Il est même conseillé pour la flore de l'épiderme (la fameuse barrière contre certains pathogènes) de ne pas se laver tous les jours. Vous économiserez ainsi une qunatité d'eau non négligeable.", + "longDescription": "Si on n'a pas transpiré la journée et qu'on ne sent pas sale, aucune obligation de se laver tous les jours. Il est même conseillé pour la flore de l'épiderme (la fameuse barrière contre certains pathogènes) de ne pas se laver tous les jours. Vous économiserez ainsi une quantité d'eau non négligeable.", "usage": "Eau chaude sanitaire", "fluidTypes": [1], "pack": 6, - "nwh": 5, - "iconName" : "" + "nwh": 5 }, { "_id": "0037", @@ -32,8 +30,7 @@ "usage": "Eau chaude sanitaire", "fluidTypes": [1], "pack": 0, - "nwh": 4, - "iconName" : "" + "nwh": 4 }, { "_id": "0038", @@ -44,8 +41,7 @@ "usage": "Eau chaude sanitaire", "fluidTypes": [0, 2], "pack": 0, - "nwh": 2, - "iconName" : "" + "nwh": 2 }, { "_id": "0040", @@ -56,8 +52,7 @@ "usage": "Eau chaude sanitaire", "fluidTypes": [0], "pack": 0, - "nwh": 6, - "iconName" : "" + "nwh": 6 }, { "_id": "0041", @@ -68,8 +63,7 @@ "usage": "Eau chaude sanitaire", "fluidTypes": [1], "pack": 7, - "nwh": 6, - "iconName" : "" + "nwh": 6 }, { "_id": "0042", @@ -80,8 +74,7 @@ "usage": "Eau chaude sanitaire", "fluidTypes": [1], "pack": 5, - "nwh": 5, - "iconName" : "" + "nwh": 5 }, { "_id": "0043", @@ -92,8 +85,7 @@ "usage": "Eau chaude sanitaire", "fluidTypes": [0, 2], "pack": 3, - "nwh": 3, - "iconName" : "poings" + "nwh": 3 }, { "_id": "0044", @@ -104,8 +96,7 @@ "usage": "Eau chaude sanitaire", "fluidTypes": [1], "pack": 0, - "nwh": 3, - "iconName" : "" + "nwh": 3 }, { "_id": "0045", @@ -116,8 +107,7 @@ "usage": "Eau chaude sanitaire", "fluidTypes": [0, 2], "pack": 2, - "nwh": 3, - "iconName" : "vaisselle" + "nwh": 3 }, { "_id": "0046", @@ -128,8 +118,7 @@ "usage": "Eau froide", "fluidTypes": [1], "pack": 0, - "nwh": 6, - "iconName" : "" + "nwh": 6 }, { "_id": "0048", @@ -140,8 +129,7 @@ "usage": "Eau froide", "fluidTypes": [1], "pack": 0, - "nwh": 6, - "iconName" : "" + "nwh": 6 }, { "_id": "0050", @@ -152,8 +140,7 @@ "usage": "Froid", "fluidTypes": [0], "pack": 4, - "nwh": 3, - "iconName" : "hibernation" + "nwh": 3 }, { "_id": "0052", @@ -164,8 +151,7 @@ "usage": "Froid", "fluidTypes": [0], "pack": 0, - "nwh": 2, - "iconName" : "" + "nwh": 2 }, { "_id": "0053", @@ -176,8 +162,7 @@ "usage": "Froid", "fluidTypes": [0], "pack": 0, - "nwh": 1, - "iconName" : "" + "nwh": 1 }, { "_id": "0054", @@ -188,8 +173,7 @@ "usage": "Froid", "fluidTypes": [0], "pack": 0, - "nwh": 1, - "iconName" : "" + "nwh": 1 }, { "_id": "0055", @@ -200,8 +184,7 @@ "usage": "Froid", "fluidTypes": [0], "pack": 0, - "nwh": 1, - "iconName" : "" + "nwh": 1 }, { "_id": "0056", @@ -212,8 +195,7 @@ "usage": "Froid", "fluidTypes": [0], "pack": 0, - "nwh": 1, - "iconName" : "" + "nwh": 1 }, { "_id": "0057", @@ -224,8 +206,7 @@ "usage": "Froid", "fluidTypes": [0], "pack": 0, - "nwh": 1, - "iconName" : "" + "nwh": 1 }, { "_id": "0058", @@ -236,8 +217,7 @@ "usage": "Froid", "fluidTypes": [0], "pack": 5, - "nwh": 2, - "iconName" : "" + "nwh": 2 }, { "_id": "0059", @@ -248,8 +228,7 @@ "usage": "Froid", "fluidTypes": [0], "pack": 0, - "nwh": 1, - "iconName" : "" + "nwh": 1 }, { "_id": "0061", @@ -260,8 +239,7 @@ "usage": "Froid", "fluidTypes": [0], "pack": 0, - "nwh": 1, - "iconName" : "" + "nwh": 1 }, { "_id": "0064", @@ -272,8 +250,7 @@ "usage": "Audiovisuel, Petit électroménager, Hi-Fi, Informatique", "fluidTypes": [0], "pack": 2, - "nwh": 3, - "iconName" : "electro" + "nwh": 3 }, { "_id": "0065", @@ -284,8 +261,7 @@ "usage": "Audiovisuel, Petit électroménager, Hi-Fi, Informatique", "fluidTypes": [0], "pack": 0, - "nwh": 1, - "iconName" : "" + "nwh": 1 }, { "_id": "0066", @@ -296,8 +272,7 @@ "usage": "Audiovisuel, Petit électroménager, Hi-Fi, Informatique", "fluidTypes": [0], "pack": 6, - "nwh": 3, - "iconName" : "" + "nwh": 3 }, { "_id": "0068", @@ -308,8 +283,7 @@ "usage": "Audiovisuel, Petit électroménager, Hi-Fi, Informatique", "fluidTypes": [0], "pack": 0, - "nwh": 1, - "iconName" : "" + "nwh": 1 }, { "_id": "0071", @@ -320,8 +294,7 @@ "usage": "Lavage", "fluidTypes": [0, 1], "pack": 3, - "nwh": 2, - "iconName" : "accelerateur" + "nwh": 2 }, { "_id": "0072", @@ -332,8 +305,7 @@ "usage": "Lavage", "fluidTypes": [0, 1], "pack": 0, - "nwh": 2, - "iconName" : "" + "nwh": 2 }, { "_id": "0074", @@ -344,8 +316,7 @@ "usage": "Lavage", "fluidTypes": [0, 1], "pack": 0, - "nwh": 1, - "iconName" : "" + "nwh": 1 }, { "_id": "0077", @@ -356,8 +327,7 @@ "usage": "Lavage", "fluidTypes": [0], "pack": 0, - "nwh": 1, - "iconName" : "" + "nwh": 1 }, { "_id": "0078", @@ -368,8 +338,7 @@ "usage": "Lavage", "fluidTypes": [0], "pack": 8, - "nwh": 3, - "iconName" : "" + "nwh": 3 }, { "_id": "0082", @@ -380,8 +349,7 @@ "usage": "Eclairage", "fluidTypes": [0], "pack": 7, - "nwh": 3, - "iconName" : "" + "nwh": 3 }, { "_id": "0085", @@ -392,8 +360,7 @@ "usage": "Eclairage", "fluidTypes": [0], "pack": 1, - "nwh": 2, - "iconName" : "frerots" + "nwh": 2 }, { "_id": "0086", @@ -404,8 +371,7 @@ "usage": "Eclairage", "fluidTypes": [0], "pack": 0, - "nwh": 1, - "iconName" : "" + "nwh": 1 }, { "_id": "0087", @@ -416,8 +382,7 @@ "usage": "Eclairage", "fluidTypes": [0], "pack": 0, - "nwh": 1, - "iconName" : "" + "nwh": 1 }, { "_id": "0092", @@ -428,8 +393,7 @@ "usage": "Cuisson", "fluidTypes": [0, 2], "pack": 1, - "nwh": 3, - "iconName" : "cymbal" + "nwh": 3 }, { "_id": "0093", @@ -440,8 +404,7 @@ "usage": "Cuisson", "fluidTypes": [0], "pack": 4, - "nwh": 3, - "iconName" : "casque" + "nwh": 3 }, { "_id": "0097", @@ -452,7 +415,6 @@ "usage": "Cuisson", "fluidTypes": [0], "pack": 0, - "nwh": 2, - "iconName" : "" + "nwh": 2 } ] \ No newline at end of file diff --git a/src/doctypes/io-cozy-accounts.ts b/src/doctypes/io-cozy-accounts.ts index a0fc3b34a016566b417392d7547ce50ca140a91f..5969812143d8b01562adda58a08295cf2ee46d22 100644 --- a/src/doctypes/io-cozy-accounts.ts +++ b/src/doctypes/io-cozy-accounts.ts @@ -1,12 +1,21 @@ export const ACCOUNTS_DOCTYPE = 'io.cozy.accounts' +export type AuthLoginData = { + login: string + credentials_encrypted?: string + password?: string +} + +export type OAuthData = { + access_token: string + refresh_token: string + scope: string | null +} + export type Account = { _id: string account_type: string - auth: { - credentials_encrypted: string - login: string - } + auth: AuthLoginData | OAuthData identifier: string state?: string | null } diff --git a/src/doctypes/io-cozy-triggers.ts b/src/doctypes/io-cozy-triggers.ts index 1366e7b53412a70a493b260d4ad9ad5fb5b1a5c6..60e696f4ac1906bd6518670c2e709f1dffac04d1 100644 --- a/src/doctypes/io-cozy-triggers.ts +++ b/src/doctypes/io-cozy-triggers.ts @@ -3,7 +3,7 @@ export const TRIGGERS_DOCTYPE = 'io.cozy.triggers' export type Trigger = { _id: string type: string - workker: string + worker: string arguments: string message: { account: string @@ -11,12 +11,24 @@ export type Trigger = { } } +export type TriggerState = { + trigger_id: string + status: string + last_error?: string + last_executed_job_id: string + last_execution: string + last_failed_job_id: string + last_failure: string + last_manual_execution: string + last_manual_job_id: string +} + export function isTrigger(trigger: any): trigger is Trigger { return ( trigger && '_id' in trigger && 'type' in trigger && - 'workker' in trigger && + 'worker' in trigger && 'arguments' in trigger && 'message' in trigger ) diff --git a/src/enum/ecogestureIcon.enum.ts b/src/enum/ecogestureIcon.enum.ts deleted file mode 100644 index e156b7006387afdbb4f0a9299eb7b611df3c8025..0000000000000000000000000000000000000000 --- a/src/enum/ecogestureIcon.enum.ts +++ /dev/null @@ -1,10 +0,0 @@ -export enum EcogesturesIcon { - ACCELEREATEUR = 'accelerateur', - CASQUE = 'casque', - CYMBAL = 'cymbal', - ELECTRO = 'electro', - FREROTS = 'frerots', - HIBERNATION = 'hibernation', - POINGS = 'poings', - VAISSELLE = 'vaisselle', -} diff --git a/src/locales/en.json b/src/locales/en.json index 8f90c311f7835ae7b2c01ee6d62cab01b35852ab..aa587c9f10971a033e9667c8fa79e2d7caa6ce94 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -114,14 +114,21 @@ "LABEL_CONNECTTO_ELECTRICITY": "Se connecter à l'électricité", "LABEL_CONNECTTO_WATER": "Se connecter à l'eau", "LABEL_CONNECTTO_GAS": "Se connecter au gaz", - "BTN_CONNECTION": "Connexion", + "BTN_CONNECTION": "Je me connecte à mon compte", "BTN_NOACCOUNT": "Créer mes identifiants", "BTN_INSTALL": "Installer", "BTN_CONFIGURE": "Configurer", "BTN_UPDATE": "Mettre à jour", "BTN_DELETE": "Supprimer", "LOADING_DATA": "Vos premières données seront disponibles dans quelques minutes et les prochaines données seront chargées automatiquement.", - "PLZ_WAIT": "Veuillez patienter..." + "PLZ_WAIT": "Veuillez patienter...", + "NOT_INSTALLED": "Le connecteur n'est pas installé. Veuillez l'installer en cliquant sur le bouton ci-dessous.", + "ERROR_NO_LOGIN_PASSWORD": "Identifiant et mot de passe requis", + "ERROR_ACCOUNT_CREATION": "Une erreur est survenue, veuillez essayer de nouveau.", + "ERROR_LOGIN_FAILED": "Identifiants invalides", + "SUCCESS": "Félicitations, vos premières données sont disponibles et les prochaines seront chargées automatiquement.", + "ERROR_DATA": "Une erreur est survenue pendant le rapatriement des données.", + "OK": "Ok" }, "INDICATOR": { "DISPLAY_OTHER_FLUID": "Voir", @@ -140,6 +147,7 @@ "ONGOING_CHALLENGE": "En cours", "ENDINGDATE_UNDEFINED": "Date non connue", "LOCKED": "Vous devez finir le défi précédent pour accéder à celui-ci", + "FULLY_LOCKED": "Ce défi sera disponible dans une prochaine mise à jour", "START": "Allons-y !", "NOT_NOW": "Pas maintenant !", "STOP": "Arrêter le défi", @@ -157,8 +165,9 @@ "RESULT_POSITIF": "Vous avez économisé", "RESULT_NEGATIF": "Vous avez dépassé de", "RESULT_NOT_AVAILABLE": "Objectif à venir", - "DEFEAT": "Vous avez dépassé", - "DEFEAT2": "de ", + "DEFEAT": "Presque... ", + "DEFEAT_RESULT": "Vous avez dépassé", + "DEFEAT_RESULT2": "de ", "CONSOLATION": "Vous êtes proches de votre objectif, gardez le cap avec ce badge ", "CONSOLATION2": " en chocolat." }, @@ -176,25 +185,54 @@ "WEAK": "1 nWh : économie faible" } }, - "oauth": { - "connect": { - "enedis": { - "info" : "En cliquant sur ce bouton, vous allez accéder à votre compte personnel Enedis où vous pourrez donner votre accord pour qu’Enedis nous transmette vos données.", + "auth": { + "enedis": { + "connect": { + "info" : "En cliquant sur ce bouton, vous accéderez à votre compte Enedis. Vous pourrez donner votre accord pour récupérer vos données de consommation électriques dans votre cloud personnel", "label1": "J'accède à mon", "label2": "espace client Enedis" - } - }, - "no_account" : { - "enedis" : { + }, + "no_account" : { "title": "Pas de compte Enedis ?", "text": "Vous pouvez le créer en vous munissant d'une facture d'élétricité." - } + }, + "create_account": "Je crée mon compte personnel Enedis" }, - "create_account": { - "enedis": "Je créé mon compte personnal Enedis" + "grdf" : { + "connect": { + "label1": "Je me connecte à ", + "label2": "mon compte GRDF" + }, + "no_account" : { + "title": "Pas de compte GRDF ?", + "text": "Vous pouvez le créer en vous munissant d'une facture de gaz." + }, + "create_account": "Je crée mon compte GRDF" }, + "egl" : { + "connect": { + "label1": "Je me connecte à ", + "label2": "mon compte Eau du Grand Lyon" + }, + "no_account" : { + "title": "Pas de compte Eau du Grand Lyon ?", + "text": "Vous pouvez le créer en vous munissant d'une facture d'eau." + }, + "create_account": "Je crée mon compte Eau du GL" + } + }, + "oauth": { "window": { "title": "OAuth" } + }, + "timestep": { + "activate": { + "enedis": { + "info": "Pour visualiser vos consommations à la 1/2 heure, il vous faut valider l'activation de l'enregistrement de votre consommation horaire sur votre compte Enedis", + "label1": "Activer sur mon compte Enedis", + "activateLink": "https://mon-compte-client.enedis.fr/" + } + } } } diff --git a/src/services/accountService.ts b/src/services/accountService.ts index 3732790237cdc495153cdc32865f62d50418ced2..74ac09a72071c57115686d02c6627c998e3e36d1 100644 --- a/src/services/accountService.ts +++ b/src/services/accountService.ts @@ -98,15 +98,26 @@ export class AccountService { } } + static updateAccount = async (client: Client, account: Account) => { + try { + const updatedAccount: Account = await accountsMutations( + client + ).updateAccount(account) + return updatedAccount + } catch (error) { + throw error + } + } + static getAccountByType = async (client: Client, type: string) => { try { const query = client .find('io.cozy.accounts') // eslint-disable-next-line @typescript-eslint/camelcase .where({ account_type: type }) - // .sortBy([{ 'cozyMetadata.updatedAt': 'desc' }]) .limitBy(1) - return await client.query(query) + const result = await client.query(query) + return result.data[0] ? result.data[0] : null } catch (error) { throw error } diff --git a/src/services/challengeDataManagerService.ts b/src/services/challengeDataManagerService.ts index 9550bafa189c4c0d8b22c364180f2d9ebf67039a..6da8ff4b80846bb72f731101bafd4d876e1f866d 100644 --- a/src/services/challengeDataManagerService.ts +++ b/src/services/challengeDataManagerService.ts @@ -202,16 +202,14 @@ export default class ChallengeManager implements IChallengeManager { return 0 } - public async updateUserLevel(level?: number) { + public async updateUserLevel(level: number) { await this._client .query(this._client.find(USERPROFILE_DOCTYPE).limitBy(1)) .then(async ({ data }) => { const doc = data[0] - let actualLevel = 0 - if (level) { + let actualLevel = doc.level + if (level > actualLevel) { actualLevel = level - } else { - actualLevel = doc.level } await this._client.save({ ...doc, @@ -445,6 +443,16 @@ export default class ChallengeManager implements IChallengeManager { return challengeTypes } + public async getUserLevel() { + let userLevel + await this._client + .query(this._client.find(USERPROFILE_DOCTYPE).limitBy(1)) + .then(async ({ data }) => { + userLevel = data[0].level + }) + return userLevel + } + public async startChallenge( challenge: ChallengeType, fluidTypes: FluidType[], @@ -621,7 +629,6 @@ export default class ChallengeManager implements IChallengeManager { }) .include(relationShipsToInclude) ) - console.log(ecogestures) if (ecogestures.data.length === 0) return null const unlocked = ecogestures.data.map( x => x.relationships.selectedEcogestures.data diff --git a/src/services/connectionService.ts b/src/services/connectionService.ts index 7108fedf68945dbeea026025100b04b65be2f58c..6fb4a3044b20f441b356c810728f4ea5757f4bbc 100644 --- a/src/services/connectionService.ts +++ b/src/services/connectionService.ts @@ -48,11 +48,15 @@ export class ConnectionService { if (!trigger) { throw new Error(`Error during trigger creation`) } - //Launch the creation trigger - const job = await triggersServices.launchTrigger() - if (!job) { - throw new Error(`Error during trigger launching`) + return { + account: account, + trigger: trigger, } - return job + //Launch the creation trigger + // const job = await triggersServices.launchTrigger() + // if (!job) { + // throw new Error(`Error during trigger launching`) + // } + // return job } } diff --git a/src/services/consumptionDataManagerService.ts b/src/services/consumptionDataManagerService.ts index 67464a3ff11e366444b7964c044a93e6dd2e0fba..b203ecb491b6e8db3d992536e511e790cf11a23d 100644 --- a/src/services/consumptionDataManagerService.ts +++ b/src/services/consumptionDataManagerService.ts @@ -287,6 +287,17 @@ export default class ConsumptionDataManager implements IConsumptionDataManager { return lastDay } + public async checkDoctypeEntries( + fluideType: FluidType, + timeStep: TimeStep + ): Promise<boolean> { + const queryResult = await this._queryRunner.getEntries(fluideType, timeStep) + if (queryResult.data.length > 0) { + return true + } + return false + } + private aggregateGraphData( singleFluidCharts: ISingleFluidChartData[] //,withComparison: boolean = true diff --git a/src/services/konnectorStatusService.ts b/src/services/konnectorStatusService.ts index 0b241f9f9152794bc6bee4ea6f2a1812677bef6f..8ab8c3bde63422f10d14660e413ac12406e8f0be 100644 --- a/src/services/konnectorStatusService.ts +++ b/src/services/konnectorStatusService.ts @@ -16,6 +16,7 @@ export default class KonnectorStatusService { return 'konnector status' } + // TODO - move to triggerservices async getTriggerbyKonnector(konnector: Konnector) { const query = this._client .find('io.cozy.triggers') @@ -120,13 +121,13 @@ export default class KonnectorStatusService { ), ]) const data: FluidType[] = [] - if (elecData && elecData.data && elecData.data[0]) { + if (elecData) { data.push(fluidConfig[FluidType.ELECTRICITY].fluidTypeId) } - if (gasData && gasData.data && gasData.data[0]) { + if (gasData) { data.push(fluidConfig[FluidType.GAS].fluidTypeId) } - if (waterData && waterData.data && waterData.data[0]) { + if (waterData) { data.push(fluidConfig[FluidType.WATER].fluidTypeId) } return data diff --git a/src/services/queryRunnerService.ts b/src/services/queryRunnerService.ts index 729da2df1e9972e491e382496fe4c41dd8095bda..a5c0e288929f68824fd7a3de26b09e0b49cc1182 100644 --- a/src/services/queryRunnerService.ts +++ b/src/services/queryRunnerService.ts @@ -112,6 +112,17 @@ export class QueryRunner { return result } + public async getEntries(fluidType: FluidType, timeStep: TimeStep) { + let result = null + const doctype = this.getRelevantDoctype(fluidType, timeStep) + try { + result = await this._client.query(this._client.find(doctype).where({})) + } catch (error) { + return null + } + return result + } + private filterDataList(data, timePeriod: ITimePeriod) { const filteredResult = data.data.filter(entry => this.withinDateBoundaries( @@ -265,7 +276,6 @@ export class QueryRunner { } break } - return predicate } diff --git a/src/services/triggersService.ts b/src/services/triggersService.ts index 790798be45796c6c72294ba2c48fca4dfc4e0c60..1356ad79fe67302a8f15e22621535ce7c0bdbc5d 100644 --- a/src/services/triggersService.ts +++ b/src/services/triggersService.ts @@ -24,7 +24,7 @@ export class TriggerService { this._trigger = { _id: '', type: '', - workker: '', + worker: '', arguments: '', message: { account: '', @@ -65,14 +65,10 @@ export class TriggerService { 'TriggersServices : createTrigger - _triggerAttributes or _client not found' ) } - try { - this._trigger = await triggersMutations(this._client).createTrigger( - this._triggerAttributes - ) - return this._trigger - } catch (error) { - throw error - } + this._trigger = await triggersMutations(this._client).createTrigger( + this._triggerAttributes + ) + return this._trigger } setTrigger = (trigger: Trigger) => { @@ -110,4 +106,25 @@ export class TriggerService { trigger.current_state.last_execution ).toLocaleString(DateTime.DATETIME_MED) } + + static async fetchTriggerFromAccount(client: Client, account: Account) { + if (account == null) return null + const query = client + .find('io.cozy.triggers') + .where({ 'message.account': account._id }) + .sortBy([{ 'cozyMetadata.updatedAt': 'desc' }]) + .limitBy(1) + const result = await client.query(query) + return result.data[0] ? result.data[0] : null + } + + static async fetchTriggerState(client: Client, trigger: Trigger) { + if (trigger == null) return null + const triggerState = await client + .getStackClient() + .fetchJSON('GET', `/jobs/triggers/${trigger._id}`) + return triggerState.data.attributes.current_state + ? triggerState.data.attributes.current_state + : null + } } diff --git a/src/styles/components/_oauth.scss b/src/styles/components/_auth.scss similarity index 53% rename from src/styles/components/_oauth.scss rename to src/styles/components/_auth.scss index 7e305641fd84873ee25f6c141bdeb0777d38b093..b4c77eef0258d030e6a89e138a2671a7884e63e7 100644 --- a/src/styles/components/_oauth.scss +++ b/src/styles/components/_auth.scss @@ -1,16 +1,22 @@ @import '../base/color'; @import '../base/breakpoint'; -.oauthform-button-content{ +.authform-button-content{ display: flex; justify-content: center; align-items: center; - .oauthform-button-content-icon{ + width: 100%; + @media #{$large-phone} { + justify-content: left; + } + .authform-button-content-icon{ margin: 0 1.375rem; } - .oauthform-button-text{ + .authform-button-text{ display: flex; flex-direction: column; align-items: flex-start; + text-align: left; + max-width: 10.625rem; } } \ No newline at end of file diff --git a/src/styles/components/_challenges.scss b/src/styles/components/_challenges.scss index e25d2d44c12f2c4198bbac2f9a8a8c69ad6df1ab..a1b4b034469f8e755811ccc7afeba8ef2bba65ea 100644 --- a/src/styles/components/_challenges.scss +++ b/src/styles/components/_challenges.scss @@ -96,6 +96,7 @@ flex-direction: row; .cli-content-icon { margin: 0.5rem 0; + z-index: 5; } .cli-content-title { color: $text-white; @@ -197,7 +198,7 @@ flex-direction: column; justify-content: space-around; align-items: center; - padding: 1.5rem 1rem 0.5rem; + padding: 1.5rem 1rem 1.5rem; width: 22.125rem; @media #{$large-phone} { width: 90%; @@ -229,15 +230,28 @@ } .cm-title { text-align: center; - margin-bottom: 210px; } .cm-win-badge-star { display: grid; align-items: center; justify-items: center; position: absolute; - top: 22px; + top: 15px; + @media #{$large-phone} { + top: 65px; + } + &.--ecolyo-royal { + @extend .cp-content; + top: -38px; + @media #{$large-phone} { + top: 12px; + } + } .cm-win-badge { + -webkit-animation: scale-in-center 0.6s + cubic-bezier(0.25, 0.46, 0.45, 0.94) 0.1s both; + animation: scale-in-center 0.6s cubic-bezier(0.25, 0.46, 0.45, 0.94) 0.1s + both; grid-column: 1; grid-row: 1; z-index: 1; @@ -247,8 +261,25 @@ grid-row: 1; } } + .cm-result { + color: $text-bright; + text-align: center; + margin-top: 1.5rem; + margin-bottom: 0.5rem; + margin-bottom: 165px; + .cm-result-positif { + color: $green-2; + } + .cm-result-negatif { + color: $red-no-data; + } + } .cm-badge { - margin: 2rem; + position: absolute; + top: 135px; + @media #{$large-phone} { + top: 142px; + } } .cm-button-valid { margin-top: 1rem; @@ -263,17 +294,17 @@ margin-top: 1.25rem; } } -.cm-overspent-value { - color: $red-primary; -} // FollowChallengeTimeLine .list-of-days-duration { display: flex; flex-direction: row; justify-content: center; - margin-top: 1rem; + margin-top: 3rem; width: 100%; + @media #{$large-phone} { + margin-top: 1rem; + } .day-solo { display: flex; flex-direction: column; @@ -295,6 +326,9 @@ .futur { background-color: $grey-dark; } + .none { + opacity: 0; + } .date-label { width: 0.625rem; height: 0.625rem; @@ -326,6 +360,7 @@ display: flex; flex-direction: row; align-items: center; + justify-content: center; width: 100%; .pile-section { display: grid; @@ -385,6 +420,7 @@ justify-content: space-between; background-color: $dark-light-2; width: 100%; + min-height: 55vh; padding-top: 1rem; padding-bottom: 0.5rem; &.--available { @@ -392,7 +428,7 @@ height: 74vh; } .cp-icon { - margin-bottom: 1rem; + margin: 1rem; } .cp-icon-available { margin: 2rem; @@ -401,6 +437,7 @@ display: grid; align-items: center; justify-items: center; + margin: -100px; .cp-win-badge { grid-column: 1; grid-row: 1; @@ -450,7 +487,10 @@ max-width: 53rem; &.--ongoing { @extend .cp-valid; - width: 60%; + width: 25%; + @media #{$large-phone} { + width: 60%; + } } .cp-left-button { margin-right: 0.25rem; @@ -503,3 +543,30 @@ } } } + +// animations + +@-webkit-keyframes scale-in-center { + 0% { + -webkit-transform: scale(0); + transform: scale(0); + opacity: 1; + } + 100% { + -webkit-transform: scale(1); + transform: scale(1); + opacity: 1; + } +} +@keyframes scale-in-center { + 0% { + -webkit-transform: scale(0); + transform: scale(0); + opacity: 1; + } + 100% { + -webkit-transform: scale(1); + transform: scale(1); + opacity: 1; + } +} diff --git a/src/styles/components/_ecogesture.scss b/src/styles/components/_ecogesture.scss index b5900788c3578ae130b1d2bff715184dc220bc91..4006d837fec8ee9bfc8498019a9be97b59fb0f6f 100644 --- a/src/styles/components/_ecogesture.scss +++ b/src/styles/components/_ecogesture.scss @@ -54,7 +54,7 @@ display: flex; flex-direction: column; align-items: center; - justify-content: flex-end; + justify-content: space-around; &.ec-content-unlocked { padding: 0.4rem 0; } @@ -64,11 +64,6 @@ .ec-content-icon{ min-height: 50px; } - .ec-content-challenge-text { - display: flex; - flex: 1; - align-items: center; - } .ec-content-short-name { display: flex; flex: 1; @@ -163,6 +158,9 @@ flex-direction: column; justify-content: center; align-items: center; + .icon { + margin-bottom: 1rem; + } } .em-description { padding-bottom: 2.5rem; diff --git a/src/styles/components/_fluid.scss b/src/styles/components/_fluid.scss index 33cc49178ee5a8c52c6d61d3a6419b2b58e366bb..eefc82bf4df61ae03de2099b596aa8fa7a899322 100644 --- a/src/styles/components/_fluid.scss +++ b/src/styles/components/_fluid.scss @@ -90,7 +90,7 @@ } } } - + .fv-footer-challenge { width: 100%; max-width: 58.75rem; @@ -126,3 +126,45 @@ } } } + +// Enedis Half Hour Load Activation +.cta-box { + background-color: rgba(18, 18, 18, 0.8); + position: absolute; + left: 0; + width: calc(100vw - 220px); + padding: 0rem 1rem 0rem 0rem; + z-index: 1; + display: flex; + justify-content: center; + align-items: center; + flex-direction: column; + height: 37.5rem; + @media #{$large-phone} { + height: 29rem; + width: 100vw; + } + @media #{$tablet} { + width: 100vw; + } + + .cta-box-header { + text-align: center; + font-weight: bold; + letter-spacing: 0.2px; + margin-bottom: 1.5em; + color: $text-bright; + width: 50%; + @media #{$large-phone} { + width: 80%; + } + } + .cta-box-button { + margin-left: auto; + margin-right: auto; + width: 50%; + @media #{$large-phone} { + width: 80%; + } + } +} diff --git a/src/styles/components/_form.scss b/src/styles/components/_form.scss index b783811df1eb23611db386fdd20d3a7eb792a389..84d3cff65330d16599687fe1ffd31b829b4fa486 100644 --- a/src/styles/components/_form.scss +++ b/src/styles/components/_form.scss @@ -19,10 +19,16 @@ border-radius: 4px; color: $google-text-1; padding: 0 5%; + outline-offset: -1px; + } + .form-input:focus{ + outline: none; + box-shadow: inset 0px 0px 0px 1px $gold-shadow; } .form-group { display: flex; flex-direction: column; + margin: 1.5rem 0 0 0; .form-trailing-icon { float: right; position: relative; @@ -39,6 +45,10 @@ .form-message { color: $red-error; min-height: 1.25rem; + margin-top: 0.125rem; + } + .form-button { + margin-top: 0.125rem; } ::placeholder { color: $google-text-1; diff --git a/src/styles/components/_konnector.scss b/src/styles/components/_konnector.scss index f12600f8c40f89692e245945242f78f4f827865b..f45481cfd8e0624d746c808dea141381217c6f40 100644 --- a/src/styles/components/_konnector.scss +++ b/src/styles/components/_konnector.scss @@ -44,6 +44,7 @@ } .state-picto { position: absolute; + display: flex; } } .accordion-update-result { @@ -111,39 +112,71 @@ } } +// KonnectorNotFound +.knotfound { + margin: 0 1.5rem; + @media #{$large-phone} { + margin: 0; + } + .knotfound-text { + color: $text-bright; + padding-top: 1rem; + } + .knotfound-button { + margin-bottom: 1rem; + } +} + // KonnectorOAuthForm -.koauthform{ +.koauthform { margin: 0 1.5rem; @media #{$large-phone} { margin: 0; } - .koauthform-text{ + .koauthform-text { color: $text-bright; padding-top: 1rem; } - .koauthform-button{ + .koauthform-button { margin-bottom: 1rem; } } +// KonnectorLoginForm +.kloginauthform { + .kloginauthform-text { + color: $text-bright; + padding-top: 1rem; + } + .kloginauthform-button { + margin-bottom: 1rem; + } +} + + // KonnectorLoading -.kload-content { +.klaunch-content { margin: 0.5rem 1.5rem; @media #{$large-phone} { margin: 0.5rem 0; } - .kload-content-text { + .klaunch-content-text { color: $text-bright; margin: 1rem 0; } - .kload-content-text-center { + .klaunch-content-text-center { text-align: center; } + .klaunch-info-txt { + margin-top: 1.5rem; + } } + .state-icon { height: 22px; width: 22px; - margin-left: 32px; - margin-bottom: 40px; + position: absolute; + bottom: 8px; + left: 30px; } diff --git a/src/styles/components/_nav.scss b/src/styles/components/_nav.scss index ec1db7f555bc615166b4b8f493e8de82ff453579..d8e4e8189cba94b337741c0e5dc4fa6c28d7a617 100644 --- a/src/styles/components/_nav.scss +++ b/src/styles/components/_nav.scss @@ -17,6 +17,14 @@ @media #{$tablet} { background-color: $primary-color; } + .logo-grand-lyon { + position: absolute; + top: 50%; + left: 100px; + @media #{$tablet} { + display: none; + } + } } .c-nav-link { padding: 0 1rem; @@ -76,3 +84,24 @@ box-shadow: unset; } } + +.nb-challenge-notif { + position: absolute; + display: flex; + justify-content: center; + align-items: center; + left: 42px; + bottom: 22px; + width: 1.25rem; + height: 1.25rem; + color: $dark-light; + border-radius: 50%; + border: 1px solid $dark-light; + z-index: 1; + background: $blue-radial-gradient; + font-size: 12px; + @media #{$tablet} { + left: 25px; + bottom: unset; + } +} diff --git a/src/styles/index.scss b/src/styles/index.scss index 840c8d99c5335c425aec2a8b469b6b8318629034..79e0b9103d483cb5de60521f71f4276d6130e4f0 100644 --- a/src/styles/index.scss +++ b/src/styles/index.scss @@ -22,7 +22,7 @@ @import 'components/modal'; @import 'components/faq'; @import 'components/splash'; -@import 'components/oauth'; +@import 'components/auth'; :root { --blue: #{$blue}; diff --git a/src/targets/browser/index.tsx b/src/targets/browser/index.tsx index 956406bcb7ba757cac820203914cd303d274ed6c..2686920170ff6cfe0040793c4eec705c8218fed7 100644 --- a/src/targets/browser/index.tsx +++ b/src/targets/browser/index.tsx @@ -35,7 +35,6 @@ const getDataOrDefault = function(toTest, defaultData) { document.addEventListener('DOMContentLoaded', () => { const root = document.querySelector('[role=application]') const data = root.dataset - const appIcon = getDataOrDefault( data.cozyIconPath, require('../vendor/assets/icon.svg') @@ -49,7 +48,8 @@ document.addEventListener('DOMContentLoaded', () => { const appSlug = getDataOrDefault(data.cozyAppSlug, manifest.slug) const appVersion = getDataOrDefault(data.cozyAppVersion, manifest.version) - appLocale = getDataOrDefault(data.cozyLocale, 'en') + // appLocale = getDataOrDefault(data.cozyLocale, 'fr') + appLocale = 'fr' const protocol = window.location ? window.location.protocol : 'https:'