diff --git a/.vscode/settings.json b/.vscode/settings.json
index 296bf5e4667218150edea99874c5c57df612e225..b50abf3cd3f39274f45886c0ca3f1b202430cbc7 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -87,6 +87,7 @@
"ENEDIS",
"enedissgegrandlyon",
"energical",
+ "epgl",
"Epgl",
"esnext",
"Explo",
diff --git a/scripts/createConnections.ts b/scripts/createConnections.ts
index e8b11a1ba34e7b96444bce58ddfe38277e8c8944..0534f8ad4a27e61a5b6152aa97a846f3d6001a90 100644
--- a/scripts/createConnections.ts
+++ b/scripts/createConnections.ts
@@ -40,11 +40,13 @@ const GRDF_ACCOUNT: Partial<Account> = {
id: GRDF_ACCOUNT_ID,
account_type: 'grdfgrandlyon',
auth: {
- credentials_encrypted:
- 'bmFjbMKrNCS+4Liakxdu+xNu9I3sSyvda8iAp0o3U3OAymbIeoLhLtxPdsa+3mu/8yTnDudBcJo=',
- login: 'test',
+ pce: '12345678901234',
+ email: 'jane@grandlyon.com',
+ lastname: 'Doe',
+ firstname: 'Jane',
+ postalCode: '69003',
},
- identifier: 'login',
+ identifier: 'email',
state: null,
}
const dataGrdfAccount = JSON.stringify(GRDF_ACCOUNT)
@@ -54,11 +56,10 @@ const EGL_ACCOUNT: Partial<Account> = {
id: EGL_ACCOUNT_ID,
account_type: 'eglgrandlyon',
auth: {
- credentials_encrypted:
- 'bmFjbHI5OoL+VNCT6JDFYea1dNiBGGNJM1zY0M4uWcjhALJcQT9uk9p9WPD7+1OryCAoYf9eaSE=',
- login: 'test',
+ contractId: '1234567',
+ meteringId: '123456789ABC',
},
- identifier: 'login',
+ identifier: 'contractId',
state: null,
}
const dataEglAccount = JSON.stringify(EGL_ACCOUNT)
diff --git a/src/assets/icons/ico/trailing-icon.svg b/src/assets/icons/ico/trailing-icon.svg
deleted file mode 100644
index a166346947602467cc2986cf39a65c08c9030926..0000000000000000000000000000000000000000
--- a/src/assets/icons/ico/trailing-icon.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M12 5C7 5 2.73 8.11 1 12.5C2.73 16.89 7 20 12 20C17 20 21.27 16.89 23 12.5C21.27 8.11 17 5 12 5ZM12 17.5C9.24 17.5 7 15.26 7 12.5C7 9.74 9.24 7.5 12 7.5C14.76 7.5 17 9.74 17 12.5C17 15.26 14.76 17.5 12 17.5ZM12 9.5C10.34 9.5 9 10.84 9 12.5C9 14.16 10.34 15.5 12 15.5C13.66 15.5 15 14.16 15 12.5C15 10.84 13.66 9.5 12 9.5Z" fill="white" fill-opacity="0.6"/>
-</svg>
diff --git a/src/assets/icons/visu/egl-logo.svg b/src/assets/icons/visu/egl-logo.svg
deleted file mode 100644
index 1dbbeb465c136f3eb5c796847de6358aa9b94144..0000000000000000000000000000000000000000
--- a/src/assets/icons/visu/egl-logo.svg
+++ /dev/null
@@ -1,25 +0,0 @@
-<svg width="80" height="80" viewBox="0 0 80 80" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M9.98869 50.3503C9.68579 50.6552 9.24152 50.8189 8.71967 50.8189H7V45.7662H8.71967C9.24152 45.7662 9.68579 45.9299 9.98869 46.2348C10.5105 46.7601 10.4818 47.5336 10.4818 48.2364C10.4818 48.9393 10.5095 49.8261 9.98869 50.3514M9.61458 46.6189C9.35418 46.3493 9.01514 46.2498 8.6272 46.2498H7.53567V50.3375H8.62826C9.0162 50.3375 9.35418 50.238 9.61564 49.9684C9.96106 49.6068 9.94724 48.8548 9.94724 48.2364C9.94724 47.6181 9.96106 46.9805 9.61564 46.6189" fill="black"/>
-<path d="M13.2816 50.8607C12.2666 50.8607 11.5332 50.1579 11.5332 49.1501V45.7653H12.0689V49.1073C12.0689 49.8733 12.5482 50.3772 13.2816 50.3772C14.0149 50.3772 14.5017 49.8733 14.5017 49.1073V45.7653H15.0374V49.1501C15.0374 50.1579 14.2966 50.8607 13.2816 50.8607Z" fill="black"/>
-<path d="M19.216 50.2798C18.8568 50.6564 18.3838 50.8618 17.8131 50.8618C17.2423 50.8618 16.8119 50.6628 16.459 50.3087C15.952 49.7973 15.9659 49.1662 15.9659 48.2932C15.9659 47.4202 15.952 46.7891 16.459 46.2777C16.8119 45.9225 17.2487 45.7246 17.8131 45.7246C18.5113 45.7246 18.8993 45.9161 19.3499 46.3708L18.6867 47.0383C18.4051 46.7548 18.1999 46.6051 17.8131 46.6051C17.5452 46.6051 17.3263 46.711 17.186 46.8746C16.9957 47.0875 16.9469 47.3218 16.9469 48.2943C16.9469 49.2667 16.9957 49.5074 17.186 49.7203C17.3273 49.884 17.5452 49.9824 17.8131 49.9824C18.1096 49.9824 18.3211 49.8765 18.4827 49.6989C18.6453 49.5213 18.7016 49.2592 18.7016 49.011V48.8335H17.8131V48.0097H19.6815V48.734C19.6815 49.4646 19.5689 49.9118 19.216 50.2809" fill="black"/>
-<path d="M23.1494 50.8189L22.1695 48.8034H21.4648V50.8189H20.4849V45.7662H22.4522C23.4746 45.7662 24.0804 46.4691 24.0804 47.3132C24.0804 48.0225 23.65 48.4632 23.1643 48.6397L24.2856 50.8178H23.1505L23.1494 50.8189ZM22.3884 46.6467H21.4648V47.9807H22.3884C22.8189 47.9807 23.1005 47.7036 23.1005 47.3142C23.1005 46.9248 22.8189 46.6478 22.3884 46.6478" fill="black"/>
-<path d="M27.8106 50.8189L27.5141 49.9246H25.7306L25.4277 50.8189H24.4053L26.2312 45.7662H26.9997L28.833 50.8189H27.8106ZM26.6404 47.2565L26.0059 49.0944H27.2537L26.6404 47.2565Z" fill="black"/>
-<path d="M32.279 50.8189L30.2905 47.7176V50.8189H29.3105V45.7662H30.1853L32.1728 48.8601V45.7662H33.1527V50.8189H32.279Z" fill="black"/>
-<path d="M37.3196 50.3364C36.988 50.6702 36.5161 50.8189 35.9943 50.8189H34.1821V45.7662H35.9943C36.5161 45.7662 36.988 45.916 37.3196 46.2487C37.884 46.8168 37.8277 47.5122 37.8277 48.2706C37.8277 49.0291 37.884 49.7684 37.3196 50.3354M36.6362 46.958C36.4672 46.7526 36.2419 46.6456 35.9029 46.6456H35.1631V49.9385H35.9029C36.2408 49.9385 36.4672 49.8315 36.6362 49.6261C36.819 49.3993 36.8477 49.0377 36.8477 48.2706C36.8477 47.5036 36.819 47.1848 36.6362 46.958Z" fill="black"/>
-<path d="M38.6865 50.8189V45.7662H39.6665V49.9385H41.9431V50.8189H38.6865Z" fill="black"/>
-<path d="M43.9524 48.7467V50.8189H42.9799V48.7467L41.4707 45.7662H42.5357L43.4731 47.8021L44.3967 45.7662H45.4606L43.9524 48.7467Z" fill="black"/>
-<path d="M48.8942 50.3076C48.5413 50.6628 48.112 50.8607 47.5402 50.8607C46.9683 50.8607 46.5315 50.6617 46.1797 50.3076C45.6717 49.7963 45.6866 49.1651 45.6866 48.2921C45.6866 47.4191 45.6728 46.788 46.1797 46.2766C46.5326 45.9214 46.9694 45.7235 47.5402 45.7235C48.1109 45.7235 48.5413 45.9225 48.8942 46.2766C49.4022 46.788 49.3948 47.4191 49.3948 48.2921C49.3948 49.1651 49.4022 49.7963 48.8942 50.3076ZM48.1683 46.8725C48.0269 46.7088 47.8091 46.6029 47.5412 46.6029C47.2734 46.6029 47.0481 46.7088 46.9067 46.8725C46.7165 47.0854 46.6676 47.3197 46.6676 48.2921C46.6676 49.2646 46.7165 49.4988 46.9067 49.7117C47.0481 49.8754 47.2734 49.9813 47.5412 49.9813C47.8091 49.9813 48.028 49.8754 48.1683 49.7117C48.3585 49.4988 48.4149 49.2646 48.4149 48.2921C48.4149 47.3197 48.3585 47.0854 48.1683 46.8725Z" fill="black"/>
-<path d="M53.2229 50.8189L51.2343 47.7176V50.8189H50.2544V45.7662H51.1291L53.1166 48.8601V45.7662H54.0965V50.8189H53.2229Z" fill="black"/>
-<path d="M20.8979 32.9372C20.7417 32.6334 20.5291 32.2942 20.2634 31.9262C20.105 31.7272 19.8925 31.4833 19.6299 31.1987C19.2611 30.8479 18.9954 30.62 18.8211 30.5034C18.5416 30.2926 18.3099 30.1332 18.1143 30.0145C17.7732 29.808 17.3172 29.6037 16.7581 29.4058C16.028 29.1608 15.2744 29.0313 14.5177 29.0206H14.3721C13.6015 29.0206 12.8182 29.1501 12.0434 29.4058C11.4844 29.6037 11.0284 29.808 10.6883 30.0145C10.4917 30.1322 10.2547 30.2969 9.9847 30.5012C9.8072 30.6189 9.5415 30.8479 9.1695 31.202C8.91017 31.4833 8.6976 31.7272 8.53712 31.9284C8.27141 32.2953 8.05884 32.6344 7.90473 32.9361C7.32548 34.0476 7.0332 35.2105 7.0332 36.3916V36.4804C7.0332 37.6796 7.3308 38.8575 7.91748 39.9808C8.10454 40.3274 8.35218 40.6965 8.65403 41.0773C8.92718 41.4314 9.28323 41.7952 9.7158 42.16C9.96132 42.3579 10.1834 42.5226 10.3779 42.6499C11.6087 43.4469 12.967 43.8513 14.4146 43.8513C15.4891 43.8513 16.5551 43.6117 17.584 43.1378C17.9847 42.9313 18.3811 42.6884 18.7595 42.4146C18.9657 42.2755 19.2144 42.0647 19.495 41.7919C19.6841 41.6336 19.7809 41.4731 19.7809 41.3169V41.2742C19.7809 41.1832 19.7522 41.0966 19.6958 41.0153L18.7148 40.0129C18.5767 39.8406 18.4268 39.7529 18.2716 39.7529C18.1622 39.7529 18.0548 39.7925 17.956 39.8695L17.9496 39.8749C17.8348 39.9904 17.7136 40.1027 17.5882 40.2097C17.3278 40.4333 17.0855 40.6087 16.8687 40.7318C16.0939 41.165 15.2787 41.3854 14.4454 41.3854C13.3539 41.3854 12.3548 41.0634 11.4727 40.4269C11.3196 40.322 11.1071 40.1316 10.8413 39.8631C10.6288 39.6288 10.463 39.4277 10.3503 39.2672C10.0113 38.7601 9.76682 38.2252 9.62015 37.6753H21.2943C21.6057 37.686 21.7694 37.5213 21.7694 37.2003V35.7005C21.7694 35.5882 21.7492 35.4919 21.7088 35.4148C21.5898 34.5729 21.3188 33.7385 20.9 32.9372M14.3731 31.4715C14.5475 31.4715 14.7069 31.4812 14.8631 31.5004C15.3329 31.5486 15.809 31.6663 16.2767 31.8481C17.5117 32.3798 18.4098 33.2688 18.9455 34.4895C19.0401 34.7238 19.1208 34.9655 19.1857 35.2105H9.61802C9.68179 34.9666 9.76257 34.7248 9.85716 34.4905C10.3928 33.2688 11.292 32.3798 12.5259 31.8481C13.1477 31.5978 13.7695 31.4715 14.3721 31.4715" fill="black"/>
-<path d="M37.7937 36.4866C37.7937 34.7353 37.2484 33.1542 36.1728 31.7848C35.8508 31.3922 35.4799 31.0188 35.0685 30.6733C34.6944 30.377 34.3479 30.1363 34.0376 29.9608C32.9025 29.3328 31.7025 29.014 30.4707 29.014H30.3836C29.2963 29.014 28.2207 29.2687 27.1876 29.7693C26.9049 29.8966 26.5627 30.101 26.1694 30.378C25.9218 30.5471 25.6253 30.7963 25.2841 31.1205C25.0024 31.4029 24.7888 31.6372 24.6496 31.818C24.3945 32.1635 24.1862 32.477 24.0321 32.7519C23.3869 33.9127 23.0596 35.1355 23.0596 36.385V36.4727C23.0596 37.5265 23.2923 38.5738 23.7525 39.588C24.3977 40.9349 25.3691 42.0132 26.6403 42.791C27.8232 43.4895 29.088 43.8437 30.3974 43.8437H37.3037C37.3133 43.8437 37.3239 43.8437 37.3335 43.8437C37.4993 43.8437 37.6236 43.7998 37.7012 43.7131C37.7767 43.6286 37.8075 43.5056 37.7926 43.3526V36.4855L37.7937 36.4866ZM35.3598 36.5305V41.3917H30.4271C29.2974 41.3917 28.2494 41.0151 27.313 40.2748C27.1185 40.109 26.8943 39.8832 26.6488 39.6062C25.8835 38.6519 25.4945 37.5832 25.4945 36.4267C25.4945 35.8009 25.6157 35.175 25.8548 34.5685C26.0759 34.0186 26.3958 33.5168 26.805 33.0761L26.8783 33.0012C27.1005 32.768 27.2854 32.5979 27.4257 32.493C28.3355 31.8094 29.3441 31.4617 30.4261 31.4617C31.3922 31.4617 32.2999 31.7356 33.1214 32.2737C33.334 32.4192 33.5774 32.615 33.842 32.8525C34.0982 33.121 34.2735 33.3211 34.3766 33.4634C34.5786 33.7436 34.738 34.0122 34.8539 34.2625C35.1887 34.9268 35.3587 35.6896 35.3587 36.5273" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M53.951 29.1362C54.0286 29.2164 54.0658 29.3341 54.0605 29.4838H54.0616V32.1219H51.6266V29.4368C51.6266 29.241 51.7085 29.0067 52.0985 29.0067H53.5737C53.7417 29.0067 53.8681 29.0506 53.951 29.1362ZM51.4746 37.6603C51.3318 38.2213 51.0887 38.7582 50.7477 39.2651C50.6339 39.4277 50.4724 39.6234 50.2577 39.8599C49.9888 40.1305 49.7752 40.321 49.6232 40.4258C48.7421 41.0613 47.7568 41.3833 46.6951 41.3833C45.6333 41.3833 44.648 41.0613 43.7659 40.4247C43.615 40.321 43.4013 40.1305 43.1346 39.862C42.922 39.6277 42.7562 39.4266 42.6435 39.2661C42.06 38.3996 41.7635 37.4475 41.7635 36.4354V29.4528C41.7635 29.256 41.6817 29.0217 41.2905 29.0217H39.8153C39.6463 29.0217 39.5199 29.0656 39.437 29.1511C39.3594 29.2324 39.3232 29.3491 39.3275 29.4967V36.5103C39.3275 37.7021 39.6251 38.8692 40.2118 39.9808C40.3999 40.3284 40.6475 40.6975 40.9483 41.0773C41.2225 41.4325 41.5796 41.7962 42.0101 42.1599C42.2545 42.3568 42.4777 42.5215 42.6733 42.6499C43.9041 43.4469 45.257 43.8513 46.6951 43.8513C48.1331 43.8513 49.4861 43.4469 50.7168 42.6499C50.9124 42.5215 51.1282 42.3621 51.3811 42.1589C51.8105 41.7951 52.1676 41.4314 52.4418 41.0773C52.7437 40.6954 52.9913 40.3263 53.1784 39.9797C53.5714 39.2286 53.8342 38.452 53.9649 37.6603H51.4746Z" fill="black"/>
-<path d="M72.9993 37.7876H46.7632V31.9946H72.9993V37.7887V37.7876ZM47.0161 37.533H72.7463V32.2492H47.0161V37.533Z" fill="black"/>
-<path d="M48.5164 36.5521C48.4856 36.5521 48.4644 36.5307 48.4644 36.4997V33.0656C48.4644 33.0346 48.4856 33.0132 48.5164 33.0132H49.8811C50.6453 33.0132 51.1055 33.4764 51.1055 34.1525C51.1055 34.8286 50.64 35.2865 49.8811 35.2865H49.2551C49.2338 35.2865 49.2243 35.2972 49.2243 35.3186V36.4986C49.2243 36.5296 49.203 36.551 49.1722 36.551H48.5154L48.5164 36.5521ZM50.3456 34.1547C50.3456 33.868 50.1543 33.6754 49.8344 33.6754H49.2551C49.2338 33.6754 49.2243 33.6861 49.2243 33.7064V34.5965C49.2243 34.6168 49.2349 34.6275 49.2551 34.6275H49.8344C50.1543 34.6275 50.3456 34.4403 50.3456 34.1547Z" fill="black"/>
-<path d="M51.5767 35.2523V33.0678C51.5767 33.0368 51.5969 33.0154 51.6277 33.0154H52.2845C52.3153 33.0154 52.3366 33.0368 52.3366 33.0678V35.2737C52.3366 35.6952 52.5693 35.9349 52.9265 35.9349C53.2836 35.9349 53.51 35.6952 53.51 35.2737V33.0678C53.51 33.0368 53.5312 33.0154 53.562 33.0154H54.2178C54.2497 33.0154 54.2699 33.0368 54.2699 33.0678V35.2523C54.2699 36.1317 53.7119 36.6099 52.9265 36.6099C52.141 36.6099 51.5777 36.1317 51.5777 35.2523H51.5767Z" fill="black"/>
-<path d="M54.9272 33.0665C54.9272 33.0354 54.9485 33.014 54.9793 33.014H56.3493C57.1135 33.014 57.4706 33.3938 57.4706 33.9555C57.4706 34.3406 57.2952 34.5802 57.0625 34.7107V34.7214C57.2952 34.8102 57.5323 35.1012 57.5323 35.5227C57.5323 36.2202 57.072 36.5529 56.3121 36.5529H54.9793C54.9485 36.5529 54.9272 36.5316 54.9272 36.5005V33.0665ZM56.2558 34.4615C56.5459 34.4615 56.716 34.3053 56.716 34.0453C56.716 33.7854 56.5459 33.6345 56.2558 33.6345H55.7191C55.6978 33.6345 55.6882 33.6452 55.6882 33.6655V34.4305C55.6882 34.4508 55.6989 34.4615 55.7191 34.4615H56.2558ZM55.7191 35.9335H56.2983C56.6087 35.9335 56.7734 35.7666 56.7734 35.4917C56.7734 35.2168 56.6076 35.0499 56.2983 35.0499H55.7191C55.6978 35.0499 55.6882 35.0606 55.6882 35.0809V35.9036C55.6882 35.9239 55.6989 35.9346 55.7191 35.9346V35.9335Z" fill="black"/>
-<path d="M58.0815 33.0665C58.0815 33.0354 58.1028 33.014 58.1336 33.014H58.7905C58.8213 33.014 58.8425 33.0354 58.8425 33.0665V35.8394C58.8425 35.8608 58.8532 35.8704 58.8734 35.8704H60.424C60.4549 35.8704 60.4761 35.8918 60.4761 35.9228V36.5005C60.4761 36.5316 60.4549 36.5529 60.424 36.5529H58.1347C58.1039 36.5529 58.0826 36.5316 58.0826 36.5005V33.0665H58.0815Z" fill="black"/>
-<path d="M60.9248 33.0665C60.9248 33.0354 60.9461 33.014 60.9769 33.014H61.6337C61.6645 33.014 61.6858 33.0354 61.6858 33.0665V36.5005C61.6858 36.5316 61.6645 36.5529 61.6337 36.5529H60.9769C60.9461 36.5529 60.9248 36.5316 60.9248 36.5005V33.0665Z" fill="black"/>
-<path d="M64.7935 36.8066C64.7723 36.828 64.7415 36.8323 64.716 36.8066L64.3588 36.4472C64.1516 36.551 63.9093 36.6087 63.6457 36.6087C63.0314 36.6087 62.5446 36.3231 62.3639 35.7507C62.2874 35.5058 62.2661 35.3089 62.2661 34.7826C62.2661 34.2562 62.2874 34.0594 62.3639 33.8144C62.5446 33.2421 63.0314 32.9564 63.6457 32.9564C64.26 32.9564 64.7415 33.2431 64.9275 33.8144C65.005 34.0594 65.0263 34.2562 65.0263 34.7826C65.0263 35.3089 65.005 35.5058 64.9275 35.7507C64.9019 35.8288 64.8711 35.8962 64.8392 35.9647L65.2059 36.3284C65.2272 36.3498 65.2272 36.3809 65.2059 36.4012L64.7935 36.8066ZM63.8317 35.9176L63.6095 35.694C63.5883 35.6727 63.584 35.647 63.6095 35.6213L64.023 35.2265C64.0538 35.2009 64.0793 35.2051 64.0995 35.2265L64.2387 35.3667C64.2547 35.2469 64.26 35.0704 64.26 34.7836C64.26 34.3215 64.2451 34.1439 64.2037 34.0198C64.1261 33.7748 63.9348 33.6293 63.6457 33.6293C63.3566 33.6293 63.1642 33.7748 63.0877 34.0198C63.0462 34.1439 63.0314 34.3215 63.0314 34.7836C63.0314 35.2458 63.0462 35.4234 63.0877 35.5486C63.1642 35.7935 63.3555 35.939 63.6457 35.939C63.7126 35.939 63.7753 35.9337 63.8317 35.9176Z" fill="black"/>
-<path d="M65.5908 35.2523V33.0678C65.5908 33.0368 65.611 33.0154 65.6429 33.0154H66.2987C66.3295 33.0154 66.3507 33.0368 66.3507 33.0678V35.2737C66.3507 35.6952 66.5835 35.9349 66.9406 35.9349C67.2977 35.9349 67.5241 35.6952 67.5241 35.2737V33.0678C67.5241 33.0368 67.5443 33.0154 67.5762 33.0154H68.232C68.2638 33.0154 68.284 33.0368 68.284 33.0678V35.2523C68.284 36.1317 67.7261 36.6099 66.9406 36.6099C66.1552 36.6099 65.5919 36.1317 65.5919 35.2523H65.5908Z" fill="black"/>
-<path d="M68.9424 33.0665C68.9424 33.0354 68.9636 33.014 68.9945 33.014H71.2477C71.2785 33.014 71.2998 33.0354 71.2998 33.0665V33.6228C71.2998 33.6549 71.2785 33.6752 71.2477 33.6752H69.7331C69.7119 33.6752 69.7023 33.6859 69.7023 33.7062V34.4091C69.7023 34.4305 69.7129 34.4401 69.7331 34.4401H70.9947C71.0255 34.4401 71.0457 34.4615 71.0457 34.4925V35.0445C71.0457 35.0755 71.0255 35.0969 70.9947 35.0969H69.7331C69.7119 35.0969 69.7023 35.1076 69.7023 35.128V35.8608C69.7023 35.8822 69.7129 35.8918 69.7331 35.8918H71.2477C71.2785 35.8918 71.2998 35.9132 71.2998 35.9442V36.5005C71.2998 36.5316 71.2785 36.5529 71.2477 36.5529H68.9945C68.9636 36.5529 68.9424 36.5316 68.9424 36.5005V33.0665Z" fill="black"/>
-</svg>
diff --git a/src/assets/icons/visu/onboarding/browser_egl.svg b/src/assets/icons/visu/onboarding/browser_egl.svg
deleted file mode 100644
index df9f9e889b443ac056d8d65dc60a17ebfdb306ce..0000000000000000000000000000000000000000
--- a/src/assets/icons/visu/onboarding/browser_egl.svg
+++ /dev/null
@@ -1,30 +0,0 @@
-<svg width="83" height="62" viewBox="0 0 83 62" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M0.5 8.5H82.5V58C82.5 59.933 80.933 61.5 79 61.5H4C2.06701 61.5 0.5 59.933 0.5 58V8.5Z" fill="white" stroke="#A2B4C1"/>
-<path d="M0 4C0 1.79086 1.79086 0 4 0H79C81.2091 0 83 1.79086 83 4V8H0V4Z" fill="#A2B4C1"/>
-<circle cx="5" cy="5" r="2" fill="#FF5F5F"/>
-<circle cx="11" cy="5" r="2" fill="#FFB850"/>
-<circle cx="17" cy="5" r="2" fill="#3CE800"/>
-<path d="M13.717 44.0593C13.4417 44.3364 13.0378 44.4852 12.5634 44.4852H11V39.8918H12.5634C13.0378 39.8918 13.4417 40.0406 13.717 40.3178C14.1914 40.7954 14.1654 41.4985 14.1654 42.1375C14.1654 42.7765 14.1905 43.5827 13.717 44.0602M13.3769 40.667C13.1402 40.4219 12.832 40.3314 12.4793 40.3314H11.487V44.0476H12.4803C12.8329 44.0476 13.1402 43.9571 13.3779 43.7121C13.6919 43.3833 13.6793 42.6996 13.6793 42.1375C13.6793 41.5753 13.6919 40.9957 13.3779 40.667" fill="#1A171B"/>
-<path d="M16.7105 44.5233C15.7878 44.5233 15.1211 43.8843 15.1211 42.9682V39.891H15.6081V42.9293C15.6081 43.6256 16.0438 44.0837 16.7105 44.0837C17.3772 44.0837 17.8198 43.6256 17.8198 42.9293V39.891H18.3067V42.9682C18.3067 43.8843 17.6333 44.5233 16.7105 44.5233Z" fill="#1A171B"/>
-<path d="M22.1056 43.9952C21.779 44.3375 21.3491 44.5242 20.8302 44.5242C20.3113 44.5242 19.92 44.3433 19.5992 44.0214C19.1384 43.5565 19.1509 42.9827 19.1509 42.1891C19.1509 41.3955 19.1384 40.8217 19.5992 40.3568C19.92 40.0339 20.3171 39.854 20.8302 39.854C21.465 39.854 21.8177 40.0281 22.2274 40.4414L21.6244 41.0483C21.3684 40.7906 21.1819 40.6544 20.8302 40.6544C20.5867 40.6544 20.3877 40.7507 20.2601 40.8995C20.0872 41.093 20.0427 41.306 20.0427 42.1901C20.0427 43.0741 20.0872 43.293 20.2601 43.4865C20.3886 43.6353 20.5867 43.7248 20.8302 43.7248C21.0998 43.7248 21.2921 43.6285 21.4389 43.4671C21.5868 43.3056 21.638 43.0673 21.638 42.8417V42.6803H20.8302V41.9314H22.5288V42.5898C22.5288 43.2541 22.4264 43.6606 22.1056 43.9961" fill="#1A171B"/>
-<path d="M25.6816 44.4852L24.7907 42.6529H24.1501V44.4852H23.2593V39.8918H25.0478C25.9773 39.8918 26.528 40.5308 26.528 41.2982C26.528 41.943 26.1367 42.3437 25.6951 42.5041L26.7145 44.4843H25.6826L25.6816 44.4852ZM24.9898 40.6923H24.1501V41.905H24.9898C25.3811 41.905 25.6372 41.6532 25.6372 41.2991C25.6372 40.9451 25.3811 40.6932 24.9898 40.6932" fill="#1A171B"/>
-<path d="M29.919 44.4852L29.6495 43.6722H28.0281L27.7528 44.4852H26.8232L28.4832 39.8918H29.1818L30.8485 44.4852H29.919ZM28.8552 41.2466L28.2784 42.9175H29.4127L28.8552 41.2466Z" fill="#1A171B"/>
-<path d="M33.9814 44.4852L32.1736 41.6658V44.4852H31.2827V39.8918H32.0779L33.8848 42.7045V39.8918H34.7756V44.4852H33.9814Z" fill="#1A171B"/>
-<path d="M38.5637 44.0466C38.2623 44.3501 37.8333 44.4852 37.3588 44.4852H35.7114V39.8918H37.3588C37.8333 39.8918 38.2623 40.028 38.5637 40.3305C39.0768 40.8469 39.0256 41.4791 39.0256 42.1686C39.0256 42.8582 39.0768 43.5302 38.5637 44.0456M37.9424 40.9753C37.7888 40.7885 37.584 40.6913 37.2757 40.6913H36.6033V43.6848H37.2757C37.583 43.6848 37.7888 43.5876 37.9424 43.4008C38.1086 43.1947 38.1347 42.8659 38.1347 42.1686C38.1347 41.4713 38.1086 41.1815 37.9424 40.9753Z" fill="#1A171B"/>
-<path d="M39.8062 44.4852V39.8918H40.697V43.6848H42.7667V44.4852H39.8062Z" fill="#1A171B"/>
-<path d="M44.5935 42.6014V44.4852H43.7094V42.6014L42.3374 39.8918H43.3056L44.1578 41.7426L44.9974 39.8918H45.9646L44.5935 42.6014Z" fill="#1A171B"/>
-<path d="M49.086 44.0204C48.7652 44.3433 48.3749 44.5233 47.8551 44.5233C47.3352 44.5233 46.9381 44.3424 46.6183 44.0204C46.1564 43.5556 46.17 42.9818 46.17 42.1881C46.17 41.3945 46.1574 40.8207 46.6183 40.3558C46.9391 40.033 47.3362 39.853 47.8551 39.853C48.3739 39.853 48.7652 40.0339 49.086 40.3558C49.5479 40.8207 49.5411 41.3945 49.5411 42.1881C49.5411 42.9818 49.5479 43.5556 49.086 44.0204ZM48.4261 40.8976C48.2976 40.7488 48.0995 40.6525 47.856 40.6525C47.6125 40.6525 47.4077 40.7488 47.2792 40.8976C47.1062 41.0911 47.0618 41.3041 47.0618 42.1881C47.0618 43.0722 47.1062 43.2852 47.2792 43.4787C47.4077 43.6275 47.6125 43.7238 47.856 43.7238C48.0995 43.7238 48.2986 43.6275 48.4261 43.4787C48.5991 43.2852 48.6503 43.0722 48.6503 42.1881C48.6503 41.3041 48.5991 41.0911 48.4261 40.8976Z" fill="#1A171B"/>
-<path d="M53.0214 44.4852L51.2136 41.6658V44.4852H50.3228V39.8918H51.118L52.9248 42.7045V39.8918H53.8157V44.4852H53.0214Z" fill="#1A171B"/>
-<path d="M23.6347 28.229C23.4926 27.9528 23.2994 27.6445 23.0578 27.3099C22.9139 27.129 22.7206 26.9073 22.482 26.6486C22.1467 26.3296 21.9051 26.1224 21.7467 26.0164C21.4926 25.8248 21.2819 25.6799 21.1041 25.572C20.794 25.3843 20.3795 25.1985 19.8712 25.0186C19.2074 24.7959 18.5224 24.6782 17.8344 24.6685H17.7021C17.0015 24.6685 16.2894 24.7861 15.5851 25.0186C15.0768 25.1985 14.6623 25.3843 14.3531 25.572C14.1744 25.6789 13.9589 25.8287 13.7135 26.0145C13.5521 26.1215 13.3106 26.3296 12.9724 26.6515C12.7366 26.9073 12.5434 27.129 12.3975 27.3119C12.1559 27.6455 11.9627 27.9538 11.8226 28.228C11.296 29.2385 11.0303 30.2957 11.0303 31.3694V31.4501C11.0303 32.5404 11.3008 33.6111 11.8342 34.6323C12.0042 34.9474 12.2294 35.283 12.5038 35.6292C12.7521 35.9511 13.0758 36.2818 13.469 36.6134C13.6922 36.7934 13.8942 36.9431 14.071 37.0589C15.1899 37.7834 16.4247 38.1511 17.7407 38.1511C18.7176 38.1511 19.6867 37.9332 20.622 37.5024C20.9863 37.3147 21.3467 37.0939 21.6906 36.8449C21.8781 36.7185 22.1042 36.5269 22.3593 36.2789C22.5313 36.1349 22.6192 35.9891 22.6192 35.8471V35.8082C22.6192 35.7255 22.5931 35.6467 22.5419 35.5728L21.6501 34.6615C21.5244 34.5049 21.3882 34.4252 21.2471 34.4252C21.1476 34.4252 21.05 34.4612 20.9602 34.5312L20.9544 34.536C20.85 34.6411 20.7399 34.7432 20.6259 34.8405C20.3891 35.0437 20.1688 35.2032 19.9717 35.3151C19.2673 35.709 18.5263 35.9093 17.7687 35.9093C16.7764 35.9093 15.8682 35.6166 15.0662 35.0379C14.9271 34.9426 14.7338 34.7695 14.4923 34.5254C14.299 34.3124 14.1483 34.1295 14.0459 33.9836C13.7376 33.5226 13.5154 33.0364 13.3821 32.5365H23.9951C24.2782 32.5462 24.427 32.3964 24.427 32.1046V30.7411C24.427 30.639 24.4086 30.5515 24.3719 30.4814C24.2637 29.716 24.0173 28.9574 23.6366 28.229M17.703 26.8966C17.8615 26.8966 18.0064 26.9053 18.1485 26.9229C18.5755 26.9666 19.0084 27.0736 19.4335 27.2389C20.5563 27.7223 21.3728 28.5305 21.8597 29.6402C21.9457 29.8532 22.0192 30.073 22.0781 30.2957H13.3801C13.4381 30.0739 13.5115 29.8541 13.5975 29.6412C14.0845 28.5305 14.9019 27.7223 16.0237 27.2389C16.589 27.0114 17.1542 26.8966 17.7021 26.8966" fill="#E20025"/>
-<path d="M38.9944 31.4558C38.9944 29.8637 38.4987 28.4263 37.5209 27.1814C37.2281 26.8245 36.8909 26.4851 36.517 26.1709C36.1769 25.9015 35.8619 25.6827 35.5798 25.5232C34.5478 24.9523 33.457 24.6625 32.3371 24.6625H32.2579C31.2694 24.6625 30.2916 24.8939 29.3524 25.3491C29.0954 25.4648 28.7843 25.6506 28.4268 25.9025C28.2017 26.0562 27.9321 26.2828 27.6219 26.5774C27.3659 26.8342 27.1717 27.0472 27.0451 27.2116C26.8132 27.5257 26.6238 27.8107 26.4837 28.0606C25.8972 29.1158 25.5996 30.2275 25.5996 31.3634V31.4432C25.5996 32.4011 25.8112 33.3533 26.2296 34.2753C26.8161 35.4997 27.6992 36.48 28.8548 37.1871C29.9302 37.8222 31.08 38.1441 32.2704 38.1441H38.549C38.5577 38.1441 38.5673 38.1441 38.576 38.1441C38.7267 38.1441 38.8398 38.1042 38.9103 38.0254C38.9789 37.9486 39.007 37.8368 38.9934 37.6977V31.4548L38.9944 31.4558ZM36.7817 31.4957V35.915H32.2975C31.2704 35.915 30.3177 35.5727 29.4664 34.8996C29.2896 34.7489 29.0857 34.5437 28.8626 34.2918C28.1669 33.4243 27.8132 32.4527 27.8132 31.4013C27.8132 30.8324 27.9234 30.2634 28.1408 29.712C28.3418 29.2121 28.6326 28.756 29.0046 28.3553L29.0713 28.2872C29.2732 28.0752 29.4413 27.9206 29.5689 27.8252C30.396 27.2038 31.3129 26.8877 32.2965 26.8877C33.1748 26.8877 34 27.1367 34.7469 27.6259C34.9401 27.7581 35.1614 27.9361 35.402 28.152C35.6348 28.3961 35.7943 28.578 35.888 28.7074C36.0716 28.9622 36.2165 29.2063 36.3218 29.4339C36.6262 30.0378 36.7808 30.7312 36.7808 31.4928" fill="#E20025"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M53.6833 24.7734C53.7538 24.8464 53.7876 24.9534 53.7828 25.0895H53.7838V27.4878H51.5701V25.0467C51.5701 24.8688 51.6445 24.6558 51.9991 24.6558H53.3403C53.4929 24.6558 53.6079 24.6956 53.6833 24.7734ZM51.432 32.5228C51.3021 33.0328 51.0811 33.5209 50.7711 33.9816C50.6677 34.1295 50.5208 34.3074 50.3256 34.5224C50.0812 34.7684 49.887 34.9416 49.7488 35.0369C48.9478 35.6146 48.0521 35.9073 47.0869 35.9073C46.1216 35.9073 45.2259 35.6146 44.4239 35.0359C44.2867 34.9416 44.0925 34.7684 43.85 34.5243C43.6568 34.3113 43.506 34.1285 43.4036 33.9826C42.8731 33.1948 42.6036 32.3293 42.6036 31.4092V25.0613C42.6036 24.8824 42.5292 24.6694 42.1736 24.6694H40.8325C40.6788 24.6694 40.5639 24.7093 40.4885 24.7871C40.418 24.861 40.3851 24.967 40.389 25.1012V31.4773C40.389 32.5607 40.6595 33.6218 41.1929 34.6323C41.3639 34.9484 41.589 35.2839 41.8625 35.6292C42.1118 35.952 42.4364 36.2827 42.8277 36.6134C43.05 36.7923 43.2529 36.9421 43.4307 37.0588C44.5495 37.7834 45.7796 38.151 47.0869 38.151C48.3942 38.151 49.6242 37.7834 50.743 37.0588C50.9208 36.9421 51.117 36.7972 51.3469 36.6124C51.7373 36.2817 52.0619 35.9511 52.3112 35.6292C52.5856 35.282 52.8108 34.9464 52.9808 34.6313C53.3381 33.9485 53.5771 33.2425 53.6959 32.5228H51.432Z" fill="#E20025"/>
-<path d="M71.0002 32.6385H47.1489V27.3721H71.0002V32.6395V32.6385ZM47.3789 32.407H70.7702V27.6035H47.3789V32.407Z" fill="#E4212C"/>
-<path d="M48.7427 31.5153C48.7146 31.5153 48.6953 31.4959 48.6953 31.4677V28.3458C48.6953 28.3175 48.7146 28.2981 48.7427 28.2981H49.9833C50.678 28.2981 51.0964 28.7192 51.0964 29.3339C51.0964 29.9485 50.6732 30.3648 49.9833 30.3648H49.4142C49.3949 30.3648 49.3862 30.3745 49.3862 30.394V31.4667C49.3862 31.4949 49.3668 31.5144 49.3388 31.5144H48.7417L48.7427 31.5153ZM50.4055 29.3358C50.4055 29.0752 50.2316 28.9001 49.9408 28.9001H49.4142C49.3949 28.9001 49.3862 28.9098 49.3862 28.9283V29.7375C49.3862 29.756 49.3958 29.7657 49.4142 29.7657H49.9408C50.2316 29.7657 50.4055 29.5955 50.4055 29.3358Z" fill="#E4212C"/>
-<path d="M51.5249 30.3337V28.3477C51.5249 28.3195 51.5433 28.3 51.5713 28.3H52.1684C52.1964 28.3 52.2158 28.3195 52.2158 28.3477V30.3531C52.2158 30.7363 52.4274 30.9542 52.752 30.9542C53.0767 30.9542 53.2825 30.7363 53.2825 30.3531V28.3477C53.2825 28.3195 53.3018 28.3 53.3298 28.3H53.926C53.955 28.3 53.9733 28.3195 53.9733 28.3477V30.3337C53.9733 31.1331 53.466 31.5678 52.752 31.5678C52.038 31.5678 51.5259 31.1331 51.5259 30.3337H51.5249Z" fill="#E4212C"/>
-<path d="M54.5708 28.3465C54.5708 28.3183 54.5901 28.2988 54.6181 28.2988H55.8636C56.5583 28.2988 56.883 28.6441 56.883 29.1547C56.883 29.5048 56.7236 29.7227 56.5119 29.8413V29.851C56.7236 29.9318 56.939 30.1963 56.939 30.5795C56.939 31.2136 56.5206 31.5161 55.8298 31.5161H54.6181C54.5901 31.5161 54.5708 31.4966 54.5708 31.4684V28.3465ZM55.7786 29.6147C56.0424 29.6147 56.197 29.4727 56.197 29.2364C56.197 29 56.0424 28.8629 55.7786 28.8629H55.2906C55.2713 28.8629 55.2626 28.8726 55.2626 28.8911V29.5865C55.2626 29.605 55.2723 29.6147 55.2906 29.6147H55.7786ZM55.2906 30.9529H55.8172C56.0994 30.9529 56.2491 30.8012 56.2491 30.5513C56.2491 30.3013 56.0984 30.1496 55.8172 30.1496H55.2906C55.2713 30.1496 55.2626 30.1593 55.2626 30.1778V30.9257C55.2626 30.9442 55.2723 30.9539 55.2906 30.9539V30.9529Z" fill="#E4212C"/>
-<path d="M57.4385 28.3465C57.4385 28.3183 57.4578 28.2988 57.4858 28.2988H58.083C58.111 28.2988 58.1303 28.3183 58.1303 28.3465V30.8674C58.1303 30.8868 58.14 30.8956 58.1583 30.8956H59.568C59.5961 30.8956 59.6154 30.915 59.6154 30.9432V31.4684C59.6154 31.4966 59.5961 31.5161 59.568 31.5161H57.4868C57.4588 31.5161 57.4394 31.4966 57.4394 31.4684V28.3465H57.4385Z" fill="#E4212C"/>
-<path d="M60.0234 28.3465C60.0234 28.3183 60.0428 28.2988 60.0708 28.2988H60.6679C60.6959 28.2988 60.7153 28.3183 60.7153 28.3465V31.4684C60.7153 31.4966 60.6959 31.5161 60.6679 31.5161H60.0708C60.0428 31.5161 60.0234 31.4966 60.0234 31.4684V28.3465Z" fill="#E4212C"/>
-<path d="M63.5404 31.7467C63.521 31.7662 63.493 31.77 63.4698 31.7467L63.1452 31.4199C62.9568 31.5143 62.7365 31.5668 62.4968 31.5668C61.9384 31.5668 61.4958 31.3071 61.3316 30.7868C61.262 30.5641 61.2427 30.3851 61.2427 29.9066C61.2427 29.4281 61.262 29.2492 61.3316 29.0265C61.4958 28.5061 61.9384 28.2465 62.4968 28.2465C63.0553 28.2465 63.493 28.5071 63.6621 29.0265C63.7326 29.2492 63.752 29.4281 63.752 29.9066C63.752 30.3851 63.7326 30.5641 63.6621 30.7868C63.6389 30.8578 63.6109 30.9191 63.5819 30.9813L63.9153 31.312C63.9346 31.3314 63.9346 31.3596 63.9153 31.3781L63.5404 31.7467ZM62.6659 30.9385L62.464 30.7352C62.4447 30.7158 62.4408 30.6924 62.464 30.6691L62.8398 30.3102C62.8679 30.2869 62.8911 30.2908 62.9094 30.3102L63.036 30.4376C63.0505 30.3287 63.0553 30.1682 63.0553 29.9076C63.0553 29.4874 63.0418 29.326 63.0041 29.2132C62.9336 28.9905 62.7597 28.8582 62.4968 28.8582C62.234 28.8582 62.0591 28.9905 61.9896 29.2132C61.9519 29.326 61.9384 29.4874 61.9384 29.9076C61.9384 30.3277 61.9519 30.4892 61.9896 30.603C62.0591 30.8257 62.2331 30.958 62.4968 30.958C62.5577 30.958 62.6147 30.9531 62.6659 30.9385Z" fill="#E4212C"/>
-<path d="M64.2651 30.3337V28.3477C64.2651 28.3195 64.2835 28.3 64.3125 28.3H64.9086C64.9367 28.3 64.956 28.3195 64.956 28.3477V30.3531C64.956 30.7363 65.1676 30.9542 65.4922 30.9542C65.8169 30.9542 66.0227 30.7363 66.0227 30.3531V28.3477C66.0227 28.3195 66.0411 28.3 66.07 28.3H66.6662C66.6952 28.3 66.7135 28.3195 66.7135 28.3477V30.3337C66.7135 31.1331 66.2063 31.5678 65.4922 31.5678C64.7782 31.5678 64.2661 31.1331 64.2661 30.3337H64.2651Z" fill="#E4212C"/>
-<path d="M67.312 28.3465C67.312 28.3183 67.3313 28.2988 67.3594 28.2988H69.4078C69.4358 28.2988 69.4551 28.3183 69.4551 28.3465V28.8522C69.4551 28.8814 69.4358 28.8999 69.4078 28.8999H68.0309C68.0116 28.8999 68.0029 28.9096 68.0029 28.9281V29.567C68.0029 29.5865 68.0125 29.5953 68.0309 29.5953H69.1778C69.2058 29.5953 69.2242 29.6147 69.2242 29.6429V30.1447C69.2242 30.173 69.2058 30.1924 69.1778 30.1924H68.0309C68.0116 30.1924 68.0029 30.2021 68.0029 30.2206V30.8868C68.0029 30.9063 68.0125 30.915 68.0309 30.915H69.4078C69.4358 30.915 69.4551 30.9345 69.4551 30.9627V31.4684C69.4551 31.4966 69.4358 31.5161 69.4078 31.5161H67.3594C67.3313 31.5161 67.312 31.4966 67.312 31.4684V28.3465Z" fill="#E4212C"/>
-</svg>
diff --git a/src/assets/icons/visu/onboarding/egl.svg b/src/assets/icons/visu/onboarding/egl.svg
deleted file mode 100644
index dcabb3675bb76468a52f8896308411265f75218a..0000000000000000000000000000000000000000
--- a/src/assets/icons/visu/onboarding/egl.svg
+++ /dev/null
@@ -1,53 +0,0 @@
-<svg width="220" height="220" viewBox="0 0 220 220" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M2.52899 131.208H115.611V199.241C115.611 201.174 114.044 202.741 112.111 202.741H6.02899C4.096 202.741 2.52899 201.174 2.52899 199.241V131.208Z" fill="url(#paint0_linear_115_37049)" stroke="#52616C"/>
-<path d="M2.02899 123.962C2.02899 121.753 3.81985 119.962 6.02899 119.962H112.111C114.32 119.962 116.111 121.753 116.111 123.962V130.708H2.02899V123.962Z" fill="#52616C"/>
-<ellipse cx="8.90143" cy="126.679" rx="2.74897" ry="2.68643" fill="#FF5F5F"/>
-<ellipse cx="17.1484" cy="126.678" rx="2.74897" ry="2.68643" fill="#FFB850"/>
-<ellipse cx="25.3953" cy="126.678" rx="2.74896" ry="2.68643" fill="#3CE800"/>
-<path d="M44.2781 179.917V181.115H39.0252V184.724H43.2779V185.876H39.0252V189.583H44.2781V190.781H37.5364V179.917H44.2781Z" fill="white"/>
-<path d="M51.471 184.466C51.4303 184.522 51.3896 184.564 51.3489 184.595C51.3081 184.625 51.2496 184.64 51.1732 184.64C51.0969 184.64 51.0129 184.61 50.9213 184.549C50.8348 184.484 50.7228 184.413 50.5854 184.337C50.4479 184.261 50.28 184.193 50.0815 184.132C49.888 184.067 49.6488 184.034 49.3638 184.034C48.9871 184.034 48.6537 184.102 48.3636 184.238C48.0735 184.37 47.8291 184.562 47.6306 184.815C47.4372 185.067 47.2896 185.373 47.1878 185.732C47.0911 186.091 47.0428 186.492 47.0428 186.937C47.0428 187.402 47.0962 187.817 47.2031 188.18C47.31 188.539 47.4601 188.843 47.6535 189.09C47.847 189.333 48.0811 189.52 48.356 189.651C48.6359 189.777 48.9489 189.841 49.2951 189.841C49.6259 189.841 49.8982 189.803 50.112 189.727C50.3258 189.646 50.5039 189.558 50.6464 189.462C50.789 189.366 50.906 189.28 50.9976 189.204C51.0893 189.123 51.1809 189.083 51.2725 189.083C51.3896 189.083 51.4761 189.126 51.5321 189.211L51.9138 189.704C51.5779 190.114 51.158 190.414 50.6541 190.606C50.1502 190.793 49.6183 190.887 49.0584 190.887C48.5748 190.887 48.1244 190.798 47.707 190.621C47.2947 190.445 46.9359 190.189 46.6305 189.856C46.3251 189.517 46.0833 189.103 45.9052 188.613C45.7321 188.122 45.6456 187.564 45.6456 186.937C45.6456 186.366 45.7245 185.838 45.8822 185.353C46.0451 184.868 46.2793 184.451 46.5847 184.102C46.8951 183.748 47.2769 183.473 47.7299 183.276C48.1829 183.079 48.7021 182.98 49.2874 182.98C49.827 182.98 50.3054 183.069 50.7228 183.245C51.1402 183.417 51.5092 183.662 51.8299 183.981L51.471 184.466Z" fill="white"/>
-<path d="M56.4535 182.98C57.0185 182.98 57.5275 183.074 57.9805 183.261C58.4386 183.448 58.8254 183.713 59.141 184.057C59.4617 184.4 59.706 184.817 59.874 185.307C60.047 185.793 60.1335 186.336 60.1335 186.937C60.1335 187.544 60.047 188.089 59.874 188.575C59.706 189.06 59.4617 189.474 59.141 189.818C58.8254 190.162 58.4386 190.427 57.9805 190.614C57.5275 190.796 57.0185 190.887 56.4535 190.887C55.8885 190.887 55.377 190.796 54.9189 190.614C54.4659 190.427 54.0791 190.162 53.7584 189.818C53.4377 189.474 53.1909 189.06 53.0178 188.575C52.8447 188.089 52.7582 187.544 52.7582 186.937C52.7582 186.336 52.8447 185.793 53.0178 185.307C53.1909 184.817 53.4377 184.4 53.7584 184.057C54.0791 183.713 54.4659 183.448 54.9189 183.261C55.377 183.074 55.8885 182.98 56.4535 182.98ZM56.4535 189.833C57.217 189.833 57.7871 189.58 58.1637 189.075C58.5404 188.565 58.7287 187.854 58.7287 186.945C58.7287 186.03 58.5404 185.317 58.1637 184.807C57.7871 184.297 57.217 184.041 56.4535 184.041C56.0667 184.041 55.7307 184.107 55.4457 184.238C55.1607 184.37 54.9214 184.559 54.728 184.807C54.5397 185.055 54.3972 185.36 54.3005 185.724C54.2088 186.083 54.163 186.49 54.163 186.945C54.163 187.4 54.2088 187.806 54.3005 188.165C54.3972 188.524 54.5397 188.827 54.728 189.075C54.9214 189.318 55.1607 189.505 55.4457 189.636C55.7307 189.767 56.0667 189.833 56.4535 189.833Z" fill="white"/>
-<path d="M63.3198 179.614V190.781H61.9608V179.614H63.3198Z" fill="white"/>
-<path d="M67.9826 193.047C67.9368 193.148 67.8783 193.229 67.807 193.29C67.7408 193.351 67.6365 193.381 67.494 193.381H66.4862L67.8986 190.333L64.7072 183.101H65.883C66.0001 183.101 66.0917 183.132 66.1579 183.192C66.224 183.248 66.2724 183.311 66.3029 183.382L68.372 188.218C68.4178 188.33 68.456 188.441 68.4865 188.552C68.5221 188.663 68.5527 188.777 68.5781 188.893C68.6138 188.777 68.6494 188.663 68.685 188.552C68.7206 188.441 68.7614 188.327 68.8072 188.211L70.8152 183.382C70.8457 183.301 70.8966 183.235 70.9679 183.185C71.0442 183.129 71.1256 183.101 71.2122 183.101H72.2963L67.9826 193.047Z" fill="white"/>
-<path d="M76.4654 182.98C77.0303 182.98 77.5393 183.074 77.9924 183.261C78.4504 183.448 78.8373 183.713 79.1529 184.057C79.4735 184.4 79.7178 184.817 79.8858 185.307C80.0589 185.793 80.1454 186.336 80.1454 186.937C80.1454 187.544 80.0589 188.089 79.8858 188.575C79.7178 189.06 79.4735 189.474 79.1529 189.818C78.8373 190.162 78.4504 190.427 77.9924 190.614C77.5393 190.796 77.0303 190.887 76.4654 190.887C75.9004 190.887 75.3888 190.796 74.9307 190.614C74.4777 190.427 74.0909 190.162 73.7702 189.818C73.4496 189.474 73.2027 189.06 73.0297 188.575C72.8566 188.089 72.7701 187.544 72.7701 186.937C72.7701 186.336 72.8566 185.793 73.0297 185.307C73.2027 184.817 73.4496 184.4 73.7702 184.057C74.0909 183.713 74.4777 183.448 74.9307 183.261C75.3888 183.074 75.9004 182.98 76.4654 182.98ZM76.4654 189.833C77.2289 189.833 77.7989 189.58 78.1756 189.075C78.5522 188.565 78.7406 187.854 78.7406 186.945C78.7406 186.03 78.5522 185.317 78.1756 184.807C77.7989 184.297 77.2289 184.041 76.4654 184.041C76.0785 184.041 75.7426 184.107 75.4576 184.238C75.1725 184.37 74.9333 184.559 74.7399 184.807C74.5515 185.055 74.409 185.36 74.3123 185.724C74.2207 186.083 74.1749 186.49 74.1749 186.945C74.1749 187.4 74.2207 187.806 74.3123 188.165C74.409 188.524 74.5515 188.827 74.7399 189.075C74.9333 189.318 75.1725 189.505 75.4576 189.636C75.7426 189.767 76.0785 189.833 76.4654 189.833Z" fill="white"/>
-<path d="M59.1008 174.343C74.5603 168.216 73.3588 159.506 72.5578 146.516C67.5915 146.294 63.1859 144.744 59.1008 142.161C55.0156 144.744 50.6101 146.294 45.6438 146.516C44.8428 159.506 43.6413 168.216 59.1008 174.343Z" fill="#1B1C22"/>
-<path d="M59.1007 139.791L58.0534 140.453C54.2234 142.875 50.1447 144.301 45.5568 144.506L43.7779 144.585L43.6666 146.389C43.6336 146.925 43.5992 147.458 43.5651 147.988C43.1976 153.692 42.853 159.041 44.3993 163.651C46.182 168.966 50.3175 173.021 58.3804 176.216L59.1007 176.501V174.342C44.2473 168.456 44.7741 160.185 45.5487 148.023C45.5803 147.527 45.6123 147.024 45.6437 146.515C50.61 146.294 55.0156 144.744 59.1007 142.16V139.791Z" fill="#FFC600"/>
-<path d="M59.1008 139.791L60.1481 140.453C63.9781 142.875 68.0567 144.301 72.6447 144.506L74.4236 144.585L74.5349 146.389C74.5679 146.925 74.6023 147.458 74.6364 147.988C75.0038 153.692 75.3485 159.041 73.8022 163.651C72.0195 168.966 67.884 173.021 59.821 176.216L59.1008 176.501V174.342C73.9541 168.456 73.4274 160.185 72.6528 148.023C72.6212 147.527 72.5892 147.024 72.5577 146.515C67.5915 146.294 63.1859 144.744 59.1008 142.16V139.791Z" fill="#DB8300"/>
-<path d="M54.2157 152.443H54.9185C55.1992 152.443 55.4684 152.555 55.6668 152.754C55.8653 152.953 55.9768 153.223 55.9768 153.505V164.286H53.1574V153.505C53.1574 153.223 53.2689 152.953 53.4674 152.754C53.6659 152.555 53.9351 152.443 54.2157 152.443ZM59.0988 157.692H59.8016C60.0823 157.692 60.3514 157.804 60.5499 158.004C60.7484 158.203 60.8599 158.473 60.8599 158.755V164.286H58.0405V158.755C58.0405 158.473 58.152 158.203 58.3505 158.004C58.5489 157.804 58.8181 157.692 59.0988 157.692ZM64.2729 155.662H64.9757C65.2564 155.662 65.5256 155.774 65.724 155.973C65.9225 156.172 66.034 156.442 66.034 156.724V164.286H63.2146V156.724C63.2146 156.442 63.3261 156.172 63.5246 155.973C63.723 155.774 63.9922 155.662 64.2729 155.662Z" fill="#FFC600"/>
-<path d="M121.39 51.5076C105.492 53.5145 90.8163 61.0769 79.9556 72.8582C69.095 84.6394 62.7489 99.8809 62.0392 115.889" stroke="#A0A0A0" stroke-width="2"/>
-<path d="M131.5 25.5H213.5V75C213.5 76.933 211.933 78.5 210 78.5H135C133.067 78.5 131.5 76.933 131.5 75V25.5Z" fill="white" stroke="#A2B4C1"/>
-<path d="M131 21C131 18.7909 132.791 17 135 17H210C212.209 17 214 18.7909 214 21V25H131V21Z" fill="#A2B4C1"/>
-<circle cx="136" cy="22" r="2" fill="#FF5F5F"/>
-<circle cx="142" cy="22" r="2" fill="#FFB850"/>
-<circle cx="148" cy="22" r="2" fill="#3CE800"/>
-<path d="M145.497 60.4122C145.229 60.6696 144.837 60.8078 144.376 60.8078H142.857V56.5425H144.376C144.837 56.5425 145.229 56.6807 145.497 56.938C145.958 57.3815 145.932 58.0344 145.932 58.6277C145.932 59.221 145.957 59.9697 145.497 60.4131M145.166 57.2622C144.936 57.0347 144.637 56.9507 144.294 56.9507H143.33V60.4014H144.295C144.638 60.4014 144.936 60.3174 145.167 60.0898C145.472 59.7846 145.46 59.1497 145.46 58.6277C145.46 58.1057 145.472 57.5675 145.167 57.2622" fill="#1A171B"/>
-<path d="M148.405 60.8429C147.508 60.8429 146.861 60.2496 146.861 59.3989V56.5415H147.334V59.3628C147.334 60.0094 147.757 60.4347 148.405 60.4347C149.053 60.4347 149.482 60.0094 149.482 59.3628V56.5415H149.955V59.3989C149.955 60.2496 149.301 60.8429 148.405 60.8429Z" fill="#1A171B"/>
-<path d="M153.646 60.3527C153.328 60.6706 152.911 60.844 152.407 60.844C151.903 60.844 151.523 60.676 151.211 60.3771C150.763 59.9454 150.775 59.4126 150.775 58.6756C150.775 57.9387 150.763 57.4059 151.211 56.9742C151.523 56.6744 151.908 56.5073 152.407 56.5073C153.023 56.5073 153.366 56.669 153.764 57.0528L153.178 57.6163C152.93 57.377 152.748 57.2506 152.407 57.2506C152.17 57.2506 151.977 57.34 151.853 57.4781C151.685 57.6579 151.642 57.8556 151.642 58.6765C151.642 59.4975 151.685 59.7007 151.853 59.8804C151.978 60.0185 152.17 60.1016 152.407 60.1016C152.669 60.1016 152.855 60.0122 152.998 59.8623C153.142 59.7124 153.191 59.4911 153.191 59.2816V59.1317H152.407V58.4363H154.057V59.0477C154.057 59.6645 153.957 60.042 153.646 60.3536" fill="#1A171B"/>
-<path d="M157.12 60.8078L156.254 59.1064H155.632V60.8078H154.766V56.5425H156.504C157.407 56.5425 157.942 57.1358 157.942 57.8483C157.942 58.4471 157.562 58.8192 157.133 58.9682L158.123 60.8069H157.121L157.12 60.8078ZM156.448 57.2857H155.632V58.4119H156.448C156.828 58.4119 157.076 58.178 157.076 57.8493C157.076 57.5205 156.828 57.2866 156.448 57.2866" fill="#1A171B"/>
-<path d="M161.236 60.8078L160.974 60.0528H159.399L159.132 60.8078H158.229L159.841 56.5425H160.52L162.139 60.8078H161.236ZM160.203 57.8005L159.642 59.352H160.744L160.203 57.8005Z" fill="#1A171B"/>
-<path d="M165.182 60.8078L163.426 58.1897V60.8078H162.561V56.5425H163.333L165.088 59.1542V56.5425H165.954V60.8078H165.182Z" fill="#1A171B"/>
-<path d="M169.633 60.4005C169.341 60.6823 168.924 60.8078 168.463 60.8078H166.863V56.5425H168.463C168.924 56.5425 169.341 56.6689 169.633 56.9498C170.132 57.4293 170.082 58.0163 170.082 58.6566C170.082 59.2969 170.132 59.9209 169.633 60.3996M169.03 57.5485C168.881 57.3751 168.682 57.2848 168.382 57.2848H167.729V60.0645H168.382C168.681 60.0645 168.881 59.9742 169.03 59.8008C169.191 59.6094 169.217 59.3041 169.217 58.6566C169.217 58.0091 169.191 57.74 169.03 57.5485Z" fill="#1A171B"/>
-<path d="M170.841 60.8078V56.5425H171.706V60.0645H173.717V60.8078H170.841Z" fill="#1A171B"/>
-<path d="M175.491 59.0585V60.8078H174.632V59.0585L173.299 56.5425H174.24L175.068 58.2611L175.883 56.5425H176.823L175.491 59.0585Z" fill="#1A171B"/>
-<path d="M179.855 60.3761C179.544 60.6759 179.164 60.843 178.659 60.843C178.154 60.843 177.769 60.675 177.458 60.3761C177.009 59.9444 177.022 59.4116 177.022 58.6747C177.022 57.9377 177.01 57.4049 177.458 56.9732C177.77 56.6734 178.155 56.5063 178.659 56.5063C179.163 56.5063 179.544 56.6743 179.855 56.9732C180.304 57.4049 180.297 57.9377 180.297 58.6747C180.297 59.4116 180.304 59.9444 179.855 60.3761ZM179.214 57.4763C179.089 57.3381 178.897 57.2487 178.66 57.2487C178.424 57.2487 178.225 57.3381 178.1 57.4763C177.932 57.656 177.889 57.8538 177.889 58.6747C177.889 59.4956 177.932 59.6934 178.1 59.8731C178.225 60.0112 178.424 60.1007 178.66 60.1007C178.897 60.1007 179.09 60.0112 179.214 59.8731C179.382 59.6934 179.432 59.4956 179.432 58.6747C179.432 57.8538 179.382 57.656 179.214 57.4763Z" fill="#1A171B"/>
-<path d="M183.678 60.8078L181.922 58.1897V60.8078H181.056V56.5425H181.829L183.584 59.1542V56.5425H184.45V60.8078H183.678Z" fill="#1A171B"/>
-<path d="M155.131 45.7125C154.993 45.456 154.805 45.1697 154.571 44.859C154.431 44.6911 154.243 44.4852 154.011 44.2449C153.686 43.9487 153.451 43.7564 153.297 43.6579C153.05 43.48 152.845 43.3455 152.673 43.2452C152.371 43.0709 151.969 42.8984 151.475 42.7314C150.83 42.5246 150.165 42.4153 149.496 42.4062H149.368C148.687 42.4062 147.996 42.5155 147.311 42.7314C146.818 42.8984 146.415 43.0709 146.115 43.2452C145.941 43.3446 145.732 43.4836 145.493 43.6561C145.337 43.7555 145.102 43.9487 144.773 44.2477C144.544 44.4852 144.357 44.6911 144.215 44.8609C143.98 45.1706 143.792 45.4569 143.656 45.7116C143.145 46.6499 142.887 47.6315 142.887 48.6285V48.7035C142.887 49.7159 143.15 50.7102 143.668 51.6584C143.833 51.951 144.052 52.2626 144.318 52.5841C144.559 52.883 144.874 53.1901 145.256 53.498C145.473 53.6651 145.669 53.8042 145.841 53.9116C146.927 54.5844 148.127 54.9258 149.405 54.9258C150.354 54.9258 151.296 54.7235 152.204 54.3234C152.558 54.1491 152.908 53.9441 153.243 53.713C153.425 53.5956 153.644 53.4176 153.892 53.1874C154.059 53.0537 154.145 52.9182 154.145 52.7864V52.7503C154.145 52.6735 154.119 52.6003 154.069 52.5317L153.203 51.6855C153.081 51.5401 152.949 51.4661 152.812 51.4661C152.715 51.4661 152.62 51.4995 152.533 51.5645L152.527 51.569C152.426 51.6665 152.319 51.7614 152.208 51.8517C151.978 52.0404 151.764 52.1885 151.573 52.2924C150.888 52.6581 150.169 52.8442 149.433 52.8442C148.469 52.8442 147.586 52.5723 146.807 52.035C146.672 51.9465 146.484 51.7858 146.25 51.5591C146.062 51.3613 145.916 51.1915 145.816 51.0561C145.517 50.628 145.301 50.1764 145.171 49.7123H155.481C155.756 49.7213 155.901 49.5822 155.901 49.3113V48.0452C155.901 47.9503 155.883 47.869 155.847 47.804C155.742 47.0933 155.503 46.3889 155.133 45.7125M149.369 44.4752C149.523 44.4752 149.664 44.4834 149.802 44.4996C150.216 44.5403 150.637 44.6396 151.05 44.7931C152.141 45.242 152.934 45.9924 153.407 47.0229C153.49 47.2206 153.562 47.4247 153.619 47.6315H145.169C145.226 47.4256 145.297 47.2215 145.381 47.0238C145.854 45.9924 146.648 45.242 147.738 44.7931C148.287 44.5818 148.836 44.4752 149.368 44.4752" fill="#E20025"/>
-<path d="M170.052 48.709C170.052 47.2306 169.571 45.8958 168.621 44.7399C168.336 44.4085 168.009 44.0933 167.645 43.8016C167.315 43.5514 167.009 43.3482 166.735 43.2001C165.733 42.67 164.673 42.4009 163.585 42.4009H163.508C162.548 42.4009 161.598 42.6158 160.686 43.0385C160.436 43.1459 160.134 43.3184 159.786 43.5523C159.568 43.695 159.306 43.9054 159.005 44.1791C158.756 44.4175 158.567 44.6153 158.444 44.7679C158.219 45.0596 158.035 45.3242 157.899 45.5563C157.329 46.5361 157.04 47.5684 157.04 48.6232V48.6972C157.04 49.5868 157.246 50.4709 157.652 51.327C158.222 52.464 159.08 53.3743 160.202 54.0309C161.247 54.6206 162.364 54.9195 163.52 54.9195H169.619C169.628 54.9195 169.637 54.9195 169.646 54.9195C169.792 54.9195 169.902 54.8825 169.97 54.8094C170.037 54.738 170.064 54.6342 170.051 54.505V48.7081L170.052 48.709ZM167.903 48.746V52.8496H163.547C162.549 52.8496 161.623 52.5318 160.796 51.9068C160.625 51.7668 160.427 51.5763 160.21 51.3424C159.534 50.5368 159.19 49.6346 159.19 48.6584C159.19 48.1301 159.297 47.6018 159.509 47.0897C159.704 46.6255 159.986 46.202 160.348 45.8299L160.412 45.7667C160.609 45.5698 160.772 45.4262 160.896 45.3377C161.699 44.7607 162.59 44.4672 163.546 44.4672C164.399 44.4672 165.2 44.6983 165.926 45.1526C166.114 45.2754 166.329 45.4407 166.562 45.6412C166.789 45.8678 166.943 46.0367 167.034 46.1568C167.213 46.3934 167.354 46.6201 167.456 46.8314C167.752 47.3923 167.902 48.0362 167.902 48.7433" fill="#E20025"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M184.321 42.5038C184.39 42.5715 184.422 42.6709 184.418 42.7973H184.419V45.0243H182.268V42.7576C182.268 42.5923 182.341 42.3945 182.685 42.3945H183.988C184.136 42.3945 184.248 42.4316 184.321 42.5038ZM182.134 49.6996C182.008 50.1732 181.793 50.6264 181.492 51.0543C181.392 51.1915 181.249 51.3568 181.059 51.5564C180.822 51.7849 180.633 51.9456 180.499 52.0341C179.721 52.5706 178.851 52.8424 177.913 52.8424C176.975 52.8424 176.105 52.5706 175.326 52.0332C175.193 51.9456 175.004 51.7849 174.769 51.5582C174.581 51.3604 174.435 51.1906 174.335 51.0552C173.82 50.3237 173.558 49.5199 173.558 48.6656V42.7711C173.558 42.605 173.486 42.4072 173.14 42.4072H171.837C171.688 42.4072 171.577 42.4442 171.503 42.5164C171.435 42.5851 171.403 42.6835 171.407 42.8081V48.7288C171.407 49.7349 171.669 50.7201 172.188 51.6584C172.354 51.9519 172.572 52.2635 172.838 52.5841C173.08 52.8839 173.396 53.191 173.776 53.498C173.992 53.6642 174.189 53.8033 174.361 53.9117C175.448 54.5845 176.643 54.9258 177.913 54.9258C179.183 54.9258 180.378 54.5845 181.465 53.9117C181.638 53.8033 181.828 53.6687 182.052 53.4971C182.431 53.1901 182.746 52.883 182.988 52.5841C183.255 52.2617 183.474 51.9501 183.639 51.6575C183.986 51.0235 184.218 50.3679 184.333 49.6996H182.134Z" fill="#E20025"/>
-<path d="M201.143 49.8072H177.974V44.917H201.143V49.8081V49.8072ZM178.197 49.5923H200.92V45.1319H178.197V49.5923Z" fill="#E4212C"/>
-<path d="M179.522 48.7638C179.495 48.7638 179.476 48.7457 179.476 48.7195V45.8206C179.476 45.7944 179.495 45.7764 179.522 45.7764H180.727C181.402 45.7764 181.808 46.1674 181.808 46.7382C181.808 47.3089 181.397 47.6954 180.727 47.6954H180.174C180.156 47.6954 180.147 47.7045 180.147 47.7225V48.7186C180.147 48.7448 180.128 48.7629 180.101 48.7629H179.521L179.522 48.7638ZM181.137 46.74C181.137 46.4979 180.968 46.3354 180.686 46.3354H180.174C180.156 46.3354 180.147 46.3444 180.147 46.3616V47.1129C180.147 47.1301 180.156 47.1391 180.174 47.1391H180.686C180.968 47.1391 181.137 46.9811 181.137 46.74Z" fill="#E4212C"/>
-<path d="M182.224 47.6667V45.8226C182.224 45.7964 182.242 45.7783 182.27 45.7783H182.85C182.877 45.7783 182.896 45.7964 182.896 45.8226V47.6847C182.896 48.0406 183.101 48.2429 183.417 48.2429C183.732 48.2429 183.932 48.0406 183.932 47.6847V45.8226C183.932 45.7964 183.951 45.7783 183.978 45.7783H184.557C184.585 45.7783 184.603 45.7964 184.603 45.8226V47.6667C184.603 48.409 184.11 48.8127 183.417 48.8127C182.723 48.8127 182.225 48.409 182.225 47.6667H182.224Z" fill="#E4212C"/>
-<path d="M185.183 45.8216C185.183 45.7954 185.202 45.7773 185.229 45.7773H186.439C187.114 45.7773 187.43 46.0979 187.43 46.5721C187.43 46.8972 187.275 47.0995 187.069 47.2096V47.2187C187.275 47.2936 187.484 47.5393 187.484 47.8951C187.484 48.4839 187.078 48.7648 186.406 48.7648H185.229C185.202 48.7648 185.183 48.7467 185.183 48.7205V45.8216ZM186.357 46.9992C186.613 46.9992 186.763 46.8674 186.763 46.6479C186.763 46.4285 186.613 46.3011 186.357 46.3011H185.883C185.864 46.3011 185.856 46.3102 185.856 46.3273V46.973C185.856 46.9902 185.865 46.9992 185.883 46.9992H186.357ZM185.883 48.2419H186.394C186.668 48.2419 186.814 48.101 186.814 47.8689C186.814 47.6368 186.667 47.4959 186.394 47.4959H185.883C185.864 47.4959 185.856 47.505 185.856 47.5221V48.2166C185.856 48.2338 185.865 48.2428 185.883 48.2428V48.2419Z" fill="#E4212C"/>
-<path d="M187.969 45.8216C187.969 45.7954 187.988 45.7773 188.015 45.7773H188.595C188.623 45.7773 188.641 45.7954 188.641 45.8216V48.1624C188.641 48.1805 188.651 48.1886 188.669 48.1886H190.038C190.065 48.1886 190.084 48.2067 190.084 48.2328V48.7205C190.084 48.7467 190.065 48.7648 190.038 48.7648H188.016C187.989 48.7648 187.97 48.7467 187.97 48.7205V45.8216H187.969Z" fill="#E4212C"/>
-<path d="M190.48 45.8216C190.48 45.7954 190.499 45.7773 190.526 45.7773H191.107C191.134 45.7773 191.153 45.7954 191.153 45.8216V48.7205C191.153 48.7467 191.134 48.7648 191.107 48.7648H190.526C190.499 48.7648 190.48 48.7467 190.48 48.7205V45.8216Z" fill="#E4212C"/>
-<path d="M193.897 48.9787C193.878 48.9968 193.851 49.0004 193.828 48.9787L193.513 48.6753C193.33 48.7629 193.116 48.8117 192.883 48.8117C192.34 48.8117 191.911 48.5705 191.751 48.0874C191.683 47.8806 191.665 47.7144 191.665 47.2701C191.665 46.8258 191.683 46.6596 191.751 46.4528C191.911 45.9696 192.34 45.7285 192.883 45.7285C193.426 45.7285 193.851 45.9705 194.015 46.4528C194.083 46.6596 194.102 46.8258 194.102 47.2701C194.102 47.7144 194.083 47.8806 194.015 48.0874C193.992 48.1533 193.965 48.2102 193.937 48.268L194.261 48.5751C194.28 48.5931 194.28 48.6193 194.261 48.6365L193.897 48.9787ZM193.047 48.2283L192.851 48.0395C192.832 48.0215 192.829 47.9998 192.851 47.9781L193.216 47.6449C193.243 47.6232 193.266 47.6268 193.284 47.6449L193.407 47.7632C193.421 47.662 193.426 47.513 193.426 47.271C193.426 46.8809 193.412 46.7309 193.376 46.6262C193.307 46.4194 193.138 46.2966 192.883 46.2966C192.628 46.2966 192.458 46.4194 192.39 46.6262C192.354 46.7309 192.34 46.8809 192.34 47.271C192.34 47.6611 192.354 47.811 192.39 47.9167C192.458 48.1235 192.627 48.2463 192.883 48.2463C192.942 48.2463 192.998 48.2418 193.047 48.2283Z" fill="#E4212C"/>
-<path d="M194.601 47.6667V45.8226C194.601 45.7964 194.619 45.7783 194.647 45.7783H195.226C195.253 45.7783 195.272 45.7964 195.272 45.8226V47.6847C195.272 48.0406 195.478 48.2429 195.793 48.2429C196.108 48.2429 196.308 48.0406 196.308 47.6847V45.8226C196.308 45.7964 196.326 45.7783 196.354 45.7783H196.933C196.961 45.7783 196.979 45.7964 196.979 45.8226V47.6667C196.979 48.409 196.487 48.8127 195.793 48.8127C195.099 48.8127 194.602 48.409 194.602 47.6667H194.601Z" fill="#E4212C"/>
-<path d="M197.561 45.8216C197.561 45.7954 197.579 45.7773 197.607 45.7773H199.597C199.624 45.7773 199.643 45.7954 199.643 45.8216V46.2912C199.643 46.3183 199.624 46.3355 199.597 46.3355H198.259C198.24 46.3355 198.232 46.3445 198.232 46.3616V46.955C198.232 46.973 198.241 46.9812 198.259 46.9812H199.373C199.4 46.9812 199.418 46.9992 199.418 47.0254V47.4914C199.418 47.5176 199.4 47.5357 199.373 47.5357H198.259C198.24 47.5357 198.232 47.5447 198.232 47.5619V48.1805C198.232 48.1985 198.241 48.2067 198.259 48.2067H199.597C199.624 48.2067 199.643 48.2247 199.643 48.2509V48.7205C199.643 48.7467 199.624 48.7648 199.597 48.7648H197.607C197.579 48.7648 197.561 48.7467 197.561 48.7205V45.8216Z" fill="#E4212C"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M188.177 86C192.818 94.2213 195.697 103.387 196.553 112.912C197.9 127.919 194.144 142.942 185.892 155.548C177.643 168.152 165.384 177.603 151.097 182.375C147.902 183.347 139.667 184.868 121.422 184.992L126.071 180.343C126.462 179.953 126.462 179.319 126.071 178.929C125.681 178.538 125.047 178.538 124.657 178.929L118.293 185.293C117.902 185.683 117.902 186.317 118.293 186.707L124.657 193.071C125.047 193.462 125.681 193.462 126.071 193.071C126.462 192.681 126.462 192.047 126.071 191.657L121.406 186.992C139.762 186.869 148.23 185.34 151.693 184.284L151.705 184.28L151.718 184.276C166.437 179.363 179.068 169.627 187.566 156.644C196.064 143.66 199.932 128.189 198.545 112.734C197.698 103.301 194.924 94.2119 190.463 86H188.177Z" fill="#A0A0A0"/>
-<defs>
-<linearGradient id="paint0_linear_115_37049" x1="57.1092" y1="130.708" x2="57.1092" y2="203.241" gradientUnits="userSpaceOnUse">
-<stop stop-color="#323339"/>
-<stop offset="1" stop-color="#25262B"/>
-</linearGradient>
-</defs>
-</svg>
diff --git a/src/components/Connection/EPGLConnect/EpglBill.tsx b/src/components/Connection/EPGLConnect/EpglBill.tsx
deleted file mode 100644
index 8179dda880dead3ca510dcd808a75a55cd7178d4..0000000000000000000000000000000000000000
--- a/src/components/Connection/EPGLConnect/EpglBill.tsx
+++ /dev/null
@@ -1,54 +0,0 @@
-import Button from '@material-ui/core/Button'
-import WaterBillIcon from 'assets/icons/visu/onboarding/water_bill.svg'
-import StyledIcon from 'components/CommonKit/Icon/StyledIcon'
-import { useI18n } from 'cozy-ui/transpiled/react/providers/I18n'
-import { FluidType } from 'enums'
-import React from 'react'
-import { setShowOfflineData } from 'store/chart/chart.slice'
-import { useAppDispatch, useAppSelector } from 'store/hooks'
-import '../connection.scss'
-
-const EpglBill = ({
- openModal: setOpenModal,
-}: {
- openModal: (value: boolean) => void
-}) => {
- const { t } = useI18n()
- const dispatch = useAppDispatch()
- const { fluidStatus } = useAppSelector(state => state.ecolyo.global)
- const currentFluidStatus = fluidStatus[FluidType.WATER]
-
- return (
- <div className="connection-form">
- <h2 className="connection-form-title eglgrandlyon text-20-bold">
- {t('auth.eglgrandlyon.no_account.title')}
- </h2>
-
- <StyledIcon icon={WaterBillIcon} size={180} />
- <p
- className="connection-form-subtitle text-16-regular"
- dangerouslySetInnerHTML={{ __html: t('auth.eglgrandlyon.bill') }}
- />
-
- <div className="connection-form-button">
- <Button
- aria-label={t('auth.eglgrandlyon.accessibility.connect')}
- onClick={() => setOpenModal(true)}
- className="btnPrimary"
- >
- {t('auth.eglgrandlyon.connect')}
- </Button>
- {currentFluidStatus.firstDataDate && (
- <Button
- className="btnSecondary"
- onClick={() => dispatch(setShowOfflineData(true))}
- >
- {t('auth.button_showOfflineData')}
- </Button>
- )}
- </div>
- </div>
- )
-}
-
-export default EpglBill
diff --git a/src/components/Connection/EPGLConnect/EpglConnectModal/EpglConnectModal.tsx b/src/components/Connection/EPGLConnect/EpglConnectModal/EpglConnectModal.tsx
deleted file mode 100644
index 2c86cb80f9b0c9c6f24cc7a83faf3bc70d5a4f0c..0000000000000000000000000000000000000000
--- a/src/components/Connection/EPGLConnect/EpglConnectModal/EpglConnectModal.tsx
+++ /dev/null
@@ -1,124 +0,0 @@
-import { Button, Dialog } from '@material-ui/core'
-import CloseIcon from 'assets/icons/ico/close.svg'
-import StyledIconButton from 'components/CommonKit/IconButton/StyledIconButton'
-import { useI18n } from 'cozy-ui/transpiled/react/providers/I18n'
-import { FluidType } from 'enums'
-import React, { useState } from 'react'
-import { useAppSelector } from 'store/hooks'
-import './PartnerConnectModal.scss'
-import EpglCreateAccount from './Steps/EpglCreateAccount'
-import EpglDoYouHaveAccount from './Steps/EpglDoYouHaveAccount'
-
-interface StepContent {
- content: JSX.Element
- topButton: JSX.Element
- bottomButton: JSX.Element
-}
-
-enum StepEnum {
- DoYouHaveAccount,
- CreateAccount,
-}
-
-interface EpglConnectModalProps {
- open: boolean
- setShowForm: (value: boolean) => void
- setHasCreatedAccount: (value: boolean) => void
- closeModal: (value: boolean) => void
-}
-
-const EpglConnectModal = ({
- open,
- setShowForm,
- setHasCreatedAccount,
- closeModal: setOpenModal,
-}: EpglConnectModalProps) => {
- const { t } = useI18n()
- const { fluidStatus } = useAppSelector(state => state.ecolyo.global)
- const currentFluidStatus = fluidStatus[FluidType.WATER]
- const siteLink = currentFluidStatus.connection.konnectorConfig.siteLink
-
- const [currentStep, setCurrentStep] = useState(StepEnum.DoYouHaveAccount)
-
- const handleCloseModal = () => {
- setCurrentStep(StepEnum.DoYouHaveAccount)
- setOpenModal(false)
- }
-
- const goToPartnerSite = () => {
- window.open(siteLink, '_blank')
- }
- const handleGoToPartnerSite = () => {
- goToPartnerSite()
- setHasCreatedAccount(true)
- setShowForm(true)
- handleCloseModal()
- }
-
- const handleShowForm = () => {
- setShowForm(true)
- handleCloseModal()
- }
-
- const steps: Record<StepEnum, StepContent> = {
- [StepEnum.DoYouHaveAccount]: {
- content: <EpglDoYouHaveAccount />,
- topButton: (
- <Button onClick={handleShowForm} className="btnPrimary">
- {t('auth.button_connect')}
- </Button>
- ),
- bottomButton: (
- <Button
- onClick={() => setCurrentStep(StepEnum.CreateAccount)}
- className="btnSecondary"
- >
- {t('auth.button_create_account')}
- </Button>
- ),
- },
- [StepEnum.CreateAccount]: {
- content: <EpglCreateAccount />,
- topButton: (
- <Button onClick={handleGoToPartnerSite} className="btnPrimary">
- {t('auth.eglgrandlyon.button_go_to_partner_site')}
- </Button>
- ),
- bottomButton: (
- <Button
- onClick={() => setCurrentStep(StepEnum.DoYouHaveAccount)}
- className="btnSecondary"
- >
- {t('auth.button_previous')}
- </Button>
- ),
- },
- }
-
- return (
- <Dialog
- open={open}
- onClose={handleCloseModal}
- classes={{
- root: 'modal-root',
- paper: 'modal-paper',
- }}
- >
- <StyledIconButton
- icon={CloseIcon}
- onClick={handleCloseModal}
- aria-label={t('auth.accessibility.button_close')}
- className="modal-paper-close-button"
- />
- <div className="partners-connection-step-content">
- {steps[currentStep].content}
- </div>
- <div className="partners-connection-step-navigation">
- {steps[currentStep].topButton}
- {steps[currentStep].bottomButton}
- </div>
- </Dialog>
- )
-}
-
-export default EpglConnectModal
diff --git a/src/components/Connection/EPGLConnect/EpglConnectModal/PartnerConnectModal.scss b/src/components/Connection/EPGLConnect/EpglConnectModal/PartnerConnectModal.scss
deleted file mode 100644
index e5394492ba08706b7c7b2151bc3dd98f27ea2c4f..0000000000000000000000000000000000000000
--- a/src/components/Connection/EPGLConnect/EpglConnectModal/PartnerConnectModal.scss
+++ /dev/null
@@ -1,18 +0,0 @@
-@import 'src/styles/base/color';
-
-.partners-connection-step-content {
- padding: 0.5rem 0.5rem 0;
- text-align: center;
-}
-
-.partners-connection-step-navigation {
- width: 100%;
- display: flex;
- justify-content: center;
- flex-direction: column;
- gap: 1rem;
-}
-
-#accessibility-title {
- display: none;
-}
diff --git a/src/components/Connection/EPGLConnect/EpglConnectModal/Steps/EpglCreateAccount.tsx b/src/components/Connection/EPGLConnect/EpglConnectModal/Steps/EpglCreateAccount.tsx
deleted file mode 100644
index 79e9850a01edfb84b4de7aac7b3896c67a7323bd..0000000000000000000000000000000000000000
--- a/src/components/Connection/EPGLConnect/EpglConnectModal/Steps/EpglCreateAccount.tsx
+++ /dev/null
@@ -1,25 +0,0 @@
-import EglIcon from 'assets/icons/visu/onboarding/egl.svg'
-import StyledIcon from 'components/CommonKit/Icon/StyledIcon'
-import { useI18n } from 'cozy-ui/transpiled/react/providers/I18n'
-import React from 'react'
-import './stepDetail.scss'
-
-const EpglCreateAccount = () => {
- const { t } = useI18n()
-
- return (
- <div className="step-detail-info">
- <StyledIcon className="info-icon" icon={EglIcon} size={220} />
- <div className="info-content text-18-normal">
- <div
- className="info-content-text"
- dangerouslySetInnerHTML={{
- __html: t('auth.eglgrandlyon.step2.info1'),
- }}
- />
- </div>
- </div>
- )
-}
-
-export default EpglCreateAccount
diff --git a/src/components/Connection/EPGLConnect/EpglConnectModal/Steps/EpglDoYouHaveAccount.tsx b/src/components/Connection/EPGLConnect/EpglConnectModal/Steps/EpglDoYouHaveAccount.tsx
deleted file mode 100644
index 434d82a2db5c20e7adb61c554dd161ea8e98e2fa..0000000000000000000000000000000000000000
--- a/src/components/Connection/EPGLConnect/EpglConnectModal/Steps/EpglDoYouHaveAccount.tsx
+++ /dev/null
@@ -1,31 +0,0 @@
-import BrowserEgl from 'assets/icons/visu/onboarding/browser_egl.svg'
-import StyledIcon from 'components/CommonKit/Icon/StyledIcon'
-import { useI18n } from 'cozy-ui/transpiled/react/providers/I18n'
-import React from 'react'
-import './stepDetail.scss'
-
-const EpglDoYouHaveAccount = () => {
- const { t } = useI18n()
-
- return (
- <div className="step-detail-info">
- <StyledIcon className="info-icon" icon={BrowserEgl} size={150} />
- <div className="info-content text-18-normal">
- <div
- className="info-content-text"
- dangerouslySetInnerHTML={{
- __html: t('auth.eglgrandlyon.step1.info1'),
- }}
- />
- <div
- className="info-content-text"
- dangerouslySetInnerHTML={{
- __html: t('auth.eglgrandlyon.step1.info2'),
- }}
- />
- </div>
- </div>
- )
-}
-
-export default EpglDoYouHaveAccount
diff --git a/src/components/Connection/EPGLConnect/EpglConnectModal/Steps/stepDetail.scss b/src/components/Connection/EPGLConnect/EpglConnectModal/Steps/stepDetail.scss
deleted file mode 100644
index 0a51f47bf92d6e67ed70d94f7e23f9d8802546b8..0000000000000000000000000000000000000000
--- a/src/components/Connection/EPGLConnect/EpglConnectModal/Steps/stepDetail.scss
+++ /dev/null
@@ -1,33 +0,0 @@
-@import 'src/styles/base/color';
-
-.step-detail-info {
- display: flex;
- flex-direction: column;
- align-items: center;
- justify-content: center;
-
- .info-icon {
- margin-top: 1rem;
- }
-
- .info-content {
- min-height: 7.75rem;
- display: flex;
- flex-direction: column;
- gap: 1rem;
- margin-bottom: 1rem;
-
- .info-content-text {
- span {
- color: $gold-shadow;
- font-weight: bold;
- }
- p {
- margin: 0;
- font-style: italic;
- font-size: 0.875rem;
- line-height: 1rem;
- }
- }
- }
-}
diff --git a/src/components/Connection/EPGLConnect/EpglConnectView.tsx b/src/components/Connection/EPGLConnect/EpglConnectView.tsx
new file mode 100644
index 0000000000000000000000000000000000000000..ec6b6318879ab70cfe39a80e470ab7d071ccdfd9
--- /dev/null
+++ b/src/components/Connection/EPGLConnect/EpglConnectView.tsx
@@ -0,0 +1,162 @@
+import FormNavigation from 'components/CommonKit/FormNavigation/FormNavigation'
+import FormProgress from 'components/CommonKit/FormProgress/FormProgress'
+import Content from 'components/Content/Content'
+import CozyBar from 'components/Header/CozyBar'
+import Header from 'components/Header/Header'
+import useKonnectorAuth from 'components/Hooks/useKonnectorAuth'
+import { useClient } from 'cozy-client'
+import { FORM_DOCTYPE } from 'doctypes'
+import { FluidType } from 'enums'
+import { AccountEPGLData } from 'models'
+import React, { useCallback, useEffect, useRef, useState } from 'react'
+import { useNavigate } from 'react-router-dom'
+import { useAppSelector } from 'store/hooks'
+import '../connection.scss'
+import { createInitialEpglState, useFormData } from '../useForm'
+import StepConsent from './StepConsent'
+import { StepIdentity } from './StepIdentity'
+
+export enum EpglSteps {
+ Identity,
+ Consent,
+}
+/**
+ * http://ecolyo.cozy.tools:8080/#/connect/water
+ */
+export const EpglConnectView = () => {
+ const client = useClient()
+ const navigate = useNavigate()
+ const { formData } = useFormData()
+ const { fluidStatus } = useAppSelector(state => state.ecolyo.global)
+ const currentFluidStatus = fluidStatus[FluidType.WATER]
+ const account = currentFluidStatus.connection.account
+
+ const [launchConnection, setLaunchConnection] = useState(false)
+ const [currentStep, setCurrentStep] = useState<EpglSteps>(EpglSteps.Identity)
+ const [epglState, setEpglState] = useState<AccountEPGLData>(() =>
+ createInitialEpglState()
+ )
+ const [formConsent, setFormConsent] = useState({
+ dataConsent: false,
+ contractConfirm: false,
+ })
+
+ const mainContentRef = useRef<HTMLDivElement>(null)
+ const focusMainContent = () => {
+ setTimeout(() => mainContentRef.current?.focus(), 0)
+ }
+
+ const [connect, update] = useKonnectorAuth(FluidType.WATER, {
+ eglAuthData: epglState,
+ })
+
+ useEffect(() => {
+ setEpglState(prevState => ({
+ ...prevState,
+ ...createInitialEpglState(formData),
+ }))
+ }, [formData])
+
+ useEffect(() => {
+ async function launchConnect() {
+ if (launchConnection) {
+ setLaunchConnection(false)
+ if (!account) {
+ await connect()
+ } else {
+ await update()
+ }
+
+ navigate('/consumption/water')
+ }
+ }
+ launchConnect()
+ }, [account, connect, launchConnection, navigate, update])
+
+ const isNextValid = useCallback(() => {
+ if (currentStep === EpglSteps.Identity) {
+ return (
+ epglState.contractId !== '' &&
+ epglState.meteringId !== '' &&
+ epglState.contractId.length === 7 &&
+ epglState.meteringId.length === 11
+ )
+ } else if (currentStep === EpglSteps.Consent) {
+ return formConsent.dataConsent && formConsent.contractConfirm
+ }
+ return false
+ }, [
+ currentStep,
+ formConsent.dataConsent,
+ formConsent.contractConfirm,
+ epglState.contractId,
+ epglState.meteringId,
+ ])
+
+ const handleNext = useCallback(() => {
+ if (!isNextValid()) return
+ if (currentStep < EpglSteps.Consent) {
+ setCurrentStep(prev => prev + 1)
+ client.save({
+ ...formData,
+ _type: FORM_DOCTYPE,
+ contractId: epglState.contractId,
+ meteringId: epglState.meteringId,
+ })
+ }
+ if (currentStep === EpglSteps.Consent) {
+ setLaunchConnection(true)
+ }
+ focusMainContent()
+ }, [
+ client,
+ currentStep,
+ epglState.contractId,
+ epglState.meteringId,
+ formData,
+ isNextValid,
+ ])
+
+ const handlePrev = () => {
+ setCurrentStep(prev => prev - 1)
+ focusMainContent()
+ }
+
+ const renderStep = (step: EpglSteps) => {
+ if (step === EpglSteps.Identity) {
+ return <StepIdentity formData={epglState} setFormData={setEpglState} />
+ }
+ return (
+ <StepConsent formConsent={formConsent} setFormConsent={setFormConsent} />
+ )
+ }
+
+ return (
+ <>
+ <CozyBar titleKey="common.title_water_connect" displayBackArrow={true} />
+ <Header
+ desktopTitleKey="common.title_water_connect"
+ displayBackArrow={true}
+ />
+ <Content>
+ <div ref={mainContentRef} className="connectView" tabIndex={-1}>
+ <div className="stepContainer">
+ <FormProgress
+ currentStep={currentStep}
+ totalSteps={Object.keys(EpglSteps).length / 2}
+ />
+ {renderStep(currentStep)}
+ </div>
+ <FormNavigation
+ handlePrevious={handlePrev}
+ handleNext={handleNext}
+ isLoading={false}
+ disableNextButton={!isNextValid()}
+ disablePrevButton={currentStep === EpglSteps.Identity}
+ isLastStep={currentStep === EpglSteps.Consent}
+ />
+ </div>
+ </Content>
+ </>
+ )
+}
diff --git a/src/components/Connection/EPGLConnect/EpglForm.scss b/src/components/Connection/EPGLConnect/EpglForm.scss
deleted file mode 100644
index 8ec67c230423962c184fc1811b762b54b5f06da5..0000000000000000000000000000000000000000
--- a/src/components/Connection/EPGLConnect/EpglForm.scss
+++ /dev/null
@@ -1,22 +0,0 @@
-@import 'src/styles/base/color';
-@import 'src/styles/base/breakpoint';
-@import 'src/styles/components/input';
-
-form {
- margin-top: 1rem;
- display: flex;
- flex-direction: column;
- gap: 1rem;
-
- .iconShowPassword {
- float: right;
- position: relative;
- margin-top: -67px;
- margin-right: 15px;
- }
-
- .errorMessage {
- color: $red-primary;
- min-height: 1.25rem;
- }
-}
diff --git a/src/components/Connection/EPGLConnect/EpglForm.tsx b/src/components/Connection/EPGLConnect/EpglForm.tsx
deleted file mode 100644
index 55df38c5158d9ce9739153d1016da494fead8b3f..0000000000000000000000000000000000000000
--- a/src/components/Connection/EPGLConnect/EpglForm.tsx
+++ /dev/null
@@ -1,162 +0,0 @@
-import { Button, TextField } from '@material-ui/core'
-import * as Sentry from '@sentry/react'
-import TrailingIcon from 'assets/icons/ico/trailing-icon.svg'
-import EglLogo from 'assets/icons/visu/egl-logo.svg'
-import classNames from 'classnames'
-import StyledIcon from 'components/CommonKit/Icon/StyledIcon'
-import StyledIconButton from 'components/CommonKit/IconButton/StyledIconButton'
-import useKonnectorAuth from 'components/Hooks/useKonnectorAuth'
-import { useI18n } from 'cozy-ui/transpiled/react/providers/I18n'
-import { FluidType } from 'enums'
-import { AccountEGLData } from 'models'
-import React, { useEffect, useState } from 'react'
-import { useAppSelector } from 'store/hooks'
-import logApp from 'utils/logger'
-import './EpglForm.scss'
-
-const EpglForm = ({ hasCreatedAccount }: { hasCreatedAccount: boolean }) => {
- const { t } = useI18n()
- const { fluidStatus, lastEpglLogin } = useAppSelector(
- state => state.ecolyo.global
- )
- const currentFluidStatus = fluidStatus[FluidType.WATER]
- const fluidName = FluidType[currentFluidStatus.fluidType]
- const account = currentFluidStatus.connection.account
-
- const [login, setLogin] = useState<string>('')
- const [password, setPassword] = useState<string>('')
- const [error, setError] = useState<string>('')
- const [loading, setLoading] = useState<boolean>(false)
- const [showPassword, setShowPassword] = useState(false)
-
- const [connect, update, connectError] = useKonnectorAuth(FluidType.WATER, {
- eglAuthData: { login, password },
- })
-
- const changeLogin = (value: string) => {
- if (value.toString().length > 7) return
- setError('')
- setLogin(value)
- }
-
- const changePassword = (value: string) => {
- setError('')
- setPassword(value)
- }
-
- const handleSubmit = async () => {
- try {
- setError('')
- setLoading(true)
- if (!login || !password) {
- setError(t('konnector_form.error_no_login_password'))
- setLoading(false)
- return null
- }
- if (!account) {
- await connect()
- setLoading(false)
- } else {
- await update()
- }
- } catch (error) {
- logApp.error(error)
- Sentry.captureException(error)
- setLoading(false)
- }
- }
-
- useEffect(() => {
- if (connectError) setError(connectError)
- }, [connectError])
-
- useEffect(() => {
- if (account?.auth) {
- const auth = account.auth
- const authData = auth as AccountEGLData
- if (authData.login) {
- setLogin(authData.login)
- }
- } else if (lastEpglLogin) {
- setLogin(lastEpglLogin)
- setError(t('konnector_form.error_login_failed'))
- }
- }, [account, lastEpglLogin, t])
-
- return (
- <>
- {hasCreatedAccount && (
- <h2 className="connection-form-title eglgrandlyon text-20-bold">
- {t('auth.eglgrandlyon.with_account.title')}
- </h2>
- )}
- <div className="connection-form-subtitle text-18-bold">
- {t('auth.eglgrandlyon.with_account.subtitle1')}
- </div>
- <form>
- <TextField
- variant="outlined"
- id={'idFieldLogin' + fluidName}
- type="number"
- className={classNames('inputText', { error: error !== '' })}
- label={t(`auth.eglgrandlyon.connect_form.login`)}
- onChange={e => changeLogin(e.target.value)}
- value={login}
- inputMode="numeric"
- error={Boolean(error)}
- required
- />
-
- <TextField
- variant="outlined"
- id={'idFieldPassword' + fluidName}
- type={showPassword ? 'text' : 'password'}
- className={classNames('inputText', { error: error !== '' })}
- label={t(`auth.eglgrandlyon.connect_form.password`)}
- onChange={e => changePassword(e.target.value)}
- value={password}
- error={Boolean(error)}
- required
- />
- <span>
- <StyledIconButton
- icon={TrailingIcon}
- aria-label={
- showPassword
- ? t('auth.accessibility.button_hide_password')
- : t('auth.accessibility.button_reveal_password')
- }
- aria-checked={showPassword}
- className="iconShowPassword"
- sized={22}
- onClick={() => setShowPassword(prev => !prev)}
- />
- </span>
-
- <div className="errorMessage">{error === '' ? null : error}</div>
- <div className="connection-form-connect-button">
- <Button
- aria-label={t('auth.accessibility.button_connect')}
- disabled={loading}
- classes={{
- root: 'btnPrimary',
- label: 'text-18-bold',
- }}
- onClick={handleSubmit}
- >
- <div className="connection-form-connect-button-content">
- <div className="connection-form-connect-button-content-icon">
- <StyledIcon icon={EglLogo} size={80} />
- </div>
- <div className="connection-form-connect-button-text text-18-bold">
- <div>{t(`auth.eglgrandlyon.connect_form.label`)}</div>
- </div>
- </div>
- </Button>
- </div>
- </form>
- </>
- )
-}
-
-export default EpglForm
diff --git a/src/components/Connection/EPGLConnect/EpglInit.tsx b/src/components/Connection/EPGLConnect/EpglInit.tsx
index 216e832f9f8d8f28b28644d9625fbe3a79c74aef..dc7132e1ce0c311eebf1f8d71105067ea2e87cc8 100644
--- a/src/components/Connection/EPGLConnect/EpglInit.tsx
+++ b/src/components/Connection/EPGLConnect/EpglInit.tsx
@@ -1,28 +1,51 @@
-import React, { useState } from 'react'
+import { Button } from '@material-ui/core'
+import WaterBill from 'assets/icons/visu/onboarding/water_bill.svg'
+import StyledIcon from 'components/CommonKit/Icon/StyledIcon'
+import { useI18n } from 'cozy-ui/transpiled/react/providers/I18n'
+import { FluidType } from 'enums'
+import React from 'react'
+import { useNavigate } from 'react-router-dom'
+import { setShowOfflineData } from 'store/chart/chart.slice'
+import { useAppDispatch, useAppSelector } from 'store/hooks'
import '../connection.scss'
-import EpglBill from './EpglBill'
-import EpglConnectModal from './EpglConnectModal/EpglConnectModal'
-import EpglForm from './EpglForm'
const EpglInit = () => {
- const [openModal, setOpenModal] = useState(false)
- const [showForm, setShowForm] = useState(false)
- const [hasCreatedAccount, setHasCreatedAccount] = useState(false)
+ const { t } = useI18n()
+ const navigate = useNavigate()
+ const dispatch = useAppDispatch()
+ const { fluidStatus } = useAppSelector(state => state.ecolyo.global)
+ const currentFluidStatus = fluidStatus[FluidType.WATER]
return (
- <>
- {!showForm ? (
- <EpglBill openModal={setOpenModal} />
- ) : (
- <EpglForm hasCreatedAccount={hasCreatedAccount} />
- )}
- <EpglConnectModal
- open={openModal}
- setShowForm={setShowForm}
- setHasCreatedAccount={setHasCreatedAccount}
- closeModal={setOpenModal}
+ <div className="connection-form">
+ <h2 className="connection-form-title eglgrandlyon text-20-bold">
+ {t('auth.eglgrandlyon.no_account.title')}
+ </h2>
+
+ <StyledIcon icon={WaterBill} size={180} />
+ <p
+ className="connection-form-subtitle text-16-regular"
+ dangerouslySetInnerHTML={{ __html: t('auth.eglgrandlyon.bill') }}
/>
- </>
+
+ <div className="connection-form-button">
+ <Button
+ aria-label={t('auth.eglgrandlyon.accessibility.connect')}
+ onClick={() => navigate('/connect/water')}
+ className="btnPrimary"
+ >
+ {t('auth.eglgrandlyon.connect')}
+ </Button>
+ {currentFluidStatus.firstDataDate && (
+ <Button
+ className="btnSecondary"
+ onClick={() => dispatch(setShowOfflineData(true))}
+ >
+ {t('auth.button_showOfflineData')}
+ </Button>
+ )}
+ </div>
+ </div>
)
}
diff --git a/src/components/Connection/EPGLConnect/EpglModalHint.tsx b/src/components/Connection/EPGLConnect/EpglModalHint.tsx
new file mode 100644
index 0000000000000000000000000000000000000000..366a67128d24ede7b41b882c55306da5c18ebb35
--- /dev/null
+++ b/src/components/Connection/EPGLConnect/EpglModalHint.tsx
@@ -0,0 +1,71 @@
+import Button from '@material-ui/core/Button'
+import Dialog from '@material-ui/core/Dialog'
+import CloseIcon from 'assets/icons/ico/close.svg'
+import StyledIconButton from 'components/CommonKit/IconButton/StyledIconButton'
+import { useI18n } from 'cozy-ui/transpiled/react/providers/I18n'
+import React from 'react'
+
+const EpglModalHint = ({
+ open,
+ handleCloseClick,
+}: {
+ open: boolean
+ handleCloseClick: () => void
+}) => {
+ const { t } = useI18n()
+
+ return (
+ <Dialog
+ open={open}
+ disableEscapeKeyDown
+ onClose={handleCloseClick}
+ aria-labelledby="accessibility-title"
+ classes={{
+ root: 'modal-root',
+ paper: 'modal-paper',
+ }}
+ >
+ <div id="accessibility-title">
+ {t('auth.eglgrandlyon.accessibility.modalHintsTitle')}
+ </div>
+ <StyledIconButton
+ icon={CloseIcon}
+ onClick={handleCloseClick}
+ aria-label={t('feedback.accessibility.button_close')}
+ className="modal-paper-close-button"
+ />
+ <div className="hintModal">
+ <h1 className="text-20-bold">
+ {t('auth.eglgrandlyon.hintsModal.title')}
+ </h1>
+ <div className="content">
+ <div>
+ <p
+ className="epglText"
+ dangerouslySetInnerHTML={{
+ __html: t('auth.eglgrandlyon.hintsModal.description'),
+ }}
+ />
+ <ul className="text-16-normal">
+ <li
+ dangerouslySetInnerHTML={{
+ __html: t('auth.eglgrandlyon.hintsModal.contractId'),
+ }}
+ />
+ <li
+ dangerouslySetInnerHTML={{
+ __html: t('auth.eglgrandlyon.hintsModal.meteringId'),
+ }}
+ />
+ </ul>
+ </div>
+ <Button onClick={handleCloseClick} className="btnPrimary">
+ {t('auth.eglgrandlyon.hintsModal.okButton')}
+ </Button>
+ </div>
+ </div>
+ </Dialog>
+ )
+}
+
+export default EpglModalHint
diff --git a/src/components/Connection/EPGLConnect/StepConsent.tsx b/src/components/Connection/EPGLConnect/StepConsent.tsx
new file mode 100644
index 0000000000000000000000000000000000000000..f41407892a1e80bc65b4a380e05bec324aaf6aa1
--- /dev/null
+++ b/src/components/Connection/EPGLConnect/StepConsent.tsx
@@ -0,0 +1,68 @@
+import { Checkbox } from '@material-ui/core'
+import { useI18n } from 'cozy-ui/transpiled/react/providers/I18n'
+import React from 'react'
+
+const StepConsent = ({
+ formConsent,
+ setFormConsent,
+}: {
+ formConsent: {
+ dataConsent: boolean
+ contractConfirm: boolean
+ }
+ setFormConsent: React.Dispatch<
+ React.SetStateAction<{
+ dataConsent: boolean
+ contractConfirm: boolean
+ }>
+ >
+}) => {
+ const { t } = useI18n()
+
+ return (
+ <div className="stepDetails">
+ <div className="text-16-normal">{t('auth.eglgrandlyon.headConsent')}</div>
+ <h2 className="text-22-bold">{t('auth.eglgrandlyon.textConsent')}</h2>
+ <ul className="text-16-normal">
+ <li>{t('auth.eglgrandlyon.consentLi')}</li>
+ </ul>
+ <label htmlFor="dataConsentEpgl" className="inline">
+ <Checkbox
+ id="dataConsentEpgl"
+ className="inputCheckbox"
+ checked={formConsent.dataConsent}
+ onChange={e =>
+ setFormConsent(prev => ({ ...prev, dataConsent: e.target.checked }))
+ }
+ required
+ />
+ <span
+ dangerouslySetInnerHTML={{
+ __html: t('auth.eglgrandlyon.consentCheck1'),
+ }}
+ />
+ </label>
+ <label htmlFor="contractConfirm" className="inline">
+ <Checkbox
+ id="contractConfirm"
+ className="inputCheckbox"
+ checked={formConsent.contractConfirm}
+ onChange={e =>
+ setFormConsent(prev => ({
+ ...prev,
+ contractConfirm: e.target.checked,
+ }))
+ }
+ required
+ />
+ <span
+ dangerouslySetInnerHTML={{
+ __html: t('auth.eglgrandlyon.consentCheck2'),
+ }}
+ />
+ </label>
+ </div>
+ )
+}
+
+export default StepConsent
diff --git a/src/components/Connection/EPGLConnect/StepIdentity.tsx b/src/components/Connection/EPGLConnect/StepIdentity.tsx
new file mode 100644
index 0000000000000000000000000000000000000000..4f1fc584a3b5b54228926b4a34122ec34baae461
--- /dev/null
+++ b/src/components/Connection/EPGLConnect/StepIdentity.tsx
@@ -0,0 +1,57 @@
+import { TextField } from '@material-ui/core'
+import Button from '@material-ui/core/Button'
+import { useI18n } from 'cozy-ui/transpiled/react/providers/I18n'
+import { AccountEPGLData } from 'models'
+import React, { useState } from 'react'
+import EpglModalHint from './EpglModalHint'
+
+export const StepIdentity = ({
+ formData,
+ setFormData,
+}: {
+ formData: AccountEPGLData
+ setFormData: React.Dispatch<React.SetStateAction<AccountEPGLData>>
+}) => {
+ const { t } = useI18n()
+ const [openHintModal, setOpenHintModal] = useState<boolean>(false)
+
+ return (
+ <div className="stepDetails stepIdentity">
+ <h2 className="text-22-bold">{t('auth.eglgrandlyon.contractId')}</h2>
+ <TextField
+ label={t('auth.eglgrandlyon.contractIdTextField')}
+ variant="outlined"
+ type="number"
+ id="contractId"
+ value={formData.contractId}
+ onChange={e => {
+ if (e.target.value.length > 7) return
+ setFormData(prev => ({ ...prev, contractId: e.target.value }))
+ }}
+ required
+ />
+
+ <h2 className="text-22-bold">{t('auth.eglgrandlyon.meteringId')}</h2>
+ <TextField
+ label={t('auth.eglgrandlyon.meteringIdTextField')}
+ variant="outlined"
+ type="text"
+ id="meteringId"
+ required
+ value={formData.meteringId}
+ onChange={e => {
+ if (e.target.value.length > 11) return
+ setFormData(prev => ({ ...prev, meteringId: e.target.value }))
+ }}
+ />
+
+ <Button className="btnText" onClick={() => setOpenHintModal(true)}>
+ {t('auth.eglgrandlyon.contractHints')}
+ </Button>
+ <EpglModalHint
+ open={openHintModal}
+ handleCloseClick={() => setOpenHintModal(false)}
+ />
+ </div>
+ )
+}
diff --git a/src/components/Connection/GRDFConnect/GrdfConnectView.tsx b/src/components/Connection/GRDFConnect/GrdfConnectView.tsx
index 6ab30c622d79200d845cffc7a0d18561c5220f09..86f7694ad0c870be6ef69b5a8d9eeb68bb1f4808 100644
--- a/src/components/Connection/GRDFConnect/GrdfConnectView.tsx
+++ b/src/components/Connection/GRDFConnect/GrdfConnectView.tsx
@@ -36,7 +36,7 @@ export const GrdfConnectView = () => {
const [launchConnection, setLaunchConnection] = useState(false)
const [currentStep, setCurrentStep] = useState<GrdfStep>(GrdfStep.Identity)
- const [grdfState, setGrdfState] = useState<AccountGRDFData>(
+ const [grdfState, setGrdfState] = useState<AccountGRDFData>(() =>
createInitialGrdfState()
)
const [formConsent, setFormConsent] = useState({
diff --git a/src/components/Connection/GRDFConnect/GrdfModalHint.tsx b/src/components/Connection/GRDFConnect/GrdfModalHint.tsx
index c2bb744a97e47fe962f984f6cc1757b6cbb45ece..688edad60a456643ce508db2c0f2860948cf4fbb 100644
--- a/src/components/Connection/GRDFConnect/GrdfModalHint.tsx
+++ b/src/components/Connection/GRDFConnect/GrdfModalHint.tsx
@@ -28,7 +28,7 @@ const GrdfModalHint = ({
}}
>
<div id="accessibility-title">
- {t('challenge_no_fluid_modal.accessibility.window_title')}
+ {t('auth.grdfgrandlyon.accessibility.modalHintsTitle')}
</div>
<StyledIconButton
icon={CloseIcon}
@@ -50,11 +50,7 @@ const GrdfModalHint = ({
__html: t('auth.grdfgrandlyon.pceModal.txt1'),
}}
/>
- <Button
- aria-label={t('auth.grdfgrandlyon.pceModal.button-accessibility')}
- onClick={handleCloseClick}
- className="btnPrimary"
- >
+ <Button onClick={handleCloseClick} className="btnPrimary">
{t('auth.grdfgrandlyon.pceModal.button')}
</Button>
</div>
diff --git a/src/components/Connection/GRDFConnect/StepConsent.tsx b/src/components/Connection/GRDFConnect/StepConsent.tsx
index 988a84c685c5a5b663af1b1b60feafe403483ce9..c4e8eb042054054144d1617f0f1cb273ed4ccb2f 100644
--- a/src/components/Connection/GRDFConnect/StepConsent.tsx
+++ b/src/components/Connection/GRDFConnect/StepConsent.tsx
@@ -20,7 +20,7 @@ const StepConsent = ({
const { t } = useI18n()
return (
- <div className="stepDetails stepConsent">
+ <div className="stepDetails">
<div className="text-16-normal">
{t('auth.grdfgrandlyon.headConsent')}
</div>
@@ -53,7 +53,11 @@ const StepConsent = ({
}
required
/>
- <span>{t('auth.grdfgrandlyon.consentCheck2')}</span>
+ <span
+ dangerouslySetInnerHTML={{
+ __html: t('auth.grdfgrandlyon.consentCheck2'),
+ }}
+ />
</label>
</div>
)
diff --git a/src/components/Connection/SGEConnect/SgeConnectView.tsx b/src/components/Connection/SGEConnect/SgeConnectView.tsx
index 0f179a07b9acc17e88d3189b1feaf96df8c630b8..ec99cf44a364b21a1b8ab2ad52a200d1c2022e27 100644
--- a/src/components/Connection/SGEConnect/SgeConnectView.tsx
+++ b/src/components/Connection/SGEConnect/SgeConnectView.tsx
@@ -37,7 +37,9 @@ const SgeConnectView = () => {
const dispatch = useAppDispatch()
const { formData } = useFormData()
const [isLoading, setIsLoading] = useState(false)
- const [sgeState, setSgeState] = useState<SgeStore>(createInitialSgeState())
+ const [sgeState, setSgeState] = useState<SgeStore>(() =>
+ createInitialSgeState()
+ )
const [currentStep, setCurrentStep] = useState<SgeStep>(
SgeStep.IdentityAndPDL
)
@@ -54,17 +56,12 @@ const SgeConnectView = () => {
sgeAuthData: sgeState,
})
- useEffect(
- function applyFormData() {
- if (formData) {
- setSgeState(prevState => ({
- ...prevState,
- ...createInitialSgeState(formData),
- }))
- }
- },
- [formData]
- )
+ useEffect(() => {
+ setSgeState(prevState => ({
+ ...prevState,
+ ...createInitialSgeState(formData),
+ }))
+ }, [formData])
useEffect(() => {
async function launchConnect() {
diff --git a/src/components/Connection/connection.scss b/src/components/Connection/connection.scss
index ca34a3ae309c71f946d441f3020d6f35fe5657e4..43b035aa5dceabc08473065121c80729a87978df 100644
--- a/src/components/Connection/connection.scss
+++ b/src/components/Connection/connection.scss
@@ -113,6 +113,7 @@
span.gold {
color: $gold-shadow;
+ font-weight: bold;
}
}
#zipCode {
@@ -154,6 +155,7 @@
display: flex;
flex-direction: column;
text-align: left;
+ padding: 0.5rem;
h1 {
text-align: center;
@@ -164,20 +166,35 @@
.content {
display: flex;
flex-direction: column;
- gap: 1.5rem;
+ gap: 1rem;
+
+ span {
+ color: $gold-shadow;
+ font-weight: 700;
+ }
+
p {
text-align: center;
- color: $grey-bright;
margin: 0;
text-wrap: pretty;
}
+ ul {
+ margin: 0;
+ padding: 0 1rem 1rem;
+ line-height: 130%;
+ li {
+ margin: 0.5rem 0;
+ }
+ }
+
+ .epglText {
+ color: $grey-bright;
+ text-align: left;
+ }
+
.grdfText {
color: $grey-bright;
- span {
- color: $gold-shadow;
- font-weight: 700;
- }
}
.bill {
diff --git a/src/components/Connection/useForm.tsx b/src/components/Connection/useForm.tsx
index 90d7c2d3920c75fb5143576e11e87adeb2ee816b..a1f36cd1be34ee4a5309067bf61588ac0cc5574e 100644
--- a/src/components/Connection/useForm.tsx
+++ b/src/components/Connection/useForm.tsx
@@ -2,7 +2,7 @@ import { Q, QueryDefinition, useQuery } from 'cozy-client'
import { QueryOptions } from 'cozy-client/types/types'
import { FORM_DOCTYPE } from 'doctypes'
import { SgeStep } from 'enums'
-import { AccountGRDFData, SgeStore } from 'models'
+import { AccountEPGLData, AccountGRDFData, SgeStore } from 'models'
export type QueryParams = (arg?: any) => {
definition: QueryDefinition
@@ -18,6 +18,8 @@ interface FormData {
zipCode: string
city: string
address: string
+ contractId: string
+ meteringId: string
}
const getFormData: QueryParams = () => ({
@@ -66,3 +68,10 @@ export const createInitialGrdfState = (
pce: formData?.pce ?? '',
postalCode: formData?.zipCode ?? '',
})
+
+export const createInitialEpglState = (
+ formData?: FormData
+): AccountEPGLData => ({
+ contractId: formData?.contractId ?? '',
+ meteringId: formData?.meteringId ?? '',
+})
diff --git a/src/components/Hooks/useKonnectorAuth.tsx b/src/components/Hooks/useKonnectorAuth.tsx
index 6755f9ed4dcffe90ac611bfbe61df92ba11bbe7c..273a6ef75d1b09ae76cc1268abce8dbf749e57a9 100644
--- a/src/components/Hooks/useKonnectorAuth.tsx
+++ b/src/components/Hooks/useKonnectorAuth.tsx
@@ -3,7 +3,7 @@ import { useClient } from 'cozy-client'
import { useI18n } from 'cozy-ui/transpiled/react/providers/I18n'
import { FluidType } from 'enums'
import {
- AccountEGLData,
+ AccountEPGLData,
AccountGRDFData,
AccountSgeData,
FluidConnection,
@@ -24,16 +24,12 @@ const formatAuthData = ({
grdfAuthData,
sgeAuthData,
}: {
- eglAuthData?: AccountEGLData
+ eglAuthData?: AccountEPGLData
sgeAuthData?: SgeStore
grdfAuthData?: AccountGRDFData
-}): AccountEGLData | AccountSgeData | AccountGRDFData => {
+}): AccountEPGLData | AccountSgeData | AccountGRDFData => {
if (eglAuthData) {
- const konnectorFields: AccountEGLData = {
- login: eglAuthData.login,
- password: eglAuthData.password,
- }
- return konnectorFields
+ return eglAuthData
// TODO could be simplified with satisfies but parser error
} else if (grdfAuthData) {
const konnectorFields: AccountGRDFData = {
@@ -55,14 +51,14 @@ const formatAuthData = ({
}
return konnectorFields
} else {
- throw new Error('Expected data but got none')
+ throw new Error('Expected authentification info but got none')
}
}
const useKonnectorAuth = (
fluidType: FluidType,
options: {
- eglAuthData?: AccountEGLData
+ eglAuthData?: AccountEPGLData
sgeAuthData?: SgeStore
grdfAuthData?: AccountGRDFData
}
diff --git a/src/components/Konnector/KonnectorViewerCard.tsx b/src/components/Konnector/KonnectorViewerCard.tsx
index a2be9f11307a10da70613ed7d489f0e425904895..d7f45747fef5a60bdd1a06ff997ed78530f987fe 100644
--- a/src/components/Konnector/KonnectorViewerCard.tsx
+++ b/src/components/Konnector/KonnectorViewerCard.tsx
@@ -24,7 +24,6 @@ import {
} from 'cozy-harvest-lib/dist/models/flowEvents'
import { useI18n } from 'cozy-ui/transpiled/react/providers/I18n'
import {
- FluidSlugType,
FluidState,
FluidType,
KonnectorError,
@@ -32,7 +31,7 @@ import {
UserDuelState,
} from 'enums'
import { DateTime } from 'luxon'
-import { AccountEGLData, FluidConnection, FluidStatus } from 'models'
+import { FluidConnection, FluidStatus } from 'models'
import React, { useCallback, useEffect, useMemo, useState } from 'react'
import { useNavigate } from 'react-router-dom'
import AccountService from 'services/account.service'
@@ -48,7 +47,6 @@ import {
} from 'store/chart/chart.slice'
import {
setFluidStatus,
- setLastEpglLogin,
toggleChallengeDuelNotification,
updateFluidConnection,
} from 'store/global/global.slice'
@@ -199,12 +197,6 @@ const KonnectorViewerCard = ({
if (shouldDeleteAccount) {
logApp('info', `shouldDeleteAccount`)
- // KEEP LAST LOGIN FOR EPGL
- if (fluidSlug === FluidSlugType.WATER && account?.auth) {
- const auth = account.auth as AccountEGLData
- const lastEpglLogin = auth.login
- dispatch(setLastEpglLogin(lastEpglLogin))
- }
// DELETE ACCOUNT
await accountService.deleteAccount(account)
await handleAccountDeletion()
@@ -223,7 +215,6 @@ const KonnectorViewerCard = ({
fluidType,
currentFluidStatus,
dispatch,
- fluidSlug,
accountService,
handleAccountDeletion,
fluidService,
diff --git a/src/components/Routes/Routes.tsx b/src/components/Routes/Routes.tsx
index a1a55f5ce7708c662e9da033e65de53b044f09fe..f17ab936f629dd048256434cd6d921e3a43e6ab2 100644
--- a/src/components/Routes/Routes.tsx
+++ b/src/components/Routes/Routes.tsx
@@ -1,5 +1,6 @@
import ActionView from 'components/Action/ActionView'
import ChallengeView from 'components/Challenge/ChallengeView'
+import { EpglConnectView } from 'components/Connection/EPGLConnect/EpglConnectView'
import { GrdfConnectView } from 'components/Connection/GRDFConnect/GrdfConnectView'
import SgeConnectView from 'components/Connection/SGEConnect/SgeConnectView'
import DuelView from 'components/Duel/DuelView'
@@ -68,6 +69,7 @@ const AppRoutes = ({ termsStatus }: { termsStatus: TermsStatus }) => {
element={<ConsumptionView fluidType={FluidType.MULTIFLUID} />}
/>
<Route path="/connect/electricity" element={<SgeConnectView />} />
+ <Route path="/connect/water" element={<EpglConnectView />} />
<Route path="/connect/gas" element={<GrdfConnectView />} />
<Route path="/challenges/duel" element={<DuelView />} />
<Route path="/challenges/quiz" element={<QuizView />} />
diff --git a/src/locales/fr.json b/src/locales/fr.json
index 75f24dc1fc2bfa5b6f05b4c4c5959eca5c26a0ed..1e3e3452eab263a6c38ecff74418cdbd029aca65 100644
--- a/src/locales/fr.json
+++ b/src/locales/fr.json
@@ -20,6 +20,7 @@
"title_gcu": "Conditions générales d’utilisation",
"title_accessibility": "Accessibilité : non conforme",
"title_sge_connect": "Connexion à l'électricité",
+ "title_water_connect": "Connexion à l'eau",
"title_gas_connect": "Connexion au gaz",
"accessibility": {
"loading": "Chargement",
@@ -216,15 +217,16 @@
"consentLi2": "L'historique et le relevé de vos consommations au pas de temps 30 minutes",
"consentLi3": "Les puissances maximales atteintes quotidiennement",
"consentLi4": "Les données contractuelles (début de contrat et puissance souscrite)",
- "consentCheck1": "Je consens à partager les données personnelles ci-dessus pour une durée d'<span class='gold'>un\u00a0an</span> *",
- "consentCheck2": "J’atteste être le titulaire du point de livraison (PDL) renseigné à l’étape précédente *"
+ "consentCheck1": "Je consens à partager les données personnelles ci-dessus pour une durée d'<span class='gold'>un\u00a0an*</span>",
+ "consentCheck2": "J’atteste être le titulaire du point de livraison (PDL) renseigné à l’étape précédente<span class='gold'>*</span>"
},
"grdfgrandlyon": {
"title": "Ecolyo doit se connecter au gaz",
"bill": "Munissez-vous d’une <span>facture de gaz</span> pour valider la connexion",
"connect": "Je me connecte au gaz",
"accessibility": {
- "connect": "Se connecter"
+ "connect": "Se connecter",
+ "modalHintsTitle": "Modale d'aide vis-à -vis du PCE demandé"
},
"identityTitle": "Nom inscrit sur la facture",
"firstName": "Prénom",
@@ -238,15 +240,14 @@
"title": "Où trouver le n° de PCE\u00a0?",
"txt1": "Votre numéro de <span>PCE</span> - ou <span>Point de comptage et d'estimation</span> - se trouve sur votre facture au niveau de vos informations contractuelles (parfois en 1ère page... parfois en dernière !)<br/><br/> C'est un identifiant à 14 chiffres.",
"button": "J'ai compris",
- "accessibility": "Titre de la modale",
- "button-accessibility": "Bouton valider"
+ "accessibility": "Titre de la modale"
},
"headConsent": "Vous allez partager vos données à la Métropole de Lyon. Elles seront directement transférées à Ecolyo à l'intérieur de votre cloud personnel, sans que la Métropole n'y accède ni ne les visualise.",
"textConsent": "Afin de vous offrir des fonctionnalités de visualisation et d'analyse, Ecolyo a besoin des données suivantes\u00a0:",
"consentLi1": "L'historique de vos consommations (jusqu’à 36 mois) et le relevé quotidien de vos consommations",
"consentLi2": "Les données contractuelles (type de compteur, date de début de contrat)",
- "consentCheck1": "Je consens à partager les données personnelles ci-dessus pour une durée d'<span class='gold'>un\u00a0an</span> *",
- "consentCheck2": "J’atteste être le titulaire du point de livraison (PCE) renseigné à l’étape précédente *",
+ "consentCheck1": "Je consens à partager les données personnelles ci-dessus pour une durée d'<span class='gold'>un\u00a0an*</span>",
+ "consentCheck2": "J’atteste être le titulaire du point de livraison (PCE) renseigné à l’étape précédente<span class='gold'>*</span>",
"waiting": {
"mailSent": "Un mail vous a été envoyé...",
"mailDelay": "cela peut prendre jusqu'Ã 3 minutes",
@@ -259,28 +260,30 @@
"bill": "Munissez-vous d’une <span>facture d'eau</span> pour valider la connexion",
"connect": "Je me connecte à l'eau",
"accessibility": {
- "connect": "Se connecter"
+ "connect": "Se connecter",
+ "modalHintsTitle": "Modale d'aide vis-à -vis des numéros d'authentification demandés"
},
- "connect_form": {
- "login": "Identifiant (7 chiffres)",
- "password": "Mot de passe",
- "label": "Je connecte Ecolyo à mon compte Eau Publique du Grand Lyon"
+ "contractId": "Numéro de contrat",
+ "contractIdTextField": "Numéro (7 chiffres)",
+ "meteringId": "Numéro de compteur",
+ "meteringIdTextField": "Numéro (11 caractères)",
+ "contractHints": "Où trouver ces éléments\u00a0?",
+ "hintsModal": {
+ "title": "Où trouver vos identifiants eau\u00a0?",
+ "description": "Votre numéro de contrat ainsi que votre référence compteur se trouvent sur votre facture d'eau\u00a0:",
+ "contractId": "<span>Le numéro de contrat</span> se trouve en haut à droite des <span>deux pages</span>",
+ "meteringId": "<span>Le numéro de compteur</span> se trouve en haut à gauche de la <span>page 2</span>",
+ "okButton": "J'ai compris"
},
+ "headConsent": "Vous allez partager vos données à la Métropole de Lyon. Elles seront directement transférées à Ecolyo à l'intérieur de votre cloud personnel, sans que la Métropole n'y accède ni ne les visualise.",
+ "textConsent": "Afin de vous offrir des fonctionnalités de visualisation et d'analyse, Ecolyo a besoin des données suivantes\u00a0:",
+ "consentLi": "L'historique de vos consommations (jusqu’à 36 mois) et le relevé quotidien de vos consommations",
+ "consentCheck1": "Je consens à partager les données personnelles ci-dessus pour une durée d'<span class='gold'>un\u00a0an*</span>",
+ "consentCheck2": "J’atteste être le titulaire du compteur d'eau renseigné à l'étape précédente<span class='gold'>*</span>",
+
"no_account": {
"title": "Ecolyo doit se connecter à l'eau"
- },
- "with_account": {
- "title": "Votre compte Eau Publique du Grand Lyon a bien été créé\u00a0?",
- "subtitle1": "Plus qu’à donner votre accord pour connecter votre compteur d'eau et Ecolyo\u00a0!"
- },
- "step1": {
- "info1": "La connexion se fait via <span>votre compte Eau Publique du Grand Lyon</span>.",
- "info2": "Possédez-vous un <span>compte Eau Publique du Grand Lyon</span>\u00a0?"
- },
- "step2": {
- "info1": "Une fois votre compte créé, <span>n'oubliez pas de revenir sur Ecolyo</span> pour finaliser la connexion."
- },
- "button_go_to_partner_site": "Aller sur EPGL"
+ }
},
"connect_oauth": {
"loading": "Chargement..."
@@ -878,7 +881,7 @@
"text2": "Reconfigurer mon connecteur\u00a0?",
"text3": "La reconfiguration de votre connecteur passe par sa suppression et sa nouvelle installation. Vos données seront conservées."
},
- "error_credentials_water": "Une erreur s'est glissée dans vos identifiants de connexion. Veuillez vérifier ces éléments et tenter de vous reconnecter. L'identifiant est un numéro à 7 chiffres (différent de votre numéro de contrat).",
+ "error_credentials_water": "Il semblerait que le numéro de compteur ne corresponde pas au numéro de contrat.",
"error_credentials_electricity": "Il semblerait que les nom(s) et adresse ne concordent pas avec le numéro de votre compteur.",
"error_credentials_electricity_2": "Nous ne pouvons vous donner accès aux données de consommation.",
"error_credentials_update_water": "Une erreur s'est glissée dans vos identifiants de connexion. Veuillez vérifier ces éléments et tenter de vous reconnecter.",
diff --git a/src/models/account.model.ts b/src/models/account.model.ts
index 4595f62e3605221e82dcce7791d11d1a8f5528ca..5aeb90f261db9443fc8b12808942dbc6fee12e4b 100644
--- a/src/models/account.model.ts
+++ b/src/models/account.model.ts
@@ -1,6 +1,6 @@
export interface AccountAttributes {
account_type: string
- auth?: AccountEGLData | AccountSgeData | AccountGRDFData
+ auth?: AccountEPGLData | AccountSgeData | AccountGRDFData
identifier?: string
state?: string | null
name?: string
@@ -20,10 +20,9 @@ export interface SgeAccountData {
offPeakHours?: string
}
-export interface AccountEGLData {
- login: string
- credentials_encrypted?: string
- password?: string
+export interface AccountEPGLData {
+ contractId: string
+ meteringId: string
}
export interface AccountGRDFData {
diff --git a/src/models/global.model.ts b/src/models/global.model.ts
index 98f670d2a4e630da0a65b717611f4e6890f09ced..43ef96a50929efdae113a512d7b283ee9459c2a3 100644
--- a/src/models/global.model.ts
+++ b/src/models/global.model.ts
@@ -17,6 +17,5 @@ export interface GlobalState {
shouldRefreshConsent: boolean
partnersInfo: PartnersInfo
ecogestureFilter: Usage
- lastEpglLogin: string
headerHeight: number
}
diff --git a/src/services/account.service.spec.ts b/src/services/account.service.spec.ts
index 5eef808b36786a1191a1f7224ecbd08010c36d70..50de2b9221691b57f2fa7bd8994b8a61ec5be39f 100644
--- a/src/services/account.service.spec.ts
+++ b/src/services/account.service.spec.ts
@@ -1,7 +1,7 @@
/* eslint-disable camelcase */
import { QueryResult } from 'cozy-client'
import * as harvestLibAccounts from 'cozy-harvest-lib/dist/connections/accounts'
-import { Account, AccountEGLData } from 'models'
+import { Account, AccountEPGLData } from 'models'
import { accountsData } from 'tests/__mocks__/accountsData.mock'
import mockClient from 'tests/__mocks__/client.mock'
import { konnectorsData } from 'tests/__mocks__/konnectorsData.mock'
@@ -27,9 +27,9 @@ describe('Account service', () => {
mockHarvestLibAccounts.createAccount.mockResolvedValueOnce(
accountsData[2]
)
- const mockAuthData: AccountEGLData = {
- login: 'login',
- password: 'password', // NOSONAR
+ const mockAuthData: AccountEPGLData = {
+ contractId: 'contractId',
+ meteringId: 'meteringId',
}
const result = await accountService.createAccount(
konnectorsData[2],
diff --git a/src/services/account.service.ts b/src/services/account.service.ts
index 7fa566503377b5e606400e56d7b1c64ed32ee754..e7687c35facc6e9b69a1ca831b97b8f1643ce6ca 100644
--- a/src/services/account.service.ts
+++ b/src/services/account.service.ts
@@ -14,7 +14,7 @@ import { DateTime } from 'luxon'
import {
Account,
AccountAttributes,
- AccountEGLData,
+ AccountEPGLData,
AccountGRDFData,
AccountSgeData,
Konnector,
@@ -34,7 +34,7 @@ export default class AccountService {
public async createAccount(
konnector: Konnector,
- authData: AccountEGLData | AccountSgeData | AccountGRDFData
+ authData: AccountEPGLData | AccountSgeData | AccountGRDFData
): Promise<Account> {
const accountAttributes: AccountAttributes = await build(
konnector,
diff --git a/src/services/connection.service.spec.ts b/src/services/connection.service.spec.ts
index 6494c5b7d38b4832ce5fdd8706ce5a75b5f7a0fd..0044772f896884c6dd1e265e645466561f6436a5 100644
--- a/src/services/connection.service.spec.ts
+++ b/src/services/connection.service.spec.ts
@@ -1,4 +1,4 @@
-import { AccountEGLData } from 'models'
+import { AccountEPGLData } from 'models'
import { accountsData } from 'tests/__mocks__/accountsData.mock'
import mockClient from 'tests/__mocks__/client.mock'
import { konnectorsData } from 'tests/__mocks__/konnectorsData.mock'
@@ -26,9 +26,9 @@ jest.mock('./triggers.service', () => {
}))
})
-const mockEGLAuthData: AccountEGLData = {
- login: 'login',
- password: 'password',
+const mockEGLAuthData: AccountEPGLData = {
+ contractId: 'contractId',
+ meteringId: 'meteringId',
}
describe('Connection service', () => {
diff --git a/src/services/connection.service.ts b/src/services/connection.service.ts
index 86f5da837bb72668a3a7cc1424e3249680e1e2ac..2a39b97d3dfd19beea62a98420b06e07de599be5 100644
--- a/src/services/connection.service.ts
+++ b/src/services/connection.service.ts
@@ -3,7 +3,7 @@ import { Client } from 'cozy-client'
import logger from 'cozy-logger'
import {
Account,
- AccountEGLData,
+ AccountEPGLData,
AccountGRDFData,
AccountSgeData,
Trigger,
@@ -24,7 +24,7 @@ export default class ConnectionService {
public async connectNewUser(
konnectorId: string,
- authData: AccountEGLData | AccountSgeData | AccountGRDFData
+ authData: AccountEPGLData | AccountSgeData | AccountGRDFData
): Promise<{ account: Account; trigger: Trigger }> {
// Retrieve konnector
const konnectorService = new KonnectorService(this._client)
diff --git a/src/store/global/global.slice.spec.ts b/src/store/global/global.slice.spec.ts
index 608bd5f10bea23a3d71d01804987cc4fced1e287..43ec508317a3beaada2df8065a1fc8538d83a5cc 100644
--- a/src/store/global/global.slice.spec.ts
+++ b/src/store/global/global.slice.spec.ts
@@ -11,7 +11,6 @@ import {
globalSlice,
setFluidStatus,
setHeaderHeight,
- setLastEpglLogin,
setPartnersInfo,
setShouldRefreshConsent,
showReleaseNotes,
@@ -282,17 +281,6 @@ describe('globalSlice', () => {
})
})
- it('should handle setLastEpglLogin', () => {
- const state = globalSlice.reducer(
- mockGlobalState,
- setLastEpglLogin('1234567')
- )
- expect(state).toEqual({
- ...mockGlobalState,
- lastEpglLogin: '1234567',
- })
- })
-
it('should change the ecogestureFilter', () => {
const state = globalSlice.reducer(
mockGlobalState,
diff --git a/src/store/global/global.slice.ts b/src/store/global/global.slice.ts
index 9b6acdedb6b4b9376eff0c602bd303fb7e3ef3db..d012eec87f89230099e1bffc3393c47e281a2edd 100644
--- a/src/store/global/global.slice.ts
+++ b/src/store/global/global.slice.ts
@@ -107,7 +107,6 @@ const initialState: GlobalState = {
},
shouldRefreshConsent: false,
ecogestureFilter: Usage.ALL,
- lastEpglLogin: '',
}
type UpdatedFluidConnection = PayloadAction<{
@@ -191,10 +190,6 @@ export const globalSlice = createSlice({
) => {
state.fluidStatus[fluidType].connection = fluidConnection
},
- /** Restore last known credentials */
- setLastEpglLogin: (state, action: PayloadAction<string>) => {
- state.lastEpglLogin = action.payload
- },
updateEcogestureFilter: (state, action: PayloadAction<Usage>) => {
state.ecogestureFilter = action.payload
},
@@ -205,7 +200,6 @@ export const {
setHeaderHeight,
changeScreenType,
setFluidStatus,
- setLastEpglLogin,
setPartnersInfo,
setShouldRefreshConsent,
showReleaseNotes,
diff --git a/tests/__mocks__/accountsData.mock.ts b/tests/__mocks__/accountsData.mock.ts
index 911835bf0dfad32f72a0b5622aea9dce6a99ec6c..c7a02d0416657fb5497d6291e41aa2ec45b83a3b 100644
--- a/tests/__mocks__/accountsData.mock.ts
+++ b/tests/__mocks__/accountsData.mock.ts
@@ -25,17 +25,17 @@ export const accountsData: Account[] = [
expirationDate: '2023-09-26',
offPeakHours: '22H00-6H00',
},
+ identifier: 'address',
},
{
_id: '90e68b8450cee09fe2f077610901094d',
id: '90e68b8450cee09fe2f077610901094d',
account_type: 'eglgrandlyon',
auth: {
- credentials_encrypted:
- 'bmFjbHI5OoL+VNCT6JDFYea1dNiBGGNJM1zY0M4uWcjhALJcQT9uk9p9WPD7+1OryCAoYf9eaSE=',
- login: 'test',
+ contractId: '1234567',
+ meteringId: '123456789ABC',
},
- identifier: 'login',
+ identifier: 'contractId',
state: null,
_rev: '1-90e68b8450cee09fe2f077610901094d',
_type: 'io.cozy.accounts',
diff --git a/tests/__mocks__/store/global.state.mock.ts b/tests/__mocks__/store/global.state.mock.ts
index de8407406461bd29b994341b7e5a05f68f72867b..442b6c27d870b1cbd1a325c5436eddf8c9f375fe 100644
--- a/tests/__mocks__/store/global.state.mock.ts
+++ b/tests/__mocks__/store/global.state.mock.ts
@@ -9,7 +9,6 @@ export const mockGlobalState: GlobalState = {
challengeActionNotification: false,
challengeDuelNotification: false,
analysisNotification: false,
- lastEpglLogin: '',
termsStatus: {
accepted: true,
versionType: 'init',