diff --git a/src/assets/icons/ico/skip-enabled.svg b/src/assets/icons/ico/skip-enabled.svg
new file mode 100644
index 0000000000000000000000000000000000000000..791506267456762edfebe96bd22b15138f6cbd75
--- /dev/null
+++ b/src/assets/icons/ico/skip-enabled.svg
@@ -0,0 +1,14 @@
+<svg width="60" height="60" viewBox="0 0 60 60" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_11109_67546)">
+<path d="M34.0241 7.0181C33.9319 7.01732 33.8397 7.01654 33.7573 7.01368L30.2032 6.84152L30.1811 7.26545C30.054 7.29258 29.9289 7.32948 29.7899 7.34892L27.7788 48.1467C27.9087 48.1803 28.0329 48.2356 28.153 48.2713L28.1331 48.705L31.6873 48.8772L31.6852 48.8674C31.7774 48.8682 31.8619 48.8808 31.9561 48.8914C42.4147 49.4105 51.3632 40.4561 51.9328 28.8927C52.5123 17.3272 44.4924 7.53509 34.0241 7.0181Z" fill="#8C2929"/>
+<path d="M51.7189 24.4391L47.7945 23.5382L27.7944 47.8364L27.7788 48.1465C27.9087 48.1801 28.0329 48.2354 28.153 48.2711L28.1331 48.7049L31.6873 48.877L31.6852 48.8672C31.7774 48.868 31.8619 48.8807 31.9561 48.8912C42.4147 49.4103 51.3632 40.4559 51.9328 28.8925C52.0152 27.3616 51.9334 25.876 51.7189 24.4391Z" fill="#681818"/>
+<path d="M48.2123 28.7005C48.7827 17.1388 40.7624 7.34778 30.2985 6.83153C19.8346 6.31528 10.8895 15.2693 10.3191 26.831C9.74866 38.3926 17.769 48.1836 28.2329 48.6999C38.6968 49.2161 47.6419 40.2621 48.2123 28.7005Z" fill="#E24444"/>
+<path d="M44.3172 28.5078C44.7706 19.3181 38.3994 11.5358 30.0867 11.1257C21.774 10.7156 14.6677 17.8329 14.2144 27.0226C13.761 36.2124 20.1322 43.9946 28.4449 44.4047C36.7575 44.8148 43.8638 37.6975 44.3172 28.5078Z" fill="white"/>
+<rect x="39.1628" y="12" width="6.17925" height="37" transform="rotate(45 39.1628 12)" fill="#E24444"/>
+</g>
+<defs>
+<clipPath id="clip0_11109_67546">
+<rect width="60" height="60" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/src/assets/icons/visu/equipments/AIR_CONDITIONING.svg b/src/assets/icons/visu/equipments/AIR_CONDITIONING.svg
index 5205f7bbd202eca12d197c2f6c4f0d955c59fd39..858c9490013d2d14ffcdd58ace24376c410c5659 100644
--- a/src/assets/icons/visu/equipments/AIR_CONDITIONING.svg
+++ b/src/assets/icons/visu/equipments/AIR_CONDITIONING.svg
@@ -1,11 +1,10 @@
-<svg width="80" height="80" viewBox="0 0 80 80" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect width="80" height="80" rx="4" fill="#E0E0E0"/>
-<g clip-path="url(#clip0_11856_14985)">
-<path d="M30.7429 21.0755C34.5566 18.1256 38.6962 21.7274 39.6252 27.3338C40.326 27.3338 41.0105 27.5294 41.6298 27.8879C42.4773 26.9101 43.2269 25.5737 42.9336 24.0743C42.2491 20.5703 46.1768 17.7345 49.909 22.5749C52.8589 26.3885 49.2571 30.5281 43.6344 31.4571C43.6344 32.1579 43.4551 32.8587 43.0803 33.478C44.0581 34.3092 45.3945 35.0589 46.8939 34.7655C50.3653 34.081 53.2174 37.9925 48.377 41.7409C44.5634 44.6908 40.4238 41.089 39.4948 35.4826C38.794 35.4826 38.1095 35.2708 37.5065 34.9122C36.659 35.8901 35.893 37.2428 36.1864 38.7422C36.8709 42.2299 32.9431 45.0819 29.211 40.2415C26.2448 36.4116 29.8629 32.272 35.4856 31.3593C35.4856 30.6585 35.6974 29.974 36.056 29.3547C35.0781 28.5235 33.7417 27.7575 32.226 28.0509C28.7546 28.7354 25.9025 24.824 30.7429 21.0755ZM28.1516 46.0761H31.4112C32.2756 46.0761 33.1047 46.4195 33.716 47.0308C34.3273 47.6421 34.6707 48.4711 34.6707 49.3356V59.1142H31.4112V55.8547H28.1516V59.1142H24.8921V49.3356C24.8921 48.4711 25.2355 47.6421 25.8468 47.0308C26.4581 46.4195 27.2871 46.0761 28.1516 46.0761ZM28.1516 49.3356V52.5952H31.4112V49.3356H28.1516ZM41.0757 46.0761H44.4493L39.6741 59.1142H36.3004L41.0757 46.0761ZM49.3386 46.0761H54.2279V49.3356H49.3386V55.8547H54.2279V59.1142H49.3386C48.4741 59.1142 47.645 58.7708 47.0337 58.1595C46.4225 57.5482 46.079 56.7192 46.079 55.8547V49.3356C46.079 48.4711 46.4225 47.6421 47.0337 47.0308C47.645 46.4195 48.4741 46.0761 49.3386 46.0761Z" fill="black"/>
+<svg width="40" height="40" viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_12059_7514)">
+<path d="M10.7429 1.0755C14.5566 -1.87438 18.6962 1.72741 19.6252 7.3338C20.326 7.3338 21.0105 7.52937 21.6298 7.88792C22.4773 6.91006 23.2269 5.57365 22.9336 4.07427C22.2491 0.570272 26.1768 -2.26552 29.909 2.57488C32.8589 6.38853 29.2571 10.5281 23.6344 11.4571C23.6344 12.1579 23.4551 12.8587 23.0803 13.478C24.0581 14.3092 25.3945 15.0589 26.8939 14.7655C30.3653 14.081 33.2174 17.9925 28.377 21.7409C24.5634 24.6908 20.4238 21.089 19.4948 15.4826C18.794 15.4826 18.1095 15.2708 17.5065 14.9122C16.659 15.8901 15.893 17.2428 16.1864 18.7422C16.8709 22.2299 12.9431 25.0819 9.21097 20.2415C6.2448 16.4116 9.86287 12.272 15.4856 11.3593C15.4856 10.6585 15.6974 9.97402 16.056 9.35471C15.0781 8.52353 13.7417 7.75754 12.226 8.0509C8.75463 8.7354 5.90254 4.82396 10.7429 1.0755ZM8.15162 26.0761H11.4112C12.2756 26.0761 13.1047 26.4195 13.716 27.0308C14.3273 27.6421 14.6707 28.4711 14.6707 29.3356V39.1142H11.4112V35.8547H8.15162V39.1142H4.89209V29.3356C4.89209 28.4711 5.2355 27.6421 5.84678 27.0308C6.45806 26.4195 7.28714 26.0761 8.15162 26.0761ZM8.15162 29.3356V32.5952H11.4112V29.3356H8.15162ZM21.0757 26.0761H24.4493L19.6741 39.1142H16.3004L21.0757 26.0761ZM29.3386 26.0761H34.2279V29.3356H29.3386V35.8547H34.2279V39.1142H29.3386C28.4741 39.1142 27.645 38.7708 27.0337 38.1595C26.4225 37.5482 26.079 36.7192 26.079 35.8547V29.3356C26.079 28.4711 26.4225 27.6421 27.0337 27.0308C27.645 26.4195 28.4741 26.0761 29.3386 26.0761Z" fill="black"/>
</g>
<defs>
-<clipPath id="clip0_11856_14985">
-<rect width="40" height="40" fill="white" transform="translate(20 20)"/>
+<clipPath id="clip0_12059_7514">
+<rect width="40" height="40" fill="white"/>
</clipPath>
</defs>
</svg>
diff --git a/src/assets/icons/visu/equipments/BOILER.svg b/src/assets/icons/visu/equipments/BOILER.svg
index 4dd45904916d0412755b3d28b95cec95445787dd..336811783d51a91db43116976c0b1f6bcd7ded61 100644
--- a/src/assets/icons/visu/equipments/BOILER.svg
+++ b/src/assets/icons/visu/equipments/BOILER.svg
@@ -1,4 +1,3 @@
-<svg width="80" height="80" viewBox="0 0 80 80" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect width="80" height="80" rx="4" fill="#E0E0E0"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M30 22C28.8954 22 28 22.8954 28 24V55C28 55.9835 28.7099 56.8012 29.6452 56.9686C29.6576 56.9349 29.6707 56.9012 29.6844 56.8676L32.13 50.8676C32.5904 49.7383 33.6886 49 34.9081 49L45.1646 49.0001C46.3025 49.0001 47.3425 49.6438 47.8498 50.6623L50.839 56.6622C50.8597 56.7039 50.8794 56.7456 50.898 56.7876C51.5516 56.4586 52 55.7816 52 55V24C52 22.8954 51.1046 22 50 22H30ZM50.4248 56.9548C50.4141 56.9315 50.403 56.9083 50.3914 56.8852L47.4023 50.8853C46.9795 50.0365 46.1129 49.5001 45.1646 49.5001L34.9081 49.5C33.8918 49.5 32.9767 50.1152 32.5931 51.0564L30.1704 57H50C50.1458 57 50.2879 56.9844 50.4248 56.9548ZM36.5 55C37.3284 55 38 54.3284 38 53.5C38 52.6716 37.3284 52 36.5 52C35.6716 52 35 52.6716 35 53.5C35 54.3284 35.6716 55 36.5 55ZM45 53.5C45 54.3284 44.3284 55 43.5 55C42.6716 55 42 54.3284 42 53.5C42 52.6716 42.6716 52 43.5 52C44.3284 52 45 52.6716 45 53.5ZM40.8549 28.4812L40 29L39.1451 28.4812L40 27.0726L40.8549 28.4812ZM40 43C37.5838 43 35.625 41.0412 35.625 38.625C35.625 36.7598 38.232 32.0388 39.4211 29.9825C39.7724 29.3749 40 29 40 29C40 29 40.2275 29.3749 40.5789 29.9825C41.768 32.0388 44.375 36.7598 44.375 38.625C44.375 41.0412 42.4162 43 40 43ZM40 43C38.5503 43 37.375 41.8982 37.375 40.5391C37.375 39.1799 40 35.125 40 35.125C40 35.125 42.625 39.1799 42.625 40.5391C42.625 41.8982 41.4497 43 40 43ZM40.855 28.4814C40.8549 28.4813 40.8549 28.4812 40 29C39.1451 28.4812 39.1451 28.4813 39.145 28.4814L39.1448 28.4818L39.144 28.483L39.1413 28.4874L39.1313 28.504L39.0934 28.5669C39.0605 28.6218 39.0126 28.702 38.9518 28.8046C38.8302 29.0097 38.657 29.3046 38.4494 29.6658C38.0347 30.3873 37.4805 31.3768 36.9252 32.4452C36.3715 33.5105 35.8084 34.6697 35.3814 35.7273C34.9725 36.7397 34.625 37.8061 34.625 38.625C34.625 41.5935 37.0315 44 40 44C42.9685 44 45.375 41.5935 45.375 38.625C45.375 37.8061 45.0275 36.7397 44.6186 35.7273C44.1916 34.6697 43.6285 33.5105 43.0748 32.4452C42.5195 31.3768 41.9653 30.3873 41.5506 29.6658C41.343 29.3046 41.1698 29.0097 41.0482 28.8046C40.9874 28.702 40.9395 28.6218 40.9066 28.5669L40.8687 28.504L40.8587 28.4874L40.856 28.483L40.8552 28.4818L40.855 28.4814Z" fill="#121212"/>
+<svg width="40" height="40" viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M10 2C8.89543 2 8 2.89543 8 4V35C8 35.9835 8.7099 36.8012 9.64524 36.9686C9.65764 36.9349 9.67069 36.9012 9.68439 36.8676L12.13 30.8676C12.5904 29.7383 13.6886 29 14.9081 29L25.1646 29.0001C26.3025 29.0001 27.3425 29.6438 27.8498 30.6623L30.839 36.6622C30.8597 36.7039 30.8794 36.7456 30.898 36.7876C31.5516 36.4586 32 35.7816 32 35V4C32 2.89543 31.1046 2 30 2H10ZM30.4248 36.9548C30.4141 36.9315 30.403 36.9083 30.3914 36.8852L27.4023 30.8853C26.9795 30.0365 26.1129 29.5001 25.1646 29.5001L14.9081 29.5C13.8918 29.5 12.9767 30.1152 12.5931 31.0564L10.1704 37H30C30.1458 37 30.2879 36.9844 30.4248 36.9548ZM16.5 35C17.3284 35 18 34.3284 18 33.5C18 32.6716 17.3284 32 16.5 32C15.6716 32 15 32.6716 15 33.5C15 34.3284 15.6716 35 16.5 35ZM25 33.5C25 34.3284 24.3284 35 23.5 35C22.6716 35 22 34.3284 22 33.5C22 32.6716 22.6716 32 23.5 32C24.3284 32 25 32.6716 25 33.5ZM20.8549 8.48117L20 9L19.1451 8.48117L20 7.07258L20.8549 8.48117ZM20 23C17.5838 23 15.625 21.0412 15.625 18.625C15.625 16.7598 18.232 12.0388 19.4211 9.98246C19.7724 9.37494 20 9 20 9C20 9 20.2275 9.37494 20.5789 9.98246C21.768 12.0388 24.375 16.7598 24.375 18.625C24.375 21.0412 22.4162 23 20 23ZM20 23C18.5503 23 17.375 21.8982 17.375 20.5391C17.375 19.1799 20 15.125 20 15.125C20 15.125 22.625 19.1799 22.625 20.5391C22.625 21.8982 21.4497 23 20 23ZM20.855 8.48138C20.8549 8.48126 20.8549 8.48117 20 9C19.1451 8.48117 19.1451 8.48126 19.145 8.48138L19.1448 8.48175L19.144 8.48299L19.1413 8.48741L19.1313 8.50397L19.0934 8.56693C19.0605 8.6218 19.0126 8.702 18.9518 8.80459C18.8302 9.00974 18.657 9.30465 18.4494 9.66579C18.0347 10.3873 17.4805 11.3768 16.9252 12.4452C16.3715 13.5105 15.8084 14.6697 15.3814 15.7273C14.9725 16.7397 14.625 17.8061 14.625 18.625C14.625 21.5935 17.0315 24 20 24C22.9685 24 25.375 21.5935 25.375 18.625C25.375 17.8061 25.0275 16.7397 24.6186 15.7273C24.1916 14.6697 23.6285 13.5105 23.0748 12.4452C22.5195 11.3768 21.9653 10.3873 21.5506 9.66579C21.343 9.30465 21.1698 9.00974 21.0482 8.80459C20.9874 8.702 20.9395 8.6218 20.9066 8.56693L20.8687 8.50397L20.8587 8.48741L20.856 8.48299L20.8552 8.48175L20.855 8.48138Z" fill="#121212"/>
</svg>
diff --git a/src/assets/icons/visu/equipments/COMPUTER.svg b/src/assets/icons/visu/equipments/COMPUTER.svg
index 31de04839fc74c861594db9ccdcc09ff0d5bf4bc..a4724683f54b886a14aa4a8228870a8954eca3f4 100644
--- a/src/assets/icons/visu/equipments/COMPUTER.svg
+++ b/src/assets/icons/visu/equipments/COMPUTER.svg
@@ -1,4 +1,3 @@
-<svg width="80" height="80" viewBox="0 0 80 80" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect width="80" height="80" rx="4" fill="#E0E0E0"/>
-<path d="M25.2595 49.8167H54.5953V28.6298C54.5953 28.1975 54.4236 27.783 54.118 27.4773C53.8123 27.1717 53.3978 27 52.9655 27H26.8893C26.4571 27 26.0425 27.1717 25.7369 27.4773C25.4312 27.783 25.2595 28.1975 25.2595 28.6298V49.8167ZM23.6298 53.0762H56.2251C57.8548 53.0762 57.8548 51.4465 57.8548 51.4465H22C22 51.4465 22 53.0762 23.6298 53.0762Z" stroke="black" stroke-width="2"/>
+<svg width="40" height="40" viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M5.25953 29.8167H34.5953V8.62977C34.5953 8.19752 34.4236 7.78299 34.118 7.47735C33.8123 7.17171 33.3978 7 32.9655 7H6.8893C6.45706 7 6.04252 7.17171 5.73688 7.47735C5.43124 7.78299 5.25953 8.19752 5.25953 8.62977V29.8167ZM3.62977 33.0762H36.2251C37.8548 33.0762 37.8548 31.4465 37.8548 31.4465H2C2 31.4465 2 33.0762 3.62977 33.0762Z" stroke="black" stroke-width="2"/>
</svg>
diff --git a/src/assets/icons/visu/equipments/COOKING_PLATES.svg b/src/assets/icons/visu/equipments/COOKING_PLATES.svg
index d952c919a594136df6460dcdc34bb4488908978e..8f2dd5d7ca4b87b5e4c39c89f5be420186878016 100644
--- a/src/assets/icons/visu/equipments/COOKING_PLATES.svg
+++ b/src/assets/icons/visu/equipments/COOKING_PLATES.svg
@@ -1,6 +1,5 @@
-<svg width="80" height="80" viewBox="0 0 80 80" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect width="80" height="80" rx="4" fill="#E0E0E0"/>
-<path d="M37 33C37 34.6569 35.6569 36 34 36C32.3431 36 31 34.6569 31 33C31 31.3431 32.3431 30 34 30C35.6569 30 37 31.3431 37 33Z" fill="black"/>
-<path d="M34 50C35.6569 50 37 48.6569 37 47C37 45.3431 35.6569 44 34 44C32.3431 44 31 45.3431 31 47C31 48.6569 32.3431 50 34 50Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M24 52L24 28C24 26.9391 24.3477 25.9217 24.9665 25.1716C25.5854 24.4214 26.4248 24 27.3 24L53.7 24C54.5752 24 55.4146 24.4214 56.0334 25.1716C56.6523 25.9217 57 26.9391 57 28V52C57 53.0609 56.6523 54.0783 56.0334 54.8284C55.4146 55.5786 54.5752 56 53.7 56H27.3C26.4248 56 25.5854 55.5786 24.9665 54.8284C24.3477 54.0783 24 53.0609 24 52ZM52 33C52 34.1046 51.1046 35 50 35C48.8954 35 48 34.1046 48 33C48 31.8954 48.8954 31 50 31C51.1046 31 52 31.8954 52 33ZM40 33C40 36.3137 37.3137 39 34 39C30.6863 39 28 36.3137 28 33C28 29.6863 30.6863 27 34 27C37.3137 27 40 29.6863 40 33ZM34 53C37.3137 53 40 50.3137 40 47C40 43.6863 37.3137 41 34 41C30.6863 41 28 43.6863 28 47C28 50.3137 30.6863 53 34 53ZM50 49C51.1046 49 52 48.1046 52 47C52 45.8954 51.1046 45 50 45C48.8954 45 48 45.8954 48 47C48 48.1046 48.8954 49 50 49Z" fill="black"/>
+<svg width="40" height="40" viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M17 13C17 14.6569 15.6569 16 14 16C12.3431 16 11 14.6569 11 13C11 11.3431 12.3431 10 14 10C15.6569 10 17 11.3431 17 13Z" fill="black"/>
+<path d="M14 30C15.6569 30 17 28.6569 17 27C17 25.3431 15.6569 24 14 24C12.3431 24 11 25.3431 11 27C11 28.6569 12.3431 30 14 30Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M4 32L4 8C4 6.93914 4.34768 5.92172 4.96655 5.17157C5.58542 4.42143 6.42479 4 7.3 4L33.7 4C34.5752 4 35.4146 4.42143 36.0334 5.17157C36.6523 5.92172 37 6.93913 37 8V32C37 33.0609 36.6523 34.0783 36.0334 34.8284C35.4146 35.5786 34.5752 36 33.7 36H7.3C6.42479 36 5.58542 35.5786 4.96655 34.8284C4.34768 34.0783 4 33.0609 4 32ZM32 13C32 14.1046 31.1046 15 30 15C28.8954 15 28 14.1046 28 13C28 11.8954 28.8954 11 30 11C31.1046 11 32 11.8954 32 13ZM20 13C20 16.3137 17.3137 19 14 19C10.6863 19 8 16.3137 8 13C8 9.68629 10.6863 7 14 7C17.3137 7 20 9.68629 20 13ZM14 33C17.3137 33 20 30.3137 20 27C20 23.6863 17.3137 21 14 21C10.6863 21 8 23.6863 8 27C8 30.3137 10.6863 33 14 33ZM30 29C31.1046 29 32 28.1046 32 27C32 25.8954 31.1046 25 30 25C28.8954 25 28 25.8954 28 27C28 28.1046 28.8954 29 30 29Z" fill="black"/>
</svg>
diff --git a/src/assets/icons/visu/equipments/CURTAIN.svg b/src/assets/icons/visu/equipments/CURTAIN.svg
index c78577fe3c66b151545839c927cb93682126d929..5a08753799d8f35408fa00f99826f305fd8fcc4d 100644
--- a/src/assets/icons/visu/equipments/CURTAIN.svg
+++ b/src/assets/icons/visu/equipments/CURTAIN.svg
@@ -1,8 +1,7 @@
-<svg width="80" height="80" viewBox="0 0 80 80" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect width="80" height="80" rx="4" fill="#E0E0E0"/>
-<rect x="23" y="28" width="34" height="1" rx="0.5" fill="#121212"/>
-<path d="M27 30V53H33C33 50 32 47.5 30 45.5C37.5 42 40 33.3333 40 30H27Z" fill="#121212"/>
-<path d="M53 30V53H46.5C46.5 50 48 47.5 50 45.5C42.5 42 40 33.3333 40 30H53Z" fill="#121212"/>
-<circle cx="24.5" cy="28.5" r="1.5" fill="#121212"/>
-<circle cx="55.5" cy="28.5" r="1.5" fill="#121212"/>
+<svg width="40" height="40" viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="3" y="8" width="34" height="1" rx="0.5" fill="#121212"/>
+<path d="M7 10V33H13C13 30 12 27.5 10 25.5C17.5 22 20 13.3333 20 10H7Z" fill="#121212"/>
+<path d="M33 10V33H26.5C26.5 30 28 27.5 30 25.5C22.5 22 20 13.3333 20 10H33Z" fill="#121212"/>
+<circle cx="4.5" cy="8.5" r="1.5" fill="#121212"/>
+<circle cx="35.5" cy="8.5" r="1.5" fill="#121212"/>
</svg>
diff --git a/src/assets/icons/visu/equipments/DISHWASHER.svg b/src/assets/icons/visu/equipments/DISHWASHER.svg
index 5f1a3de3c980270380e0c0ab772b0cd54c26fe0f..bd2f6bd6d6c0f0f048ab2559736900f2abe6a089 100644
--- a/src/assets/icons/visu/equipments/DISHWASHER.svg
+++ b/src/assets/icons/visu/equipments/DISHWASHER.svg
@@ -1,4 +1,3 @@
-<svg width="80" height="80" viewBox="0 0 80 80" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect width="80" height="80" rx="4" fill="#E0E0E0"/>
-<path d="M49.4529 23.2598H29.8958C29.0313 23.2598 28.2022 23.6032 27.5909 24.2145C26.9796 24.8257 26.6362 25.6548 26.6362 26.5193V52.5955C26.6362 53.46 26.9796 54.2891 27.5909 54.9004C28.2022 55.5117 29.0313 55.8551 29.8958 55.8551H49.4529C50.3174 55.8551 51.1465 55.5117 51.7578 54.9004C52.3691 54.2891 52.7125 53.46 52.7125 52.5955V26.5193C52.7125 25.6548 52.3691 24.8257 51.7578 24.2145C51.1465 23.6032 50.3174 23.2598 49.4529 23.2598ZM36.4148 26.5193C36.8471 26.5193 37.2616 26.691 37.5672 26.9966C37.8729 27.3023 38.0446 27.7168 38.0446 28.1491C38.0446 28.5813 37.8729 28.9958 37.5672 29.3015C37.2616 29.6071 36.8471 29.7788 36.4148 29.7788C35.9826 29.7788 35.568 29.6071 35.2624 29.3015C34.9568 28.9958 34.7851 28.5813 34.7851 28.1491C34.7851 27.7168 34.9568 27.3023 35.2624 26.9966C35.568 26.691 35.9826 26.5193 36.4148 26.5193ZM31.5255 26.5193C31.9578 26.5193 32.3723 26.691 32.6779 26.9966C32.9836 27.3023 33.1553 27.7168 33.1553 28.1491C33.1553 28.5813 32.9836 28.9958 32.6779 29.3015C32.3723 29.6071 31.9578 29.7788 31.5255 29.7788C31.0933 29.7788 30.6787 29.6071 30.3731 29.3015C30.0675 28.9958 29.8958 28.5813 29.8958 28.1491C29.8958 27.7168 30.0675 27.3023 30.3731 26.9966C30.6787 26.691 31.0933 26.5193 31.5255 26.5193ZM49.4529 52.5955H29.8958V33.0384H49.4529V52.5955ZM44.0258 44.9845C44.0584 46.1254 43.6021 47.2336 42.7872 48.0485C42.3785 48.4575 41.8933 48.782 41.3592 49.0033C40.825 49.2247 40.2525 49.3387 39.6744 49.3387C39.0962 49.3387 38.5237 49.2247 37.9895 49.0033C37.4554 48.782 36.9702 48.4575 36.5615 48.0485C35.7466 47.2336 35.2903 46.1254 35.3229 44.9845C35.437 43.8274 35.8118 42.7192 36.4148 41.725C37.0178 40.3723 37.7349 39.1174 38.5824 37.9277L39.6744 36.2979C42.5916 40.519 44.0258 43.4037 44.0258 44.9845Z" fill="black"/>
+<svg width="40" height="40" viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M29.4529 3.25977H9.89576C9.03128 3.25977 8.20221 3.60318 7.59092 4.21446C6.97964 4.82574 6.63623 5.65481 6.63623 6.5193V32.5955C6.63623 33.46 6.97964 34.2891 7.59092 34.9004C8.20221 35.5117 9.03128 35.8551 9.89576 35.8551H29.4529C30.3174 35.8551 31.1465 35.5117 31.7578 34.9004C32.3691 34.2891 32.7125 33.46 32.7125 32.5955V6.5193C32.7125 5.65481 32.3691 4.82574 31.7578 4.21446C31.1465 3.60318 30.3174 3.25977 29.4529 3.25977ZM16.4148 6.5193C16.8471 6.5193 17.2616 6.691 17.5672 6.99664C17.8729 7.30228 18.0446 7.71682 18.0446 8.14906C18.0446 8.5813 17.8729 8.99584 17.5672 9.30148C17.2616 9.60712 16.8471 9.77883 16.4148 9.77883C15.9826 9.77883 15.568 9.60712 15.2624 9.30148C14.9568 8.99584 14.7851 8.5813 14.7851 8.14906C14.7851 7.71682 14.9568 7.30228 15.2624 6.99664C15.568 6.691 15.9826 6.5193 16.4148 6.5193ZM11.5255 6.5193C11.9578 6.5193 12.3723 6.691 12.6779 6.99664C12.9836 7.30228 13.1553 7.71682 13.1553 8.14906C13.1553 8.5813 12.9836 8.99584 12.6779 9.30148C12.3723 9.60712 11.9578 9.77883 11.5255 9.77883C11.0933 9.77883 10.6787 9.60712 10.3731 9.30148C10.0675 8.99584 9.89576 8.5813 9.89576 8.14906C9.89576 7.71682 10.0675 7.30228 10.3731 6.99664C10.6787 6.691 11.0933 6.5193 11.5255 6.5193ZM29.4529 32.5955H9.89576V13.0384H29.4529V32.5955ZM24.0258 24.9845C24.0584 26.1254 23.6021 27.2336 22.7872 28.0485C22.3785 28.4575 21.8933 28.782 21.3592 29.0033C20.825 29.2247 20.2525 29.3387 19.6744 29.3387C19.0962 29.3387 18.5237 29.2247 17.9895 29.0033C17.4554 28.782 16.9702 28.4575 16.5615 28.0485C15.7466 27.2336 15.2903 26.1254 15.3229 24.9845C15.437 23.8274 15.8118 22.7192 16.4148 21.725C17.0178 20.3723 17.7349 19.1174 18.5824 17.9277L19.6744 16.2979C22.5916 20.519 24.0258 23.4037 24.0258 24.9845Z" fill="black"/>
</svg>
diff --git a/src/assets/icons/visu/equipments/DRYER.svg b/src/assets/icons/visu/equipments/DRYER.svg
index 9046a92ce965f580fb6499313d0c05dab9854ccb..bc38f186ac64e33a70070f3c867b80b354134e05 100644
--- a/src/assets/icons/visu/equipments/DRYER.svg
+++ b/src/assets/icons/visu/equipments/DRYER.svg
@@ -1,4 +1,3 @@
-<svg width="80" height="80" viewBox="0 0 80 80" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect width="80" height="80" rx="4" fill="#E0E0E0"/>
-<path d="M30.2595 24H49.8167C50.6812 24 51.5103 24.3434 52.1215 24.9547C52.7328 25.566 53.0762 26.395 53.0762 27.2595V53.3358C53.0762 54.2003 52.7328 55.0293 52.1215 55.6406C51.5103 56.2519 50.6812 56.5953 49.8167 56.5953H30.2595C29.395 56.5953 28.566 56.2519 27.9547 55.6406C27.3434 55.0293 27 54.2003 27 53.3358V27.2595C27 26.395 27.3434 25.566 27.9547 24.9547C28.566 24.3434 29.395 24 30.2595 24ZM31.8893 27.2595C31.4571 27.2595 31.0425 27.4312 30.7369 27.7369C30.4312 28.0425 30.2595 28.4571 30.2595 28.8893C30.2595 29.3215 30.4312 29.7361 30.7369 30.0417C31.0425 30.3474 31.4571 30.5191 31.8893 30.5191C32.3215 30.5191 32.7361 30.3474 33.0417 30.0417C33.3474 29.7361 33.5191 29.3215 33.5191 28.8893C33.5191 28.4571 33.3474 28.0425 33.0417 27.7369C32.7361 27.4312 32.3215 27.2595 31.8893 27.2595ZM36.7786 27.2595C36.3464 27.2595 35.9318 27.4312 35.6262 27.7369C35.3205 28.0425 35.1488 28.4571 35.1488 28.8893C35.1488 29.3215 35.3205 29.7361 35.6262 30.0417C35.9318 30.3474 36.3464 30.5191 36.7786 30.5191C37.2108 30.5191 37.6254 30.3474 37.931 30.0417C38.2366 29.7361 38.4084 29.3215 38.4084 28.8893C38.4084 28.4571 38.2366 28.0425 37.931 27.7369C37.6254 27.4312 37.2108 27.2595 36.7786 27.2595ZM40.0381 33.7786C37.4447 33.7786 34.9575 34.8088 33.1236 36.6427C31.2898 38.4765 30.2595 40.9637 30.2595 43.5572C30.2595 46.1506 31.2898 48.6379 33.1236 50.4717C34.9575 52.3055 37.4447 53.3358 40.0381 53.3358C42.6316 53.3358 45.1188 52.3055 46.9526 50.4717C48.7865 48.6379 49.8167 46.1506 49.8167 43.5572C49.8167 40.9637 48.7865 38.4765 46.9526 36.6427C45.1188 34.8088 42.6316 33.7786 40.0381 33.7786ZM33.6063 38.7135C33.6394 38.2179 34.0668 37.853 34.5636 37.853H35.5897C36.2105 37.853 36.6723 38.4133 36.6389 39.0332C36.5557 40.5803 36.9578 41.5812 37.7239 42.4C39.337 43.9692 40.132 45.9079 39.9545 48.4061C39.9194 48.8995 39.4931 49.2614 38.9984 49.2614H37.9675C37.3467 49.2614 36.8849 48.7011 36.9183 48.0812C37.0015 46.534 36.5994 45.5332 35.8333 44.7143C34.2213 43.1462 33.4394 41.2092 33.6063 38.7135ZM40.1254 38.7135C40.1585 38.2179 40.5859 37.853 41.0826 37.853H42.1087C42.7295 37.853 43.1913 38.4133 43.158 39.0332C43.0747 40.5803 43.4769 41.5812 44.2429 42.4C45.8561 43.9692 46.6511 45.9079 46.4736 48.4061C46.4385 48.8995 46.0121 49.2614 45.5174 49.2614H44.4866C43.8658 49.2614 43.404 48.7011 43.4373 48.0812C43.5206 46.534 43.1184 45.5332 42.3524 44.7143C40.7403 43.1462 39.9585 41.2092 40.1254 38.7135Z" fill="black"/>
+<svg width="40" height="40" viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M10.2595 4H29.8167C30.6812 4 31.5103 4.34341 32.1215 4.95469C32.7328 5.56597 33.0762 6.39505 33.0762 7.25953V33.3358C33.0762 34.2003 32.7328 35.0293 32.1215 35.6406C31.5103 36.2519 30.6812 36.5953 29.8167 36.5953H10.2595C9.39505 36.5953 8.56597 36.2519 7.95469 35.6406C7.34341 35.0293 7 34.2003 7 33.3358V7.25953C7 6.39505 7.34341 5.56597 7.95469 4.95469C8.56597 4.34341 9.39505 4 10.2595 4ZM11.8893 7.25953C11.4571 7.25953 11.0425 7.43124 10.7369 7.73688C10.4312 8.04252 10.2595 8.45706 10.2595 8.8893C10.2595 9.32154 10.4312 9.73607 10.7369 10.0417C11.0425 10.3474 11.4571 10.5191 11.8893 10.5191C12.3215 10.5191 12.7361 10.3474 13.0417 10.0417C13.3474 9.73607 13.5191 9.32154 13.5191 8.8893C13.5191 8.45706 13.3474 8.04252 13.0417 7.73688C12.7361 7.43124 12.3215 7.25953 11.8893 7.25953ZM16.7786 7.25953C16.3464 7.25953 15.9318 7.43124 15.6262 7.73688C15.3205 8.04252 15.1488 8.45706 15.1488 8.8893C15.1488 9.32154 15.3205 9.73607 15.6262 10.0417C15.9318 10.3474 16.3464 10.5191 16.7786 10.5191C17.2108 10.5191 17.6254 10.3474 17.931 10.0417C18.2366 9.73607 18.4084 9.32154 18.4084 8.8893C18.4084 8.45706 18.2366 8.04252 17.931 7.73688C17.6254 7.43124 17.2108 7.25953 16.7786 7.25953ZM20.0381 13.7786C17.4447 13.7786 14.9575 14.8088 13.1236 16.6427C11.2898 18.4765 10.2595 20.9637 10.2595 23.5572C10.2595 26.1506 11.2898 28.6379 13.1236 30.4717C14.9575 32.3055 17.4447 33.3358 20.0381 33.3358C22.6316 33.3358 25.1188 32.3055 26.9526 30.4717C28.7865 28.6379 29.8167 26.1506 29.8167 23.5572C29.8167 20.9637 28.7865 18.4765 26.9526 16.6427C25.1188 14.8088 22.6316 13.7786 20.0381 13.7786ZM13.6063 18.7135C13.6394 18.2179 14.0668 17.853 14.5636 17.853H15.5897C16.2105 17.853 16.6723 18.4133 16.6389 19.0332C16.5557 20.5803 16.9578 21.5812 17.7239 22.4C19.337 23.9692 20.132 25.9079 19.9545 28.4061C19.9194 28.8995 19.4931 29.2614 18.9984 29.2614H17.9675C17.3467 29.2614 16.8849 28.7011 16.9183 28.0812C17.0015 26.534 16.5994 25.5332 15.8333 24.7143C14.2213 23.1462 13.4394 21.2092 13.6063 18.7135ZM20.1254 18.7135C20.1585 18.2179 20.5859 17.853 21.0826 17.853H22.1087C22.7295 17.853 23.1913 18.4133 23.158 19.0332C23.0747 20.5803 23.4769 21.5812 24.2429 22.4C25.8561 23.9692 26.6511 25.9079 26.4736 28.4061C26.4385 28.8995 26.0121 29.2614 25.5174 29.2614H24.4866C23.8658 29.2614 23.404 28.7011 23.4373 28.0812C23.5206 26.534 23.1184 25.5332 22.3524 24.7143C20.7403 23.1462 19.9585 21.2092 20.1254 18.7135Z" fill="black"/>
</svg>
diff --git a/src/assets/icons/visu/equipments/FAN.svg b/src/assets/icons/visu/equipments/FAN.svg
index 223faf7dcabf1cb0f33b6d88c4c663907ead2c90..e85f23d490bb41a40aac3fe1b55c50f98d0c4460 100644
--- a/src/assets/icons/visu/equipments/FAN.svg
+++ b/src/assets/icons/visu/equipments/FAN.svg
@@ -1,4 +1,3 @@
-<svg width="80" height="80" viewBox="0 0 80 80" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect width="80" height="80" rx="4" fill="#E0E0E0"/>
-<path d="M40 23.0013C32.8224 23.0013 27 28.7863 27 35.9253C27 43.0604 32.8237 48.8481 40 48.8507C47.175 48.8481 53 43.0604 53 35.9253C53 28.785 47.1723 23 40 23V23.0013ZM40 24.4831C46.351 24.4831 51.5096 29.6069 51.5096 35.9253C51.5096 42.2425 46.3536 47.3662 40 47.3689C36.9476 47.3689 34.0203 46.1633 31.8619 44.0173C29.7036 41.8714 28.491 38.9608 28.491 35.926C28.491 32.8912 29.7036 29.9806 31.8619 27.8347C34.0203 25.6887 36.9476 24.4831 40 24.4831ZM36.7291 26.6644C35.1712 26.8158 33.6172 28.8113 34.5764 30.6159C35.4772 32.3071 37.3531 32.1438 37.9294 34.0734C38.4659 33.3411 39.5271 32.5139 41.3248 33.374C42.4879 29.0906 40.0331 26.3509 36.7291 26.6644ZM47.3684 33.9088C45.4475 33.8363 44.6168 35.5276 42.6495 35.0613C43.0165 35.8871 43.2218 37.2346 41.5725 38.3542C44.7215 41.4956 48.309 40.7383 49.6881 37.7365C50.3359 36.3205 49.4218 33.9825 47.3697 33.9088H47.3684ZM39.6688 34.2381C38.8872 34.3961 38.303 35.1008 38.303 35.9253C38.303 36.8684 39.0515 37.6126 40 37.6126C40.9485 37.6126 41.697 36.8684 41.697 35.9253C41.697 34.9823 40.9485 34.2381 40 34.2381C39.8808 34.2381 39.7801 34.2143 39.6688 34.2381ZM37.1014 36.0492C32.7906 37.1885 31.6566 40.6869 33.5828 43.3752C34.4916 44.641 37.0034 44.9822 38.095 43.2514C39.119 41.6339 38.0287 40.1034 39.4198 38.6413C38.5176 38.5452 37.2511 38.0275 37.1014 36.0492ZM37.3505 50.4142C37.3505 53.0498 32.0514 53.5016 32.0514 55.6828V57H47.9486V55.6828C47.9486 53.5016 42.6495 53.0498 42.6495 50.4142C42.6495 50.4142 42.1475 50.8264 40 50.8264C37.8525 50.8264 37.3505 50.4142 37.3505 50.4142Z" fill="black"/>
+<svg width="40" height="40" viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M20 3.00132C12.8224 3.00132 7 8.78631 7 15.9253C7 23.0604 12.8237 28.8481 20 28.8507C27.175 28.8481 33 23.0604 33 15.9253C33 8.78499 27.1723 3 20 3V3.00132ZM20 4.48313C26.351 4.48313 31.5096 9.6069 31.5096 15.9253C31.5096 22.2425 26.3536 27.3662 20 27.3689C16.9476 27.3689 14.0203 26.1633 11.8619 24.0173C9.70358 21.8714 8.49103 18.9608 8.49103 15.926C8.49103 12.8912 9.70358 9.98063 11.8619 7.83467C14.0203 5.68871 16.9476 4.48313 20 4.48313ZM16.7291 6.66436C15.1712 6.81583 13.6172 8.81134 14.5764 10.6159C15.4772 12.3071 17.3531 12.1438 17.9294 14.0734C18.4659 13.3411 19.5271 12.5139 21.3248 13.374C22.4879 9.09057 20.0331 6.35087 16.7291 6.66436ZM27.3684 13.9088C25.4475 13.8363 24.6168 15.5276 22.6495 15.0613C23.0165 15.8871 23.2218 17.2346 21.5725 18.3542C24.7215 21.4956 28.309 20.7383 29.6881 17.7365C30.3359 16.3205 29.4218 13.9825 27.3697 13.9088H27.3684ZM19.6688 14.2381C18.8872 14.3961 18.303 15.1008 18.303 15.9253C18.303 16.8684 19.0515 17.6126 20 17.6126C20.9485 17.6126 21.697 16.8684 21.697 15.9253C21.697 14.9823 20.9485 14.2381 20 14.2381C19.8808 14.2381 19.7801 14.2143 19.6688 14.2381ZM17.1014 16.0492C12.7906 17.1885 11.6566 20.6869 13.5828 23.3752C14.4916 24.641 17.0034 24.9822 18.095 23.2514C19.119 21.6339 18.0287 20.1034 19.4198 18.6413C18.5176 18.5452 17.2511 18.0275 17.1014 16.0492ZM17.3505 30.4142C17.3505 33.0498 12.0514 33.5016 12.0514 35.6828V37H27.9486V35.6828C27.9486 33.5016 22.6495 33.0498 22.6495 30.4142C22.6495 30.4142 22.1475 30.8264 20 30.8264C17.8525 30.8264 17.3505 30.4142 17.3505 30.4142Z" fill="black"/>
</svg>
diff --git a/src/assets/icons/visu/equipments/FREEZER.svg b/src/assets/icons/visu/equipments/FREEZER.svg
index 745f827e0570b7581a374efcbf7cf1a67c3fe0de..deee933ff236c374f8fb4409bbbf25e96c92ef25 100644
--- a/src/assets/icons/visu/equipments/FREEZER.svg
+++ b/src/assets/icons/visu/equipments/FREEZER.svg
@@ -1,7 +1,6 @@
-<svg width="80" height="80" viewBox="0 0 80 80" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect width="80" height="80" rx="4" fill="#E0E0E0"/>
-<path d="M27 57H31C31 57.5523 30.5523 58 30 58H28C27.4477 58 27 57.5523 27 57Z" fill="black"/>
-<path d="M49 57H53C53 57.5523 52.5523 58 52 58H50C49.4477 58 49 57.5523 49 57Z" fill="black"/>
-<path d="M24 35C24 34.4477 24.4477 34 25 34H55C55.5523 34 56 34.4477 56 35V38H24V35Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M24 39H56V56C56 56.5523 55.5523 57 55 57H25C24.4477 57 24 56.5523 24 56V39ZM35.0502 43.5355C34.855 43.3403 34.855 43.0237 35.0502 42.8284C35.2455 42.6332 35.5621 42.6332 35.7573 42.8284L36.8989 43.97L37.1196 43.1467C37.1553 43.0133 37.2924 42.9342 37.4257 42.9699C37.5591 43.0056 37.6383 43.1427 37.6025 43.2761L37.3072 44.3783L38.0746 45.1457L38.2686 44.4218L38.1204 44.3363C38.0009 44.2673 37.9599 44.1144 38.0289 43.9948C38.098 43.8752 38.2509 43.8342 38.3704 43.9033L38.4026 43.9218L38.4122 43.886C38.4479 43.7526 38.585 43.6735 38.7184 43.7092C38.8517 43.745 38.9309 43.8821 38.8951 44.0154L38.8509 44.1807L39.4999 44.5554V43.47L38.5117 42.8995C38.3921 42.8305 38.3511 42.6776 38.4202 42.558C38.4892 42.4384 38.6421 42.3974 38.7617 42.4665L39.4999 42.8927V41.2782C39.4999 41.2609 39.5007 41.2439 39.5025 41.2271C39.5281 40.9749 39.741 40.7782 39.9999 40.7782C40.276 40.7782 40.4999 41.002 40.4999 41.2782V42.8927L41.2381 42.4665C41.3576 42.3974 41.5105 42.4384 41.5796 42.558C41.6486 42.6776 41.6076 42.8305 41.4881 42.8995L40.4999 43.47V44.5554L41.1489 44.1807L41.1046 44.0154C41.0689 43.8821 41.148 43.745 41.2814 43.7092C41.4147 43.6735 41.5518 43.7526 41.5876 43.886L41.5972 43.9218L41.6293 43.9033C41.7489 43.8342 41.9018 43.8752 41.9708 43.9948C42.0399 44.1144 41.9989 44.2673 41.8793 44.3363L41.7311 44.4218L41.9251 45.1457L42.6926 44.3783L42.3972 43.2761C42.3615 43.1427 42.4406 43.0056 42.574 42.9699C42.7074 42.9342 42.8445 43.0133 42.8802 43.1467L43.1008 43.97L44.2424 42.8284C44.4377 42.6332 44.7543 42.6332 44.9495 42.8284C45.1448 43.0237 45.1448 43.3403 44.9495 43.5355L44.9495 43.5355L43.8079 44.6771L44.6313 44.8978C44.7646 44.9335 44.8438 45.0706 44.808 45.2039C44.7723 45.3373 44.6352 45.4165 44.5019 45.3807L43.3997 45.0854L42.6322 45.8528L43.3563 46.0469L43.4418 45.8988C43.5108 45.7792 43.6637 45.7382 43.7833 45.8072C43.9028 45.8763 43.9438 46.0292 43.8748 46.1488L43.8563 46.1808L43.8919 46.1904C44.0253 46.2261 44.1044 46.3632 44.0687 46.4966C44.033 46.6299 43.8959 46.7091 43.7625 46.6734L43.5974 46.6291L43.2227 47.2782H44.308L44.8786 46.29C44.9476 46.1704 45.1005 46.1295 45.2201 46.1985C45.3397 46.2675 45.3806 46.4204 45.3116 46.54L44.8854 47.2782H46.4999C46.776 47.2782 46.9999 47.5021 46.9999 47.7782C46.9999 48.0543 46.776 48.2782 46.4999 48.2782H44.8854L45.3116 49.0164C45.3806 49.136 45.3397 49.2889 45.2201 49.3579C45.1005 49.4269 44.9476 49.386 44.8786 49.2664L44.308 48.2782H43.2227L43.5974 48.9272L43.7626 48.8829C43.896 48.8472 44.0331 48.9263 44.0688 49.0597C44.1046 49.1931 44.0254 49.3301 43.8921 49.3659L43.8562 49.3755L43.8748 49.4076C43.9438 49.5272 43.9028 49.6801 43.7833 49.7491C43.6637 49.8182 43.5108 49.7772 43.4418 49.6576L43.3562 49.5095L42.6323 49.7034L43.3998 50.4709L44.502 50.1755C44.6353 50.1398 44.7724 50.219 44.8082 50.3523C44.8439 50.4857 44.7647 50.6228 44.6314 50.6585L43.808 50.8791L44.9496 52.0207C45.1449 52.216 45.1449 52.5326 44.9496 52.7278C44.7544 52.9231 44.4378 52.9231 44.2425 52.7278L43.1009 51.5862L42.8803 52.4096C42.8446 52.5429 42.7075 52.6221 42.5741 52.5864C42.4408 52.5506 42.3616 52.4135 42.3973 52.2802L42.6927 51.178L41.9252 50.4105L41.7312 51.1346L41.8793 51.2201C41.9989 51.2891 42.0399 51.442 41.9708 51.5616C41.9018 51.6812 41.7489 51.7221 41.6293 51.6531L41.5972 51.6346L41.5877 51.6703C41.5519 51.8036 41.4149 51.8828 41.2815 51.847C41.1481 51.8113 41.069 51.6742 41.1047 51.5408L41.1489 51.3758L40.4999 51.001V52.0864L41.4881 52.6569C41.6076 52.7259 41.6486 52.8788 41.5796 52.9984C41.5105 53.118 41.3576 53.1589 41.2381 53.0899L40.4999 52.6637V54.2782C40.4999 54.5543 40.276 54.7782 39.9999 54.7782C39.7237 54.7782 39.4999 54.5543 39.4999 54.2782V52.6637L38.7617 53.0899C38.6421 53.1589 38.4892 53.118 38.4202 52.9984C38.3511 52.8788 38.3921 52.7259 38.5117 52.6569L39.4999 52.0864V51.001L38.8508 51.3758L38.895 51.5408C38.9308 51.6742 38.8516 51.8113 38.7183 51.847C38.5849 51.8828 38.4478 51.8036 38.4121 51.6703L38.4025 51.6346L38.3704 51.6531C38.2509 51.7221 38.098 51.6812 38.0289 51.5616C37.9599 51.442 38.0009 51.2891 38.1204 51.2201L38.2685 51.1346L38.0745 50.4105L37.3071 51.178L37.6024 52.2802C37.6381 52.4135 37.559 52.5506 37.4256 52.5864C37.2923 52.6221 37.1552 52.5429 37.1194 52.4096L36.8988 51.5862L35.7572 52.7278C35.562 52.9231 35.2454 52.9231 35.0501 52.7278C34.8548 52.5326 34.8548 52.216 35.0501 52.0207L36.1917 50.8791L35.3684 50.6585C35.235 50.6228 35.1559 50.4857 35.1916 50.3523C35.2273 50.219 35.3644 50.1398 35.4978 50.1755L36.6 50.4709L37.3674 49.7034L36.6435 49.5095L36.558 49.6576C36.4889 49.7772 36.336 49.8182 36.2165 49.7491C36.0969 49.6801 36.0559 49.5272 36.125 49.4076L36.1435 49.3755L36.1077 49.3659C35.9743 49.3301 35.8952 49.1931 35.9309 49.0597C35.9667 48.9263 36.1037 48.8472 36.2371 48.8829L36.4023 48.9272L36.777 48.2782H35.6917L35.1212 49.2664C35.0521 49.386 34.8992 49.4269 34.7797 49.3579C34.6601 49.2889 34.6191 49.136 34.6882 49.0164L35.1144 48.2782H33.4999C33.2237 48.2782 32.9999 48.0543 32.9999 47.7782C32.9999 47.5021 33.2237 47.2782 33.4999 47.2782H35.1144L34.6882 46.54C34.6191 46.4204 34.6601 46.2675 34.7797 46.1985C34.8992 46.1295 35.0521 46.1704 35.1212 46.29L35.6917 47.2782H36.777L36.4023 46.6291L36.2372 46.6734C36.1039 46.7091 35.9668 46.6299 35.931 46.4966C35.8953 46.3632 35.9744 46.2261 36.1078 46.1904L36.1435 46.1808L36.125 46.1488C36.0559 46.0292 36.0969 45.8763 36.2165 45.8072C36.336 45.7382 36.4889 45.7792 36.558 45.8988L36.6435 46.0469L37.3675 45.8528L36.6001 45.0854L35.4979 45.3807C35.3645 45.4165 35.2274 45.3373 35.1917 45.2039C35.156 45.0706 35.2351 44.9335 35.3685 44.8978L36.1918 44.6771L35.0502 43.5355ZM40.4999 45.1327L41.2828 44.6807L41.5169 45.554L40.4999 46.571V45.1327ZM42.224 46.2611L41.2069 47.2782H42.6453L43.0974 46.4951L42.224 46.2611ZM38.7926 48.2782L37.7757 49.2952L36.9023 49.0612L37.3544 48.2782H38.7926ZM39.4999 48.9852L38.4828 50.0023L38.7168 50.8758L39.4999 50.4237V48.9852ZM41.517 50.0023L41.2829 50.8758L40.4999 50.4237V48.9852L41.517 50.0023ZM39.4999 46.571V45.1327L38.7169 44.6807L38.4829 45.554L39.4999 46.571ZM42.6453 48.2782H41.2071L42.2241 49.2952L43.0974 49.0612L42.6453 48.2782ZM38.7929 47.2782H37.3544L36.9023 46.4951L37.7758 46.2611L38.7929 47.2782Z" fill="black"/>
+<svg width="40" height="40" viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M5 35H9C9 35.5523 8.55228 36 8 36H6C5.44772 36 5 35.5523 5 35Z" fill="black"/>
+<path d="M31 35H35C35 35.5523 34.5523 36 34 36H32C31.4477 36 31 35.5523 31 35Z" fill="black"/>
+<path d="M3 9C3 8.44772 3.44772 8 4 8H36C36.5523 8 37 8.44772 37 9V12H3V9Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M3 14H37V34C37 34.5523 36.5523 35 36 35H4C3.44772 35 3 34.5523 3 34V14ZM14.7926 18.2352C14.6644 18.0411 14.6858 17.7774 14.8566 17.6065C15.0519 17.4113 15.3685 17.4113 15.5637 17.6065L16.3071 18.3499L16.5277 17.5266C16.5634 17.3933 16.7005 17.3141 16.8338 17.3499C16.9672 17.3856 17.0464 17.5227 17.0106 17.656L16.7153 18.7581L18.5882 20.6309L18.8825 19.5326L18.4263 19.2693C18.3067 19.2002 18.2657 19.0473 18.3348 18.9277C18.4038 18.8082 18.5567 18.7672 18.6763 18.8362L19.0164 19.0326L19.0753 18.8129C19.111 18.6796 19.2481 18.6004 19.3815 18.6362C19.5149 18.6719 19.594 18.809 19.5583 18.9423L19.4647 19.2914L20.3063 19.7773V17.1287L19.3182 16.5582C19.1986 16.4892 19.1577 16.3363 19.2267 16.2167C19.2957 16.0972 19.4486 16.0562 19.5682 16.1252L20.3063 16.5514V15.5001C20.3063 15.4829 20.3072 15.4658 20.3089 15.449C20.3345 15.1969 20.5474 15.0001 20.8063 15.0001C21.0824 15.0001 21.3063 15.224 21.3063 15.5001V16.5514L22.0444 16.1252C22.1639 16.0562 22.3168 16.0972 22.3859 16.2167C22.4549 16.3363 22.4139 16.4892 22.2944 16.5582L21.3063 17.1287V19.7773L22.1479 19.2914L22.0543 18.9422C22.0186 18.8088 22.0977 18.6718 22.2311 18.636C22.3644 18.6003 22.5015 18.6794 22.5373 18.8128L22.5962 19.0326L22.9363 18.8362C23.0558 18.7672 23.2087 18.8082 23.2778 18.9277C23.3468 19.0473 23.3058 19.2002 23.1863 19.2693L22.7301 19.5326L23.0244 20.6308L24.8972 18.758L24.6019 17.6559C24.5662 17.5225 24.6454 17.3855 24.7787 17.3497C24.9121 17.314 25.0492 17.3931 25.0849 17.5265L25.3055 18.3497L26.0488 17.6064C26.2441 17.4111 26.5607 17.4111 26.7559 17.6064C26.9512 17.8017 26.9512 18.1182 26.7559 18.3135L26.7559 18.3135L26.0126 19.0568L26.8358 19.2774C26.9692 19.3132 27.0483 19.4502 27.0126 19.5836C26.9769 19.717 26.8398 19.7961 26.7064 19.7604L25.6044 19.4651L23.7315 21.3379L24.2998 21.4902L24.481 21.1763C24.5501 21.0567 24.7029 21.0158 24.8225 21.0848C24.9421 21.1538 24.9831 21.3067 24.914 21.4263L24.7998 21.6242L25.5495 21.8251C25.6829 21.8608 25.762 21.9979 25.7263 22.1313C25.6906 22.2646 25.5535 22.3438 25.4201 22.308L24.541 22.0725L23.973 23.0563L26.6216 23.0563L27.192 22.0682C27.2611 21.9486 27.414 21.9077 27.5335 21.9767C27.6531 22.0457 27.6941 22.1986 27.625 22.3182L27.1989 23.0563H28.2501C28.5263 23.0563 28.7501 23.2802 28.7501 23.5563C28.7501 23.8324 28.5263 24.0563 28.2501 24.0563H27.1989L27.625 24.7944C27.6941 24.914 27.6531 25.0668 27.5335 25.1359C27.414 25.2049 27.2611 25.164 27.192 25.0444L26.6216 24.0563H23.973L24.5409 25.0399L25.4202 24.8043C25.5536 24.7686 25.6907 24.8477 25.7264 24.9811C25.7622 25.1145 25.683 25.2515 25.5496 25.2873L24.7997 25.4882L24.914 25.6863C24.9831 25.8059 24.9421 25.9588 24.8225 26.0278C24.7029 26.0968 24.5501 26.0559 24.481 25.9363L24.2997 25.6222L23.7316 25.7744L25.6045 27.6473L26.7065 27.352C26.8399 27.3162 26.977 27.3954 27.0127 27.5287C27.0485 27.6621 26.9693 27.7992 26.8359 27.8349L26.0127 28.0555L26.756 28.7988C26.9513 28.9941 26.9513 29.3107 26.756 29.5059C26.5608 29.7012 26.2442 29.7012 26.0489 29.5059L25.3056 28.7626L25.085 29.5858C25.0493 29.7192 24.9122 29.7984 24.7788 29.7626C24.6455 29.7269 24.5663 29.5898 24.6021 29.4564L24.8974 28.3544L23.0245 26.4815L22.6402 27.9158L23.1863 28.231C23.3058 28.3001 23.3468 28.453 23.2778 28.5725C23.2087 28.6921 23.0558 28.7331 22.9363 28.664L22.482 28.4018C22.4212 28.4696 22.3252 28.5015 22.2312 28.4763C22.0978 28.4406 22.0187 28.3035 22.0544 28.1701L22.058 28.1569L21.3063 27.723V30.3716L22.2944 30.942C22.4139 31.0111 22.4549 31.164 22.3859 31.2835C22.3168 31.4031 22.1639 31.4441 22.0444 31.375L21.3063 30.9489V32.0001C21.3063 32.2763 21.0824 32.5001 20.8063 32.5001C20.5301 32.5001 20.3063 32.2763 20.3063 32.0001V30.9489L19.5682 31.375C19.4486 31.4441 19.2957 31.4031 19.2267 31.2835C19.1577 31.164 19.1986 31.0111 19.3182 30.942L20.3063 30.3716V27.723L19.5545 28.157L19.558 28.1701C19.5938 28.3035 19.5146 28.4406 19.3812 28.4763C19.2872 28.5015 19.1913 28.4696 19.1304 28.4018L18.6763 28.664C18.5567 28.7331 18.4038 28.6921 18.3348 28.5725C18.2657 28.453 18.3067 28.3001 18.4263 28.231L18.9722 27.9158L18.5879 26.4815L16.7151 28.3544L17.0104 29.4564C17.0461 29.5898 16.967 29.7269 16.8336 29.7626C16.7002 29.7984 16.5632 29.7192 16.5274 29.5858L16.3068 28.7626L15.5635 29.5059C15.3682 29.7012 15.0517 29.7012 14.8564 29.5059C14.6611 29.3107 14.6611 28.9941 14.8564 28.7988L15.5997 28.0555L14.7765 27.8349C14.6431 27.7992 14.564 27.6621 14.5997 27.5287C14.6355 27.3954 14.7725 27.3162 14.9059 27.352L16.008 27.6473L17.8808 25.7744L17.2156 25.5962L17.0192 25.9363C16.9502 26.0559 16.7973 26.0968 16.6777 26.0278C16.5582 25.9588 16.5172 25.8059 16.5862 25.6863L16.7156 25.4622L16.0628 25.2873C15.9294 25.2515 15.8503 25.1145 15.886 24.9811C15.9218 24.8477 16.0588 24.7686 16.1922 24.8043L16.9744 25.0139L17.5273 24.0563H14.8787L14.3082 25.0444C14.2392 25.164 14.0863 25.2049 13.9667 25.1359C13.8472 25.0668 13.8062 24.914 13.8752 24.7944L14.3014 24.0563H13.2501C12.974 24.0563 12.7501 23.8324 12.7501 23.5563C12.7501 23.2802 12.974 23.0563 13.2501 23.0563H14.3014L13.8752 22.3182C13.8062 22.1986 13.8472 22.0457 13.9667 21.9767C14.0863 21.9077 14.2392 21.9486 14.3082 22.0682L14.8787 23.0563H17.5273L16.9744 22.0986L16.1925 22.3082C16.0591 22.3439 15.922 22.2647 15.8863 22.1314C15.8505 21.998 15.9297 21.8609 16.063 21.8252L16.7156 21.6503L16.5862 21.4263C16.5172 21.3067 16.5582 21.1538 16.6777 21.0848C16.7973 21.0158 16.9502 21.0567 17.0192 21.1763L17.2156 21.5164L17.8811 21.3381L16.0082 19.4652L14.9062 19.7605C14.7728 19.7962 14.6357 19.7171 14.6 19.5837C14.5642 19.4504 14.6434 19.3133 14.7767 19.2775L15.6 19.057L14.8566 18.3136C14.8322 18.2892 14.8109 18.2629 14.7926 18.2352ZM21.3063 20.3547L22.2818 19.7914L22.6162 21.0391L21.3063 22.3489V20.3547ZM23.3233 21.7462L22.0131 23.0563H23.3956L24.041 21.9385L23.3233 21.7462ZM19.5989 24.0563L18.2891 25.3662L17.4744 25.1479L18.1047 24.0563L19.5989 24.0563ZM20.3063 24.7632L18.9962 26.0733L19.4205 27.657L20.3063 27.1456V24.7632ZM22.6163 26.0733L22.1919 27.6569L21.3063 27.1456V24.7633L22.6163 26.0733ZM20.3063 22.3491V20.3547L19.3308 19.7914L18.9964 21.0392L20.3063 22.3491ZM22.0135 24.0563L23.3234 25.3662L24.0409 25.1739L23.3956 24.0563H22.0135ZM19.5993 23.0563H18.1047L17.4744 21.9647L18.2893 21.7463L19.5993 23.0563Z" fill="black"/>
</svg>
diff --git a/src/assets/icons/visu/equipments/GARDEN.svg b/src/assets/icons/visu/equipments/GARDEN.svg
deleted file mode 100644
index beccf9fd12a9b99f48624b8a806c94db212258f9..0000000000000000000000000000000000000000
--- a/src/assets/icons/visu/equipments/GARDEN.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<svg width="80" height="80" viewBox="0 0 80 80" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect width="80" height="80" rx="4" fill="#E0E0E0"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M28 30.0563L30.1425 26.4855C30.5309 25.8382 31.4691 25.8382 31.8575 26.4855L34 30.0563V36H28V30.0563ZM28 40V45H34V40H28ZM28 49H34V54.0563H28V49Z" fill="#121212"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M37 30.0563L39.1425 26.4855C39.5309 25.8382 40.4691 25.8382 40.8575 26.4855L43 30.0563V36H37V30.0563ZM37 40V45H43V40H37ZM37 49H43V54.0563H37V49Z" fill="#121212"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M46 30.0563L48.1425 26.4855C48.5309 25.8382 49.4691 25.8382 49.8575 26.4855L52 30.0563V36H46V30.0563ZM46 40V45H52V40H46ZM46 49H52V54.0563H46V49Z" fill="#121212"/>
-<rect x="25" y="37.0566" width="30" height="3" fill="#121212"/>
-<rect x="25" y="46.0566" width="30" height="3" fill="#121212"/>
-</svg>
diff --git a/src/assets/icons/visu/equipments/HYDRAULIC_HEATING.svg b/src/assets/icons/visu/equipments/HYDRAULIC_HEATING.svg
index 90729613e0b546d62e731d5c3f3127685d8b44e2..feba2c594b8da778b9f3153ab40c2736020f98bf 100644
--- a/src/assets/icons/visu/equipments/HYDRAULIC_HEATING.svg
+++ b/src/assets/icons/visu/equipments/HYDRAULIC_HEATING.svg
@@ -1,8 +1,7 @@
-<svg width="80" height="80" viewBox="0 0 80 80" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect width="80" height="80" rx="4" fill="#E0E0E0"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M30 36C30 35.4477 30.4477 35 31 35H34C34.5523 35 35 35.4477 35 36V38H36V36C36 35.4477 36.4477 35 37 35H40C40.5523 35 41 35.4477 41 36V38H42V36C42 35.4477 42.4477 35 43 35H46C46.5523 35 47 35.4477 47 36V38H48V36C48 35.4477 48.4477 35 49 35H52C52.5523 35 53 35.4477 53 36V38H54C54.5523 38 55 38.4477 55 39C55 39.5523 54.5523 40 54 40H53V47H54C54.5523 47 55 47.4477 55 48C55 48.5523 54.5523 49 54 49H53V51C53 51.5523 52.5523 52 52 52H49C48.4477 52 48 51.5523 48 51V49H47V51C47 51.5523 46.5523 52 46 52H43C42.4477 52 42 51.5523 42 51V49H41V51C41 51.5523 40.5523 52 40 52H37C36.4477 52 36 51.5523 36 51V49H35V51C35 51.3706 34.7984 51.6941 34.4989 51.8668C34.4996 51.8279 34.5 51.789 34.5 51.75C34.5 49.913 33.2795 48.5575 32.229 47.3906L32.1159 47.2649C31.3601 46.424 30.5995 45.5709 30 44.5358L30 40C29.4477 40 29 39.5523 29 39C29 38.4477 29.4477 38 30 38V36ZM30 46.3203C30.4497 46.9071 30.923 47.4337 31.3712 47.9323L31.372 47.9333C32.5182 49.209 33.5 50.3019 33.5 51.75C33.5 51.8336 33.498 51.9169 33.4941 52H31C30.4477 52 30 51.5523 30 51L30 49C29.4477 49 29 48.5523 29 48C29 47.4477 29.4477 47 30 47L30 46.3203ZM48 40V47H47V40H48ZM42 40V47H41V40H42ZM36 40V47H35V40H36Z" fill="#121212"/>
-<path d="M35.3106 24H34.9556C34.4583 24 34.0287 24.3655 34.0072 24.8623C33.9257 26.743 34.5375 28.2145 35.7586 29.4129C36.3158 30.0138 36.6267 30.739 36.615 31.8197C36.6083 32.4399 37.0646 33 37.6848 33H38.0445C38.5397 33 38.9683 32.6375 38.9916 32.1428C39.0805 30.2597 38.4589 28.7866 37.2368 27.5871C36.6796 26.9862 36.3686 26.261 36.3804 25.1803C36.3871 24.5601 35.9307 24 35.3106 24Z" fill="black"/>
-<path d="M40.3106 24H39.9556C39.4583 24 39.0287 24.3655 39.0072 24.8623C38.9257 26.743 39.5375 28.2145 40.7586 29.4129C41.3158 30.0138 41.6267 30.739 41.615 31.8197C41.6083 32.4399 42.0646 33 42.6848 33H43.0445C43.5397 33 43.9683 32.6375 43.9916 32.1428C44.0805 30.2597 43.4589 28.7866 42.2368 27.5871C41.6796 26.9862 41.3686 26.261 41.3804 25.1803C41.3871 24.5601 40.9307 24 40.3106 24Z" fill="black"/>
-<path d="M45.3106 24H44.9556C44.4583 24 44.0287 24.3655 44.0072 24.8623C43.9257 26.743 44.5375 28.2145 45.7586 29.4129C46.3158 30.0138 46.6267 30.739 46.615 31.8197C46.6083 32.4399 47.0646 33 47.6848 33H48.0445C48.5397 33 48.9683 32.6375 48.9916 32.1428C49.0805 30.2597 48.4589 28.7866 47.2368 27.5871C46.6796 26.9862 46.3686 26.261 46.3804 25.1803C46.3871 24.5601 45.9307 24 45.3106 24Z" fill="black"/>
-<path d="M28.25 57C29.6424 57 30.9777 56.4469 31.9623 55.4623C32.9469 54.4777 33.5 53.1424 33.5 51.75C33.5 50.3019 32.5182 49.209 31.372 47.9332C30.2222 46.654 28.9062 45.1901 28.25 43C28.25 43 23 47.9752 23 51.75C23 53.1424 23.5531 54.4777 24.5377 55.4623C25.5223 56.4469 26.8576 57 28.25 57ZM27.0652 47.0652L27.6848 47.6848C27.431 47.9385 26.6978 48.8319 26.0161 50.196L25.2339 49.804C25.9514 48.3681 26.7362 47.3951 27.0652 47.0652Z" fill="black"/>
+<svg width="40" height="40" viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M10 16C10 15.4477 10.4477 15 11 15H14C14.5523 15 15 15.4477 15 16V18H16V16C16 15.4477 16.4477 15 17 15H20C20.5523 15 21 15.4477 21 16V18H22V16C22 15.4477 22.4477 15 23 15H26C26.5523 15 27 15.4477 27 16V18H28V16C28 15.4477 28.4477 15 29 15H32C32.5523 15 33 15.4477 33 16V18H34C34.5523 18 35 18.4477 35 19C35 19.5523 34.5523 20 34 20H33V27H34C34.5523 27 35 27.4477 35 28C35 28.5523 34.5523 29 34 29H33V31C33 31.5523 32.5523 32 32 32H29C28.4477 32 28 31.5523 28 31V29H27V31C27 31.5523 26.5523 32 26 32H23C22.4477 32 22 31.5523 22 31V29H21V31C21 31.5523 20.5523 32 20 32H17C16.4477 32 16 31.5523 16 31V29H15V31C15 31.3706 14.7984 31.6941 14.4989 31.8668C14.4996 31.8279 14.5 31.789 14.5 31.75C14.5 29.913 13.2795 28.5575 12.229 27.3906L12.1159 27.2649C11.3601 26.424 10.5995 25.5709 10 24.5358L10 20C9.44772 20 9 19.5523 9 19C9 18.4477 9.44772 18 10 18V16ZM10 26.3203C10.4497 26.9071 10.923 27.4337 11.3712 27.9323L11.372 27.9333C12.5182 29.209 13.5 30.3019 13.5 31.75C13.5 31.8336 13.498 31.9169 13.4941 32H11C10.4477 32 10 31.5523 10 31L10 29C9.44772 29 9 28.5523 9 28C9 27.4477 9.44772 27 10 27L10 26.3203ZM28 20V27H27V20H28ZM22 20V27H21V20H22ZM16 20V27H15V20H16Z" fill="#121212"/>
+<path d="M15.3106 4H14.9556C14.4583 4 14.0287 4.36553 14.0072 4.8623C13.9257 6.74296 14.5375 8.21449 15.7586 9.41286C16.3158 10.0138 16.6267 10.739 16.615 11.8197C16.6083 12.4399 17.0646 13 17.6848 13H18.0445C18.5397 13 18.9683 12.6375 18.9916 12.1428C19.0805 10.2597 18.4589 8.7866 17.2368 7.58714C16.6796 6.98619 16.3686 6.26103 16.3804 5.18027C16.3871 4.56012 15.9307 4 15.3106 4Z" fill="black"/>
+<path d="M20.3106 4H19.9556C19.4583 4 19.0287 4.36553 19.0072 4.8623C18.9257 6.74296 19.5375 8.21449 20.7586 9.41286C21.3158 10.0138 21.6267 10.739 21.615 11.8197C21.6083 12.4399 22.0646 13 22.6848 13H23.0445C23.5397 13 23.9683 12.6375 23.9916 12.1428C24.0805 10.2597 23.4589 8.7866 22.2368 7.58714C21.6796 6.98619 21.3686 6.26103 21.3804 5.18027C21.3871 4.56012 20.9307 4 20.3106 4Z" fill="black"/>
+<path d="M25.3106 4H24.9556C24.4583 4 24.0287 4.36553 24.0072 4.8623C23.9257 6.74296 24.5375 8.21449 25.7586 9.41286C26.3158 10.0138 26.6267 10.739 26.615 11.8197C26.6083 12.4399 27.0646 13 27.6848 13H28.0445C28.5397 13 28.9683 12.6375 28.9916 12.1428C29.0805 10.2597 28.4589 8.7866 27.2368 7.58714C26.6796 6.98619 26.3686 6.26103 26.3804 5.18027C26.3871 4.56012 25.9307 4 25.3106 4Z" fill="black"/>
+<path d="M8.25 37C9.64239 37 10.9777 36.4469 11.9623 35.4623C12.9469 34.4777 13.5 33.1424 13.5 31.75C13.5 30.3019 12.5182 29.209 11.372 27.9332C10.2222 26.654 8.90625 25.1901 8.25 23C8.25 23 3 27.9752 3 31.75C3 33.1424 3.55312 34.4777 4.53769 35.4623C5.52226 36.4469 6.85761 37 8.25 37ZM7.06525 27.0652L7.68475 27.6848C7.431 27.9385 6.69775 28.8319 6.01612 30.196L5.23388 29.804C5.95138 28.3681 6.73625 27.3951 7.06525 27.0652Z" fill="black"/>
</svg>
diff --git a/src/assets/icons/visu/equipments/INTERNET_BOX.svg b/src/assets/icons/visu/equipments/INTERNET_BOX.svg
index 5bb72ae4df6059070dee9ee8d484bc02b4ac7601..69e6bb43d59f1fdd47a51c9d687b701ddc38b076 100644
--- a/src/assets/icons/visu/equipments/INTERNET_BOX.svg
+++ b/src/assets/icons/visu/equipments/INTERNET_BOX.svg
@@ -1,11 +1,10 @@
-<svg width="80" height="80" viewBox="0 0 80 80" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect width="80" height="80" rx="4" fill="#E0E0E0"/>
-<rect x="26" y="44" width="2" height="2" rx="1" fill="#121212"/>
-<rect x="52" y="44" width="2" height="2" rx="1" fill="#121212"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M23 39C23 37.8954 23.8954 37 25 37H55C56.1046 37 57 37.8954 57 39V44C57 44.5523 56.5523 45 56 45H24C23.4477 45 23 44.5523 23 44V39ZM26 39H36V43H26V39ZM46 41C45.4477 41 45 41.4477 45 42C45 42.5523 45.4477 43 46 43C46.5523 43 47 42.5523 47 42C47 41.4477 46.5523 41 46 41ZM49 42C49 41.4477 49.4477 41 50 41C50.5523 41 51 41.4477 51 42C51 42.5523 50.5523 43 50 43C49.4477 43 49 42.5523 49 42ZM54 41C53.4477 41 53 41.4477 53 42C53 42.5523 53.4477 43 54 43C54.5523 43 55 42.5523 55 42C55 41.4477 54.5523 41 54 41Z" fill="#121212"/>
-<rect x="27" y="40" width="1" height="2" fill="#121212"/>
-<rect x="31" y="40" width="1" height="2" fill="#121212"/>
-<rect x="34" y="40" width="1" height="2" fill="#121212"/>
-<rect x="30" y="40" width="1" height="1" fill="#121212"/>
-<rect x="28" y="41" width="1" height="1" fill="#121212"/>
+<svg width="40" height="40" viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="6" y="24" width="2" height="2" rx="1" fill="#121212"/>
+<rect x="32" y="24" width="2" height="2" rx="1" fill="#121212"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M3 19C3 17.8954 3.89543 17 5 17H35C36.1046 17 37 17.8954 37 19V24C37 24.5523 36.5523 25 36 25H4C3.44772 25 3 24.5523 3 24V19ZM6 19H16V23H6V19ZM26 21C25.4477 21 25 21.4477 25 22C25 22.5523 25.4477 23 26 23C26.5523 23 27 22.5523 27 22C27 21.4477 26.5523 21 26 21ZM29 22C29 21.4477 29.4477 21 30 21C30.5523 21 31 21.4477 31 22C31 22.5523 30.5523 23 30 23C29.4477 23 29 22.5523 29 22ZM34 21C33.4477 21 33 21.4477 33 22C33 22.5523 33.4477 23 34 23C34.5523 23 35 22.5523 35 22C35 21.4477 34.5523 21 34 21Z" fill="#121212"/>
+<rect x="7" y="20" width="1" height="2" fill="#121212"/>
+<rect x="11" y="20" width="1" height="2" fill="#121212"/>
+<rect x="14" y="20" width="1" height="2" fill="#121212"/>
+<rect x="10" y="20" width="1" height="1" fill="#121212"/>
+<rect x="8" y="21" width="1" height="1" fill="#121212"/>
</svg>
diff --git a/src/assets/icons/visu/equipments/MICROWAVE.svg b/src/assets/icons/visu/equipments/MICROWAVE.svg
index 5036c0f7d6534cc43a2ba2e4d6a4faf57c7f9a6c..2e86d4ba692a5319b2bc9eed3e354eb1d7b9d2e8 100644
--- a/src/assets/icons/visu/equipments/MICROWAVE.svg
+++ b/src/assets/icons/visu/equipments/MICROWAVE.svg
@@ -1,4 +1,3 @@
-<svg width="80" height="80" viewBox="0 0 80 80" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect width="80" height="80" rx="4" fill="#E0E0E0"/>
-<path d="M32.1661 36.5298C31.6463 36.8436 30.9296 36.91 30.4988 36.4822L29.6591 35.6484C29.2807 35.2727 29.2596 34.6597 29.6679 34.3168C30.4005 33.7013 31.5055 33.0381 32.8624 33.0381C34.1662 33.0381 35.1277 33.6737 35.8122 34.13C36.3175 34.4723 36.6434 34.6679 36.9368 34.6679C37.1637 34.6679 37.4045 34.5732 37.6296 34.4378C38.1511 34.1241 38.87 34.0587 39.3004 34.489L40.1285 35.3171C40.5045 35.6932 40.5245 36.3043 40.1177 36.6468C39.386 37.2628 38.2833 37.9274 36.9368 37.9274C35.6493 37.9274 34.704 37.3081 34.0195 36.8518C33.4817 36.4932 33.172 36.2976 32.8624 36.2976C32.6343 36.2976 32.3922 36.3932 32.1661 36.5298ZM32.8624 44.4465C33.172 44.4465 33.4817 44.642 34.0195 45.0006C34.704 45.4569 35.6493 46.0762 36.9368 46.0762C38.2941 46.0762 39.391 45.4125 40.1189 44.7969C40.525 44.4535 40.5045 43.842 40.1285 43.4659L39.3004 42.6378C38.87 42.2075 38.1481 42.2696 37.627 42.5839C37.4001 42.7208 37.1591 42.8167 36.9368 42.8167C36.6434 42.8167 36.3175 42.6211 35.8122 42.2789C35.1277 41.8225 34.1662 41.1869 32.8624 41.1869C31.504 41.1869 30.398 41.8517 29.6653 42.4677C29.2583 42.81 29.2783 43.4211 29.6544 43.7972L30.5078 44.6506C30.9292 45.072 31.6235 45.0166 32.129 44.7008C32.3663 44.5526 32.6221 44.4465 32.8624 44.4465ZM56.0865 29.7786V49.3358C56.0865 51.1285 54.6197 52.5953 52.827 52.5953H26.7507C24.958 52.5953 23.4912 51.1285 23.4912 49.3358V29.7786C23.4912 27.9858 24.958 26.519 26.7507 26.519H52.827C54.6197 26.519 56.0865 27.9858 56.0865 29.7786ZM43.0484 29.7786H26.7507V49.3358H43.0484V29.7786ZM51.1972 46.0762C51.1972 45.1799 50.4638 44.4465 49.5675 44.4465C48.6711 44.4465 47.9377 45.1799 47.9377 46.0762C47.9377 46.9726 48.6711 47.706 49.5675 47.706C50.4638 47.706 51.1972 46.9726 51.1972 46.0762ZM51.1972 39.5572C51.1972 38.6608 50.4638 37.9274 49.5675 37.9274C48.6711 37.9274 47.9377 38.6608 47.9377 39.5572C47.9377 40.4535 48.6711 41.1869 49.5675 41.1869C50.4638 41.1869 51.1972 40.4535 51.1972 39.5572ZM51.1972 31.4083H47.9377V34.6679H51.1972V31.4083Z" fill="black"/>
+<svg width="40" height="40" viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M12.1661 16.5298C11.6463 16.8436 10.9296 16.91 10.4988 16.4822L9.65911 15.6484C9.28075 15.2727 9.25959 14.6597 9.66787 14.3168C10.4005 13.7013 11.5055 13.0381 12.8624 13.0381C14.1662 13.0381 15.1277 13.6737 15.8122 14.13C16.3175 14.4723 16.6434 14.6679 16.9368 14.6679C17.1637 14.6679 17.4045 14.5732 17.6296 14.4378C18.1511 14.1241 18.87 14.0587 19.3004 14.489L20.1285 15.3171C20.5045 15.6932 20.5245 16.3043 20.1177 16.6468C19.386 17.2628 18.2833 17.9274 16.9368 17.9274C15.6493 17.9274 14.704 17.3081 14.0195 16.8518C13.4817 16.4932 13.172 16.2976 12.8624 16.2976C12.6343 16.2976 12.3922 16.3932 12.1661 16.5298ZM12.8624 24.4465C13.172 24.4465 13.4817 24.642 14.0195 25.0006C14.704 25.4569 15.6493 26.0762 16.9368 26.0762C18.2941 26.0762 19.391 25.4125 20.1189 24.7969C20.525 24.4535 20.5045 23.842 20.1285 23.4659L19.3004 22.6378C18.87 22.2075 18.1481 22.2696 17.627 22.5839C17.4001 22.7208 17.1591 22.8167 16.9368 22.8167C16.6434 22.8167 16.3175 22.6211 15.8122 22.2789C15.1277 21.8225 14.1662 21.1869 12.8624 21.1869C11.504 21.1869 10.398 21.8517 9.66535 22.4677C9.25827 22.81 9.27831 23.4211 9.65439 23.7972L10.5078 24.6506C10.9292 25.072 11.6235 25.0166 12.129 24.7008C12.3663 24.5526 12.6221 24.4465 12.8624 24.4465ZM36.0865 9.77857V29.3358C36.0865 31.1285 34.6197 32.5953 32.827 32.5953H6.75074C4.958 32.5953 3.49121 31.1285 3.49121 29.3358V9.77857C3.49121 7.98583 4.958 6.51904 6.75074 6.51904H32.827C34.6197 6.51904 36.0865 7.98583 36.0865 9.77857ZM23.0484 9.77857H6.75074V29.3358H23.0484V9.77857ZM31.1972 26.0762C31.1972 25.1799 30.4638 24.4465 29.5675 24.4465C28.6711 24.4465 27.9377 25.1799 27.9377 26.0762C27.9377 26.9726 28.6711 27.706 29.5675 27.706C30.4638 27.706 31.1972 26.9726 31.1972 26.0762ZM31.1972 19.5572C31.1972 18.6608 30.4638 17.9274 29.5675 17.9274C28.6711 17.9274 27.9377 18.6608 27.9377 19.5572C27.9377 20.4535 28.6711 21.1869 29.5675 21.1869C30.4638 21.1869 31.1972 20.4535 31.1972 19.5572ZM31.1972 11.4083H27.9377V14.6679H31.1972V11.4083Z" fill="black"/>
</svg>
diff --git a/src/assets/icons/visu/equipments/REFREGIRATOR.svg b/src/assets/icons/visu/equipments/REFREGIRATOR.svg
index 0701bef10d0671935430a6f6ad1a2e3f2cb2d6e9..2d0dc947a590cf589b69b6412f1a4a9bee4c8965 100644
--- a/src/assets/icons/visu/equipments/REFREGIRATOR.svg
+++ b/src/assets/icons/visu/equipments/REFREGIRATOR.svg
@@ -1,4 +1,3 @@
-<svg width="80" height="80" viewBox="0 0 80 80" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect width="80" height="80" rx="4" fill="#E0E0E0"/>
-<path d="M32.2595 21H48.5572C49.4217 21 50.2507 21.3434 50.862 21.9547C51.4733 22.566 51.8167 23.395 51.8167 24.2595V32.4084H29V24.2595C29 23.395 29.3434 22.566 29.9547 21.9547C30.566 21.3434 31.395 21 32.2595 21ZM51.8167 54.1107C51.8167 54.9752 51.4733 55.8043 50.862 56.4155C50.2507 57.0268 49.4217 57.3702 48.5572 57.3702V59H45.2977V57.3702H35.5191V59H32.2595V57.3702C31.395 57.3702 30.566 57.0268 29.9547 56.4155C29.3434 55.8043 29 54.9752 29 54.1107V34.0381H51.8167V54.1107ZM33.8893 25.8893V29.1488H37.1488V25.8893H33.8893ZM33.8893 37.2977V42.1869H37.1488V37.2977H33.8893Z" fill="black"/>
+<svg width="40" height="40" viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M12.2595 1H28.5572C29.4217 1 30.2507 1.34341 30.862 1.95469C31.4733 2.56597 31.8167 3.39505 31.8167 4.25953V12.4084H9V4.25953C9 3.39505 9.34341 2.56597 9.95469 1.95469C10.566 1.34341 11.395 1 12.2595 1ZM31.8167 34.1107C31.8167 34.9752 31.4733 35.8043 30.862 36.4155C30.2507 37.0268 29.4217 37.3702 28.5572 37.3702V39H25.2977V37.3702H15.5191V39H12.2595V37.3702C11.395 37.3702 10.566 37.0268 9.95469 36.4155C9.34341 35.8043 9 34.9752 9 34.1107V14.0381H31.8167V34.1107ZM13.8893 5.8893V9.14883H17.1488V5.8893H13.8893ZM13.8893 17.2977V22.1869H17.1488V17.2977H13.8893Z" fill="black"/>
</svg>
diff --git a/src/assets/icons/visu/equipments/VENTILATION.svg b/src/assets/icons/visu/equipments/VENTILATION.svg
index 6998a08c0269eaaaf19ce401dd99ddda30466889..aacb7fb38b850e11b29a5b41d92db595e8b28556 100644
--- a/src/assets/icons/visu/equipments/VENTILATION.svg
+++ b/src/assets/icons/visu/equipments/VENTILATION.svg
@@ -1,4 +1,3 @@
-<svg width="80" height="80" viewBox="0 0 80 80" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect width="80" height="80" rx="4" fill="#E0E0E0"/>
-<path d="M43.6437 50.9951C43.1757 52.4827 41.9554 53.703 40.4677 54.171C37.9437 54.9734 35.5534 53.7866 34.4669 51.7974C33.8818 50.7109 34.751 49.4071 35.988 49.4071H36.0047C36.573 49.4071 37.1413 49.6745 37.4088 50.176C37.693 50.7109 38.2446 51.0786 38.8965 51.0786C39.8158 51.0786 40.568 50.3264 40.568 49.4071C40.568 48.4877 39.8158 47.7355 38.8965 47.7355H24.6716C23.7522 47.7355 23 46.9833 23 46.064C23 45.1446 23.7522 44.3924 24.6716 44.3924H38.8798C42.156 44.3924 44.7302 47.5684 43.6437 50.9951ZM51.266 30.4684C51.0146 29.4218 50.4788 28.4651 49.7177 27.704C48.9566 26.9429 47.9999 26.4071 46.9534 26.1558C44.0114 25.4871 41.3202 27.0417 40.2337 29.4654C39.7155 30.5854 40.5179 31.8558 41.7381 31.8558C42.39 31.8558 42.9918 31.488 43.2425 30.903C43.4317 30.4425 43.7537 30.0487 44.1675 29.7718C44.5813 29.495 45.0681 29.3476 45.566 29.3484C46.9534 29.3484 48.0733 30.4684 48.0733 31.8558C48.0733 33.2432 46.9534 34.3631 45.566 34.3631H24.6716C23.7522 34.3631 23 35.1153 23 36.0347C23 36.954 23.7522 37.7062 24.6716 37.7062H45.566C49.2434 37.7062 52.1352 34.2962 51.266 30.4684ZM50.4135 39.3778H24.6716C23.7522 39.3778 23 40.13 23 41.0493C23 41.9687 23.7522 42.7209 24.6716 42.7209H50.5806C51.968 42.7209 53.088 43.8408 53.088 45.2282C53.0888 45.7261 52.9414 46.2129 52.6646 46.6267C52.3877 47.0405 51.9939 47.3625 51.5334 47.5517C50.9317 47.8024 50.5806 48.4042 50.5806 49.0561C50.5806 50.2763 51.851 51.0786 52.971 50.5772C54.1951 50.0292 55.1946 49.0784 55.8029 47.8831C56.4112 46.6878 56.5916 45.3201 56.3141 44.008C55.7457 41.2666 53.205 39.3778 50.4135 39.3778Z" fill="black"/>
+<svg width="40" height="40" viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M23.6437 30.9951C23.1757 32.4827 21.9554 33.703 20.4677 34.171C17.9437 34.9734 15.5534 33.7866 14.4669 31.7974C13.8818 30.7109 14.751 29.4071 15.988 29.4071H16.0047C16.573 29.4071 17.1413 29.6745 17.4088 30.176C17.693 30.7109 18.2446 31.0786 18.8965 31.0786C19.8158 31.0786 20.568 30.3264 20.568 29.4071C20.568 28.4877 19.8158 27.7355 18.8965 27.7355H4.67155C3.7522 27.7355 3 26.9833 3 26.064C3 25.1446 3.7522 24.3924 4.67155 24.3924H18.8798C22.156 24.3924 24.7302 27.5684 23.6437 30.9951ZM31.266 10.4684C31.0146 9.42181 30.4788 8.46511 29.7177 7.70402C28.9566 6.94294 27.9999 6.40712 26.9534 6.15577C24.0114 5.48715 21.3202 7.04169 20.2337 9.46545C19.7155 10.5854 20.5179 11.8558 21.7381 11.8558C22.39 11.8558 22.9918 11.488 23.2425 10.903C23.4317 10.4425 23.7537 10.0487 24.1675 9.77185C24.5813 9.495 25.0681 9.3476 25.566 9.34844C26.9534 9.34844 28.0733 10.4684 28.0733 11.8558C28.0733 13.2432 26.9534 14.3631 25.566 14.3631H4.67155C3.7522 14.3631 3 15.1153 3 16.0347C3 16.954 3.7522 17.7062 4.67155 17.7062H25.566C29.2434 17.7062 32.1352 14.2962 31.266 10.4684ZM30.4135 19.3778H4.67155C3.7522 19.3778 3 20.13 3 21.0493C3 21.9687 3.7522 22.7209 4.67155 22.7209H30.5806C31.968 22.7209 33.088 23.8408 33.088 25.2282C33.0888 25.7261 32.9414 26.2129 32.6646 26.6267C32.3877 27.0405 31.9939 27.3625 31.5334 27.5517C30.9317 27.8024 30.5806 28.4042 30.5806 29.0561C30.5806 30.2763 31.851 31.0786 32.971 30.5772C34.1951 30.0292 35.1946 29.0784 35.8029 27.8831C36.4112 26.6878 36.5916 25.3201 36.3141 24.008C35.7457 21.2666 33.205 19.3778 30.4135 19.3778Z" fill="black"/>
</svg>
diff --git a/src/assets/icons/visu/equipments/WASHING_MACHINE.svg b/src/assets/icons/visu/equipments/WASHING_MACHINE.svg
index bce9a3fe4af6631893db15641e5ccdfb7340ed0b..4b956d4bfe0948bda92c62c68f597ab13e3a6f78 100644
--- a/src/assets/icons/visu/equipments/WASHING_MACHINE.svg
+++ b/src/assets/icons/visu/equipments/WASHING_MACHINE.svg
@@ -1,4 +1,3 @@
-<svg width="80" height="80" viewBox="0 0 80 80" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect width="80" height="80" rx="4" fill="#E0E0E0"/>
-<path d="M44.6504 38.9449C45.8713 40.1694 46.5569 41.828 46.5569 43.5572C46.5569 45.2863 45.8713 46.945 44.6504 48.1694C43.4259 49.3904 41.7673 50.076 40.0381 50.076C38.309 50.076 36.6503 49.3904 35.4259 48.1694L44.6504 38.9449ZM30.2595 24H49.8167C50.6812 24 51.5103 24.3434 52.1215 24.9547C52.7328 25.566 53.0762 26.395 53.0762 27.2595V53.3358C53.0762 54.2003 52.7328 55.0293 52.1215 55.6406C51.5103 56.2519 50.6812 56.5953 49.8167 56.5953H30.2595C29.395 56.5953 28.566 56.2519 27.9547 55.6406C27.3434 55.0293 27 54.2003 27 53.3358V27.2595C27 26.395 27.3434 25.566 27.9547 24.9547C28.566 24.3434 29.395 24 30.2595 24ZM31.8893 27.2595C31.4571 27.2595 31.0425 27.4312 30.7369 27.7369C30.4312 28.0425 30.2595 28.4571 30.2595 28.8893C30.2595 29.3215 30.4312 29.7361 30.7369 30.0417C31.0425 30.3474 31.4571 30.5191 31.8893 30.5191C32.3215 30.5191 32.7361 30.3474 33.0417 30.0417C33.3474 29.7361 33.5191 29.3215 33.5191 28.8893C33.5191 28.4571 33.3474 28.0425 33.0417 27.7369C32.7361 27.4312 32.3215 27.2595 31.8893 27.2595ZM36.7786 27.2595C36.3464 27.2595 35.9318 27.4312 35.6262 27.7369C35.3205 28.0425 35.1488 28.4571 35.1488 28.8893C35.1488 29.3215 35.3205 29.7361 35.6262 30.0417C35.9318 30.3474 36.3464 30.5191 36.7786 30.5191C37.2108 30.5191 37.6254 30.3474 37.931 30.0417C38.2366 29.7361 38.4084 29.3215 38.4084 28.8893C38.4084 28.4571 38.2366 28.0425 37.931 27.7369C37.6254 27.4312 37.2108 27.2595 36.7786 27.2595ZM40.0381 33.7786C37.4447 33.7786 34.9575 34.8088 33.1236 36.6427C31.2898 38.4765 30.2595 40.9637 30.2595 43.5572C30.2595 46.1506 31.2898 48.6379 33.1236 50.4717C34.9575 52.3055 37.4447 53.3358 40.0381 53.3358C42.6316 53.3358 45.1188 52.3055 46.9526 50.4717C48.7865 48.6379 49.8167 46.1506 49.8167 43.5572C49.8167 40.9637 48.7865 38.4765 46.9526 36.6427C45.1188 34.8088 42.6316 33.7786 40.0381 33.7786Z" fill="black"/>
+<svg width="40" height="40" viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M24.6504 18.9449C25.8713 20.1694 26.5569 21.828 26.5569 23.5572C26.5569 25.2863 25.8713 26.945 24.6504 28.1694C23.4259 29.3904 21.7673 30.076 20.0381 30.076C18.309 30.076 16.6503 29.3904 15.4259 28.1694L24.6504 18.9449ZM10.2595 4H29.8167C30.6812 4 31.5103 4.34341 32.1215 4.95469C32.7328 5.56597 33.0762 6.39505 33.0762 7.25953V33.3358C33.0762 34.2003 32.7328 35.0293 32.1215 35.6406C31.5103 36.2519 30.6812 36.5953 29.8167 36.5953H10.2595C9.39505 36.5953 8.56597 36.2519 7.95469 35.6406C7.34341 35.0293 7 34.2003 7 33.3358V7.25953C7 6.39505 7.34341 5.56597 7.95469 4.95469C8.56597 4.34341 9.39505 4 10.2595 4ZM11.8893 7.25953C11.4571 7.25953 11.0425 7.43124 10.7369 7.73688C10.4312 8.04252 10.2595 8.45706 10.2595 8.8893C10.2595 9.32154 10.4312 9.73607 10.7369 10.0417C11.0425 10.3474 11.4571 10.5191 11.8893 10.5191C12.3215 10.5191 12.7361 10.3474 13.0417 10.0417C13.3474 9.73607 13.5191 9.32154 13.5191 8.8893C13.5191 8.45706 13.3474 8.04252 13.0417 7.73688C12.7361 7.43124 12.3215 7.25953 11.8893 7.25953ZM16.7786 7.25953C16.3464 7.25953 15.9318 7.43124 15.6262 7.73688C15.3205 8.04252 15.1488 8.45706 15.1488 8.8893C15.1488 9.32154 15.3205 9.73607 15.6262 10.0417C15.9318 10.3474 16.3464 10.5191 16.7786 10.5191C17.2108 10.5191 17.6254 10.3474 17.931 10.0417C18.2366 9.73607 18.4084 9.32154 18.4084 8.8893C18.4084 8.45706 18.2366 8.04252 17.931 7.73688C17.6254 7.43124 17.2108 7.25953 16.7786 7.25953ZM20.0381 13.7786C17.4447 13.7786 14.9575 14.8088 13.1236 16.6427C11.2898 18.4765 10.2595 20.9637 10.2595 23.5572C10.2595 26.1506 11.2898 28.6379 13.1236 30.4717C14.9575 32.3055 17.4447 33.3358 20.0381 33.3358C22.6316 33.3358 25.1188 32.3055 26.9526 30.4717C28.7865 28.6379 29.8167 26.1506 29.8167 23.5572C29.8167 20.9637 28.7865 18.4765 26.9526 16.6427C25.1188 14.8088 22.6316 13.7786 20.0381 13.7786Z" fill="black"/>
</svg>
diff --git a/src/components/Ecogesture/EcogestureList.spec.tsx b/src/components/Ecogesture/EcogestureList.spec.tsx
index 58cc2649500282b31cc14ce0558984d6621c6128..f56bd2f2352d1207de14f95851f41a095c44d8b7 100644
--- a/src/components/Ecogesture/EcogestureList.spec.tsx
+++ b/src/components/Ecogesture/EcogestureList.spec.tsx
@@ -35,13 +35,19 @@ describe('EcogesturesList component', () => {
const wrapper = mount(
<Provider store={store}>
<BrowserRouter>
- <EcogestureList list={ecogesturesData} />
+ <EcogestureList
+ list={ecogesturesData}
+ displaySelection={false}
+ selectionTotal={0}
+ selectionViewed={0}
+ />
</BrowserRouter>
</Provider>
)
await waitForComponentToPaint(wrapper)
expect(toJson(wrapper)).toMatchSnapshot()
})
+
it('should open the filter menu and select all ecogesture', async () => {
const store = mockStore({
ecolyo: {
@@ -52,7 +58,12 @@ describe('EcogesturesList component', () => {
const wrapper = mount(
<Provider store={store}>
<BrowserRouter>
- <EcogestureList list={ecogesturesData} />
+ <EcogestureList
+ list={ecogesturesData}
+ displaySelection={false}
+ selectionTotal={0}
+ selectionViewed={0}
+ />
</BrowserRouter>
</Provider>
)
@@ -69,4 +80,27 @@ describe('EcogesturesList component', () => {
.simulate('click')
expect(wrapper.find('.ecogestures').text()).toBe('ecogesture.HEATING')
})
+
+ it('should display the selection section', async () => {
+ const store = mockStore({
+ ecolyo: {
+ global: globalStateData,
+ challenge: challengeStateData,
+ },
+ })
+ const wrapper = mount(
+ <Provider store={store}>
+ <BrowserRouter>
+ <EcogestureList
+ list={ecogesturesData}
+ displaySelection={true}
+ selectionTotal={50}
+ selectionViewed={10}
+ />
+ </BrowserRouter>
+ </Provider>
+ )
+ await waitForComponentToPaint(wrapper)
+ expect(wrapper.find('.selection').exists()).toBeTruthy()
+ })
})
diff --git a/src/components/Ecogesture/EcogestureList.tsx b/src/components/Ecogesture/EcogestureList.tsx
index f791c5e697fd3eaf979788df503370cca4224c8d..578a45adb2d1a258e1d495816392637dc05157e9 100644
--- a/src/components/Ecogesture/EcogestureList.tsx
+++ b/src/components/Ecogesture/EcogestureList.tsx
@@ -1,5 +1,6 @@
import React, { useState } from 'react'
import { useI18n } from 'cozy-ui/transpiled/react/I18n'
+import { useHistory } from 'react-router-dom'
import { Ecogesture } from 'models'
import { Menu, MenuItem, ListItemIcon } from '@material-ui/core/'
@@ -14,12 +15,19 @@ import { Usage } from 'enum/ecogesture.enum'
interface EcogestureListProps {
list: Ecogesture[]
+ displaySelection: boolean
+ selectionTotal: number
+ selectionViewed: number
}
const EcogestureList: React.FC<EcogestureListProps> = ({
list,
+ displaySelection,
+ selectionTotal,
+ selectionViewed,
}: EcogestureListProps) => {
const { t } = useI18n()
+ const history = useHistory()
const [activeFilter, setactiveFilter] = useState<string>(Usage[Usage.ALL])
const [openDropDown, setopenDropDown] = useState<boolean>(false)
const [anchorEl, setAnchorEl] = useState<null | HTMLElement>(null)
@@ -36,6 +44,7 @@ const EcogestureList: React.FC<EcogestureListProps> = ({
usage && setactiveFilter(usage)
setAnchorEl(null)
}
+
const filterEcogesture = (_ecogestures: Ecogesture[]) => {
const filtered = _ecogestures
.filter(ecogesture => Usage[ecogesture.usage] === activeFilter)
@@ -49,7 +58,7 @@ const EcogestureList: React.FC<EcogestureListProps> = ({
} else {
return (
<div className="ec-filter-error">
- <div className="text-16-normal">
+ <div className="text-20-normal">
{t('ecogesture.no_ecogesture_filter.text1')}
</div>
<div className="text-16-italic">
@@ -63,82 +72,110 @@ const EcogestureList: React.FC<EcogestureListProps> = ({
return (
<div className="ecogesture-root">
<div className="efficiency-button-content">
- <div className="filters text-16-normal">
- <div
- className="filter-button"
- onClick={() => toggleDropDown()}
- tabIndex={0}
- onBlur={e => {
- if (e.relatedTarget === null) toggleDropDown()
- }}
- >
+ {displaySelection ? (
+ <div className="selection text-16-normal">
+ <span>{t('ecogesture.selection')}</span>
+ <span>
+ {`(${selectionViewed} ${t(
+ 'ecogesture.selection_2'
+ )} ${selectionTotal})`}
+ </span>
<Button
+ aria-label={t('ecogesture.accessibility.button_selection')}
classes={{
- root: 'btn-secondary-negative',
- label: 'text-14-normal',
+ root: 'btn-highlight',
+ label: 'text-16-bold',
}}
- aria-controls="simple-menu"
- aria-haspopup="true"
- aria-label={t(`ecogesture.MENU_TITLE`)}
- onClick={toggleMenu}
- variant="contained"
+ onClick={() => history.push('/ecogesture-selection')}
>
- <StyledIcon icon={SortIcon} size={20} />
- <span
- className={openDropDown ? 'ecogestures opened' : 'ecogestures'}
- >
- {activeFilter === 'ALL'
- ? t(`ecogesture.MENU_TITLE`)
- : t(`ecogesture.${activeFilter}`)}
- </span>
+ {t('ecogesture.button_selection')}
</Button>
- <Menu
- anchorEl={anchorEl}
- keepMounted
- open={Boolean(anchorEl)}
- onClose={() => closeMenu()}
- PopoverClasses={{
- paper: 'filter-menu',
+ </div>
+ ) : (
+ <div className="filters text-16-normal">
+ <div
+ className="filter-button"
+ onClick={() => toggleDropDown()}
+ tabIndex={0}
+ onBlur={e => {
+ if (e.relatedTarget === null) toggleDropDown()
}}
- variant="menu"
- MenuListProps={{ className: 'filter-menu-list' }}
>
- {Object.values(Usage).map((usage, key) => {
- return (
- typeof usage !== 'number' && (
- <MenuItem
- classes={{
- root: `${usage === activeFilter ? 'item-active' : ''}`,
- }}
- key={key}
- selected={usage === activeFilter}
- onClick={() => closeMenu(usage)}
- >
- {t(`ecogesture.${usage}`)}
- {usage === activeFilter && (
- <ListItemIcon classes={{ root: 'filter-menu-icon' }}>
- <StyledIcon icon={CheckIcon} size={13} />
- </ListItemIcon>
- )}
- </MenuItem>
+ <Button
+ classes={{
+ root: 'btn-secondary-negative',
+ label: 'text-14-normal',
+ }}
+ aria-controls="simple-menu"
+ aria-haspopup="true"
+ aria-label={t(`ecogesture.MENU_TITLE`)}
+ onClick={toggleMenu}
+ variant="contained"
+ >
+ <StyledIcon icon={SortIcon} size={20} />
+ <span
+ className={
+ openDropDown ? 'ecogestures opened' : 'ecogestures'
+ }
+ >
+ {activeFilter === 'ALL'
+ ? t(`ecogesture.MENU_TITLE`)
+ : t(`ecogesture.${activeFilter}`)}
+ </span>
+ </Button>
+ <Menu
+ anchorEl={anchorEl}
+ keepMounted
+ open={Boolean(anchorEl)}
+ onClose={() => closeMenu()}
+ PopoverClasses={{
+ paper: 'filter-menu',
+ }}
+ variant="menu"
+ MenuListProps={{ className: 'filter-menu-list' }}
+ >
+ {Object.values(Usage).map((usage, key) => {
+ return (
+ typeof usage !== 'number' && (
+ <MenuItem
+ classes={{
+ root: `${
+ usage === activeFilter ? 'item-active' : ''
+ }`,
+ }}
+ key={key}
+ selected={usage === activeFilter}
+ onClick={() => closeMenu(usage)}
+ >
+ {t(`ecogesture.${usage}`)}
+ {usage === activeFilter && (
+ <ListItemIcon classes={{ root: 'filter-menu-icon' }}>
+ <StyledIcon icon={CheckIcon} size={13} />
+ </ListItemIcon>
+ )}
+ </MenuItem>
+ )
)
- )
- })}
- </Menu>
+ })}
+ </Menu>
+ </div>
</div>
- </div>
+ )}
</div>
<div className="ecogesture-content">
- {list && activeFilter === Usage[Usage.ALL] ? (
+ {list.length > 0 && activeFilter === Usage[Usage.ALL] ? (
list.map((ecogesture, index) => (
<EcogestureCard ecogesture={ecogesture} key={index} />
))
- ) : list && activeFilter !== Usage[Usage.ALL] ? (
+ ) : list.length > 0 && activeFilter !== Usage[Usage.ALL] ? (
filterEcogesture(list)
) : (
<div className="ec-filter-error">
- <div className="text-16-normal">
- {t('ecogesture.no_ecogesture')}
+ <div className="text-20-normal">
+ {t('ecogesture.no_ecogesture_filter.text1')}
+ </div>
+ <div className="text-16-italic">
+ {t('ecogesture.no_ecogesture_filter.text2')}
</div>
</div>
)}
diff --git a/src/components/Ecogesture/EcogestureView.spec.tsx b/src/components/Ecogesture/EcogestureView.spec.tsx
index 96898cfc97a37e00150ae217b7cdf76fb7fe540c..0c7ab368b83f4f492036b88c08246bc8fe91195f 100644
--- a/src/components/Ecogesture/EcogestureView.spec.tsx
+++ b/src/components/Ecogesture/EcogestureView.spec.tsx
@@ -27,10 +27,12 @@ jest.mock('cozy-ui/transpiled/react/I18n', () => {
}
})
const mockgetAllEcogestures = jest.fn()
+const mockGetEcogestureListByProfile = jest.fn()
jest.mock('services/ecogesture.service', () => {
return jest.fn(() => {
return {
getAllEcogestures: mockgetAllEcogestures,
+ getEcogestureListByProfile: mockGetEcogestureListByProfile,
}
})
})
@@ -77,6 +79,9 @@ describe('EcogestureView component', () => {
let store: any
beforeEach(() => {
store = createMockStore(mockInitialEcolyoState)
+ mockgetSeason.mockClear()
+ mockgetAllEcogestures.mockClear()
+ mockGetEcogestureListByProfile.mockClear()
})
it('should be rendered correctly', async () => {
@@ -87,6 +92,7 @@ describe('EcogestureView component', () => {
})
mockgetSeason.mockReturnValue(Season.WINTER)
mockgetAllEcogestures.mockResolvedValueOnce(ecogesturesData)
+ mockGetEcogestureListByProfile.mockResolvedValue([])
const wrapper = mount(
<Provider store={store}>
<EcogestureView />
@@ -107,6 +113,7 @@ describe('EcogestureView component', () => {
})
mockgetSeason.mockReturnValue(Season.WINTER)
mockgetAllEcogestures.mockResolvedValueOnce(ecogesturesData)
+ mockGetEcogestureListByProfile.mockResolvedValueOnce([])
const wrapper = mount(
<Provider store={store}>
<EcogestureView />
@@ -134,6 +141,7 @@ describe('EcogestureView component', () => {
})
mockgetSeason.mockReturnValue(Season.WINTER)
mockgetAllEcogestures.mockResolvedValueOnce([])
+ mockGetEcogestureListByProfile.mockResolvedValueOnce([])
const wrapper = mount(
<Provider store={store}>
<EcogestureView />
@@ -151,6 +159,7 @@ describe('EcogestureView component', () => {
})
mockgetSeason.mockReturnValue(Season.WINTER)
mockgetAllEcogestures.mockResolvedValueOnce(ecogesturesData)
+ mockGetEcogestureListByProfile.mockResolvedValueOnce([])
const wrapper = mount(
<Provider store={store}>
<EcogestureView />
diff --git a/src/components/Ecogesture/EcogestureView.tsx b/src/components/Ecogesture/EcogestureView.tsx
index 5e52ea9e4adf5db16cd6c40a18b1eff1873fbcdb..582af599b6919104861d68895d0f60a3202df8ad 100644
--- a/src/components/Ecogesture/EcogestureView.tsx
+++ b/src/components/Ecogesture/EcogestureView.tsx
@@ -20,6 +20,7 @@ import { EcogestureStatus } from 'enum/ecogesture.enum'
import EcogestureInitModal from './EcogestureInitModal'
import { updateProfile } from 'store/profile/profile.actions'
import { useHistory, useLocation } from 'react-router-dom'
+import { ProfileEcogesture } from 'models/profileEcogesture.model'
interface TabPanelProps {
children?: React.ReactNode
@@ -54,7 +55,11 @@ const EcogestureView: React.FC = () => {
const tab = new URLSearchParams(useLocation().search).get('tab')
const profileType = useSelector((state: AppStore) => state.ecolyo.profileType)
- const { haveSeenEcogestureModal } = useSelector(
+ const profileEcogesture: ProfileEcogesture = useSelector(
+ (state: AppStore) => state.ecolyo.profileEcogesture
+ )
+
+ const { haveSeenEcogestureModal, isProfileEcogestureCompleted } = useSelector(
(state: AppStore) => state.ecolyo.profile
)
const [tabValue, setTabValue] = useState<EcogestureStatus>(
@@ -69,6 +74,8 @@ const EcogestureView: React.FC = () => {
const [objectiveEcogestureList, setObjectiveEcogestureList] = useState<
Ecogesture[]
>([])
+ const [totalViewed, setTotalViewed] = useState<number>(0)
+ const [totalAvailable, setTotalAvailable] = useState<number>(0)
const [openEcogestureInitModal, setOpenEcogestureInitModal] = useState<
boolean
>(!haveSeenEcogestureModal)
@@ -128,6 +135,12 @@ const EcogestureView: React.FC = () => {
async function loadEcogestures() {
const ecogestureService = new EcogestureService(client)
const dataAll = await ecogestureService.getAllEcogestures(getSeason())
+ const availableList: Ecogesture[] = await ecogestureService.getEcogestureListByProfile(
+ profileEcogesture
+ )
+ const filteredList: Ecogesture[] = availableList.filter(
+ (ecogesture: Ecogesture) => ecogesture.viewedInSelection === false
+ )
if (subscribed && dataAll) {
const doing = dataAll.filter(ecogesture => ecogesture.doing === true)
const objective = dataAll.filter(
@@ -136,6 +149,8 @@ const EcogestureView: React.FC = () => {
setAllEcogestureList(dataAll)
setObjectiveEcogestureList(objective)
setDoingEcogestureList(doing)
+ setTotalAvailable(availableList.length)
+ setTotalViewed(availableList.length - filteredList.length)
}
setIsLoaded(true)
}
@@ -143,7 +158,7 @@ const EcogestureView: React.FC = () => {
return () => {
subscribed = false
}
- }, [client, profileType])
+ }, [client, profileEcogesture, profileType])
return (
<>
@@ -193,23 +208,38 @@ const EcogestureView: React.FC = () => {
</Header>
<Content height={headerHeight}>
<TabPanel value={tabValue} index={EcogestureStatus.OBJECTIVE}>
- {objectiveEcogestureList.length ? (
- <EcogestureList list={objectiveEcogestureList} />
+ {isProfileEcogestureCompleted === true ? (
+ <EcogestureList
+ list={objectiveEcogestureList}
+ displaySelection={totalAvailable !== totalViewed}
+ selectionTotal={totalAvailable}
+ selectionViewed={totalViewed}
+ />
) : (
<EcogestureEmptyList setTab={setTabValue} isObjective={true} />
)}
</TabPanel>
<TabPanel value={tabValue} index={EcogestureStatus.DOING}>
- {doingEcogestureList.length ? (
- <EcogestureList list={doingEcogestureList} />
+ {isProfileEcogestureCompleted === true ? (
+ <EcogestureList
+ list={doingEcogestureList}
+ displaySelection={totalAvailable !== totalViewed}
+ selectionTotal={totalAvailable}
+ selectionViewed={totalViewed}
+ />
) : (
<EcogestureEmptyList setTab={setTabValue} isObjective={false} />
)}
</TabPanel>
<TabPanel value={tabValue} index={EcogestureStatus.ALL}>
{allEcogestureList.length && (
- <EcogestureList list={allEcogestureList} />
+ <EcogestureList
+ list={allEcogestureList}
+ displaySelection={false}
+ selectionTotal={totalAvailable}
+ selectionViewed={totalViewed}
+ />
)}
</TabPanel>
</Content>
diff --git a/src/components/Ecogesture/__snapshots__/EcogestureCard.spec.tsx.snap b/src/components/Ecogesture/__snapshots__/EcogestureCard.spec.tsx.snap
index 67d64db1063b18850e5fae93aaf9785652fb26be..f919091582e7d742b443f548059551526e767bcb 100644
--- a/src/components/Ecogesture/__snapshots__/EcogestureCard.spec.tsx.snap
+++ b/src/components/Ecogesture/__snapshots__/EcogestureCard.spec.tsx.snap
@@ -67,6 +67,7 @@ exports[`EcogestureCard component should be rendered correctly 1`] = `
"season": "Hiver",
"shortName": "Bonhomme de neige",
"usage": 1,
+ "viewedInSelection": false,
}
}
>
diff --git a/src/components/Ecogesture/__snapshots__/EcogestureList.spec.tsx.snap b/src/components/Ecogesture/__snapshots__/EcogestureList.spec.tsx.snap
index 530fde834cf7320246bf842e86419839b06605f6..5ecf8327ab3872c13aa3cbb97aa041c35957cb8b 100644
--- a/src/components/Ecogesture/__snapshots__/EcogestureList.spec.tsx.snap
+++ b/src/components/Ecogesture/__snapshots__/EcogestureList.spec.tsx.snap
@@ -37,6 +37,7 @@ exports[`EcogesturesList component should be rendered correctly 1`] = `
}
>
<EcogestureList
+ displaySelection={false}
list={
Array [
Object {
@@ -68,6 +69,7 @@ exports[`EcogesturesList component should be rendered correctly 1`] = `
"season": "Hiver",
"shortName": "Bonhomme de neige",
"usage": 1,
+ "viewedInSelection": false,
},
Object {
"_id": "ECOGESTURE002",
@@ -99,6 +101,7 @@ exports[`EcogesturesList component should be rendered correctly 1`] = `
"season": "Eté",
"shortName": "Coup de vent",
"usage": 2,
+ "viewedInSelection": false,
},
Object {
"_id": "ECOGESTURE0013",
@@ -133,9 +136,12 @@ exports[`EcogesturesList component should be rendered correctly 1`] = `
"season": "Sans saison",
"shortName": "Accelerateur de particules",
"usage": 5,
+ "viewedInSelection": false,
},
]
}
+ selectionTotal={0}
+ selectionViewed={0}
>
<div
className="ecogesture-root"
@@ -1861,6 +1867,7 @@ exports[`EcogesturesList component should be rendered correctly 1`] = `
"season": "Hiver",
"shortName": "Bonhomme de neige",
"usage": 1,
+ "viewedInSelection": false,
}
}
key="0"
@@ -1897,6 +1904,7 @@ exports[`EcogesturesList component should be rendered correctly 1`] = `
"season": "Eté",
"shortName": "Coup de vent",
"usage": 2,
+ "viewedInSelection": false,
}
}
key="1"
@@ -1936,6 +1944,7 @@ exports[`EcogesturesList component should be rendered correctly 1`] = `
"season": "Sans saison",
"shortName": "Accelerateur de particules",
"usage": 5,
+ "viewedInSelection": false,
}
}
key="2"
diff --git a/src/components/Ecogesture/__snapshots__/EcogestureView.spec.tsx.snap b/src/components/Ecogesture/__snapshots__/EcogestureView.spec.tsx.snap
index d915c155c542c7b99168a29e4f3ad984e693ebb9..6389b50f17cb2b13d2f50cf51ecd964dbc9311af 100644
--- a/src/components/Ecogesture/__snapshots__/EcogestureView.spec.tsx.snap
+++ b/src/components/Ecogesture/__snapshots__/EcogestureView.spec.tsx.snap
@@ -1241,6 +1241,7 @@ exports[`EcogestureView component should be rendered correctly 1`] = `
role="tabpanel"
>
<mock-ecogesturelist
+ displaySelection={false}
list={
Array [
Object {
@@ -1272,6 +1273,7 @@ exports[`EcogestureView component should be rendered correctly 1`] = `
"season": "Hiver",
"shortName": "Bonhomme de neige",
"usage": 1,
+ "viewedInSelection": false,
},
Object {
"_id": "ECOGESTURE002",
@@ -1303,6 +1305,7 @@ exports[`EcogestureView component should be rendered correctly 1`] = `
"season": "Eté",
"shortName": "Coup de vent",
"usage": 2,
+ "viewedInSelection": false,
},
Object {
"_id": "ECOGESTURE0013",
@@ -1337,9 +1340,12 @@ exports[`EcogestureView component should be rendered correctly 1`] = `
"season": "Sans saison",
"shortName": "Accelerateur de particules",
"usage": 5,
+ "viewedInSelection": false,
},
]
}
+ selectionTotal={0}
+ selectionViewed={0}
/>
</div>
</TabPanel>
diff --git a/src/components/Ecogesture/ecogestureInitModal.scss b/src/components/Ecogesture/ecogestureInitModal.scss
index 4c99819dd632e2b2ca4523fe3260298a57455ee4..3088fd8fd08b7122aed896d9cdf995fa8697b16e 100644
--- a/src/components/Ecogesture/ecogestureInitModal.scss
+++ b/src/components/Ecogesture/ecogestureInitModal.scss
@@ -14,6 +14,7 @@
display: flex;
button {
min-height: 45px;
+ cursor: pointer;
}
button.btn1 {
margin-right: 1rem;
diff --git a/src/components/Ecogesture/ecogestureList.scss b/src/components/Ecogesture/ecogestureList.scss
index 3d857bdcb5f9aecde4d6b0acc4f97264bcdd7980..07b207a0f9df5e8d05bf12e8f7f662c968718ec2 100644
--- a/src/components/Ecogesture/ecogestureList.scss
+++ b/src/components/Ecogesture/ecogestureList.scss
@@ -22,7 +22,20 @@
@media #{$large-phone} {
width: 97%;
}
-
+ .selection {
+ display: flex;
+ align-items: center;
+ flex-direction: column;
+ color: white;
+ text-align: center;
+ margin: 1rem auto;
+ @media #{$large-phone} {
+ margin: 1rem 0;
+ }
+ button.btn-highlight {
+ padding: 0.625rem;
+ }
+ }
.filters {
display: flex;
align-items: center;
diff --git a/src/components/EcogestureForm/EcogestureFormEquipment.tsx b/src/components/EcogestureForm/EcogestureFormEquipment.tsx
index e25e9b52a53bee88fc77185895b4fd0b7cecbc77..268ae76cc137b0c56b4b038b29348a204a417938 100644
--- a/src/components/EcogestureForm/EcogestureFormEquipment.tsx
+++ b/src/components/EcogestureForm/EcogestureFormEquipment.tsx
@@ -31,7 +31,7 @@ const EcogestureFormEquipment: React.FC<EcogestureFormEquipmentProps> = ({
}, [profileEcogesture, setPreviousStep])
const handleFinish = useCallback(() => {
- profileEcogesture.equipments = answer
+ profileEcogesture.equipments = answer as EquipmentType[]
dispatch(newProfileEcogestureEntry(profileEcogesture))
dispatch(updateProfile({ isProfileEcogestureCompleted: true }))
history.push('/ecogesture-selection')
@@ -63,7 +63,7 @@ const EcogestureFormEquipment: React.FC<EcogestureFormEquipmentProps> = ({
)
return (
- <>
+ <div className="ecogesture-profile-container">
<div className={'equipment-form-container'}>
<div className={'equipment-label text-22-normal'}>
{t(
@@ -108,7 +108,7 @@ const EcogestureFormEquipment: React.FC<EcogestureFormEquipmentProps> = ({
handleNext={handleFinish}
disableNextButton={answer === []}
/>
- </>
+ </div>
)
}
diff --git a/src/components/EcogestureForm/EcogestureFormSingleChoice.tsx b/src/components/EcogestureForm/EcogestureFormSingleChoice.tsx
index 8b3e538ab77fb1b559e0d340e3be441c38d187ed..cb1a155dfb1d0e0f4d2dbe8e8cece7ea1a565867 100644
--- a/src/components/EcogestureForm/EcogestureFormSingleChoice.tsx
+++ b/src/components/EcogestureForm/EcogestureFormSingleChoice.tsx
@@ -50,7 +50,7 @@ const EcogestureFormSingleChoice: React.FC<EcogestureFormSingleChoiceProps> = ({
}, [step, viewedStep, profileEcogesture, answerType])
return (
- <>
+ <div className="ecogesture-profile-container">
<div className={'profile-form-container ecogesture-form-single'}>
<div className={'profile-question-label'}>
{t(
@@ -92,7 +92,7 @@ const EcogestureFormSingleChoice: React.FC<EcogestureFormSingleChoiceProps> = ({
handleNext={handleNext}
disableNextButton={answer === ''}
/>
- </>
+ </div>
)
}
diff --git a/src/components/EcogestureForm/EcogestureSelection.tsx b/src/components/EcogestureForm/EcogestureSelection.tsx
deleted file mode 100644
index 1cb1fa2cfa9ac0922722b93ffcfb17ed95b9dc50..0000000000000000000000000000000000000000
--- a/src/components/EcogestureForm/EcogestureSelection.tsx
+++ /dev/null
@@ -1,33 +0,0 @@
-import React, { useEffect, useMemo } from 'react'
-import 'components/ProfileType/profileTypeForm.scss'
-import { useI18n } from 'cozy-ui/transpiled/react/I18n'
-import { useClient } from 'cozy-client'
-import EcogestureService from 'services/ecogesture.service'
-import { ProfileEcogesture } from 'models/profileEcogesture.model'
-import { useSelector } from 'react-redux'
-import { AppStore } from 'store'
-
-const EcogestureSelection: React.FC = () => {
- const { t } = useI18n()
- const client = useClient()
-
- const ecogestureService = useMemo(() => new EcogestureService(client), [
- client,
- ])
- const profileEcogesture: ProfileEcogesture = useSelector(
- (state: AppStore) => state.ecolyo.profileEcogesture
- )
- useEffect(() => {
- async function getFilteredList() {
- const filteredList = await ecogestureService.getEcogestureListByProfile(
- profileEcogesture
- )
- console.log('filtered', filteredList)
- }
- getFilteredList()
- }, [ecogestureService, profileEcogesture])
-
- return <div className="ecogesture-selection">Tinderr</div>
-}
-
-export default EcogestureSelection
diff --git a/src/components/EcogestureForm/EquipmentIcon.tsx b/src/components/EcogestureForm/EquipmentIcon.tsx
index 945d3ea11b5ffcd09092eb88606cacfe2367e3f9..6792b4cc9e9d3f1fe184312d460b20301647f568 100644
--- a/src/components/EcogestureForm/EquipmentIcon.tsx
+++ b/src/components/EcogestureForm/EquipmentIcon.tsx
@@ -30,11 +30,15 @@ const EquipmentIcon: React.FC<EquipmentIconProps> = ({
}, [equipment])
return (
<>
- <Icon
- icon={icon}
- size={80}
- className={isChecked ? 'equipmentIcon checked' : 'equipmentIcon'}
- />
+ <div
+ className={
+ isChecked
+ ? 'equipment-icon-container checked'
+ : ' equipment-icon-container'
+ }
+ >
+ <Icon icon={icon} size={40} className={'equipmentIcon '} />
+ </div>
<div className="text text-14-normal">
{t(`ecogesture_profile.equipments.${equipment.toLocaleLowerCase()}`)}
</div>
diff --git a/src/components/EcogestureForm/__snapshots__/EcogestureFormEquipment.spec.tsx.snap b/src/components/EcogestureForm/__snapshots__/EcogestureFormEquipment.spec.tsx.snap
index fb4b342c226d988c696b5f3c7463f12704e5fcdf..4e2e1a1666d9a520148693fc9b339c95f51ef1e0 100644
--- a/src/components/EcogestureForm/__snapshots__/EcogestureFormEquipment.spec.tsx.snap
+++ b/src/components/EcogestureForm/__snapshots__/EcogestureFormEquipment.spec.tsx.snap
@@ -25,358 +25,344 @@ exports[`EcogestureFormEquipment component should be rendered correctly 1`] = `
setPreviousStep={[MockFunction]}
>
<div
- className="equipment-form-container"
+ className="ecogesture-profile-container"
>
<div
- className="equipment-label text-22-normal"
+ className="equipment-form-container"
>
- ecogesture_profile.equipments.question
- </div>
- <div
- className="equipment-hint text-16-normal"
- >
- ecogesture_profile.equipments.hint
- </div>
- <div
- className="icons-container"
- >
- <label
- className="checkbox-equipment"
- key="0"
- >
- <input
- checked={false}
- className="item-eq"
- name="AIR_CONDITIONING"
- onChange={[Function]}
- type="checkbox"
- value="AIR_CONDITIONING"
- />
- <mock-equipment-icon
- equipment="AIR_CONDITIONING"
- isChecked={false}
- />
- </label>
- <label
- className="checkbox-equipment"
- key="1"
- >
- <input
- checked={false}
- className="item-eq"
- name="COMPUTER"
- onChange={[Function]}
- type="checkbox"
- value="COMPUTER"
- />
- <mock-equipment-icon
- equipment="COMPUTER"
- isChecked={false}
- />
- </label>
- <label
- className="checkbox-equipment"
- key="2"
- >
- <input
- checked={false}
- className="item-eq"
- name="MICROWAVE"
- onChange={[Function]}
- type="checkbox"
- value="MICROWAVE"
- />
- <mock-equipment-icon
- equipment="MICROWAVE"
- isChecked={false}
- />
- </label>
- <label
- className="checkbox-equipment"
- key="3"
- >
- <input
- checked={false}
- className="item-eq"
- name="WASHING_MACHINE"
- onChange={[Function]}
- type="checkbox"
- value="WASHING_MACHINE"
- />
- <mock-equipment-icon
- equipment="WASHING_MACHINE"
- isChecked={false}
- />
- </label>
- <label
- className="checkbox-equipment"
- key="4"
- >
- <input
- checked={false}
- className="item-eq"
- name="DISHWASHER"
- onChange={[Function]}
- type="checkbox"
- value="DISHWASHER"
- />
- <mock-equipment-icon
- equipment="DISHWASHER"
- isChecked={false}
- />
- </label>
- <label
- className="checkbox-equipment"
- key="5"
- >
- <input
- checked={false}
- className="item-eq"
- name="COOKING_PLATES"
- onChange={[Function]}
- type="checkbox"
- value="COOKING_PLATES"
- />
- <mock-equipment-icon
- equipment="COOKING_PLATES"
- isChecked={false}
- />
- </label>
- <label
- className="checkbox-equipment"
- key="6"
- >
- <input
- checked={false}
- className="item-eq"
- name="DRYER"
- onChange={[Function]}
- type="checkbox"
- value="DRYER"
- />
- <mock-equipment-icon
- equipment="DRYER"
- isChecked={false}
- />
- </label>
- <label
- className="checkbox-equipment"
- key="7"
- >
- <input
- checked={false}
- className="item-eq"
- name="REFREGIRATOR"
- onChange={[Function]}
- type="checkbox"
- value="REFREGIRATOR"
- />
- <mock-equipment-icon
- equipment="REFREGIRATOR"
- isChecked={false}
- />
- </label>
- <label
- className="checkbox-equipment"
- key="8"
+ <div
+ className="equipment-label text-22-normal"
>
- <input
- checked={false}
- className="item-eq"
- name="FAN"
- onChange={[Function]}
- type="checkbox"
- value="FAN"
- />
- <mock-equipment-icon
- equipment="FAN"
- isChecked={false}
- />
- </label>
- <label
- className="checkbox-equipment"
- key="9"
+ ecogesture_profile.equipments.question
+ </div>
+ <div
+ className="equipment-hint text-16-normal"
>
- <input
- checked={false}
- className="item-eq"
- name="CURTAIN"
- onChange={[Function]}
- type="checkbox"
- value="CURTAIN"
- />
- <mock-equipment-icon
- equipment="CURTAIN"
- isChecked={false}
- />
- </label>
- <label
- className="checkbox-equipment"
- key="10"
+ ecogesture_profile.equipments.hint
+ </div>
+ <div
+ className="icons-container"
>
- <input
- checked={false}
- className="item-eq"
- name="INTERNET_BOX"
- onChange={[Function]}
- type="checkbox"
- value="INTERNET_BOX"
- />
- <mock-equipment-icon
- equipment="INTERNET_BOX"
- isChecked={false}
- />
- </label>
- <label
- className="checkbox-equipment"
- key="11"
- >
- <input
- checked={false}
- className="item-eq"
- name="VENTILATION"
- onChange={[Function]}
- type="checkbox"
- value="VENTILATION"
- />
- <mock-equipment-icon
- equipment="VENTILATION"
- isChecked={false}
- />
- </label>
- <label
- className="checkbox-equipment"
- key="12"
- >
- <input
- checked={false}
- className="item-eq"
- name="FREEZER"
- onChange={[Function]}
- type="checkbox"
- value="FREEZER"
- />
- <mock-equipment-icon
- equipment="FREEZER"
- isChecked={false}
- />
- </label>
- <label
- className="checkbox-equipment"
- key="13"
- >
- <input
- checked={false}
- className="item-eq"
- name="BOILER"
- onChange={[Function]}
- type="checkbox"
- value="BOILER"
- />
- <mock-equipment-icon
- equipment="BOILER"
- isChecked={false}
- />
- </label>
- <label
- className="checkbox-equipment"
- key="14"
- >
- <input
- checked={false}
- className="item-eq"
- name="HYDRAULIC_HEATING"
- onChange={[Function]}
- type="checkbox"
- value="HYDRAULIC_HEATING"
- />
- <mock-equipment-icon
- equipment="HYDRAULIC_HEATING"
- isChecked={false}
- />
- </label>
+ <label
+ className="checkbox-equipment"
+ key="0"
+ >
+ <input
+ checked={false}
+ className="item-eq"
+ name="AIR_CONDITIONING"
+ onChange={[Function]}
+ type="checkbox"
+ value="AIR_CONDITIONING"
+ />
+ <mock-equipment-icon
+ equipment="AIR_CONDITIONING"
+ isChecked={false}
+ />
+ </label>
+ <label
+ className="checkbox-equipment"
+ key="1"
+ >
+ <input
+ checked={false}
+ className="item-eq"
+ name="COMPUTER"
+ onChange={[Function]}
+ type="checkbox"
+ value="COMPUTER"
+ />
+ <mock-equipment-icon
+ equipment="COMPUTER"
+ isChecked={false}
+ />
+ </label>
+ <label
+ className="checkbox-equipment"
+ key="2"
+ >
+ <input
+ checked={false}
+ className="item-eq"
+ name="MICROWAVE"
+ onChange={[Function]}
+ type="checkbox"
+ value="MICROWAVE"
+ />
+ <mock-equipment-icon
+ equipment="MICROWAVE"
+ isChecked={false}
+ />
+ </label>
+ <label
+ className="checkbox-equipment"
+ key="3"
+ >
+ <input
+ checked={false}
+ className="item-eq"
+ name="WASHING_MACHINE"
+ onChange={[Function]}
+ type="checkbox"
+ value="WASHING_MACHINE"
+ />
+ <mock-equipment-icon
+ equipment="WASHING_MACHINE"
+ isChecked={false}
+ />
+ </label>
+ <label
+ className="checkbox-equipment"
+ key="4"
+ >
+ <input
+ checked={false}
+ className="item-eq"
+ name="DISHWASHER"
+ onChange={[Function]}
+ type="checkbox"
+ value="DISHWASHER"
+ />
+ <mock-equipment-icon
+ equipment="DISHWASHER"
+ isChecked={false}
+ />
+ </label>
+ <label
+ className="checkbox-equipment"
+ key="5"
+ >
+ <input
+ checked={false}
+ className="item-eq"
+ name="COOKING_PLATES"
+ onChange={[Function]}
+ type="checkbox"
+ value="COOKING_PLATES"
+ />
+ <mock-equipment-icon
+ equipment="COOKING_PLATES"
+ isChecked={false}
+ />
+ </label>
+ <label
+ className="checkbox-equipment"
+ key="6"
+ >
+ <input
+ checked={false}
+ className="item-eq"
+ name="DRYER"
+ onChange={[Function]}
+ type="checkbox"
+ value="DRYER"
+ />
+ <mock-equipment-icon
+ equipment="DRYER"
+ isChecked={false}
+ />
+ </label>
+ <label
+ className="checkbox-equipment"
+ key="7"
+ >
+ <input
+ checked={false}
+ className="item-eq"
+ name="REFREGIRATOR"
+ onChange={[Function]}
+ type="checkbox"
+ value="REFREGIRATOR"
+ />
+ <mock-equipment-icon
+ equipment="REFREGIRATOR"
+ isChecked={false}
+ />
+ </label>
+ <label
+ className="checkbox-equipment"
+ key="8"
+ >
+ <input
+ checked={false}
+ className="item-eq"
+ name="FAN"
+ onChange={[Function]}
+ type="checkbox"
+ value="FAN"
+ />
+ <mock-equipment-icon
+ equipment="FAN"
+ isChecked={false}
+ />
+ </label>
+ <label
+ className="checkbox-equipment"
+ key="9"
+ >
+ <input
+ checked={false}
+ className="item-eq"
+ name="CURTAIN"
+ onChange={[Function]}
+ type="checkbox"
+ value="CURTAIN"
+ />
+ <mock-equipment-icon
+ equipment="CURTAIN"
+ isChecked={false}
+ />
+ </label>
+ <label
+ className="checkbox-equipment"
+ key="10"
+ >
+ <input
+ checked={false}
+ className="item-eq"
+ name="INTERNET_BOX"
+ onChange={[Function]}
+ type="checkbox"
+ value="INTERNET_BOX"
+ />
+ <mock-equipment-icon
+ equipment="INTERNET_BOX"
+ isChecked={false}
+ />
+ </label>
+ <label
+ className="checkbox-equipment"
+ key="11"
+ >
+ <input
+ checked={false}
+ className="item-eq"
+ name="VENTILATION"
+ onChange={[Function]}
+ type="checkbox"
+ value="VENTILATION"
+ />
+ <mock-equipment-icon
+ equipment="VENTILATION"
+ isChecked={false}
+ />
+ </label>
+ <label
+ className="checkbox-equipment"
+ key="12"
+ >
+ <input
+ checked={false}
+ className="item-eq"
+ name="FREEZER"
+ onChange={[Function]}
+ type="checkbox"
+ value="FREEZER"
+ />
+ <mock-equipment-icon
+ equipment="FREEZER"
+ isChecked={false}
+ />
+ </label>
+ <label
+ className="checkbox-equipment"
+ key="13"
+ >
+ <input
+ checked={false}
+ className="item-eq"
+ name="BOILER"
+ onChange={[Function]}
+ type="checkbox"
+ value="BOILER"
+ />
+ <mock-equipment-icon
+ equipment="BOILER"
+ isChecked={false}
+ />
+ </label>
+ <label
+ className="checkbox-equipment"
+ key="14"
+ >
+ <input
+ checked={false}
+ className="item-eq"
+ name="HYDRAULIC_HEATING"
+ onChange={[Function]}
+ type="checkbox"
+ value="HYDRAULIC_HEATING"
+ />
+ <mock-equipment-icon
+ equipment="HYDRAULIC_HEATING"
+ isChecked={false}
+ />
+ </label>
+ </div>
</div>
- </div>
- <FormNavigation
- disableNextButton={false}
- handleNext={[Function]}
- handlePrevious={[Function]}
- step={3}
- >
- <div
- className="profile-navigation"
+ <FormNavigation
+ disableNextButton={false}
+ handleNext={[Function]}
+ handlePrevious={[Function]}
+ step={3}
>
- <WithStyles(ForwardRef(Button))
- aria-label="profile_type.accessibility.button_previous"
- className="profile-navigation-button"
- classes={
- Object {
- "label": "text-16-normal",
- "root": "btn-profile-back",
- }
- }
- disabled={false}
- onClick={[Function]}
+ <div
+ className="profile-navigation"
>
- <ForwardRef(Button)
+ <WithStyles(ForwardRef(Button))
aria-label="profile_type.accessibility.button_previous"
className="profile-navigation-button"
classes={
Object {
- "colorInherit": "MuiButton-colorInherit",
- "contained": "MuiButton-contained",
- "containedPrimary": "MuiButton-containedPrimary",
- "containedSecondary": "MuiButton-containedSecondary",
- "containedSizeLarge": "MuiButton-containedSizeLarge",
- "containedSizeSmall": "MuiButton-containedSizeSmall",
- "disableElevation": "MuiButton-disableElevation",
- "disabled": "Mui-disabled",
- "endIcon": "MuiButton-endIcon",
- "focusVisible": "Mui-focusVisible",
- "fullWidth": "MuiButton-fullWidth",
- "iconSizeLarge": "MuiButton-iconSizeLarge",
- "iconSizeMedium": "MuiButton-iconSizeMedium",
- "iconSizeSmall": "MuiButton-iconSizeSmall",
- "label": "MuiButton-label text-16-normal",
- "outlined": "MuiButton-outlined",
- "outlinedPrimary": "MuiButton-outlinedPrimary",
- "outlinedSecondary": "MuiButton-outlinedSecondary",
- "outlinedSizeLarge": "MuiButton-outlinedSizeLarge",
- "outlinedSizeSmall": "MuiButton-outlinedSizeSmall",
- "root": "MuiButton-root btn-profile-back",
- "sizeLarge": "MuiButton-sizeLarge",
- "sizeSmall": "MuiButton-sizeSmall",
- "startIcon": "MuiButton-startIcon",
- "text": "MuiButton-text",
- "textPrimary": "MuiButton-textPrimary",
- "textSecondary": "MuiButton-textSecondary",
- "textSizeLarge": "MuiButton-textSizeLarge",
- "textSizeSmall": "MuiButton-textSizeSmall",
+ "label": "text-16-normal",
+ "root": "btn-profile-back",
}
}
disabled={false}
onClick={[Function]}
>
- <WithStyles(ForwardRef(ButtonBase))
+ <ForwardRef(Button)
aria-label="profile_type.accessibility.button_previous"
- className="MuiButton-root btn-profile-back MuiButton-text profile-navigation-button"
- component="button"
+ className="profile-navigation-button"
+ classes={
+ Object {
+ "colorInherit": "MuiButton-colorInherit",
+ "contained": "MuiButton-contained",
+ "containedPrimary": "MuiButton-containedPrimary",
+ "containedSecondary": "MuiButton-containedSecondary",
+ "containedSizeLarge": "MuiButton-containedSizeLarge",
+ "containedSizeSmall": "MuiButton-containedSizeSmall",
+ "disableElevation": "MuiButton-disableElevation",
+ "disabled": "Mui-disabled",
+ "endIcon": "MuiButton-endIcon",
+ "focusVisible": "Mui-focusVisible",
+ "fullWidth": "MuiButton-fullWidth",
+ "iconSizeLarge": "MuiButton-iconSizeLarge",
+ "iconSizeMedium": "MuiButton-iconSizeMedium",
+ "iconSizeSmall": "MuiButton-iconSizeSmall",
+ "label": "MuiButton-label text-16-normal",
+ "outlined": "MuiButton-outlined",
+ "outlinedPrimary": "MuiButton-outlinedPrimary",
+ "outlinedSecondary": "MuiButton-outlinedSecondary",
+ "outlinedSizeLarge": "MuiButton-outlinedSizeLarge",
+ "outlinedSizeSmall": "MuiButton-outlinedSizeSmall",
+ "root": "MuiButton-root btn-profile-back",
+ "sizeLarge": "MuiButton-sizeLarge",
+ "sizeSmall": "MuiButton-sizeSmall",
+ "startIcon": "MuiButton-startIcon",
+ "text": "MuiButton-text",
+ "textPrimary": "MuiButton-textPrimary",
+ "textSecondary": "MuiButton-textSecondary",
+ "textSizeLarge": "MuiButton-textSizeLarge",
+ "textSizeSmall": "MuiButton-textSizeSmall",
+ }
+ }
disabled={false}
- focusRipple={true}
- focusVisibleClassName="Mui-focusVisible"
onClick={[Function]}
- type="button"
>
- <ForwardRef(ButtonBase)
+ <WithStyles(ForwardRef(ButtonBase))
aria-label="profile_type.accessibility.button_previous"
className="MuiButton-root btn-profile-back MuiButton-text profile-navigation-button"
- classes={
- Object {
- "disabled": "Mui-disabled",
- "focusVisible": "Mui-focusVisible",
- "root": "MuiButtonBase-root",
- }
- }
component="button"
disabled={false}
focusRipple={true}
@@ -384,136 +370,136 @@ exports[`EcogestureFormEquipment component should be rendered correctly 1`] = `
onClick={[Function]}
type="button"
>
- <button
+ <ForwardRef(ButtonBase)
aria-label="profile_type.accessibility.button_previous"
- className="MuiButtonBase-root MuiButton-root btn-profile-back MuiButton-text profile-navigation-button"
+ className="MuiButton-root btn-profile-back MuiButton-text profile-navigation-button"
+ classes={
+ Object {
+ "disabled": "Mui-disabled",
+ "focusVisible": "Mui-focusVisible",
+ "root": "MuiButtonBase-root",
+ }
+ }
+ component="button"
disabled={false}
- onBlur={[Function]}
+ focusRipple={true}
+ focusVisibleClassName="Mui-focusVisible"
onClick={[Function]}
- onDragLeave={[Function]}
- onFocus={[Function]}
- onKeyDown={[Function]}
- onKeyUp={[Function]}
- onMouseDown={[Function]}
- onMouseLeave={[Function]}
- onMouseUp={[Function]}
- onTouchEnd={[Function]}
- onTouchMove={[Function]}
- onTouchStart={[Function]}
- tabIndex={0}
type="button"
>
- <span
- className="MuiButton-label text-16-normal"
+ <button
+ aria-label="profile_type.accessibility.button_previous"
+ className="MuiButtonBase-root MuiButton-root btn-profile-back MuiButton-text profile-navigation-button"
+ disabled={false}
+ onBlur={[Function]}
+ onClick={[Function]}
+ onDragLeave={[Function]}
+ onFocus={[Function]}
+ onKeyDown={[Function]}
+ onKeyUp={[Function]}
+ onMouseDown={[Function]}
+ onMouseLeave={[Function]}
+ onMouseUp={[Function]}
+ onTouchEnd={[Function]}
+ onTouchMove={[Function]}
+ onTouchStart={[Function]}
+ tabIndex={0}
+ type="button"
>
- < profile_type.form.button_previous
- </span>
- <NoSsr>
- <WithStyles(memo)
- center={false}
+ <span
+ className="MuiButton-label text-16-normal"
>
- <ForwardRef(TouchRipple)
+ < profile_type.form.button_previous
+ </span>
+ <NoSsr>
+ <WithStyles(memo)
center={false}
- classes={
- Object {
- "child": "MuiTouchRipple-child",
- "childLeaving": "MuiTouchRipple-childLeaving",
- "childPulsate": "MuiTouchRipple-childPulsate",
- "ripple": "MuiTouchRipple-ripple",
- "ripplePulsate": "MuiTouchRipple-ripplePulsate",
- "rippleVisible": "MuiTouchRipple-rippleVisible",
- "root": "MuiTouchRipple-root",
- }
- }
>
- <span
- className="MuiTouchRipple-root"
+ <ForwardRef(TouchRipple)
+ center={false}
+ classes={
+ Object {
+ "child": "MuiTouchRipple-child",
+ "childLeaving": "MuiTouchRipple-childLeaving",
+ "childPulsate": "MuiTouchRipple-childPulsate",
+ "ripple": "MuiTouchRipple-ripple",
+ "ripplePulsate": "MuiTouchRipple-ripplePulsate",
+ "rippleVisible": "MuiTouchRipple-rippleVisible",
+ "root": "MuiTouchRipple-root",
+ }
+ }
>
- <TransitionGroup
- childFactory={[Function]}
- component={null}
- exit={true}
- />
- </span>
- </ForwardRef(TouchRipple)>
- </WithStyles(memo)>
- </NoSsr>
- </button>
- </ForwardRef(ButtonBase)>
- </WithStyles(ForwardRef(ButtonBase))>
- </ForwardRef(Button)>
- </WithStyles(ForwardRef(Button))>
- <WithStyles(ForwardRef(Button))
- aria-label="profile_type.accessibility.button_end"
- className="profile-navigation-button"
- classes={
- Object {
- "label": "text-16-normal",
- "root": "btn-profile-next rounded",
- }
- }
- disabled={false}
- onClick={[Function]}
- >
- <ForwardRef(Button)
+ <span
+ className="MuiTouchRipple-root"
+ >
+ <TransitionGroup
+ childFactory={[Function]}
+ component={null}
+ exit={true}
+ />
+ </span>
+ </ForwardRef(TouchRipple)>
+ </WithStyles(memo)>
+ </NoSsr>
+ </button>
+ </ForwardRef(ButtonBase)>
+ </WithStyles(ForwardRef(ButtonBase))>
+ </ForwardRef(Button)>
+ </WithStyles(ForwardRef(Button))>
+ <WithStyles(ForwardRef(Button))
aria-label="profile_type.accessibility.button_end"
className="profile-navigation-button"
classes={
Object {
- "colorInherit": "MuiButton-colorInherit",
- "contained": "MuiButton-contained",
- "containedPrimary": "MuiButton-containedPrimary",
- "containedSecondary": "MuiButton-containedSecondary",
- "containedSizeLarge": "MuiButton-containedSizeLarge",
- "containedSizeSmall": "MuiButton-containedSizeSmall",
- "disableElevation": "MuiButton-disableElevation",
- "disabled": "Mui-disabled",
- "endIcon": "MuiButton-endIcon",
- "focusVisible": "Mui-focusVisible",
- "fullWidth": "MuiButton-fullWidth",
- "iconSizeLarge": "MuiButton-iconSizeLarge",
- "iconSizeMedium": "MuiButton-iconSizeMedium",
- "iconSizeSmall": "MuiButton-iconSizeSmall",
- "label": "MuiButton-label text-16-normal",
- "outlined": "MuiButton-outlined",
- "outlinedPrimary": "MuiButton-outlinedPrimary",
- "outlinedSecondary": "MuiButton-outlinedSecondary",
- "outlinedSizeLarge": "MuiButton-outlinedSizeLarge",
- "outlinedSizeSmall": "MuiButton-outlinedSizeSmall",
- "root": "MuiButton-root btn-profile-next rounded",
- "sizeLarge": "MuiButton-sizeLarge",
- "sizeSmall": "MuiButton-sizeSmall",
- "startIcon": "MuiButton-startIcon",
- "text": "MuiButton-text",
- "textPrimary": "MuiButton-textPrimary",
- "textSecondary": "MuiButton-textSecondary",
- "textSizeLarge": "MuiButton-textSizeLarge",
- "textSizeSmall": "MuiButton-textSizeSmall",
+ "label": "text-16-normal",
+ "root": "btn-profile-next rounded",
}
}
disabled={false}
onClick={[Function]}
>
- <WithStyles(ForwardRef(ButtonBase))
+ <ForwardRef(Button)
aria-label="profile_type.accessibility.button_end"
- className="MuiButton-root btn-profile-next rounded MuiButton-text profile-navigation-button"
- component="button"
+ className="profile-navigation-button"
+ classes={
+ Object {
+ "colorInherit": "MuiButton-colorInherit",
+ "contained": "MuiButton-contained",
+ "containedPrimary": "MuiButton-containedPrimary",
+ "containedSecondary": "MuiButton-containedSecondary",
+ "containedSizeLarge": "MuiButton-containedSizeLarge",
+ "containedSizeSmall": "MuiButton-containedSizeSmall",
+ "disableElevation": "MuiButton-disableElevation",
+ "disabled": "Mui-disabled",
+ "endIcon": "MuiButton-endIcon",
+ "focusVisible": "Mui-focusVisible",
+ "fullWidth": "MuiButton-fullWidth",
+ "iconSizeLarge": "MuiButton-iconSizeLarge",
+ "iconSizeMedium": "MuiButton-iconSizeMedium",
+ "iconSizeSmall": "MuiButton-iconSizeSmall",
+ "label": "MuiButton-label text-16-normal",
+ "outlined": "MuiButton-outlined",
+ "outlinedPrimary": "MuiButton-outlinedPrimary",
+ "outlinedSecondary": "MuiButton-outlinedSecondary",
+ "outlinedSizeLarge": "MuiButton-outlinedSizeLarge",
+ "outlinedSizeSmall": "MuiButton-outlinedSizeSmall",
+ "root": "MuiButton-root btn-profile-next rounded",
+ "sizeLarge": "MuiButton-sizeLarge",
+ "sizeSmall": "MuiButton-sizeSmall",
+ "startIcon": "MuiButton-startIcon",
+ "text": "MuiButton-text",
+ "textPrimary": "MuiButton-textPrimary",
+ "textSecondary": "MuiButton-textSecondary",
+ "textSizeLarge": "MuiButton-textSizeLarge",
+ "textSizeSmall": "MuiButton-textSizeSmall",
+ }
+ }
disabled={false}
- focusRipple={true}
- focusVisibleClassName="Mui-focusVisible"
onClick={[Function]}
- type="button"
>
- <ForwardRef(ButtonBase)
+ <WithStyles(ForwardRef(ButtonBase))
aria-label="profile_type.accessibility.button_end"
className="MuiButton-root btn-profile-next rounded MuiButton-text profile-navigation-button"
- classes={
- Object {
- "disabled": "Mui-disabled",
- "focusVisible": "Mui-focusVisible",
- "root": "MuiButtonBase-root",
- }
- }
component="button"
disabled={false}
focusRipple={true}
@@ -521,67 +507,85 @@ exports[`EcogestureFormEquipment component should be rendered correctly 1`] = `
onClick={[Function]}
type="button"
>
- <button
+ <ForwardRef(ButtonBase)
aria-label="profile_type.accessibility.button_end"
- className="MuiButtonBase-root MuiButton-root btn-profile-next rounded MuiButton-text profile-navigation-button"
+ className="MuiButton-root btn-profile-next rounded MuiButton-text profile-navigation-button"
+ classes={
+ Object {
+ "disabled": "Mui-disabled",
+ "focusVisible": "Mui-focusVisible",
+ "root": "MuiButtonBase-root",
+ }
+ }
+ component="button"
disabled={false}
- onBlur={[Function]}
+ focusRipple={true}
+ focusVisibleClassName="Mui-focusVisible"
onClick={[Function]}
- onDragLeave={[Function]}
- onFocus={[Function]}
- onKeyDown={[Function]}
- onKeyUp={[Function]}
- onMouseDown={[Function]}
- onMouseLeave={[Function]}
- onMouseUp={[Function]}
- onTouchEnd={[Function]}
- onTouchMove={[Function]}
- onTouchStart={[Function]}
- tabIndex={0}
type="button"
>
- <span
- className="MuiButton-label text-16-normal"
+ <button
+ aria-label="profile_type.accessibility.button_end"
+ className="MuiButtonBase-root MuiButton-root btn-profile-next rounded MuiButton-text profile-navigation-button"
+ disabled={false}
+ onBlur={[Function]}
+ onClick={[Function]}
+ onDragLeave={[Function]}
+ onFocus={[Function]}
+ onKeyDown={[Function]}
+ onKeyUp={[Function]}
+ onMouseDown={[Function]}
+ onMouseLeave={[Function]}
+ onMouseUp={[Function]}
+ onTouchEnd={[Function]}
+ onTouchMove={[Function]}
+ onTouchStart={[Function]}
+ tabIndex={0}
+ type="button"
>
- profile_type.form.button_end
- </span>
- <NoSsr>
- <WithStyles(memo)
- center={false}
+ <span
+ className="MuiButton-label text-16-normal"
>
- <ForwardRef(TouchRipple)
+ profile_type.form.button_end
+ </span>
+ <NoSsr>
+ <WithStyles(memo)
center={false}
- classes={
- Object {
- "child": "MuiTouchRipple-child",
- "childLeaving": "MuiTouchRipple-childLeaving",
- "childPulsate": "MuiTouchRipple-childPulsate",
- "ripple": "MuiTouchRipple-ripple",
- "ripplePulsate": "MuiTouchRipple-ripplePulsate",
- "rippleVisible": "MuiTouchRipple-rippleVisible",
- "root": "MuiTouchRipple-root",
- }
- }
>
- <span
- className="MuiTouchRipple-root"
+ <ForwardRef(TouchRipple)
+ center={false}
+ classes={
+ Object {
+ "child": "MuiTouchRipple-child",
+ "childLeaving": "MuiTouchRipple-childLeaving",
+ "childPulsate": "MuiTouchRipple-childPulsate",
+ "ripple": "MuiTouchRipple-ripple",
+ "ripplePulsate": "MuiTouchRipple-ripplePulsate",
+ "rippleVisible": "MuiTouchRipple-rippleVisible",
+ "root": "MuiTouchRipple-root",
+ }
+ }
>
- <TransitionGroup
- childFactory={[Function]}
- component={null}
- exit={true}
- />
- </span>
- </ForwardRef(TouchRipple)>
- </WithStyles(memo)>
- </NoSsr>
- </button>
- </ForwardRef(ButtonBase)>
- </WithStyles(ForwardRef(ButtonBase))>
- </ForwardRef(Button)>
- </WithStyles(ForwardRef(Button))>
- </div>
- </FormNavigation>
+ <span
+ className="MuiTouchRipple-root"
+ >
+ <TransitionGroup
+ childFactory={[Function]}
+ component={null}
+ exit={true}
+ />
+ </span>
+ </ForwardRef(TouchRipple)>
+ </WithStyles(memo)>
+ </NoSsr>
+ </button>
+ </ForwardRef(ButtonBase)>
+ </WithStyles(ForwardRef(ButtonBase))>
+ </ForwardRef(Button)>
+ </WithStyles(ForwardRef(Button))>
+ </div>
+ </FormNavigation>
+ </div>
</EcogestureFormEquipment>
</Provider>
`;
diff --git a/src/components/EcogestureForm/__snapshots__/EcogestureFormSingleChoice.spec.tsx.snap b/src/components/EcogestureForm/__snapshots__/EcogestureFormSingleChoice.spec.tsx.snap
index e56e00d42d9035c6de90b89166d281bb9cd7535e..bb393acb5b411574e73c9758f3eb1ab51c0746ab 100644
--- a/src/components/EcogestureForm/__snapshots__/EcogestureFormSingleChoice.spec.tsx.snap
+++ b/src/components/EcogestureForm/__snapshots__/EcogestureFormSingleChoice.spec.tsx.snap
@@ -38,122 +38,108 @@ exports[`EcogestureFormSingleChoice component should be rendered correctly 1`] =
viewedStep={-1}
>
<div
- className="profile-form-container ecogesture-form-single"
+ className="ecogesture-profile-container"
>
<div
- className="profile-question-label"
+ className="profile-form-container ecogesture-form-single"
>
- ecogesture_form.heating_type.question
+ <div
+ className="profile-question-label"
+ >
+ ecogesture_form.heating_type.question
+ </div>
+ <label
+ className="radio_short"
+ key="0"
+ >
+ <input
+ checked={false}
+ className=""
+ name="individual"
+ onChange={[Function]}
+ type="radio"
+ value="individual"
+ />
+ ecogesture_form.heating_type.individual
+ </label>
+ <label
+ className="radio_short"
+ key="1"
+ >
+ <input
+ checked={false}
+ className=""
+ name="collective"
+ onChange={[Function]}
+ type="radio"
+ value="collective"
+ />
+ ecogesture_form.heating_type.collective
+ </label>
</div>
- <label
- className="radio_short"
- key="0"
- >
- <input
- checked={false}
- className=""
- name="individual"
- onChange={[Function]}
- type="radio"
- value="individual"
- />
- ecogesture_form.heating_type.individual
- </label>
- <label
- className="radio_short"
- key="1"
- >
- <input
- checked={false}
- className=""
- name="collective"
- onChange={[Function]}
- type="radio"
- value="collective"
- />
- ecogesture_form.heating_type.collective
- </label>
- </div>
- <FormNavigation
- disableNextButton={true}
- handleNext={[Function]}
- handlePrevious={[Function]}
- step={0}
- >
- <div
- className="profile-navigation"
+ <FormNavigation
+ disableNextButton={true}
+ handleNext={[Function]}
+ handlePrevious={[Function]}
+ step={0}
>
- <WithStyles(ForwardRef(Button))
- aria-label="profile_type.accessibility.button_previous"
- className="profile-navigation-button"
- classes={
- Object {
- "label": "text-16-normal",
- "root": "btn-profile-back",
- }
- }
- disabled={true}
- onClick={[Function]}
+ <div
+ className="profile-navigation"
>
- <ForwardRef(Button)
+ <WithStyles(ForwardRef(Button))
aria-label="profile_type.accessibility.button_previous"
className="profile-navigation-button"
classes={
Object {
- "colorInherit": "MuiButton-colorInherit",
- "contained": "MuiButton-contained",
- "containedPrimary": "MuiButton-containedPrimary",
- "containedSecondary": "MuiButton-containedSecondary",
- "containedSizeLarge": "MuiButton-containedSizeLarge",
- "containedSizeSmall": "MuiButton-containedSizeSmall",
- "disableElevation": "MuiButton-disableElevation",
- "disabled": "Mui-disabled",
- "endIcon": "MuiButton-endIcon",
- "focusVisible": "Mui-focusVisible",
- "fullWidth": "MuiButton-fullWidth",
- "iconSizeLarge": "MuiButton-iconSizeLarge",
- "iconSizeMedium": "MuiButton-iconSizeMedium",
- "iconSizeSmall": "MuiButton-iconSizeSmall",
- "label": "MuiButton-label text-16-normal",
- "outlined": "MuiButton-outlined",
- "outlinedPrimary": "MuiButton-outlinedPrimary",
- "outlinedSecondary": "MuiButton-outlinedSecondary",
- "outlinedSizeLarge": "MuiButton-outlinedSizeLarge",
- "outlinedSizeSmall": "MuiButton-outlinedSizeSmall",
- "root": "MuiButton-root btn-profile-back",
- "sizeLarge": "MuiButton-sizeLarge",
- "sizeSmall": "MuiButton-sizeSmall",
- "startIcon": "MuiButton-startIcon",
- "text": "MuiButton-text",
- "textPrimary": "MuiButton-textPrimary",
- "textSecondary": "MuiButton-textSecondary",
- "textSizeLarge": "MuiButton-textSizeLarge",
- "textSizeSmall": "MuiButton-textSizeSmall",
+ "label": "text-16-normal",
+ "root": "btn-profile-back",
}
}
disabled={true}
onClick={[Function]}
>
- <WithStyles(ForwardRef(ButtonBase))
+ <ForwardRef(Button)
aria-label="profile_type.accessibility.button_previous"
- className="MuiButton-root btn-profile-back MuiButton-text profile-navigation-button Mui-disabled"
- component="button"
+ className="profile-navigation-button"
+ classes={
+ Object {
+ "colorInherit": "MuiButton-colorInherit",
+ "contained": "MuiButton-contained",
+ "containedPrimary": "MuiButton-containedPrimary",
+ "containedSecondary": "MuiButton-containedSecondary",
+ "containedSizeLarge": "MuiButton-containedSizeLarge",
+ "containedSizeSmall": "MuiButton-containedSizeSmall",
+ "disableElevation": "MuiButton-disableElevation",
+ "disabled": "Mui-disabled",
+ "endIcon": "MuiButton-endIcon",
+ "focusVisible": "Mui-focusVisible",
+ "fullWidth": "MuiButton-fullWidth",
+ "iconSizeLarge": "MuiButton-iconSizeLarge",
+ "iconSizeMedium": "MuiButton-iconSizeMedium",
+ "iconSizeSmall": "MuiButton-iconSizeSmall",
+ "label": "MuiButton-label text-16-normal",
+ "outlined": "MuiButton-outlined",
+ "outlinedPrimary": "MuiButton-outlinedPrimary",
+ "outlinedSecondary": "MuiButton-outlinedSecondary",
+ "outlinedSizeLarge": "MuiButton-outlinedSizeLarge",
+ "outlinedSizeSmall": "MuiButton-outlinedSizeSmall",
+ "root": "MuiButton-root btn-profile-back",
+ "sizeLarge": "MuiButton-sizeLarge",
+ "sizeSmall": "MuiButton-sizeSmall",
+ "startIcon": "MuiButton-startIcon",
+ "text": "MuiButton-text",
+ "textPrimary": "MuiButton-textPrimary",
+ "textSecondary": "MuiButton-textSecondary",
+ "textSizeLarge": "MuiButton-textSizeLarge",
+ "textSizeSmall": "MuiButton-textSizeSmall",
+ }
+ }
disabled={true}
- focusRipple={true}
- focusVisibleClassName="Mui-focusVisible"
onClick={[Function]}
- type="button"
>
- <ForwardRef(ButtonBase)
+ <WithStyles(ForwardRef(ButtonBase))
aria-label="profile_type.accessibility.button_previous"
className="MuiButton-root btn-profile-back MuiButton-text profile-navigation-button Mui-disabled"
- classes={
- Object {
- "disabled": "Mui-disabled",
- "focusVisible": "Mui-focusVisible",
- "root": "MuiButtonBase-root",
- }
- }
component="button"
disabled={true}
focusRipple={true}
@@ -161,106 +147,106 @@ exports[`EcogestureFormSingleChoice component should be rendered correctly 1`] =
onClick={[Function]}
type="button"
>
- <button
+ <ForwardRef(ButtonBase)
aria-label="profile_type.accessibility.button_previous"
- className="MuiButtonBase-root MuiButton-root btn-profile-back MuiButton-text profile-navigation-button Mui-disabled Mui-disabled"
+ className="MuiButton-root btn-profile-back MuiButton-text profile-navigation-button Mui-disabled"
+ classes={
+ Object {
+ "disabled": "Mui-disabled",
+ "focusVisible": "Mui-focusVisible",
+ "root": "MuiButtonBase-root",
+ }
+ }
+ component="button"
disabled={true}
- onBlur={[Function]}
+ focusRipple={true}
+ focusVisibleClassName="Mui-focusVisible"
onClick={[Function]}
- onDragLeave={[Function]}
- onFocus={[Function]}
- onKeyDown={[Function]}
- onKeyUp={[Function]}
- onMouseDown={[Function]}
- onMouseLeave={[Function]}
- onMouseUp={[Function]}
- onTouchEnd={[Function]}
- onTouchMove={[Function]}
- onTouchStart={[Function]}
- tabIndex={-1}
type="button"
>
- <span
- className="MuiButton-label text-16-normal"
+ <button
+ aria-label="profile_type.accessibility.button_previous"
+ className="MuiButtonBase-root MuiButton-root btn-profile-back MuiButton-text profile-navigation-button Mui-disabled Mui-disabled"
+ disabled={true}
+ onBlur={[Function]}
+ onClick={[Function]}
+ onDragLeave={[Function]}
+ onFocus={[Function]}
+ onKeyDown={[Function]}
+ onKeyUp={[Function]}
+ onMouseDown={[Function]}
+ onMouseLeave={[Function]}
+ onMouseUp={[Function]}
+ onTouchEnd={[Function]}
+ onTouchMove={[Function]}
+ onTouchStart={[Function]}
+ tabIndex={-1}
+ type="button"
>
- < profile_type.form.button_previous
- </span>
- </button>
- </ForwardRef(ButtonBase)>
- </WithStyles(ForwardRef(ButtonBase))>
- </ForwardRef(Button)>
- </WithStyles(ForwardRef(Button))>
- <WithStyles(ForwardRef(Button))
- aria-label="profile_type.accessibility.button_next"
- className="profile-navigation-button disabled"
- classes={
- Object {
- "label": "text-16-normal",
- "root": "btn-profile-next rounded",
- }
- }
- disabled={true}
- onClick={[Function]}
- >
- <ForwardRef(Button)
+ <span
+ className="MuiButton-label text-16-normal"
+ >
+ < profile_type.form.button_previous
+ </span>
+ </button>
+ </ForwardRef(ButtonBase)>
+ </WithStyles(ForwardRef(ButtonBase))>
+ </ForwardRef(Button)>
+ </WithStyles(ForwardRef(Button))>
+ <WithStyles(ForwardRef(Button))
aria-label="profile_type.accessibility.button_next"
className="profile-navigation-button disabled"
classes={
Object {
- "colorInherit": "MuiButton-colorInherit",
- "contained": "MuiButton-contained",
- "containedPrimary": "MuiButton-containedPrimary",
- "containedSecondary": "MuiButton-containedSecondary",
- "containedSizeLarge": "MuiButton-containedSizeLarge",
- "containedSizeSmall": "MuiButton-containedSizeSmall",
- "disableElevation": "MuiButton-disableElevation",
- "disabled": "Mui-disabled",
- "endIcon": "MuiButton-endIcon",
- "focusVisible": "Mui-focusVisible",
- "fullWidth": "MuiButton-fullWidth",
- "iconSizeLarge": "MuiButton-iconSizeLarge",
- "iconSizeMedium": "MuiButton-iconSizeMedium",
- "iconSizeSmall": "MuiButton-iconSizeSmall",
- "label": "MuiButton-label text-16-normal",
- "outlined": "MuiButton-outlined",
- "outlinedPrimary": "MuiButton-outlinedPrimary",
- "outlinedSecondary": "MuiButton-outlinedSecondary",
- "outlinedSizeLarge": "MuiButton-outlinedSizeLarge",
- "outlinedSizeSmall": "MuiButton-outlinedSizeSmall",
- "root": "MuiButton-root btn-profile-next rounded",
- "sizeLarge": "MuiButton-sizeLarge",
- "sizeSmall": "MuiButton-sizeSmall",
- "startIcon": "MuiButton-startIcon",
- "text": "MuiButton-text",
- "textPrimary": "MuiButton-textPrimary",
- "textSecondary": "MuiButton-textSecondary",
- "textSizeLarge": "MuiButton-textSizeLarge",
- "textSizeSmall": "MuiButton-textSizeSmall",
+ "label": "text-16-normal",
+ "root": "btn-profile-next rounded",
}
}
disabled={true}
onClick={[Function]}
>
- <WithStyles(ForwardRef(ButtonBase))
+ <ForwardRef(Button)
aria-label="profile_type.accessibility.button_next"
- className="MuiButton-root btn-profile-next rounded MuiButton-text profile-navigation-button disabled Mui-disabled"
- component="button"
+ className="profile-navigation-button disabled"
+ classes={
+ Object {
+ "colorInherit": "MuiButton-colorInherit",
+ "contained": "MuiButton-contained",
+ "containedPrimary": "MuiButton-containedPrimary",
+ "containedSecondary": "MuiButton-containedSecondary",
+ "containedSizeLarge": "MuiButton-containedSizeLarge",
+ "containedSizeSmall": "MuiButton-containedSizeSmall",
+ "disableElevation": "MuiButton-disableElevation",
+ "disabled": "Mui-disabled",
+ "endIcon": "MuiButton-endIcon",
+ "focusVisible": "Mui-focusVisible",
+ "fullWidth": "MuiButton-fullWidth",
+ "iconSizeLarge": "MuiButton-iconSizeLarge",
+ "iconSizeMedium": "MuiButton-iconSizeMedium",
+ "iconSizeSmall": "MuiButton-iconSizeSmall",
+ "label": "MuiButton-label text-16-normal",
+ "outlined": "MuiButton-outlined",
+ "outlinedPrimary": "MuiButton-outlinedPrimary",
+ "outlinedSecondary": "MuiButton-outlinedSecondary",
+ "outlinedSizeLarge": "MuiButton-outlinedSizeLarge",
+ "outlinedSizeSmall": "MuiButton-outlinedSizeSmall",
+ "root": "MuiButton-root btn-profile-next rounded",
+ "sizeLarge": "MuiButton-sizeLarge",
+ "sizeSmall": "MuiButton-sizeSmall",
+ "startIcon": "MuiButton-startIcon",
+ "text": "MuiButton-text",
+ "textPrimary": "MuiButton-textPrimary",
+ "textSecondary": "MuiButton-textSecondary",
+ "textSizeLarge": "MuiButton-textSizeLarge",
+ "textSizeSmall": "MuiButton-textSizeSmall",
+ }
+ }
disabled={true}
- focusRipple={true}
- focusVisibleClassName="Mui-focusVisible"
onClick={[Function]}
- type="button"
>
- <ForwardRef(ButtonBase)
+ <WithStyles(ForwardRef(ButtonBase))
aria-label="profile_type.accessibility.button_next"
className="MuiButton-root btn-profile-next rounded MuiButton-text profile-navigation-button disabled Mui-disabled"
- classes={
- Object {
- "disabled": "Mui-disabled",
- "focusVisible": "Mui-focusVisible",
- "root": "MuiButtonBase-root",
- }
- }
component="button"
disabled={true}
focusRipple={true}
@@ -268,37 +254,55 @@ exports[`EcogestureFormSingleChoice component should be rendered correctly 1`] =
onClick={[Function]}
type="button"
>
- <button
+ <ForwardRef(ButtonBase)
aria-label="profile_type.accessibility.button_next"
- className="MuiButtonBase-root MuiButton-root btn-profile-next rounded MuiButton-text profile-navigation-button disabled Mui-disabled Mui-disabled"
+ className="MuiButton-root btn-profile-next rounded MuiButton-text profile-navigation-button disabled Mui-disabled"
+ classes={
+ Object {
+ "disabled": "Mui-disabled",
+ "focusVisible": "Mui-focusVisible",
+ "root": "MuiButtonBase-root",
+ }
+ }
+ component="button"
disabled={true}
- onBlur={[Function]}
+ focusRipple={true}
+ focusVisibleClassName="Mui-focusVisible"
onClick={[Function]}
- onDragLeave={[Function]}
- onFocus={[Function]}
- onKeyDown={[Function]}
- onKeyUp={[Function]}
- onMouseDown={[Function]}
- onMouseLeave={[Function]}
- onMouseUp={[Function]}
- onTouchEnd={[Function]}
- onTouchMove={[Function]}
- onTouchStart={[Function]}
- tabIndex={-1}
type="button"
>
- <span
- className="MuiButton-label text-16-normal"
+ <button
+ aria-label="profile_type.accessibility.button_next"
+ className="MuiButtonBase-root MuiButton-root btn-profile-next rounded MuiButton-text profile-navigation-button disabled Mui-disabled Mui-disabled"
+ disabled={true}
+ onBlur={[Function]}
+ onClick={[Function]}
+ onDragLeave={[Function]}
+ onFocus={[Function]}
+ onKeyDown={[Function]}
+ onKeyUp={[Function]}
+ onMouseDown={[Function]}
+ onMouseLeave={[Function]}
+ onMouseUp={[Function]}
+ onTouchEnd={[Function]}
+ onTouchMove={[Function]}
+ onTouchStart={[Function]}
+ tabIndex={-1}
+ type="button"
>
- profile_type.form.button_next >
- </span>
- </button>
- </ForwardRef(ButtonBase)>
- </WithStyles(ForwardRef(ButtonBase))>
- </ForwardRef(Button)>
- </WithStyles(ForwardRef(Button))>
- </div>
- </FormNavigation>
+ <span
+ className="MuiButton-label text-16-normal"
+ >
+ profile_type.form.button_next >
+ </span>
+ </button>
+ </ForwardRef(ButtonBase)>
+ </WithStyles(ForwardRef(ButtonBase))>
+ </ForwardRef(Button)>
+ </WithStyles(ForwardRef(Button))>
+ </div>
+ </FormNavigation>
+ </div>
</EcogestureFormSingleChoice>
</Provider>
`;
diff --git a/src/components/EcogestureForm/__snapshots__/EcogestureFormView.spec.tsx.snap b/src/components/EcogestureForm/__snapshots__/EcogestureFormView.spec.tsx.snap
index 0131c2279051f855f416ec56631295bdf0ebd3c0..d78f1cad36378b99e9a2b55b214520880e3bb6e4 100644
--- a/src/components/EcogestureForm/__snapshots__/EcogestureFormView.spec.tsx.snap
+++ b/src/components/EcogestureForm/__snapshots__/EcogestureFormView.spec.tsx.snap
@@ -49,122 +49,108 @@ exports[`EcogestureFormView component should be rendered correctly 1`] = `
viewedStep={-1}
>
<div
- className="profile-form-container ecogesture-form-single"
+ className="ecogesture-profile-container"
>
<div
- className="profile-question-label"
+ className="profile-form-container ecogesture-form-single"
>
- ecogesture_form.heating_type.question
+ <div
+ className="profile-question-label"
+ >
+ ecogesture_form.heating_type.question
+ </div>
+ <label
+ className="radio_short"
+ key="0"
+ >
+ <input
+ checked={false}
+ className=""
+ name="individual"
+ onChange={[Function]}
+ type="radio"
+ value="individual"
+ />
+ ecogesture_form.heating_type.individual
+ </label>
+ <label
+ className="radio_short"
+ key="1"
+ >
+ <input
+ checked={false}
+ className=""
+ name="collective"
+ onChange={[Function]}
+ type="radio"
+ value="collective"
+ />
+ ecogesture_form.heating_type.collective
+ </label>
</div>
- <label
- className="radio_short"
- key="0"
- >
- <input
- checked={false}
- className=""
- name="individual"
- onChange={[Function]}
- type="radio"
- value="individual"
- />
- ecogesture_form.heating_type.individual
- </label>
- <label
- className="radio_short"
- key="1"
- >
- <input
- checked={false}
- className=""
- name="collective"
- onChange={[Function]}
- type="radio"
- value="collective"
- />
- ecogesture_form.heating_type.collective
- </label>
- </div>
- <FormNavigation
- disableNextButton={true}
- handleNext={[Function]}
- handlePrevious={[Function]}
- step={0}
- >
- <div
- className="profile-navigation"
+ <FormNavigation
+ disableNextButton={true}
+ handleNext={[Function]}
+ handlePrevious={[Function]}
+ step={0}
>
- <WithStyles(ForwardRef(Button))
- aria-label="profile_type.accessibility.button_previous"
- className="profile-navigation-button"
- classes={
- Object {
- "label": "text-16-normal",
- "root": "btn-profile-back",
- }
- }
- disabled={true}
- onClick={[Function]}
+ <div
+ className="profile-navigation"
>
- <ForwardRef(Button)
+ <WithStyles(ForwardRef(Button))
aria-label="profile_type.accessibility.button_previous"
className="profile-navigation-button"
classes={
Object {
- "colorInherit": "MuiButton-colorInherit",
- "contained": "MuiButton-contained",
- "containedPrimary": "MuiButton-containedPrimary",
- "containedSecondary": "MuiButton-containedSecondary",
- "containedSizeLarge": "MuiButton-containedSizeLarge",
- "containedSizeSmall": "MuiButton-containedSizeSmall",
- "disableElevation": "MuiButton-disableElevation",
- "disabled": "Mui-disabled",
- "endIcon": "MuiButton-endIcon",
- "focusVisible": "Mui-focusVisible",
- "fullWidth": "MuiButton-fullWidth",
- "iconSizeLarge": "MuiButton-iconSizeLarge",
- "iconSizeMedium": "MuiButton-iconSizeMedium",
- "iconSizeSmall": "MuiButton-iconSizeSmall",
- "label": "MuiButton-label text-16-normal",
- "outlined": "MuiButton-outlined",
- "outlinedPrimary": "MuiButton-outlinedPrimary",
- "outlinedSecondary": "MuiButton-outlinedSecondary",
- "outlinedSizeLarge": "MuiButton-outlinedSizeLarge",
- "outlinedSizeSmall": "MuiButton-outlinedSizeSmall",
- "root": "MuiButton-root btn-profile-back",
- "sizeLarge": "MuiButton-sizeLarge",
- "sizeSmall": "MuiButton-sizeSmall",
- "startIcon": "MuiButton-startIcon",
- "text": "MuiButton-text",
- "textPrimary": "MuiButton-textPrimary",
- "textSecondary": "MuiButton-textSecondary",
- "textSizeLarge": "MuiButton-textSizeLarge",
- "textSizeSmall": "MuiButton-textSizeSmall",
+ "label": "text-16-normal",
+ "root": "btn-profile-back",
}
}
disabled={true}
onClick={[Function]}
>
- <WithStyles(ForwardRef(ButtonBase))
+ <ForwardRef(Button)
aria-label="profile_type.accessibility.button_previous"
- className="MuiButton-root btn-profile-back MuiButton-text profile-navigation-button Mui-disabled"
- component="button"
+ className="profile-navigation-button"
+ classes={
+ Object {
+ "colorInherit": "MuiButton-colorInherit",
+ "contained": "MuiButton-contained",
+ "containedPrimary": "MuiButton-containedPrimary",
+ "containedSecondary": "MuiButton-containedSecondary",
+ "containedSizeLarge": "MuiButton-containedSizeLarge",
+ "containedSizeSmall": "MuiButton-containedSizeSmall",
+ "disableElevation": "MuiButton-disableElevation",
+ "disabled": "Mui-disabled",
+ "endIcon": "MuiButton-endIcon",
+ "focusVisible": "Mui-focusVisible",
+ "fullWidth": "MuiButton-fullWidth",
+ "iconSizeLarge": "MuiButton-iconSizeLarge",
+ "iconSizeMedium": "MuiButton-iconSizeMedium",
+ "iconSizeSmall": "MuiButton-iconSizeSmall",
+ "label": "MuiButton-label text-16-normal",
+ "outlined": "MuiButton-outlined",
+ "outlinedPrimary": "MuiButton-outlinedPrimary",
+ "outlinedSecondary": "MuiButton-outlinedSecondary",
+ "outlinedSizeLarge": "MuiButton-outlinedSizeLarge",
+ "outlinedSizeSmall": "MuiButton-outlinedSizeSmall",
+ "root": "MuiButton-root btn-profile-back",
+ "sizeLarge": "MuiButton-sizeLarge",
+ "sizeSmall": "MuiButton-sizeSmall",
+ "startIcon": "MuiButton-startIcon",
+ "text": "MuiButton-text",
+ "textPrimary": "MuiButton-textPrimary",
+ "textSecondary": "MuiButton-textSecondary",
+ "textSizeLarge": "MuiButton-textSizeLarge",
+ "textSizeSmall": "MuiButton-textSizeSmall",
+ }
+ }
disabled={true}
- focusRipple={true}
- focusVisibleClassName="Mui-focusVisible"
onClick={[Function]}
- type="button"
>
- <ForwardRef(ButtonBase)
+ <WithStyles(ForwardRef(ButtonBase))
aria-label="profile_type.accessibility.button_previous"
className="MuiButton-root btn-profile-back MuiButton-text profile-navigation-button Mui-disabled"
- classes={
- Object {
- "disabled": "Mui-disabled",
- "focusVisible": "Mui-focusVisible",
- "root": "MuiButtonBase-root",
- }
- }
component="button"
disabled={true}
focusRipple={true}
@@ -172,106 +158,106 @@ exports[`EcogestureFormView component should be rendered correctly 1`] = `
onClick={[Function]}
type="button"
>
- <button
+ <ForwardRef(ButtonBase)
aria-label="profile_type.accessibility.button_previous"
- className="MuiButtonBase-root MuiButton-root btn-profile-back MuiButton-text profile-navigation-button Mui-disabled Mui-disabled"
+ className="MuiButton-root btn-profile-back MuiButton-text profile-navigation-button Mui-disabled"
+ classes={
+ Object {
+ "disabled": "Mui-disabled",
+ "focusVisible": "Mui-focusVisible",
+ "root": "MuiButtonBase-root",
+ }
+ }
+ component="button"
disabled={true}
- onBlur={[Function]}
+ focusRipple={true}
+ focusVisibleClassName="Mui-focusVisible"
onClick={[Function]}
- onDragLeave={[Function]}
- onFocus={[Function]}
- onKeyDown={[Function]}
- onKeyUp={[Function]}
- onMouseDown={[Function]}
- onMouseLeave={[Function]}
- onMouseUp={[Function]}
- onTouchEnd={[Function]}
- onTouchMove={[Function]}
- onTouchStart={[Function]}
- tabIndex={-1}
type="button"
>
- <span
- className="MuiButton-label text-16-normal"
+ <button
+ aria-label="profile_type.accessibility.button_previous"
+ className="MuiButtonBase-root MuiButton-root btn-profile-back MuiButton-text profile-navigation-button Mui-disabled Mui-disabled"
+ disabled={true}
+ onBlur={[Function]}
+ onClick={[Function]}
+ onDragLeave={[Function]}
+ onFocus={[Function]}
+ onKeyDown={[Function]}
+ onKeyUp={[Function]}
+ onMouseDown={[Function]}
+ onMouseLeave={[Function]}
+ onMouseUp={[Function]}
+ onTouchEnd={[Function]}
+ onTouchMove={[Function]}
+ onTouchStart={[Function]}
+ tabIndex={-1}
+ type="button"
>
- < profile_type.form.button_previous
- </span>
- </button>
- </ForwardRef(ButtonBase)>
- </WithStyles(ForwardRef(ButtonBase))>
- </ForwardRef(Button)>
- </WithStyles(ForwardRef(Button))>
- <WithStyles(ForwardRef(Button))
- aria-label="profile_type.accessibility.button_next"
- className="profile-navigation-button disabled"
- classes={
- Object {
- "label": "text-16-normal",
- "root": "btn-profile-next rounded",
- }
- }
- disabled={true}
- onClick={[Function]}
- >
- <ForwardRef(Button)
+ <span
+ className="MuiButton-label text-16-normal"
+ >
+ < profile_type.form.button_previous
+ </span>
+ </button>
+ </ForwardRef(ButtonBase)>
+ </WithStyles(ForwardRef(ButtonBase))>
+ </ForwardRef(Button)>
+ </WithStyles(ForwardRef(Button))>
+ <WithStyles(ForwardRef(Button))
aria-label="profile_type.accessibility.button_next"
className="profile-navigation-button disabled"
classes={
Object {
- "colorInherit": "MuiButton-colorInherit",
- "contained": "MuiButton-contained",
- "containedPrimary": "MuiButton-containedPrimary",
- "containedSecondary": "MuiButton-containedSecondary",
- "containedSizeLarge": "MuiButton-containedSizeLarge",
- "containedSizeSmall": "MuiButton-containedSizeSmall",
- "disableElevation": "MuiButton-disableElevation",
- "disabled": "Mui-disabled",
- "endIcon": "MuiButton-endIcon",
- "focusVisible": "Mui-focusVisible",
- "fullWidth": "MuiButton-fullWidth",
- "iconSizeLarge": "MuiButton-iconSizeLarge",
- "iconSizeMedium": "MuiButton-iconSizeMedium",
- "iconSizeSmall": "MuiButton-iconSizeSmall",
- "label": "MuiButton-label text-16-normal",
- "outlined": "MuiButton-outlined",
- "outlinedPrimary": "MuiButton-outlinedPrimary",
- "outlinedSecondary": "MuiButton-outlinedSecondary",
- "outlinedSizeLarge": "MuiButton-outlinedSizeLarge",
- "outlinedSizeSmall": "MuiButton-outlinedSizeSmall",
- "root": "MuiButton-root btn-profile-next rounded",
- "sizeLarge": "MuiButton-sizeLarge",
- "sizeSmall": "MuiButton-sizeSmall",
- "startIcon": "MuiButton-startIcon",
- "text": "MuiButton-text",
- "textPrimary": "MuiButton-textPrimary",
- "textSecondary": "MuiButton-textSecondary",
- "textSizeLarge": "MuiButton-textSizeLarge",
- "textSizeSmall": "MuiButton-textSizeSmall",
+ "label": "text-16-normal",
+ "root": "btn-profile-next rounded",
}
}
disabled={true}
onClick={[Function]}
>
- <WithStyles(ForwardRef(ButtonBase))
+ <ForwardRef(Button)
aria-label="profile_type.accessibility.button_next"
- className="MuiButton-root btn-profile-next rounded MuiButton-text profile-navigation-button disabled Mui-disabled"
- component="button"
+ className="profile-navigation-button disabled"
+ classes={
+ Object {
+ "colorInherit": "MuiButton-colorInherit",
+ "contained": "MuiButton-contained",
+ "containedPrimary": "MuiButton-containedPrimary",
+ "containedSecondary": "MuiButton-containedSecondary",
+ "containedSizeLarge": "MuiButton-containedSizeLarge",
+ "containedSizeSmall": "MuiButton-containedSizeSmall",
+ "disableElevation": "MuiButton-disableElevation",
+ "disabled": "Mui-disabled",
+ "endIcon": "MuiButton-endIcon",
+ "focusVisible": "Mui-focusVisible",
+ "fullWidth": "MuiButton-fullWidth",
+ "iconSizeLarge": "MuiButton-iconSizeLarge",
+ "iconSizeMedium": "MuiButton-iconSizeMedium",
+ "iconSizeSmall": "MuiButton-iconSizeSmall",
+ "label": "MuiButton-label text-16-normal",
+ "outlined": "MuiButton-outlined",
+ "outlinedPrimary": "MuiButton-outlinedPrimary",
+ "outlinedSecondary": "MuiButton-outlinedSecondary",
+ "outlinedSizeLarge": "MuiButton-outlinedSizeLarge",
+ "outlinedSizeSmall": "MuiButton-outlinedSizeSmall",
+ "root": "MuiButton-root btn-profile-next rounded",
+ "sizeLarge": "MuiButton-sizeLarge",
+ "sizeSmall": "MuiButton-sizeSmall",
+ "startIcon": "MuiButton-startIcon",
+ "text": "MuiButton-text",
+ "textPrimary": "MuiButton-textPrimary",
+ "textSecondary": "MuiButton-textSecondary",
+ "textSizeLarge": "MuiButton-textSizeLarge",
+ "textSizeSmall": "MuiButton-textSizeSmall",
+ }
+ }
disabled={true}
- focusRipple={true}
- focusVisibleClassName="Mui-focusVisible"
onClick={[Function]}
- type="button"
>
- <ForwardRef(ButtonBase)
+ <WithStyles(ForwardRef(ButtonBase))
aria-label="profile_type.accessibility.button_next"
className="MuiButton-root btn-profile-next rounded MuiButton-text profile-navigation-button disabled Mui-disabled"
- classes={
- Object {
- "disabled": "Mui-disabled",
- "focusVisible": "Mui-focusVisible",
- "root": "MuiButtonBase-root",
- }
- }
component="button"
disabled={true}
focusRipple={true}
@@ -279,37 +265,55 @@ exports[`EcogestureFormView component should be rendered correctly 1`] = `
onClick={[Function]}
type="button"
>
- <button
+ <ForwardRef(ButtonBase)
aria-label="profile_type.accessibility.button_next"
- className="MuiButtonBase-root MuiButton-root btn-profile-next rounded MuiButton-text profile-navigation-button disabled Mui-disabled Mui-disabled"
+ className="MuiButton-root btn-profile-next rounded MuiButton-text profile-navigation-button disabled Mui-disabled"
+ classes={
+ Object {
+ "disabled": "Mui-disabled",
+ "focusVisible": "Mui-focusVisible",
+ "root": "MuiButtonBase-root",
+ }
+ }
+ component="button"
disabled={true}
- onBlur={[Function]}
+ focusRipple={true}
+ focusVisibleClassName="Mui-focusVisible"
onClick={[Function]}
- onDragLeave={[Function]}
- onFocus={[Function]}
- onKeyDown={[Function]}
- onKeyUp={[Function]}
- onMouseDown={[Function]}
- onMouseLeave={[Function]}
- onMouseUp={[Function]}
- onTouchEnd={[Function]}
- onTouchMove={[Function]}
- onTouchStart={[Function]}
- tabIndex={-1}
type="button"
>
- <span
- className="MuiButton-label text-16-normal"
+ <button
+ aria-label="profile_type.accessibility.button_next"
+ className="MuiButtonBase-root MuiButton-root btn-profile-next rounded MuiButton-text profile-navigation-button disabled Mui-disabled Mui-disabled"
+ disabled={true}
+ onBlur={[Function]}
+ onClick={[Function]}
+ onDragLeave={[Function]}
+ onFocus={[Function]}
+ onKeyDown={[Function]}
+ onKeyUp={[Function]}
+ onMouseDown={[Function]}
+ onMouseLeave={[Function]}
+ onMouseUp={[Function]}
+ onTouchEnd={[Function]}
+ onTouchMove={[Function]}
+ onTouchStart={[Function]}
+ tabIndex={-1}
+ type="button"
>
- profile_type.form.button_next >
- </span>
- </button>
- </ForwardRef(ButtonBase)>
- </WithStyles(ForwardRef(ButtonBase))>
- </ForwardRef(Button)>
- </WithStyles(ForwardRef(Button))>
- </div>
- </FormNavigation>
+ <span
+ className="MuiButton-label text-16-normal"
+ >
+ profile_type.form.button_next >
+ </span>
+ </button>
+ </ForwardRef(ButtonBase)>
+ </WithStyles(ForwardRef(ButtonBase))>
+ </ForwardRef(Button)>
+ </WithStyles(ForwardRef(Button))>
+ </div>
+ </FormNavigation>
+ </div>
</EcogestureFormSingleChoice>
</mock-content>
<mock-ecogesturelaunchmodal
diff --git a/src/components/EcogestureForm/__snapshots__/EquipmentIcon.spec.tsx.snap b/src/components/EcogestureForm/__snapshots__/EquipmentIcon.spec.tsx.snap
index 266d737b12bbcdb87bd4067315206cd40409946b..bded38e56adb198ea87f56117e6db48cec16285f 100644
--- a/src/components/EcogestureForm/__snapshots__/EquipmentIcon.spec.tsx.snap
+++ b/src/components/EcogestureForm/__snapshots__/EquipmentIcon.spec.tsx.snap
@@ -5,30 +5,34 @@ exports[`EcogestureFormSingleChoice component should be rendered correctly 1`] =
equipment="BOILER"
isChecked={false}
>
- <Icon
- className="equipmentIcon"
- icon=""
- size={80}
- spin={false}
+ <div
+ className=" equipment-icon-container"
>
- <Component
- className="equipmentIcon styles__icon___23x3R"
- height={80}
- style={Object {}}
- width={80}
+ <Icon
+ className="equipmentIcon "
+ icon=""
+ size={40}
+ spin={false}
>
- <svg
- className="equipmentIcon styles__icon___23x3R"
- height={80}
+ <Component
+ className="equipmentIcon styles__icon___23x3R"
+ height={40}
style={Object {}}
- width={80}
+ width={40}
>
- <use
- xlinkHref="#"
- />
- </svg>
- </Component>
- </Icon>
+ <svg
+ className="equipmentIcon styles__icon___23x3R"
+ height={40}
+ style={Object {}}
+ width={40}
+ >
+ <use
+ xlinkHref="#"
+ />
+ </svg>
+ </Component>
+ </Icon>
+ </div>
<div
className="text text-14-normal"
>
diff --git a/src/components/EcogestureForm/ecogestureFormEquipment.scss b/src/components/EcogestureForm/ecogestureFormEquipment.scss
index 4836e1a48cd9c6cf850876749895f0d46bd060a2..43fb2428905e3fbb448b1a4ff157159086d16fdb 100644
--- a/src/components/EcogestureForm/ecogestureFormEquipment.scss
+++ b/src/components/EcogestureForm/ecogestureFormEquipment.scss
@@ -36,12 +36,20 @@
input.item-eq {
display: none;
}
- .equipmentIcon {
+ .equipment-icon-container {
+ display: flex;
transition: all 200ms ease;
box-sizing: border-box;
+ flex-direction: column;
+ width: 80px;
+ height: 80px;
+ border-radius: 5px;
+ background-color: $grey-bright;
&.checked {
- border: solid 3px $gold-shadow;
- border-radius: 5px;
+ background-color: $gold-shadow;
+ }
+ .equipmentIcon {
+ margin: auto;
}
}
}
diff --git a/src/components/EcogestureForm/ecogestureFormSingleChoice.scss b/src/components/EcogestureForm/ecogestureFormSingleChoice.scss
index 66ea0d2b5afc838cd65cec37eefe3fcebd7a6c58..7f02b12bb22de03604d9dc6415ffbf6fd43a7174 100644
--- a/src/components/EcogestureForm/ecogestureFormSingleChoice.scss
+++ b/src/components/EcogestureForm/ecogestureFormSingleChoice.scss
@@ -1,6 +1,24 @@
-.ecogesture-form-single {
- color: #ffffff;
- margin: 1rem 1rem 3.5rem;
- width: auto;
- max-width: 90%;
+@import '../../styles/base/color';
+@import '../../styles/base/breakpoint';
+
+.ecogesture-profile-container {
+ position: relative;
+ height: 100%;
+ min-height: inherit;
+ display: flex;
+ justify-content: center;
+ .ecogesture-form-single {
+ width: 100%;
+ max-width: 53rem;
+ color: #ffffff;
+ margin: 1rem 1rem 3.5rem;
+ color: $white;
+ margin: 1rem 1rem 3.5rem;
+ @media (min-width: $width-tablet) {
+ margin: 1rem 1rem 0;
+ }
+ label {
+ cursor: pointer;
+ }
+ }
}
diff --git a/src/components/EcogestureSelection/EcogestureSelection.spec.tsx b/src/components/EcogestureSelection/EcogestureSelection.spec.tsx
new file mode 100644
index 0000000000000000000000000000000000000000..b35f91684674ab60d459358760efc27a96c4365c
--- /dev/null
+++ b/src/components/EcogestureSelection/EcogestureSelection.spec.tsx
@@ -0,0 +1,120 @@
+/* eslint-disable react/display-name */
+import React from 'react'
+import { mount } from 'enzyme'
+import { Provider } from 'react-redux'
+import {
+ createMockStore,
+ mockInitialEcolyoState,
+} from '../../../tests/__mocks__/store'
+import EcogestureSelection from './EcogestureSelection'
+import toJson from 'enzyme-to-json'
+import { ecogesturesData } from '../../../tests/__mocks__/ecogesturesData.mock'
+import { waitForComponentToPaint } from '../../../tests/__mocks__/testUtils'
+import mockClient from '../../../tests/__mocks__/client'
+
+jest.mock('cozy-ui/transpiled/react/I18n', () => {
+ return {
+ useI18n: jest.fn(() => {
+ return {
+ t: (str: string) => str,
+ }
+ }),
+ }
+})
+jest.mock('cozy-client', () => {
+ return {
+ useClient: jest.fn(() => {
+ return mockClient
+ }),
+ }
+})
+const mockHistoryGoBack = jest.fn()
+jest.mock('react-router-dom', () => ({
+ ...jest.requireActual('react-router-dom'),
+ useLocation: () => {
+ return {
+ search: '',
+ }
+ },
+ useHistory: () => ({
+ push: mockHistoryGoBack,
+ }),
+}))
+const mockGetEcogestureListByProfile = jest.fn()
+jest.mock('services/ecogesture.service', () => {
+ return jest.fn(() => {
+ return {
+ getEcogestureListByProfile: mockGetEcogestureListByProfile,
+ }
+ })
+})
+
+jest.mock('components/Header/CozyBar', () => 'mock-cozybar')
+jest.mock('components/Header/Header', () => 'mock-header')
+jest.mock('components/Content/Content', () => 'mock-content')
+jest.mock(
+ 'components/EcogestureSelection/EcogestureSelectionModal',
+ () => 'mock-ecogestureselectionmodal'
+)
+jest.mock(
+ 'components/EcogestureSelection/EcogestureSelectionDetail',
+ () => 'mock-ecogestureselectiondetail'
+)
+jest.mock(
+ 'components/EcogestureSelection/EcogestureSelectionRestart',
+ () => 'mock-ecogestureselectionrestart'
+)
+jest.mock(
+ 'components/EcogestureSelection/EcogestureSelectionEnd',
+ () => 'mock-ecogestureselectionend'
+)
+
+describe('EcogestureSelection component', () => {
+ // eslint-disable-next-line @typescript-eslint/no-explicit-any
+ let store: any
+ beforeEach(() => {
+ store = createMockStore(mockInitialEcolyoState)
+ mockGetEcogestureListByProfile.mockClear()
+ })
+
+ it('should be rendered correctly', async () => {
+ mockGetEcogestureListByProfile.mockResolvedValue([ecogesturesData[0]])
+ const wrapper = mount(
+ <Provider store={store}>
+ <EcogestureSelection />
+ </Provider>
+ )
+ await waitForComponentToPaint(wrapper)
+ expect(toJson(wrapper)).toMatchSnapshot()
+ })
+ it('should render with the EcogestureSelectionModal', async () => {
+ mockGetEcogestureListByProfile.mockResolvedValue([ecogesturesData[0]])
+ const wrapper = mount(
+ <Provider store={store}>
+ <EcogestureSelection />
+ </Provider>
+ )
+ await waitForComponentToPaint(wrapper)
+ expect(wrapper.find('mock-ecogestureselectionmodal').exists()).toBeTruthy()
+ })
+ it('should render with the EcogestureSelectionDetail', async () => {
+ mockGetEcogestureListByProfile.mockResolvedValue([ecogesturesData[0]])
+ const wrapper = mount(
+ <Provider store={store}>
+ <EcogestureSelection />
+ </Provider>
+ )
+ await waitForComponentToPaint(wrapper)
+ expect(wrapper.find('mock-ecogestureselectiondetail').exists()).toBeTruthy()
+ })
+ it('should render with the EcogestureSelectionEnd', async () => {
+ mockGetEcogestureListByProfile.mockResolvedValue([])
+ const wrapper = mount(
+ <Provider store={store}>
+ <EcogestureSelection />
+ </Provider>
+ )
+ await waitForComponentToPaint(wrapper)
+ expect(wrapper.find('mock-ecogestureselectionend').exists()).toBeTruthy()
+ })
+})
diff --git a/src/components/EcogestureSelection/EcogestureSelection.tsx b/src/components/EcogestureSelection/EcogestureSelection.tsx
new file mode 100644
index 0000000000000000000000000000000000000000..41e0db5e6610a7101a6e46bc17eb02f8426cf2c2
--- /dev/null
+++ b/src/components/EcogestureSelection/EcogestureSelection.tsx
@@ -0,0 +1,175 @@
+import React, { useCallback, useEffect, useMemo, useState } from 'react'
+import './ecogestureSelection.scss'
+import { ProfileEcogesture } from 'models/profileEcogesture.model'
+import { useSelector } from 'react-redux'
+import { AppStore } from 'store'
+import { useClient } from 'cozy-client'
+import { useI18n } from 'cozy-ui/transpiled/react/I18n'
+import { Ecogesture } from 'models'
+import CozyBar from 'components/Header/CozyBar'
+import Header from 'components/Header/Header'
+import Content from 'components/Content/Content'
+import EcogestureService from 'services/ecogesture.service'
+import EcogestureSelectionModal from 'components/EcogestureSelection/EcogestureSelectionModal'
+import EcogestureSelectionDetail from 'components/EcogestureSelection/EcogestureSelectionDetail'
+import EcogestureSelectionRestart from 'components/EcogestureSelection/EcogestureSelectionRestart'
+import EcogestureSelectionEnd from 'components/EcogestureSelection/EcogestureSelectionEnd'
+import StyledSpinner from 'components/CommonKit/Spinner/StyledSpinner'
+import { FluidType } from 'enum/fluid.enum'
+
+const EcogestureSelection: React.FC = () => {
+ const { t } = useI18n()
+ const client = useClient()
+ const [isLoading, setIsLoading] = useState(true)
+ const [headerHeight, setHeaderHeight] = useState<number>(0)
+ const [indexEcogesture, setIndexEcogesture] = useState<number>(0)
+ const [ecogestureList, setEcogestureList] = useState<Ecogesture[]>([])
+ const [totalViewed, setTotalViewed] = useState<number>(0)
+ const [totalAvailable, setTotalAvailable] = useState<number>(0)
+ const [
+ openEcogestureSelectionModal,
+ setOpenEcogestureSelectionModal,
+ ] = useState(false)
+
+ const defineHeaderHeight = useCallback((height: number) => {
+ setHeaderHeight(height)
+ }, [])
+
+ const ecogestureService = useMemo(() => new EcogestureService(client), [
+ client,
+ ])
+ const profileEcogesture: ProfileEcogesture = useSelector(
+ (state: AppStore) => state.ecolyo.profileEcogesture
+ )
+
+ const getTitle = useCallback((): string => {
+ if (
+ indexEcogesture <= ecogestureList.length - 1 &&
+ ecogestureList[indexEcogesture]
+ ) {
+ return ecogestureList[indexEcogesture].shortName
+ }
+ return t('ecogesture_selection.header')
+ }, [ecogestureList, indexEcogesture, t])
+
+ const validateChoice = useCallback(
+ async (objective: boolean, doing: boolean) => {
+ const updatedEcogesture: Ecogesture = await ecogestureService.updateEcogesture(
+ {
+ ...ecogestureList[indexEcogesture],
+ objective: objective,
+ doing: doing,
+ viewedInSelection: true,
+ }
+ )
+ const updatedList: Ecogesture[] = ecogestureList
+ updatedList[indexEcogesture] = updatedEcogesture
+ setEcogestureList(updatedList)
+ setIndexEcogesture(prev => prev + 1)
+ },
+ [ecogestureList, ecogestureService, indexEcogesture]
+ )
+
+ const restartSelection = useCallback(async () => {
+ setIsLoading(true)
+ const availableList: Ecogesture[] = await ecogestureService.getEcogestureListByProfile(
+ profileEcogesture
+ )
+ const filteredList: Ecogesture[] = availableList.filter(
+ (ecogesture: Ecogesture) => ecogesture.viewedInSelection === false
+ )
+ const slicedFilteredList = filteredList.slice(0, 10)
+ setTotalViewed(availableList.length - filteredList.length)
+ setEcogestureList(slicedFilteredList)
+ setIndexEcogesture(0)
+ setIsLoading(false)
+ }, [ecogestureService, profileEcogesture])
+
+ useEffect(() => {
+ let subscribed = true
+ async function getFilteredList() {
+ const availableList: Ecogesture[] = await ecogestureService.getEcogestureListByProfile(
+ profileEcogesture
+ )
+ const filteredList: Ecogesture[] = availableList.filter(
+ (ecogesture: Ecogesture) => ecogesture.viewedInSelection === false
+ )
+ const slicedFilteredList = filteredList.slice(0, 10)
+ if (subscribed) {
+ if (
+ availableList.length === filteredList.length &&
+ slicedFilteredList.length > 0
+ ) {
+ setOpenEcogestureSelectionModal(true)
+ }
+ setTotalAvailable(availableList.length)
+ setTotalViewed(availableList.length - filteredList.length)
+ setEcogestureList(slicedFilteredList)
+ setIndexEcogesture(0)
+ setIsLoading(false)
+ }
+ }
+ getFilteredList()
+ return () => {
+ subscribed = false
+ }
+ }, [ecogestureService, profileEcogesture])
+
+ if (isLoading) {
+ return (
+ <Content height={headerHeight}>
+ <div className="eg-selection-loader">
+ <StyledSpinner size="5em" fluidType={FluidType.MULTIFLUID} />
+ </div>
+ </Content>
+ )
+ }
+
+ return (
+ <>
+ <CozyBar
+ titleKey={getTitle()}
+ isNotKey={true}
+ displayBackArrow={indexEcogesture === 0 ? false : true}
+ backFunction={() => setIndexEcogesture(prev => prev - 1)}
+ />
+ <Header
+ setHeaderHeight={defineHeaderHeight}
+ desktopTitleKey={getTitle()}
+ displayBackArrow={indexEcogesture === 0 ? false : true}
+ isNotKey={true}
+ backFunction={() => setIndexEcogesture(prev => prev - 1)}
+ >
+ <div className="eg-selection-header">
+ {indexEcogesture <= ecogestureList.length - 1
+ ? `${totalViewed + indexEcogesture + 1}/${totalViewed +
+ ecogestureList.length}`
+ : ''}
+ </div>
+ </Header>
+ <Content height={headerHeight}>
+ {indexEcogesture <= ecogestureList.length - 1 ? (
+ <EcogestureSelectionDetail
+ ecogesture={ecogestureList[indexEcogesture]}
+ validate={validateChoice}
+ />
+ ) : totalAvailable > totalViewed + ecogestureList.length ? (
+ <EcogestureSelectionRestart
+ listLength={ecogestureList.length}
+ restart={restartSelection}
+ />
+ ) : (
+ <EcogestureSelectionEnd />
+ )}
+ </Content>
+ {openEcogestureSelectionModal && (
+ <EcogestureSelectionModal
+ open={openEcogestureSelectionModal}
+ handleCloseClick={() => setOpenEcogestureSelectionModal(false)}
+ />
+ )}
+ </>
+ )
+}
+
+export default EcogestureSelection
diff --git a/src/components/EcogestureSelection/EcogestureSelectionDetail.spec.tsx b/src/components/EcogestureSelection/EcogestureSelectionDetail.spec.tsx
new file mode 100644
index 0000000000000000000000000000000000000000..73075d03ba3a7864e6656e41eb7440d061da4124
--- /dev/null
+++ b/src/components/EcogestureSelection/EcogestureSelectionDetail.spec.tsx
@@ -0,0 +1,93 @@
+import React from 'react'
+import { mount } from 'enzyme'
+import toJson from 'enzyme-to-json'
+import { Button } from '@material-ui/core'
+import EcogestureSelectionDetail from './EcogestureSelectionDetail'
+import { waitForComponentToPaint } from '../../../tests/__mocks__/testUtils'
+import { ecogesturesData } from '../../../tests/__mocks__/ecogesturesData.mock'
+
+jest.mock('cozy-ui/transpiled/react/I18n', () => {
+ return {
+ useI18n: jest.fn(() => {
+ return {
+ t: (str: string) => str,
+ }
+ }),
+ }
+})
+const mockImportIconbyId = jest.fn()
+jest.mock('utils/utils', () => {
+ return {
+ importIconbyId: jest.fn(() => {
+ return mockImportIconbyId
+ }),
+ }
+})
+const mockValidate = jest.fn()
+
+describe('EcogestureSelectionDetail component', () => {
+ beforeEach(() => {
+ mockImportIconbyId.mockClear()
+ mockValidate.mockClear()
+ })
+
+ it('should be rendered correctly', async () => {
+ mockImportIconbyId.mockReturnValueOnce('testIcon')
+ const wrapper = mount(
+ <EcogestureSelectionDetail
+ ecogesture={ecogesturesData[0]}
+ validate={mockValidate}
+ />
+ )
+ await waitForComponentToPaint(wrapper)
+ expect(toJson(wrapper)).toMatchSnapshot()
+ })
+
+ it('should call validate with objective to true', async () => {
+ mockImportIconbyId.mockReturnValueOnce('testIcon')
+ const wrapper = mount(
+ <EcogestureSelectionDetail
+ ecogesture={ecogesturesData[0]}
+ validate={mockValidate}
+ />
+ )
+ wrapper
+ .find(Button)
+ .at(0)
+ .simulate('click')
+ await waitForComponentToPaint(wrapper)
+ expect(mockValidate).toHaveBeenCalledWith(true, false)
+ })
+
+ it('should call validate with doing to true', async () => {
+ mockImportIconbyId.mockReturnValueOnce('testIcon')
+ const wrapper = mount(
+ <EcogestureSelectionDetail
+ ecogesture={ecogesturesData[0]}
+ validate={mockValidate}
+ />
+ )
+ wrapper
+ .find(Button)
+ .at(1)
+ .simulate('click')
+ await waitForComponentToPaint(wrapper)
+ expect(mockValidate).toHaveBeenCalledWith(false, true)
+ })
+
+ it('should call validate with objective and doing to false', async () => {
+ mockImportIconbyId.mockReturnValueOnce('testIcon')
+ const wrapper = mount(
+ <EcogestureSelectionDetail
+ ecogesture={ecogesturesData[0]}
+ validate={mockValidate}
+ />
+ )
+ wrapper
+ .find(Button)
+ .at(2)
+ .simulate('click')
+ await waitForComponentToPaint(wrapper)
+ expect(mockValidate).toHaveBeenCalledWith(false, false)
+ })
+})
diff --git a/src/components/EcogestureSelection/EcogestureSelectionDetail.tsx b/src/components/EcogestureSelection/EcogestureSelectionDetail.tsx
new file mode 100644
index 0000000000000000000000000000000000000000..055a3402acc7a20affe9c2c2ec7d0ceebc8716c9
--- /dev/null
+++ b/src/components/EcogestureSelection/EcogestureSelectionDetail.tsx
@@ -0,0 +1,88 @@
+import React, { useEffect, useState } from 'react'
+import './ecogestureSelectionDetail.scss'
+import StyledIcon from 'components/CommonKit/Icon/StyledIcon'
+import { Button } from '@material-ui/core'
+import { useI18n } from 'cozy-ui/transpiled/react/I18n'
+import { Ecogesture } from 'models'
+import objectiveIcon from 'assets/icons/ico/objective-enabled.svg'
+import doingIcon from 'assets/icons/ico/doing-enabled.svg'
+import skipIcon from 'assets/icons/ico/skip-enabled.svg'
+import defaultIcon from 'assets/icons/visu/ecogesture/default.svg'
+import { importIconbyId } from 'utils/utils'
+
+interface EcogestureSelectionDetailProps {
+ ecogesture: Ecogesture
+ validate: (objective: boolean, doing: boolean) => void
+}
+
+const EcogestureSelectionDetail: React.FC<EcogestureSelectionDetailProps> = ({
+ ecogesture,
+ validate,
+}: EcogestureSelectionDetailProps) => {
+ const { t } = useI18n()
+ const [ecogestureIcon, setEcogestureIcon] = useState<string>('')
+
+ useEffect(() => {
+ let subscribed = true
+ async function getIcon() {
+ const _icon = await importIconbyId(ecogesture.id, 'ecogesture')
+ if (subscribed) {
+ if (_icon) {
+ setEcogestureIcon(_icon)
+ } else {
+ setEcogestureIcon(defaultIcon)
+ }
+ }
+ }
+ getIcon()
+ return () => {
+ subscribed = false
+ }
+ }, [ecogesture.id])
+
+ return (
+ <div className="eg-selection-detail-container">
+ <div className="content">
+ <StyledIcon className="icon" icon={ecogestureIcon} size={240} />
+ <div className="text text-16-normal">{ecogesture.longName}</div>
+ </div>
+ <div className="buttons">
+ <Button
+ aria-label={t('ecogesture_selection.button_objective')}
+ classes={{
+ root: 'btn-secondary-negative',
+ label: 'text-14-bold',
+ }}
+ onClick={() => validate(true, false)}
+ >
+ <StyledIcon icon={objectiveIcon} size={60} />
+ {t('ecogesture_selection.button_objective')}
+ </Button>
+ <Button
+ aria-label={t('ecogesture_selection.button_doing')}
+ classes={{
+ root: 'btn-secondary-negative',
+ label: 'text-14-bold',
+ }}
+ onClick={() => validate(false, true)}
+ >
+ <StyledIcon icon={doingIcon} size={60} />
+ {t('ecogesture_selection.button_doing')}
+ </Button>
+ <Button
+ aria-label={t('ecogesture_selection.button_skip')}
+ classes={{
+ root: 'btn-secondary-negative',
+ label: 'text-14-bold',
+ }}
+ onClick={() => validate(false, false)}
+ >
+ <StyledIcon icon={skipIcon} size={60} />
+ {t('ecogesture_selection.button_skip')}
+ </Button>
+ </div>
+ </div>
+ )
+}
+
+export default EcogestureSelectionDetail
diff --git a/src/components/EcogestureSelection/EcogestureSelectionEnd.spec.tsx b/src/components/EcogestureSelection/EcogestureSelectionEnd.spec.tsx
new file mode 100644
index 0000000000000000000000000000000000000000..75cd2b7b020a6a578e5ca544c567e6601a57340f
--- /dev/null
+++ b/src/components/EcogestureSelection/EcogestureSelectionEnd.spec.tsx
@@ -0,0 +1,39 @@
+import React from 'react'
+import { mount } from 'enzyme'
+import toJson from 'enzyme-to-json'
+import EcogestureSelectionEnd from './EcogestureSelectionEnd'
+import { Button } from '@material-ui/core'
+
+jest.mock('cozy-ui/transpiled/react/I18n', () => {
+ return {
+ useI18n: jest.fn(() => {
+ return {
+ t: (str: string) => str,
+ }
+ }),
+ }
+})
+const mockHistoryPush = jest.fn()
+jest.mock('react-router-dom', () => ({
+ ...jest.requireActual('react-router-dom'),
+ useHistory: () => ({
+ push: mockHistoryPush,
+ }),
+}))
+
+describe('EcogestureSelectionEnd component', () => {
+ beforeEach(() => {
+ mockHistoryPush.mockClear()
+ })
+
+ it('should be rendered correctly', () => {
+ const wrapper = mount(<EcogestureSelectionEnd />)
+ expect(toJson(wrapper)).toMatchSnapshot()
+ })
+
+ it('should close modal and update profile', () => {
+ const wrapper = mount(<EcogestureSelectionEnd />)
+ wrapper.find(Button).simulate('click')
+ expect(mockHistoryPush).toHaveBeenCalledWith('/ecogestures?tab=0')
+ })
+})
diff --git a/src/components/EcogestureSelection/EcogestureSelectionEnd.tsx b/src/components/EcogestureSelection/EcogestureSelectionEnd.tsx
new file mode 100644
index 0000000000000000000000000000000000000000..13a515bc70c3dda147ad62af835f1f2c7bc3418e
--- /dev/null
+++ b/src/components/EcogestureSelection/EcogestureSelectionEnd.tsx
@@ -0,0 +1,46 @@
+import React, { useCallback } from 'react'
+import './ecogestureSelectionEnd.scss'
+import { useHistory } from 'react-router-dom'
+import StyledIcon from 'components/CommonKit/Icon/StyledIcon'
+import icon from 'assets/icons/visu/profileType/finish.svg'
+import { Button } from '@material-ui/core'
+import { useI18n } from 'cozy-ui/transpiled/react/I18n'
+
+const EcogestureSelectionEnd: React.FC = () => {
+ const { t } = useI18n()
+ const history = useHistory()
+
+ const goToObjectives = useCallback(() => {
+ history.push('/ecogestures?tab=0')
+ }, [history])
+ return (
+ <div className="eg-selection-end-container">
+ <div className="content">
+ <div className="title text-21-bold">
+ {t('ecogesture_selection.title_final')}
+ </div>
+ <StyledIcon icon={icon} size={120} />
+ <div className="text text-16-normal">
+ {t('ecogesture_selection.text_final_1')}
+ </div>
+ <div className="text text-16-normal">
+ {t('ecogesture_selection.text_final_2')}
+ </div>
+ </div>
+ <div className="buttons">
+ <Button
+ aria-label={t('ecogesture_selection.accessibility.button_ok')}
+ classes={{
+ root: 'btn-highlight',
+ label: 'text-16-bold',
+ }}
+ onClick={goToObjectives}
+ >
+ {t('ecogesture_selection.button_ok')}
+ </Button>
+ </div>
+ </div>
+ )
+}
+
+export default EcogestureSelectionEnd
diff --git a/src/components/EcogestureSelection/EcogestureSelectionModal.spec.tsx b/src/components/EcogestureSelection/EcogestureSelectionModal.spec.tsx
new file mode 100644
index 0000000000000000000000000000000000000000..27b1073dd4d645fca3bc29754fe5eaefdb03fda9
--- /dev/null
+++ b/src/components/EcogestureSelection/EcogestureSelectionModal.spec.tsx
@@ -0,0 +1,39 @@
+import React from 'react'
+import { mount } from 'enzyme'
+import toJson from 'enzyme-to-json'
+import EcogestureSelectionModal from './EcogestureSelectionModal'
+import { Button } from '@material-ui/core'
+
+jest.mock('cozy-ui/transpiled/react/I18n', () => {
+ return {
+ useI18n: jest.fn(() => {
+ return {
+ t: (str: string) => str,
+ }
+ }),
+ }
+})
+
+const mockHandleClose = jest.fn()
+describe('EcogestureInitModal component', () => {
+ it('should be rendered correctly', () => {
+ const wrapper = mount(
+ <EcogestureSelectionModal
+ open={true}
+ handleCloseClick={mockHandleClose}
+ />
+ )
+ expect(toJson(wrapper)).toMatchSnapshot()
+ })
+
+ it('should close modal and update profile', async () => {
+ const wrapper = mount(
+ <EcogestureSelectionModal
+ open={true}
+ handleCloseClick={mockHandleClose}
+ />
+ )
+ wrapper.find(Button).simulate('click')
+ expect(mockHandleClose).toHaveBeenCalledTimes(1)
+ })
+})
diff --git a/src/components/EcogestureSelection/EcogestureSelectionModal.tsx b/src/components/EcogestureSelection/EcogestureSelectionModal.tsx
new file mode 100644
index 0000000000000000000000000000000000000000..81990d9a416ef9422c4988835147792688ae8829
--- /dev/null
+++ b/src/components/EcogestureSelection/EcogestureSelectionModal.tsx
@@ -0,0 +1,62 @@
+import React from 'react'
+import Dialog from '@material-ui/core/Dialog'
+import { Button, IconButton } from '@material-ui/core'
+import Icon from 'cozy-ui/transpiled/react/Icon'
+import { useI18n } from 'cozy-ui/transpiled/react/I18n'
+import CloseIcon from 'assets/icons/ico/close.svg'
+import './ecogestureSelectionModal.scss'
+
+interface EcogestureSelectionModalProps {
+ open: boolean
+ handleCloseClick: () => void
+}
+
+const EcogestureSelectionModal: React.FC<EcogestureSelectionModalProps> = ({
+ open,
+ handleCloseClick,
+}: EcogestureSelectionModalProps) => {
+ const { t } = useI18n()
+
+ return (
+ <Dialog
+ open={open}
+ onClose={handleCloseClick}
+ aria-labelledby={'accessibility-title'}
+ classes={{
+ root: 'modal-root',
+ paper: 'modal-paper',
+ }}
+ >
+ <div id={'accessibility-title'}>
+ {t('ecogesture_selection.accessibility.window_title')}
+ </div>
+ <IconButton
+ aria-label={t('ecogesture_selection.accessibility.button_close')}
+ className="modal-paper-close-button"
+ onClick={handleCloseClick}
+ >
+ <Icon icon={CloseIcon} size={16} />
+ </IconButton>
+ <div className="eg-selection-modal">
+ <div className="title text-20-bold">
+ {t('ecogesture_selection.selectionModal.title')}
+ </div>
+ <div className="text text-16-normal">
+ {t('ecogesture_selection.selectionModal.text')}
+ </div>
+ <Button
+ aria-label={t('ecogesture_selection.selectionModal.button_close')}
+ onClick={handleCloseClick}
+ classes={{
+ root: 'btn-highlight',
+ label: 'text-16-bold',
+ }}
+ >
+ {t('ecogesture_selection.selectionModal.button_close')}
+ </Button>
+ </div>
+ </Dialog>
+ )
+}
+
+export default EcogestureSelectionModal
diff --git a/src/components/EcogestureSelection/EcogestureSelectionRestart.spec.tsx b/src/components/EcogestureSelection/EcogestureSelectionRestart.spec.tsx
new file mode 100644
index 0000000000000000000000000000000000000000..58b4685381bb323a08acf5c0f7511f03049e464d
--- /dev/null
+++ b/src/components/EcogestureSelection/EcogestureSelectionRestart.spec.tsx
@@ -0,0 +1,59 @@
+import React from 'react'
+import { mount } from 'enzyme'
+import toJson from 'enzyme-to-json'
+import EcogestureSelectionRestart from './EcogestureSelectionRestart'
+import { Button } from '@material-ui/core'
+
+jest.mock('cozy-ui/transpiled/react/I18n', () => {
+ return {
+ useI18n: jest.fn(() => {
+ return {
+ t: (str: string) => str,
+ }
+ }),
+ }
+})
+const mockHistoryPush = jest.fn()
+jest.mock('react-router-dom', () => ({
+ ...jest.requireActual('react-router-dom'),
+ useHistory: () => ({
+ push: mockHistoryPush,
+ }),
+}))
+const mockRestart = jest.fn()
+
+describe('EcogestureSelectionRestart component', () => {
+ beforeEach(() => {
+ mockHistoryPush.mockClear()
+ mockRestart.mockClear()
+ })
+
+ it('should be rendered correctly', () => {
+ const wrapper = mount(
+ <EcogestureSelectionRestart listLength={10} restart={mockRestart} />
+ )
+ expect(toJson(wrapper)).toMatchSnapshot()
+ })
+
+ it('should call go to the ecogesture view when user click on the button', () => {
+ const wrapper = mount(
+ <EcogestureSelectionRestart listLength={10} restart={mockRestart} />
+ )
+ wrapper
+ .find(Button)
+ .at(0)
+ .simulate('click')
+ expect(mockHistoryPush).toHaveBeenCalledWith('/ecogestures?tab=0')
+ })
+
+ it('should call the restart when user click on the button', () => {
+ const wrapper = mount(
+ <EcogestureSelectionRestart listLength={10} restart={mockRestart} />
+ )
+ wrapper
+ .find(Button)
+ .at(1)
+ .simulate('click')
+ expect(mockRestart).toHaveBeenCalledTimes(1)
+ })
+})
diff --git a/src/components/EcogestureSelection/EcogestureSelectionRestart.tsx b/src/components/EcogestureSelection/EcogestureSelectionRestart.tsx
new file mode 100644
index 0000000000000000000000000000000000000000..e8058004449d08f5219e4fe420a27bb70afaf2ef
--- /dev/null
+++ b/src/components/EcogestureSelection/EcogestureSelectionRestart.tsx
@@ -0,0 +1,67 @@
+import React, { useCallback } from 'react'
+import './ecogestureSelectionRestart.scss'
+import { useHistory } from 'react-router-dom'
+import StyledIcon from 'components/CommonKit/Icon/StyledIcon'
+import icon from 'assets/icons/visu/ecogesture/ECOGESTURE0001.svg'
+import { Button } from '@material-ui/core'
+import { useI18n } from 'cozy-ui/transpiled/react/I18n'
+
+interface EcogestureSelectionRestartProps {
+ listLength: number
+ restart: () => void
+}
+
+const EcogestureSelectionRestart: React.FC<EcogestureSelectionRestartProps> = ({
+ listLength,
+ restart,
+}: EcogestureSelectionRestartProps) => {
+ const { t } = useI18n()
+ const history = useHistory()
+
+ const goToObjectives = useCallback(() => {
+ history.push('/ecogestures?tab=0')
+ }, [history])
+
+ return (
+ <div className="eg-selection-restart-container">
+ <div className="content">
+ <div className="title text-21-bold">
+ {t('ecogesture_selection.title', {
+ // eslint-disable-next-line @typescript-eslint/camelcase
+ smart_count: listLength,
+ })}
+ </div>
+ <StyledIcon icon={icon} size={120} />
+ <div className="text text-16-normal">
+ {t('ecogesture_selection.text')}
+ </div>
+ </div>
+ <div className="buttons">
+ <Button
+ aria-label={t(
+ 'ecogesture_selection.accessibility.button_go_to_ecogesture'
+ )}
+ classes={{
+ root: 'btn-secondary-negative',
+ label: 'text-16-normal',
+ }}
+ onClick={goToObjectives}
+ >
+ {t('ecogesture_selection.button_go_to_ecogesture')}
+ </Button>
+ <Button
+ aria-label={t('ecogesture_selection.accessibility.button_continue')}
+ classes={{
+ root: 'btn-highlight',
+ label: 'text-16-bold',
+ }}
+ onClick={restart}
+ >
+ {t('ecogesture_selection.button_continue')}
+ </Button>
+ </div>
+ </div>
+ )
+}
+
+export default EcogestureSelectionRestart
diff --git a/src/components/EcogestureSelection/__snapshots__/EcogestureSelection.spec.tsx.snap b/src/components/EcogestureSelection/__snapshots__/EcogestureSelection.spec.tsx.snap
new file mode 100644
index 0000000000000000000000000000000000000000..ff696014729bcae1956c5c2c931737879190cad4
--- /dev/null
+++ b/src/components/EcogestureSelection/__snapshots__/EcogestureSelection.spec.tsx.snap
@@ -0,0 +1,82 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`EcogestureSelection component should be rendered correctly 1`] = `
+<Provider
+ store={
+ Object {
+ "clearActions": [Function],
+ "dispatch": [Function],
+ "getActions": [Function],
+ "getState": [Function],
+ "replaceReducer": [Function],
+ "subscribe": [Function],
+ }
+ }
+>
+ <EcogestureSelection>
+ <mock-cozybar
+ backFunction={[Function]}
+ displayBackArrow={false}
+ isNotKey={true}
+ titleKey="Bonhomme de neige"
+ />
+ <mock-header
+ backFunction={[Function]}
+ desktopTitleKey="Bonhomme de neige"
+ displayBackArrow={false}
+ isNotKey={true}
+ setHeaderHeight={[Function]}
+ >
+ <div
+ className="eg-selection-header"
+ >
+ 1/1
+ </div>
+ </mock-header>
+ <mock-content
+ height={0}
+ >
+ <mock-ecogestureselectiondetail
+ ecogesture={
+ Object {
+ "_id": "ECOGESTURE001",
+ "_rev": "1-67f1ea36efdd892c96bf64a8943154cd",
+ "_type": "com.grandlyon.ecolyo.ecogesture",
+ "action": false,
+ "actionDuration": 3,
+ "actionName": null,
+ "difficulty": 1,
+ "doing": false,
+ "efficiency": 4,
+ "equipment": false,
+ "equipmentInstallation": true,
+ "equipmentType": Array [],
+ "fluidTypes": Array [
+ 0,
+ 2,
+ ],
+ "id": "ECOGESTURE001",
+ "impactLevel": 8,
+ "investment": null,
+ "longDescription": "On se demande parfois si cela vaut le coup de \\"couper le chauffage\\" quand on s’absente… dès qu’il s’agit d’un week-end la réponse est « oui sûrement » ! Attention cependant au retour à ne pas faire de la surchauffe ! L’idéal est bien évidemment de régler sa programmation pour que le chauffage se relance quelques heures avant votre retour…",
+ "longName": "Je baisse le chauffage en mode hors gel lorsque je m'absente plus de 2 jours.",
+ "objective": false,
+ "room": Array [
+ 0,
+ ],
+ "season": "Hiver",
+ "shortName": "Bonhomme de neige",
+ "usage": 1,
+ "viewedInSelection": false,
+ }
+ }
+ validate={[Function]}
+ />
+ </mock-content>
+ <mock-ecogestureselectionmodal
+ handleCloseClick={[Function]}
+ open={true}
+ />
+ </EcogestureSelection>
+</Provider>
+`;
diff --git a/src/components/EcogestureSelection/__snapshots__/EcogestureSelectionDetail.spec.tsx.snap b/src/components/EcogestureSelection/__snapshots__/EcogestureSelectionDetail.spec.tsx.snap
new file mode 100644
index 0000000000000000000000000000000000000000..04807f72f8a09f0e5297a783496455859fa7612a
--- /dev/null
+++ b/src/components/EcogestureSelection/__snapshots__/EcogestureSelectionDetail.spec.tsx.snap
@@ -0,0 +1,583 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`EcogestureSelectionDetail component should be rendered correctly 1`] = `
+<EcogestureSelectionDetail
+ ecogesture={
+ Object {
+ "_id": "ECOGESTURE001",
+ "_rev": "1-67f1ea36efdd892c96bf64a8943154cd",
+ "_type": "com.grandlyon.ecolyo.ecogesture",
+ "action": false,
+ "actionDuration": 3,
+ "actionName": null,
+ "difficulty": 1,
+ "doing": false,
+ "efficiency": 4,
+ "equipment": false,
+ "equipmentInstallation": true,
+ "equipmentType": Array [],
+ "fluidTypes": Array [
+ 0,
+ 2,
+ ],
+ "id": "ECOGESTURE001",
+ "impactLevel": 8,
+ "investment": null,
+ "longDescription": "On se demande parfois si cela vaut le coup de \\"couper le chauffage\\" quand on s’absente… dès qu’il s’agit d’un week-end la réponse est « oui sûrement » ! Attention cependant au retour à ne pas faire de la surchauffe ! L’idéal est bien évidemment de régler sa programmation pour que le chauffage se relance quelques heures avant votre retour…",
+ "longName": "Je baisse le chauffage en mode hors gel lorsque je m'absente plus de 2 jours.",
+ "objective": false,
+ "room": Array [
+ 0,
+ ],
+ "season": "Hiver",
+ "shortName": "Bonhomme de neige",
+ "usage": 1,
+ "viewedInSelection": false,
+ }
+ }
+ validate={[MockFunction]}
+>
+ <div
+ className="eg-selection-detail-container"
+ >
+ <div
+ className="content"
+ >
+ <StyledIcon
+ className="icon"
+ icon="testIcon"
+ size={240}
+ >
+ <Icon
+ aria-hidden={true}
+ className="icon"
+ icon="testIcon"
+ size={240}
+ spin={false}
+ >
+ <Component
+ aria-hidden={true}
+ className="icon styles__icon___23x3R"
+ height={240}
+ style={Object {}}
+ width={240}
+ >
+ <svg
+ aria-hidden={true}
+ className="icon styles__icon___23x3R"
+ height={240}
+ style={Object {}}
+ width={240}
+ >
+ <use
+ xlinkHref="#testIcon"
+ />
+ </svg>
+ </Component>
+ </Icon>
+ </StyledIcon>
+ <div
+ className="text text-16-normal"
+ >
+ Je baisse le chauffage en mode hors gel lorsque je m'absente plus de 2 jours.
+ </div>
+ </div>
+ <div
+ className="buttons"
+ >
+ <WithStyles(ForwardRef(Button))
+ aria-label="ecogesture_selection.button_objective"
+ classes={
+ Object {
+ "label": "text-14-bold",
+ "root": "btn-secondary-negative",
+ }
+ }
+ onClick={[Function]}
+ >
+ <ForwardRef(Button)
+ aria-label="ecogesture_selection.button_objective"
+ classes={
+ Object {
+ "colorInherit": "MuiButton-colorInherit",
+ "contained": "MuiButton-contained",
+ "containedPrimary": "MuiButton-containedPrimary",
+ "containedSecondary": "MuiButton-containedSecondary",
+ "containedSizeLarge": "MuiButton-containedSizeLarge",
+ "containedSizeSmall": "MuiButton-containedSizeSmall",
+ "disableElevation": "MuiButton-disableElevation",
+ "disabled": "Mui-disabled",
+ "endIcon": "MuiButton-endIcon",
+ "focusVisible": "Mui-focusVisible",
+ "fullWidth": "MuiButton-fullWidth",
+ "iconSizeLarge": "MuiButton-iconSizeLarge",
+ "iconSizeMedium": "MuiButton-iconSizeMedium",
+ "iconSizeSmall": "MuiButton-iconSizeSmall",
+ "label": "MuiButton-label text-14-bold",
+ "outlined": "MuiButton-outlined",
+ "outlinedPrimary": "MuiButton-outlinedPrimary",
+ "outlinedSecondary": "MuiButton-outlinedSecondary",
+ "outlinedSizeLarge": "MuiButton-outlinedSizeLarge",
+ "outlinedSizeSmall": "MuiButton-outlinedSizeSmall",
+ "root": "MuiButton-root btn-secondary-negative",
+ "sizeLarge": "MuiButton-sizeLarge",
+ "sizeSmall": "MuiButton-sizeSmall",
+ "startIcon": "MuiButton-startIcon",
+ "text": "MuiButton-text",
+ "textPrimary": "MuiButton-textPrimary",
+ "textSecondary": "MuiButton-textSecondary",
+ "textSizeLarge": "MuiButton-textSizeLarge",
+ "textSizeSmall": "MuiButton-textSizeSmall",
+ }
+ }
+ onClick={[Function]}
+ >
+ <WithStyles(ForwardRef(ButtonBase))
+ aria-label="ecogesture_selection.button_objective"
+ className="MuiButton-root btn-secondary-negative MuiButton-text"
+ component="button"
+ disabled={false}
+ focusRipple={true}
+ focusVisibleClassName="Mui-focusVisible"
+ onClick={[Function]}
+ type="button"
+ >
+ <ForwardRef(ButtonBase)
+ aria-label="ecogesture_selection.button_objective"
+ className="MuiButton-root btn-secondary-negative MuiButton-text"
+ classes={
+ Object {
+ "disabled": "Mui-disabled",
+ "focusVisible": "Mui-focusVisible",
+ "root": "MuiButtonBase-root",
+ }
+ }
+ component="button"
+ disabled={false}
+ focusRipple={true}
+ focusVisibleClassName="Mui-focusVisible"
+ onClick={[Function]}
+ type="button"
+ >
+ <button
+ aria-label="ecogesture_selection.button_objective"
+ className="MuiButtonBase-root MuiButton-root btn-secondary-negative MuiButton-text"
+ disabled={false}
+ onBlur={[Function]}
+ onClick={[Function]}
+ onDragLeave={[Function]}
+ onFocus={[Function]}
+ onKeyDown={[Function]}
+ onKeyUp={[Function]}
+ onMouseDown={[Function]}
+ onMouseLeave={[Function]}
+ onMouseUp={[Function]}
+ onTouchEnd={[Function]}
+ onTouchMove={[Function]}
+ onTouchStart={[Function]}
+ tabIndex={0}
+ type="button"
+ >
+ <span
+ className="MuiButton-label text-14-bold"
+ >
+ <StyledIcon
+ icon="test-file-stub"
+ size={60}
+ >
+ <Icon
+ aria-hidden={true}
+ icon="test-file-stub"
+ size={60}
+ spin={false}
+ >
+ <Component
+ aria-hidden={true}
+ className="styles__icon___23x3R"
+ height={60}
+ style={Object {}}
+ width={60}
+ >
+ <svg
+ aria-hidden={true}
+ className="styles__icon___23x3R"
+ height={60}
+ style={Object {}}
+ width={60}
+ >
+ <use
+ xlinkHref="#test-file-stub"
+ />
+ </svg>
+ </Component>
+ </Icon>
+ </StyledIcon>
+ ecogesture_selection.button_objective
+ </span>
+ <NoSsr>
+ <WithStyles(memo)
+ center={false}
+ >
+ <ForwardRef(TouchRipple)
+ center={false}
+ classes={
+ Object {
+ "child": "MuiTouchRipple-child",
+ "childLeaving": "MuiTouchRipple-childLeaving",
+ "childPulsate": "MuiTouchRipple-childPulsate",
+ "ripple": "MuiTouchRipple-ripple",
+ "ripplePulsate": "MuiTouchRipple-ripplePulsate",
+ "rippleVisible": "MuiTouchRipple-rippleVisible",
+ "root": "MuiTouchRipple-root",
+ }
+ }
+ >
+ <span
+ className="MuiTouchRipple-root"
+ >
+ <TransitionGroup
+ childFactory={[Function]}
+ component={null}
+ exit={true}
+ />
+ </span>
+ </ForwardRef(TouchRipple)>
+ </WithStyles(memo)>
+ </NoSsr>
+ </button>
+ </ForwardRef(ButtonBase)>
+ </WithStyles(ForwardRef(ButtonBase))>
+ </ForwardRef(Button)>
+ </WithStyles(ForwardRef(Button))>
+ <WithStyles(ForwardRef(Button))
+ aria-label="ecogesture_selection.button_doing"
+ classes={
+ Object {
+ "label": "text-14-bold",
+ "root": "btn-secondary-negative",
+ }
+ }
+ onClick={[Function]}
+ >
+ <ForwardRef(Button)
+ aria-label="ecogesture_selection.button_doing"
+ classes={
+ Object {
+ "colorInherit": "MuiButton-colorInherit",
+ "contained": "MuiButton-contained",
+ "containedPrimary": "MuiButton-containedPrimary",
+ "containedSecondary": "MuiButton-containedSecondary",
+ "containedSizeLarge": "MuiButton-containedSizeLarge",
+ "containedSizeSmall": "MuiButton-containedSizeSmall",
+ "disableElevation": "MuiButton-disableElevation",
+ "disabled": "Mui-disabled",
+ "endIcon": "MuiButton-endIcon",
+ "focusVisible": "Mui-focusVisible",
+ "fullWidth": "MuiButton-fullWidth",
+ "iconSizeLarge": "MuiButton-iconSizeLarge",
+ "iconSizeMedium": "MuiButton-iconSizeMedium",
+ "iconSizeSmall": "MuiButton-iconSizeSmall",
+ "label": "MuiButton-label text-14-bold",
+ "outlined": "MuiButton-outlined",
+ "outlinedPrimary": "MuiButton-outlinedPrimary",
+ "outlinedSecondary": "MuiButton-outlinedSecondary",
+ "outlinedSizeLarge": "MuiButton-outlinedSizeLarge",
+ "outlinedSizeSmall": "MuiButton-outlinedSizeSmall",
+ "root": "MuiButton-root btn-secondary-negative",
+ "sizeLarge": "MuiButton-sizeLarge",
+ "sizeSmall": "MuiButton-sizeSmall",
+ "startIcon": "MuiButton-startIcon",
+ "text": "MuiButton-text",
+ "textPrimary": "MuiButton-textPrimary",
+ "textSecondary": "MuiButton-textSecondary",
+ "textSizeLarge": "MuiButton-textSizeLarge",
+ "textSizeSmall": "MuiButton-textSizeSmall",
+ }
+ }
+ onClick={[Function]}
+ >
+ <WithStyles(ForwardRef(ButtonBase))
+ aria-label="ecogesture_selection.button_doing"
+ className="MuiButton-root btn-secondary-negative MuiButton-text"
+ component="button"
+ disabled={false}
+ focusRipple={true}
+ focusVisibleClassName="Mui-focusVisible"
+ onClick={[Function]}
+ type="button"
+ >
+ <ForwardRef(ButtonBase)
+ aria-label="ecogesture_selection.button_doing"
+ className="MuiButton-root btn-secondary-negative MuiButton-text"
+ classes={
+ Object {
+ "disabled": "Mui-disabled",
+ "focusVisible": "Mui-focusVisible",
+ "root": "MuiButtonBase-root",
+ }
+ }
+ component="button"
+ disabled={false}
+ focusRipple={true}
+ focusVisibleClassName="Mui-focusVisible"
+ onClick={[Function]}
+ type="button"
+ >
+ <button
+ aria-label="ecogesture_selection.button_doing"
+ className="MuiButtonBase-root MuiButton-root btn-secondary-negative MuiButton-text"
+ disabled={false}
+ onBlur={[Function]}
+ onClick={[Function]}
+ onDragLeave={[Function]}
+ onFocus={[Function]}
+ onKeyDown={[Function]}
+ onKeyUp={[Function]}
+ onMouseDown={[Function]}
+ onMouseLeave={[Function]}
+ onMouseUp={[Function]}
+ onTouchEnd={[Function]}
+ onTouchMove={[Function]}
+ onTouchStart={[Function]}
+ tabIndex={0}
+ type="button"
+ >
+ <span
+ className="MuiButton-label text-14-bold"
+ >
+ <StyledIcon
+ icon="test-file-stub"
+ size={60}
+ >
+ <Icon
+ aria-hidden={true}
+ icon="test-file-stub"
+ size={60}
+ spin={false}
+ >
+ <Component
+ aria-hidden={true}
+ className="styles__icon___23x3R"
+ height={60}
+ style={Object {}}
+ width={60}
+ >
+ <svg
+ aria-hidden={true}
+ className="styles__icon___23x3R"
+ height={60}
+ style={Object {}}
+ width={60}
+ >
+ <use
+ xlinkHref="#test-file-stub"
+ />
+ </svg>
+ </Component>
+ </Icon>
+ </StyledIcon>
+ ecogesture_selection.button_doing
+ </span>
+ <NoSsr>
+ <WithStyles(memo)
+ center={false}
+ >
+ <ForwardRef(TouchRipple)
+ center={false}
+ classes={
+ Object {
+ "child": "MuiTouchRipple-child",
+ "childLeaving": "MuiTouchRipple-childLeaving",
+ "childPulsate": "MuiTouchRipple-childPulsate",
+ "ripple": "MuiTouchRipple-ripple",
+ "ripplePulsate": "MuiTouchRipple-ripplePulsate",
+ "rippleVisible": "MuiTouchRipple-rippleVisible",
+ "root": "MuiTouchRipple-root",
+ }
+ }
+ >
+ <span
+ className="MuiTouchRipple-root"
+ >
+ <TransitionGroup
+ childFactory={[Function]}
+ component={null}
+ exit={true}
+ />
+ </span>
+ </ForwardRef(TouchRipple)>
+ </WithStyles(memo)>
+ </NoSsr>
+ </button>
+ </ForwardRef(ButtonBase)>
+ </WithStyles(ForwardRef(ButtonBase))>
+ </ForwardRef(Button)>
+ </WithStyles(ForwardRef(Button))>
+ <WithStyles(ForwardRef(Button))
+ aria-label="ecogesture_selection.button_skip"
+ classes={
+ Object {
+ "label": "text-14-bold",
+ "root": "btn-secondary-negative",
+ }
+ }
+ onClick={[Function]}
+ >
+ <ForwardRef(Button)
+ aria-label="ecogesture_selection.button_skip"
+ classes={
+ Object {
+ "colorInherit": "MuiButton-colorInherit",
+ "contained": "MuiButton-contained",
+ "containedPrimary": "MuiButton-containedPrimary",
+ "containedSecondary": "MuiButton-containedSecondary",
+ "containedSizeLarge": "MuiButton-containedSizeLarge",
+ "containedSizeSmall": "MuiButton-containedSizeSmall",
+ "disableElevation": "MuiButton-disableElevation",
+ "disabled": "Mui-disabled",
+ "endIcon": "MuiButton-endIcon",
+ "focusVisible": "Mui-focusVisible",
+ "fullWidth": "MuiButton-fullWidth",
+ "iconSizeLarge": "MuiButton-iconSizeLarge",
+ "iconSizeMedium": "MuiButton-iconSizeMedium",
+ "iconSizeSmall": "MuiButton-iconSizeSmall",
+ "label": "MuiButton-label text-14-bold",
+ "outlined": "MuiButton-outlined",
+ "outlinedPrimary": "MuiButton-outlinedPrimary",
+ "outlinedSecondary": "MuiButton-outlinedSecondary",
+ "outlinedSizeLarge": "MuiButton-outlinedSizeLarge",
+ "outlinedSizeSmall": "MuiButton-outlinedSizeSmall",
+ "root": "MuiButton-root btn-secondary-negative",
+ "sizeLarge": "MuiButton-sizeLarge",
+ "sizeSmall": "MuiButton-sizeSmall",
+ "startIcon": "MuiButton-startIcon",
+ "text": "MuiButton-text",
+ "textPrimary": "MuiButton-textPrimary",
+ "textSecondary": "MuiButton-textSecondary",
+ "textSizeLarge": "MuiButton-textSizeLarge",
+ "textSizeSmall": "MuiButton-textSizeSmall",
+ }
+ }
+ onClick={[Function]}
+ >
+ <WithStyles(ForwardRef(ButtonBase))
+ aria-label="ecogesture_selection.button_skip"
+ className="MuiButton-root btn-secondary-negative MuiButton-text"
+ component="button"
+ disabled={false}
+ focusRipple={true}
+ focusVisibleClassName="Mui-focusVisible"
+ onClick={[Function]}
+ type="button"
+ >
+ <ForwardRef(ButtonBase)
+ aria-label="ecogesture_selection.button_skip"
+ className="MuiButton-root btn-secondary-negative MuiButton-text"
+ classes={
+ Object {
+ "disabled": "Mui-disabled",
+ "focusVisible": "Mui-focusVisible",
+ "root": "MuiButtonBase-root",
+ }
+ }
+ component="button"
+ disabled={false}
+ focusRipple={true}
+ focusVisibleClassName="Mui-focusVisible"
+ onClick={[Function]}
+ type="button"
+ >
+ <button
+ aria-label="ecogesture_selection.button_skip"
+ className="MuiButtonBase-root MuiButton-root btn-secondary-negative MuiButton-text"
+ disabled={false}
+ onBlur={[Function]}
+ onClick={[Function]}
+ onDragLeave={[Function]}
+ onFocus={[Function]}
+ onKeyDown={[Function]}
+ onKeyUp={[Function]}
+ onMouseDown={[Function]}
+ onMouseLeave={[Function]}
+ onMouseUp={[Function]}
+ onTouchEnd={[Function]}
+ onTouchMove={[Function]}
+ onTouchStart={[Function]}
+ tabIndex={0}
+ type="button"
+ >
+ <span
+ className="MuiButton-label text-14-bold"
+ >
+ <StyledIcon
+ icon="test-file-stub"
+ size={60}
+ >
+ <Icon
+ aria-hidden={true}
+ icon="test-file-stub"
+ size={60}
+ spin={false}
+ >
+ <Component
+ aria-hidden={true}
+ className="styles__icon___23x3R"
+ height={60}
+ style={Object {}}
+ width={60}
+ >
+ <svg
+ aria-hidden={true}
+ className="styles__icon___23x3R"
+ height={60}
+ style={Object {}}
+ width={60}
+ >
+ <use
+ xlinkHref="#test-file-stub"
+ />
+ </svg>
+ </Component>
+ </Icon>
+ </StyledIcon>
+ ecogesture_selection.button_skip
+ </span>
+ <NoSsr>
+ <WithStyles(memo)
+ center={false}
+ >
+ <ForwardRef(TouchRipple)
+ center={false}
+ classes={
+ Object {
+ "child": "MuiTouchRipple-child",
+ "childLeaving": "MuiTouchRipple-childLeaving",
+ "childPulsate": "MuiTouchRipple-childPulsate",
+ "ripple": "MuiTouchRipple-ripple",
+ "ripplePulsate": "MuiTouchRipple-ripplePulsate",
+ "rippleVisible": "MuiTouchRipple-rippleVisible",
+ "root": "MuiTouchRipple-root",
+ }
+ }
+ >
+ <span
+ className="MuiTouchRipple-root"
+ >
+ <TransitionGroup
+ childFactory={[Function]}
+ component={null}
+ exit={true}
+ />
+ </span>
+ </ForwardRef(TouchRipple)>
+ </WithStyles(memo)>
+ </NoSsr>
+ </button>
+ </ForwardRef(ButtonBase)>
+ </WithStyles(ForwardRef(ButtonBase))>
+ </ForwardRef(Button)>
+ </WithStyles(ForwardRef(Button))>
+ </div>
+ </div>
+</EcogestureSelectionDetail>
+`;
diff --git a/src/components/EcogestureSelection/__snapshots__/EcogestureSelectionEnd.spec.tsx.snap b/src/components/EcogestureSelection/__snapshots__/EcogestureSelectionEnd.spec.tsx.snap
new file mode 100644
index 0000000000000000000000000000000000000000..1b1ea7fd1956ac4587e955680a8176b9071a0480
--- /dev/null
+++ b/src/components/EcogestureSelection/__snapshots__/EcogestureSelectionEnd.spec.tsx.snap
@@ -0,0 +1,197 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`EcogestureSelectionEnd component should be rendered correctly 1`] = `
+<EcogestureSelectionEnd>
+ <div
+ className="eg-selection-end-container"
+ >
+ <div
+ className="content"
+ >
+ <div
+ className="title text-21-bold"
+ >
+ ecogesture_selection.title_final
+ </div>
+ <StyledIcon
+ icon="test-file-stub"
+ size={120}
+ >
+ <Icon
+ aria-hidden={true}
+ icon="test-file-stub"
+ size={120}
+ spin={false}
+ >
+ <Component
+ aria-hidden={true}
+ className="styles__icon___23x3R"
+ height={120}
+ style={Object {}}
+ width={120}
+ >
+ <svg
+ aria-hidden={true}
+ className="styles__icon___23x3R"
+ height={120}
+ style={Object {}}
+ width={120}
+ >
+ <use
+ xlinkHref="#test-file-stub"
+ />
+ </svg>
+ </Component>
+ </Icon>
+ </StyledIcon>
+ <div
+ className="text text-16-normal"
+ >
+ ecogesture_selection.text_final_1
+ </div>
+ <div
+ className="text text-16-normal"
+ >
+ ecogesture_selection.text_final_2
+ </div>
+ </div>
+ <div
+ className="buttons"
+ >
+ <WithStyles(ForwardRef(Button))
+ aria-label="ecogesture_selection.accessibility.button_ok"
+ classes={
+ Object {
+ "label": "text-16-bold",
+ "root": "btn-highlight",
+ }
+ }
+ onClick={[Function]}
+ >
+ <ForwardRef(Button)
+ aria-label="ecogesture_selection.accessibility.button_ok"
+ classes={
+ Object {
+ "colorInherit": "MuiButton-colorInherit",
+ "contained": "MuiButton-contained",
+ "containedPrimary": "MuiButton-containedPrimary",
+ "containedSecondary": "MuiButton-containedSecondary",
+ "containedSizeLarge": "MuiButton-containedSizeLarge",
+ "containedSizeSmall": "MuiButton-containedSizeSmall",
+ "disableElevation": "MuiButton-disableElevation",
+ "disabled": "Mui-disabled",
+ "endIcon": "MuiButton-endIcon",
+ "focusVisible": "Mui-focusVisible",
+ "fullWidth": "MuiButton-fullWidth",
+ "iconSizeLarge": "MuiButton-iconSizeLarge",
+ "iconSizeMedium": "MuiButton-iconSizeMedium",
+ "iconSizeSmall": "MuiButton-iconSizeSmall",
+ "label": "MuiButton-label text-16-bold",
+ "outlined": "MuiButton-outlined",
+ "outlinedPrimary": "MuiButton-outlinedPrimary",
+ "outlinedSecondary": "MuiButton-outlinedSecondary",
+ "outlinedSizeLarge": "MuiButton-outlinedSizeLarge",
+ "outlinedSizeSmall": "MuiButton-outlinedSizeSmall",
+ "root": "MuiButton-root btn-highlight",
+ "sizeLarge": "MuiButton-sizeLarge",
+ "sizeSmall": "MuiButton-sizeSmall",
+ "startIcon": "MuiButton-startIcon",
+ "text": "MuiButton-text",
+ "textPrimary": "MuiButton-textPrimary",
+ "textSecondary": "MuiButton-textSecondary",
+ "textSizeLarge": "MuiButton-textSizeLarge",
+ "textSizeSmall": "MuiButton-textSizeSmall",
+ }
+ }
+ onClick={[Function]}
+ >
+ <WithStyles(ForwardRef(ButtonBase))
+ aria-label="ecogesture_selection.accessibility.button_ok"
+ className="MuiButton-root btn-highlight MuiButton-text"
+ component="button"
+ disabled={false}
+ focusRipple={true}
+ focusVisibleClassName="Mui-focusVisible"
+ onClick={[Function]}
+ type="button"
+ >
+ <ForwardRef(ButtonBase)
+ aria-label="ecogesture_selection.accessibility.button_ok"
+ className="MuiButton-root btn-highlight MuiButton-text"
+ classes={
+ Object {
+ "disabled": "Mui-disabled",
+ "focusVisible": "Mui-focusVisible",
+ "root": "MuiButtonBase-root",
+ }
+ }
+ component="button"
+ disabled={false}
+ focusRipple={true}
+ focusVisibleClassName="Mui-focusVisible"
+ onClick={[Function]}
+ type="button"
+ >
+ <button
+ aria-label="ecogesture_selection.accessibility.button_ok"
+ className="MuiButtonBase-root MuiButton-root btn-highlight MuiButton-text"
+ disabled={false}
+ onBlur={[Function]}
+ onClick={[Function]}
+ onDragLeave={[Function]}
+ onFocus={[Function]}
+ onKeyDown={[Function]}
+ onKeyUp={[Function]}
+ onMouseDown={[Function]}
+ onMouseLeave={[Function]}
+ onMouseUp={[Function]}
+ onTouchEnd={[Function]}
+ onTouchMove={[Function]}
+ onTouchStart={[Function]}
+ tabIndex={0}
+ type="button"
+ >
+ <span
+ className="MuiButton-label text-16-bold"
+ >
+ ecogesture_selection.button_ok
+ </span>
+ <NoSsr>
+ <WithStyles(memo)
+ center={false}
+ >
+ <ForwardRef(TouchRipple)
+ center={false}
+ classes={
+ Object {
+ "child": "MuiTouchRipple-child",
+ "childLeaving": "MuiTouchRipple-childLeaving",
+ "childPulsate": "MuiTouchRipple-childPulsate",
+ "ripple": "MuiTouchRipple-ripple",
+ "ripplePulsate": "MuiTouchRipple-ripplePulsate",
+ "rippleVisible": "MuiTouchRipple-rippleVisible",
+ "root": "MuiTouchRipple-root",
+ }
+ }
+ >
+ <span
+ className="MuiTouchRipple-root"
+ >
+ <TransitionGroup
+ childFactory={[Function]}
+ component={null}
+ exit={true}
+ />
+ </span>
+ </ForwardRef(TouchRipple)>
+ </WithStyles(memo)>
+ </NoSsr>
+ </button>
+ </ForwardRef(ButtonBase)>
+ </WithStyles(ForwardRef(ButtonBase))>
+ </ForwardRef(Button)>
+ </WithStyles(ForwardRef(Button))>
+ </div>
+ </div>
+</EcogestureSelectionEnd>
+`;
diff --git a/src/components/EcogestureSelection/__snapshots__/EcogestureSelectionModal.spec.tsx.snap b/src/components/EcogestureSelection/__snapshots__/EcogestureSelectionModal.spec.tsx.snap
new file mode 100644
index 0000000000000000000000000000000000000000..233978637306bec8261505551c00c96c4fb22916
--- /dev/null
+++ b/src/components/EcogestureSelection/__snapshots__/EcogestureSelectionModal.spec.tsx.snap
@@ -0,0 +1,963 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`EcogestureInitModal component should be rendered correctly 1`] = `
+<EcogestureSelectionModal
+ handleCloseClick={[MockFunction]}
+ open={true}
+>
+ <WithStyles(ForwardRef(Dialog))
+ aria-labelledby="accessibility-title"
+ classes={
+ Object {
+ "paper": "modal-paper",
+ "root": "modal-root",
+ }
+ }
+ onClose={[MockFunction]}
+ open={true}
+ >
+ <ForwardRef(Dialog)
+ aria-labelledby="accessibility-title"
+ classes={
+ Object {
+ "container": "MuiDialog-container",
+ "paper": "MuiDialog-paper modal-paper",
+ "paperFullScreen": "MuiDialog-paperFullScreen",
+ "paperFullWidth": "MuiDialog-paperFullWidth",
+ "paperScrollBody": "MuiDialog-paperScrollBody",
+ "paperScrollPaper": "MuiDialog-paperScrollPaper",
+ "paperWidthFalse": "MuiDialog-paperWidthFalse",
+ "paperWidthLg": "MuiDialog-paperWidthLg",
+ "paperWidthMd": "MuiDialog-paperWidthMd",
+ "paperWidthSm": "MuiDialog-paperWidthSm",
+ "paperWidthXl": "MuiDialog-paperWidthXl",
+ "paperWidthXs": "MuiDialog-paperWidthXs",
+ "root": "MuiDialog-root modal-root",
+ "scrollBody": "MuiDialog-scrollBody",
+ "scrollPaper": "MuiDialog-scrollPaper",
+ }
+ }
+ onClose={[MockFunction]}
+ open={true}
+ >
+ <ForwardRef(Modal)
+ BackdropComponent={
+ Object {
+ "$$typeof": Symbol(react.forward_ref),
+ "Naked": Object {
+ "$$typeof": Symbol(react.forward_ref),
+ "propTypes": Object {
+ "children": [Function],
+ "className": [Function],
+ "classes": [Function],
+ "invisible": [Function],
+ "open": [Function],
+ "transitionDuration": [Function],
+ },
+ "render": [Function],
+ },
+ "displayName": "WithStyles(ForwardRef(Backdrop))",
+ "options": Object {
+ "defaultTheme": Object {
+ "breakpoints": Object {
+ "between": [Function],
+ "down": [Function],
+ "keys": Array [
+ "xs",
+ "sm",
+ "md",
+ "lg",
+ "xl",
+ ],
+ "only": [Function],
+ "up": [Function],
+ "values": Object {
+ "lg": 1280,
+ "md": 960,
+ "sm": 600,
+ "xl": 1920,
+ "xs": 0,
+ },
+ "width": [Function],
+ },
+ "direction": "ltr",
+ "mixins": Object {
+ "gutters": [Function],
+ "toolbar": Object {
+ "@media (min-width:0px) and (orientation: landscape)": Object {
+ "minHeight": 48,
+ },
+ "@media (min-width:600px)": Object {
+ "minHeight": 64,
+ },
+ "minHeight": 56,
+ },
+ },
+ "overrides": Object {},
+ "palette": Object {
+ "action": Object {
+ "active": "rgba(0, 0, 0, 0.54)",
+ "disabled": "rgba(0, 0, 0, 0.26)",
+ "disabledBackground": "rgba(0, 0, 0, 0.12)",
+ "hover": "rgba(0, 0, 0, 0.08)",
+ "hoverOpacity": 0.08,
+ "selected": "rgba(0, 0, 0, 0.14)",
+ },
+ "augmentColor": [Function],
+ "background": Object {
+ "default": "#fafafa",
+ "paper": "#fff",
+ },
+ "common": Object {
+ "black": "#000",
+ "white": "#fff",
+ },
+ "contrastThreshold": 3,
+ "divider": "rgba(0, 0, 0, 0.12)",
+ "error": Object {
+ "contrastText": "#fff",
+ "dark": "#d32f2f",
+ "light": "#e57373",
+ "main": "#f44336",
+ },
+ "getContrastText": [Function],
+ "grey": Object {
+ "100": "#f5f5f5",
+ "200": "#eeeeee",
+ "300": "#e0e0e0",
+ "400": "#bdbdbd",
+ "50": "#fafafa",
+ "500": "#9e9e9e",
+ "600": "#757575",
+ "700": "#616161",
+ "800": "#424242",
+ "900": "#212121",
+ "A100": "#d5d5d5",
+ "A200": "#aaaaaa",
+ "A400": "#303030",
+ "A700": "#616161",
+ },
+ "info": Object {
+ "contrastText": "#fff",
+ "dark": "#1976d2",
+ "light": "#64b5f6",
+ "main": "#2196f3",
+ },
+ "primary": Object {
+ "contrastText": "#fff",
+ "dark": "#303f9f",
+ "light": "#7986cb",
+ "main": "#3f51b5",
+ },
+ "secondary": Object {
+ "contrastText": "#fff",
+ "dark": "#c51162",
+ "light": "#ff4081",
+ "main": "#f50057",
+ },
+ "success": Object {
+ "contrastText": "rgba(0, 0, 0, 0.87)",
+ "dark": "#388e3c",
+ "light": "#81c784",
+ "main": "#4caf50",
+ },
+ "text": Object {
+ "disabled": "rgba(0, 0, 0, 0.38)",
+ "hint": "rgba(0, 0, 0, 0.38)",
+ "primary": "rgba(0, 0, 0, 0.87)",
+ "secondary": "rgba(0, 0, 0, 0.54)",
+ },
+ "tonalOffset": 0.2,
+ "type": "light",
+ "warning": Object {
+ "contrastText": "rgba(0, 0, 0, 0.87)",
+ "dark": "#f57c00",
+ "light": "#ffb74d",
+ "main": "#ff9800",
+ },
+ },
+ "props": Object {},
+ "shadows": Array [
+ "none",
+ "0px 2px 1px -1px rgba(0,0,0,0.2),0px 1px 1px 0px rgba(0,0,0,0.14),0px 1px 3px 0px rgba(0,0,0,0.12)",
+ "0px 3px 1px -2px rgba(0,0,0,0.2),0px 2px 2px 0px rgba(0,0,0,0.14),0px 1px 5px 0px rgba(0,0,0,0.12)",
+ "0px 3px 3px -2px rgba(0,0,0,0.2),0px 3px 4px 0px rgba(0,0,0,0.14),0px 1px 8px 0px rgba(0,0,0,0.12)",
+ "0px 2px 4px -1px rgba(0,0,0,0.2),0px 4px 5px 0px rgba(0,0,0,0.14),0px 1px 10px 0px rgba(0,0,0,0.12)",
+ "0px 3px 5px -1px rgba(0,0,0,0.2),0px 5px 8px 0px rgba(0,0,0,0.14),0px 1px 14px 0px rgba(0,0,0,0.12)",
+ "0px 3px 5px -1px rgba(0,0,0,0.2),0px 6px 10px 0px rgba(0,0,0,0.14),0px 1px 18px 0px rgba(0,0,0,0.12)",
+ "0px 4px 5px -2px rgba(0,0,0,0.2),0px 7px 10px 1px rgba(0,0,0,0.14),0px 2px 16px 1px rgba(0,0,0,0.12)",
+ "0px 5px 5px -3px rgba(0,0,0,0.2),0px 8px 10px 1px rgba(0,0,0,0.14),0px 3px 14px 2px rgba(0,0,0,0.12)",
+ "0px 5px 6px -3px rgba(0,0,0,0.2),0px 9px 12px 1px rgba(0,0,0,0.14),0px 3px 16px 2px rgba(0,0,0,0.12)",
+ "0px 6px 6px -3px rgba(0,0,0,0.2),0px 10px 14px 1px rgba(0,0,0,0.14),0px 4px 18px 3px rgba(0,0,0,0.12)",
+ "0px 6px 7px -4px rgba(0,0,0,0.2),0px 11px 15px 1px rgba(0,0,0,0.14),0px 4px 20px 3px rgba(0,0,0,0.12)",
+ "0px 7px 8px -4px rgba(0,0,0,0.2),0px 12px 17px 2px rgba(0,0,0,0.14),0px 5px 22px 4px rgba(0,0,0,0.12)",
+ "0px 7px 8px -4px rgba(0,0,0,0.2),0px 13px 19px 2px rgba(0,0,0,0.14),0px 5px 24px 4px rgba(0,0,0,0.12)",
+ "0px 7px 9px -4px rgba(0,0,0,0.2),0px 14px 21px 2px rgba(0,0,0,0.14),0px 5px 26px 4px rgba(0,0,0,0.12)",
+ "0px 8px 9px -5px rgba(0,0,0,0.2),0px 15px 22px 2px rgba(0,0,0,0.14),0px 6px 28px 5px rgba(0,0,0,0.12)",
+ "0px 8px 10px -5px rgba(0,0,0,0.2),0px 16px 24px 2px rgba(0,0,0,0.14),0px 6px 30px 5px rgba(0,0,0,0.12)",
+ "0px 8px 11px -5px rgba(0,0,0,0.2),0px 17px 26px 2px rgba(0,0,0,0.14),0px 6px 32px 5px rgba(0,0,0,0.12)",
+ "0px 9px 11px -5px rgba(0,0,0,0.2),0px 18px 28px 2px rgba(0,0,0,0.14),0px 7px 34px 6px rgba(0,0,0,0.12)",
+ "0px 9px 12px -6px rgba(0,0,0,0.2),0px 19px 29px 2px rgba(0,0,0,0.14),0px 7px 36px 6px rgba(0,0,0,0.12)",
+ "0px 10px 13px -6px rgba(0,0,0,0.2),0px 20px 31px 3px rgba(0,0,0,0.14),0px 8px 38px 7px rgba(0,0,0,0.12)",
+ "0px 10px 13px -6px rgba(0,0,0,0.2),0px 21px 33px 3px rgba(0,0,0,0.14),0px 8px 40px 7px rgba(0,0,0,0.12)",
+ "0px 10px 14px -6px rgba(0,0,0,0.2),0px 22px 35px 3px rgba(0,0,0,0.14),0px 8px 42px 7px rgba(0,0,0,0.12)",
+ "0px 11px 14px -7px rgba(0,0,0,0.2),0px 23px 36px 3px rgba(0,0,0,0.14),0px 9px 44px 8px rgba(0,0,0,0.12)",
+ "0px 11px 15px -7px rgba(0,0,0,0.2),0px 24px 38px 3px rgba(0,0,0,0.14),0px 9px 46px 8px rgba(0,0,0,0.12)",
+ ],
+ "shape": Object {
+ "borderRadius": 4,
+ },
+ "spacing": [Function],
+ "transitions": Object {
+ "create": [Function],
+ "duration": Object {
+ "complex": 375,
+ "enteringScreen": 225,
+ "leavingScreen": 195,
+ "short": 250,
+ "shorter": 200,
+ "shortest": 150,
+ "standard": 300,
+ },
+ "easing": Object {
+ "easeIn": "cubic-bezier(0.4, 0, 1, 1)",
+ "easeInOut": "cubic-bezier(0.4, 0, 0.2, 1)",
+ "easeOut": "cubic-bezier(0.0, 0, 0.2, 1)",
+ "sharp": "cubic-bezier(0.4, 0, 0.6, 1)",
+ },
+ "getAutoHeightDuration": [Function],
+ },
+ "typography": Object {
+ "body1": Object {
+ "fontFamily": "\\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+ "fontSize": "1rem",
+ "fontWeight": 400,
+ "letterSpacing": "0.00938em",
+ "lineHeight": 1.5,
+ },
+ "body2": Object {
+ "fontFamily": "\\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+ "fontSize": "0.875rem",
+ "fontWeight": 400,
+ "letterSpacing": "0.01071em",
+ "lineHeight": 1.43,
+ },
+ "button": Object {
+ "fontFamily": "\\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+ "fontSize": "0.875rem",
+ "fontWeight": 500,
+ "letterSpacing": "0.02857em",
+ "lineHeight": 1.75,
+ "textTransform": "uppercase",
+ },
+ "caption": Object {
+ "fontFamily": "\\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+ "fontSize": "0.75rem",
+ "fontWeight": 400,
+ "letterSpacing": "0.03333em",
+ "lineHeight": 1.66,
+ },
+ "fontFamily": "\\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+ "fontSize": 14,
+ "fontWeightBold": 700,
+ "fontWeightLight": 300,
+ "fontWeightMedium": 500,
+ "fontWeightRegular": 400,
+ "h1": Object {
+ "fontFamily": "\\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+ "fontSize": "6rem",
+ "fontWeight": 300,
+ "letterSpacing": "-0.01562em",
+ "lineHeight": 1.167,
+ },
+ "h2": Object {
+ "fontFamily": "\\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+ "fontSize": "3.75rem",
+ "fontWeight": 300,
+ "letterSpacing": "-0.00833em",
+ "lineHeight": 1.2,
+ },
+ "h3": Object {
+ "fontFamily": "\\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+ "fontSize": "3rem",
+ "fontWeight": 400,
+ "letterSpacing": "0em",
+ "lineHeight": 1.167,
+ },
+ "h4": Object {
+ "fontFamily": "\\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+ "fontSize": "2.125rem",
+ "fontWeight": 400,
+ "letterSpacing": "0.00735em",
+ "lineHeight": 1.235,
+ },
+ "h5": Object {
+ "fontFamily": "\\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+ "fontSize": "1.5rem",
+ "fontWeight": 400,
+ "letterSpacing": "0em",
+ "lineHeight": 1.334,
+ },
+ "h6": Object {
+ "fontFamily": "\\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+ "fontSize": "1.25rem",
+ "fontWeight": 500,
+ "letterSpacing": "0.0075em",
+ "lineHeight": 1.6,
+ },
+ "htmlFontSize": 16,
+ "overline": Object {
+ "fontFamily": "\\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+ "fontSize": "0.75rem",
+ "fontWeight": 400,
+ "letterSpacing": "0.08333em",
+ "lineHeight": 2.66,
+ "textTransform": "uppercase",
+ },
+ "pxToRem": [Function],
+ "round": [Function],
+ "subtitle1": Object {
+ "fontFamily": "\\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+ "fontSize": "1rem",
+ "fontWeight": 400,
+ "letterSpacing": "0.00938em",
+ "lineHeight": 1.75,
+ },
+ "subtitle2": Object {
+ "fontFamily": "\\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+ "fontSize": "0.875rem",
+ "fontWeight": 500,
+ "letterSpacing": "0.00714em",
+ "lineHeight": 1.57,
+ },
+ },
+ "zIndex": Object {
+ "appBar": 1100,
+ "drawer": 1200,
+ "mobileStepper": 1000,
+ "modal": 1300,
+ "snackbar": 1400,
+ "speedDial": 1050,
+ "tooltip": 1500,
+ },
+ },
+ "name": "MuiBackdrop",
+ },
+ "propTypes": Object {
+ "classes": [Function],
+ "innerRef": [Function],
+ },
+ "render": [Function],
+ "useStyles": [Function],
+ }
+ }
+ BackdropProps={
+ Object {
+ "transitionDuration": Object {
+ "enter": 225,
+ "exit": 195,
+ },
+ }
+ }
+ className="MuiDialog-root modal-root"
+ closeAfterTransition={true}
+ disableBackdropClick={false}
+ disableEscapeKeyDown={false}
+ onClose={[MockFunction]}
+ open={true}
+ >
+ <ForwardRef(Portal)
+ disablePortal={false}
+ >
+ <Portal
+ containerInfo={
+ <body
+ style="padding-right: 0px; overflow: hidden;"
+ >
+ <div
+ class="MuiDialog-root modal-root"
+ role="presentation"
+ style="position: fixed; z-index: 1300; right: 0px; bottom: 0px; top: 0px; left: 0px;"
+ >
+ <div
+ aria-hidden="true"
+ class="MuiBackdrop-root"
+ style="opacity: 1; webkit-transition: opacity 225ms cubic-bezier(0.4, 0, 0.2, 1) 0ms; transition: opacity 225ms cubic-bezier(0.4, 0, 0.2, 1) 0ms;"
+ />
+ <div
+ data-test="sentinelStart"
+ tabindex="0"
+ />
+ <div
+ class="MuiDialog-container MuiDialog-scrollPaper"
+ role="none presentation"
+ style="opacity: 1; webkit-transition: opacity 225ms cubic-bezier(0.4, 0, 0.2, 1) 0ms; transition: opacity 225ms cubic-bezier(0.4, 0, 0.2, 1) 0ms;"
+ tabindex="-1"
+ >
+ <div
+ aria-labelledby="accessibility-title"
+ class="MuiPaper-root MuiDialog-paper modal-paper MuiDialog-paperScrollPaper MuiDialog-paperWidthSm MuiPaper-elevation24 MuiPaper-rounded"
+ role="dialog"
+ >
+ <div
+ id="accessibility-title"
+ >
+ ecogesture_selection.accessibility.window_title
+ </div>
+ <button
+ aria-label="ecogesture_selection.accessibility.button_close"
+ class="MuiButtonBase-root MuiIconButton-root modal-paper-close-button"
+ tabindex="0"
+ type="button"
+ >
+ <span
+ class="MuiIconButton-label"
+ >
+ <svg
+ class="styles__icon___23x3R"
+ height="16"
+ width="16"
+ >
+ <use
+ xlink:href="#test-file-stub"
+ />
+ </svg>
+ </span>
+ <span
+ class="MuiTouchRipple-root"
+ />
+ </button>
+ <div
+ class="eg-selection-modal"
+ >
+ <div
+ class="title text-20-bold"
+ >
+ ecogesture_selection.selectionModal.title
+ </div>
+ <div
+ class="text text-16-normal"
+ >
+ ecogesture_selection.selectionModal.text
+ </div>
+ <button
+ aria-label="ecogesture_selection.selectionModal.button_close"
+ class="MuiButtonBase-root MuiButton-root btn-highlight MuiButton-text"
+ tabindex="0"
+ type="button"
+ >
+ <span
+ class="MuiButton-label text-16-bold"
+ >
+ ecogesture_selection.selectionModal.button_close
+ </span>
+ <span
+ class="MuiTouchRipple-root"
+ />
+ </button>
+ </div>
+ </div>
+ </div>
+ <div
+ data-test="sentinelEnd"
+ tabindex="0"
+ />
+ </div>
+ </body>
+ }
+ >
+ <div
+ className="MuiDialog-root modal-root"
+ onKeyDown={[Function]}
+ role="presentation"
+ style={
+ Object {
+ "bottom": 0,
+ "left": 0,
+ "position": "fixed",
+ "right": 0,
+ "top": 0,
+ "zIndex": 1300,
+ }
+ }
+ >
+ <WithStyles(ForwardRef(Backdrop))
+ onClick={[Function]}
+ open={true}
+ transitionDuration={
+ Object {
+ "enter": 225,
+ "exit": 195,
+ }
+ }
+ >
+ <ForwardRef(Backdrop)
+ classes={
+ Object {
+ "invisible": "MuiBackdrop-invisible",
+ "root": "MuiBackdrop-root",
+ }
+ }
+ onClick={[Function]}
+ open={true}
+ transitionDuration={
+ Object {
+ "enter": 225,
+ "exit": 195,
+ }
+ }
+ >
+ <ForwardRef(Fade)
+ in={true}
+ onClick={[Function]}
+ timeout={
+ Object {
+ "enter": 225,
+ "exit": 195,
+ }
+ }
+ >
+ <Transition
+ appear={true}
+ enter={true}
+ exit={true}
+ in={true}
+ mountOnEnter={false}
+ onClick={[Function]}
+ onEnter={[Function]}
+ onEntered={[Function]}
+ onEntering={[Function]}
+ onExit={[Function]}
+ onExited={[Function]}
+ onExiting={[Function]}
+ timeout={
+ Object {
+ "enter": 225,
+ "exit": 195,
+ }
+ }
+ unmountOnExit={false}
+ >
+ <div
+ aria-hidden={true}
+ className="MuiBackdrop-root"
+ onClick={[Function]}
+ style={
+ Object {
+ "opacity": 1,
+ "visibility": undefined,
+ }
+ }
+ />
+ </Transition>
+ </ForwardRef(Fade)>
+ </ForwardRef(Backdrop)>
+ </WithStyles(ForwardRef(Backdrop))>
+ <TrapFocus
+ disableAutoFocus={false}
+ disableEnforceFocus={false}
+ disableRestoreFocus={false}
+ getDoc={[Function]}
+ isEnabled={[Function]}
+ open={true}
+ >
+ <div
+ data-test="sentinelStart"
+ tabIndex={0}
+ />
+ <ForwardRef(Fade)
+ appear={true}
+ in={true}
+ onEnter={[Function]}
+ onExited={[Function]}
+ role="none presentation"
+ tabIndex="-1"
+ timeout={
+ Object {
+ "enter": 225,
+ "exit": 195,
+ }
+ }
+ >
+ <Transition
+ appear={true}
+ enter={true}
+ exit={true}
+ in={true}
+ mountOnEnter={false}
+ onEnter={[Function]}
+ onEntered={[Function]}
+ onEntering={[Function]}
+ onExit={[Function]}
+ onExited={[Function]}
+ onExiting={[Function]}
+ role="none presentation"
+ tabIndex="-1"
+ timeout={
+ Object {
+ "enter": 225,
+ "exit": 195,
+ }
+ }
+ unmountOnExit={false}
+ >
+ <div
+ className="MuiDialog-container MuiDialog-scrollPaper"
+ onClick={[Function]}
+ onMouseDown={[Function]}
+ role="none presentation"
+ style={
+ Object {
+ "opacity": 1,
+ "visibility": undefined,
+ }
+ }
+ tabIndex="-1"
+ >
+ <WithStyles(ForwardRef(Paper))
+ aria-labelledby="accessibility-title"
+ className="MuiDialog-paper modal-paper MuiDialog-paperScrollPaper MuiDialog-paperWidthSm"
+ elevation={24}
+ role="dialog"
+ >
+ <ForwardRef(Paper)
+ aria-labelledby="accessibility-title"
+ className="MuiDialog-paper modal-paper MuiDialog-paperScrollPaper MuiDialog-paperWidthSm"
+ classes={
+ Object {
+ "elevation0": "MuiPaper-elevation0",
+ "elevation1": "MuiPaper-elevation1",
+ "elevation10": "MuiPaper-elevation10",
+ "elevation11": "MuiPaper-elevation11",
+ "elevation12": "MuiPaper-elevation12",
+ "elevation13": "MuiPaper-elevation13",
+ "elevation14": "MuiPaper-elevation14",
+ "elevation15": "MuiPaper-elevation15",
+ "elevation16": "MuiPaper-elevation16",
+ "elevation17": "MuiPaper-elevation17",
+ "elevation18": "MuiPaper-elevation18",
+ "elevation19": "MuiPaper-elevation19",
+ "elevation2": "MuiPaper-elevation2",
+ "elevation20": "MuiPaper-elevation20",
+ "elevation21": "MuiPaper-elevation21",
+ "elevation22": "MuiPaper-elevation22",
+ "elevation23": "MuiPaper-elevation23",
+ "elevation24": "MuiPaper-elevation24",
+ "elevation3": "MuiPaper-elevation3",
+ "elevation4": "MuiPaper-elevation4",
+ "elevation5": "MuiPaper-elevation5",
+ "elevation6": "MuiPaper-elevation6",
+ "elevation7": "MuiPaper-elevation7",
+ "elevation8": "MuiPaper-elevation8",
+ "elevation9": "MuiPaper-elevation9",
+ "outlined": "MuiPaper-outlined",
+ "root": "MuiPaper-root",
+ "rounded": "MuiPaper-rounded",
+ }
+ }
+ elevation={24}
+ role="dialog"
+ >
+ <div
+ aria-labelledby="accessibility-title"
+ className="MuiPaper-root MuiDialog-paper modal-paper MuiDialog-paperScrollPaper MuiDialog-paperWidthSm MuiPaper-elevation24 MuiPaper-rounded"
+ role="dialog"
+ >
+ <div
+ id="accessibility-title"
+ >
+ ecogesture_selection.accessibility.window_title
+ </div>
+ <WithStyles(ForwardRef(IconButton))
+ aria-label="ecogesture_selection.accessibility.button_close"
+ className="modal-paper-close-button"
+ onClick={[MockFunction]}
+ >
+ <ForwardRef(IconButton)
+ aria-label="ecogesture_selection.accessibility.button_close"
+ className="modal-paper-close-button"
+ classes={
+ Object {
+ "colorInherit": "MuiIconButton-colorInherit",
+ "colorPrimary": "MuiIconButton-colorPrimary",
+ "colorSecondary": "MuiIconButton-colorSecondary",
+ "disabled": "Mui-disabled",
+ "edgeEnd": "MuiIconButton-edgeEnd",
+ "edgeStart": "MuiIconButton-edgeStart",
+ "label": "MuiIconButton-label",
+ "root": "MuiIconButton-root",
+ "sizeSmall": "MuiIconButton-sizeSmall",
+ }
+ }
+ onClick={[MockFunction]}
+ >
+ <WithStyles(ForwardRef(ButtonBase))
+ aria-label="ecogesture_selection.accessibility.button_close"
+ centerRipple={true}
+ className="MuiIconButton-root modal-paper-close-button"
+ disabled={false}
+ focusRipple={true}
+ onClick={[MockFunction]}
+ >
+ <ForwardRef(ButtonBase)
+ aria-label="ecogesture_selection.accessibility.button_close"
+ centerRipple={true}
+ className="MuiIconButton-root modal-paper-close-button"
+ classes={
+ Object {
+ "disabled": "Mui-disabled",
+ "focusVisible": "Mui-focusVisible",
+ "root": "MuiButtonBase-root",
+ }
+ }
+ disabled={false}
+ focusRipple={true}
+ onClick={[MockFunction]}
+ >
+ <button
+ aria-label="ecogesture_selection.accessibility.button_close"
+ className="MuiButtonBase-root MuiIconButton-root modal-paper-close-button"
+ disabled={false}
+ onBlur={[Function]}
+ onClick={[MockFunction]}
+ onDragLeave={[Function]}
+ onFocus={[Function]}
+ onKeyDown={[Function]}
+ onKeyUp={[Function]}
+ onMouseDown={[Function]}
+ onMouseLeave={[Function]}
+ onMouseUp={[Function]}
+ onTouchEnd={[Function]}
+ onTouchMove={[Function]}
+ onTouchStart={[Function]}
+ tabIndex={0}
+ type="button"
+ >
+ <span
+ className="MuiIconButton-label"
+ >
+ <Icon
+ icon="test-file-stub"
+ size={16}
+ spin={false}
+ >
+ <Component
+ className="styles__icon___23x3R"
+ height={16}
+ style={Object {}}
+ width={16}
+ >
+ <svg
+ className="styles__icon___23x3R"
+ height={16}
+ style={Object {}}
+ width={16}
+ >
+ <use
+ xlinkHref="#test-file-stub"
+ />
+ </svg>
+ </Component>
+ </Icon>
+ </span>
+ <NoSsr>
+ <WithStyles(memo)
+ center={true}
+ >
+ <ForwardRef(TouchRipple)
+ center={true}
+ classes={
+ Object {
+ "child": "MuiTouchRipple-child",
+ "childLeaving": "MuiTouchRipple-childLeaving",
+ "childPulsate": "MuiTouchRipple-childPulsate",
+ "ripple": "MuiTouchRipple-ripple",
+ "ripplePulsate": "MuiTouchRipple-ripplePulsate",
+ "rippleVisible": "MuiTouchRipple-rippleVisible",
+ "root": "MuiTouchRipple-root",
+ }
+ }
+ >
+ <span
+ className="MuiTouchRipple-root"
+ >
+ <TransitionGroup
+ childFactory={[Function]}
+ component={null}
+ exit={true}
+ />
+ </span>
+ </ForwardRef(TouchRipple)>
+ </WithStyles(memo)>
+ </NoSsr>
+ </button>
+ </ForwardRef(ButtonBase)>
+ </WithStyles(ForwardRef(ButtonBase))>
+ </ForwardRef(IconButton)>
+ </WithStyles(ForwardRef(IconButton))>
+ <div
+ className="eg-selection-modal"
+ >
+ <div
+ className="title text-20-bold"
+ >
+ ecogesture_selection.selectionModal.title
+ </div>
+ <div
+ className="text text-16-normal"
+ >
+ ecogesture_selection.selectionModal.text
+ </div>
+ <WithStyles(ForwardRef(Button))
+ aria-label="ecogesture_selection.selectionModal.button_close"
+ classes={
+ Object {
+ "label": "text-16-bold",
+ "root": "btn-highlight",
+ }
+ }
+ onClick={[MockFunction]}
+ >
+ <ForwardRef(Button)
+ aria-label="ecogesture_selection.selectionModal.button_close"
+ classes={
+ Object {
+ "colorInherit": "MuiButton-colorInherit",
+ "contained": "MuiButton-contained",
+ "containedPrimary": "MuiButton-containedPrimary",
+ "containedSecondary": "MuiButton-containedSecondary",
+ "containedSizeLarge": "MuiButton-containedSizeLarge",
+ "containedSizeSmall": "MuiButton-containedSizeSmall",
+ "disableElevation": "MuiButton-disableElevation",
+ "disabled": "Mui-disabled",
+ "endIcon": "MuiButton-endIcon",
+ "focusVisible": "Mui-focusVisible",
+ "fullWidth": "MuiButton-fullWidth",
+ "iconSizeLarge": "MuiButton-iconSizeLarge",
+ "iconSizeMedium": "MuiButton-iconSizeMedium",
+ "iconSizeSmall": "MuiButton-iconSizeSmall",
+ "label": "MuiButton-label text-16-bold",
+ "outlined": "MuiButton-outlined",
+ "outlinedPrimary": "MuiButton-outlinedPrimary",
+ "outlinedSecondary": "MuiButton-outlinedSecondary",
+ "outlinedSizeLarge": "MuiButton-outlinedSizeLarge",
+ "outlinedSizeSmall": "MuiButton-outlinedSizeSmall",
+ "root": "MuiButton-root btn-highlight",
+ "sizeLarge": "MuiButton-sizeLarge",
+ "sizeSmall": "MuiButton-sizeSmall",
+ "startIcon": "MuiButton-startIcon",
+ "text": "MuiButton-text",
+ "textPrimary": "MuiButton-textPrimary",
+ "textSecondary": "MuiButton-textSecondary",
+ "textSizeLarge": "MuiButton-textSizeLarge",
+ "textSizeSmall": "MuiButton-textSizeSmall",
+ }
+ }
+ onClick={[MockFunction]}
+ >
+ <WithStyles(ForwardRef(ButtonBase))
+ aria-label="ecogesture_selection.selectionModal.button_close"
+ className="MuiButton-root btn-highlight MuiButton-text"
+ component="button"
+ disabled={false}
+ focusRipple={true}
+ focusVisibleClassName="Mui-focusVisible"
+ onClick={[MockFunction]}
+ type="button"
+ >
+ <ForwardRef(ButtonBase)
+ aria-label="ecogesture_selection.selectionModal.button_close"
+ className="MuiButton-root btn-highlight MuiButton-text"
+ classes={
+ Object {
+ "disabled": "Mui-disabled",
+ "focusVisible": "Mui-focusVisible",
+ "root": "MuiButtonBase-root",
+ }
+ }
+ component="button"
+ disabled={false}
+ focusRipple={true}
+ focusVisibleClassName="Mui-focusVisible"
+ onClick={[MockFunction]}
+ type="button"
+ >
+ <button
+ aria-label="ecogesture_selection.selectionModal.button_close"
+ className="MuiButtonBase-root MuiButton-root btn-highlight MuiButton-text"
+ disabled={false}
+ onBlur={[Function]}
+ onClick={[MockFunction]}
+ onDragLeave={[Function]}
+ onFocus={[Function]}
+ onKeyDown={[Function]}
+ onKeyUp={[Function]}
+ onMouseDown={[Function]}
+ onMouseLeave={[Function]}
+ onMouseUp={[Function]}
+ onTouchEnd={[Function]}
+ onTouchMove={[Function]}
+ onTouchStart={[Function]}
+ tabIndex={0}
+ type="button"
+ >
+ <span
+ className="MuiButton-label text-16-bold"
+ >
+ ecogesture_selection.selectionModal.button_close
+ </span>
+ <NoSsr>
+ <WithStyles(memo)
+ center={false}
+ >
+ <ForwardRef(TouchRipple)
+ center={false}
+ classes={
+ Object {
+ "child": "MuiTouchRipple-child",
+ "childLeaving": "MuiTouchRipple-childLeaving",
+ "childPulsate": "MuiTouchRipple-childPulsate",
+ "ripple": "MuiTouchRipple-ripple",
+ "ripplePulsate": "MuiTouchRipple-ripplePulsate",
+ "rippleVisible": "MuiTouchRipple-rippleVisible",
+ "root": "MuiTouchRipple-root",
+ }
+ }
+ >
+ <span
+ className="MuiTouchRipple-root"
+ >
+ <TransitionGroup
+ childFactory={[Function]}
+ component={null}
+ exit={true}
+ />
+ </span>
+ </ForwardRef(TouchRipple)>
+ </WithStyles(memo)>
+ </NoSsr>
+ </button>
+ </ForwardRef(ButtonBase)>
+ </WithStyles(ForwardRef(ButtonBase))>
+ </ForwardRef(Button)>
+ </WithStyles(ForwardRef(Button))>
+ </div>
+ </div>
+ </ForwardRef(Paper)>
+ </WithStyles(ForwardRef(Paper))>
+ </div>
+ </Transition>
+ </ForwardRef(Fade)>
+ <div
+ data-test="sentinelEnd"
+ tabIndex={0}
+ />
+ </TrapFocus>
+ </div>
+ </Portal>
+ </ForwardRef(Portal)>
+ </ForwardRef(Modal)>
+ </ForwardRef(Dialog)>
+ </WithStyles(ForwardRef(Dialog))>
+</EcogestureSelectionModal>
+`;
diff --git a/src/components/EcogestureSelection/__snapshots__/EcogestureSelectionRestart.spec.tsx.snap b/src/components/EcogestureSelection/__snapshots__/EcogestureSelectionRestart.spec.tsx.snap
new file mode 100644
index 0000000000000000000000000000000000000000..0dc2cff5a3fb8d1819f7d58b0d4b6f43d61a4d92
--- /dev/null
+++ b/src/components/EcogestureSelection/__snapshots__/EcogestureSelectionRestart.spec.tsx.snap
@@ -0,0 +1,328 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`EcogestureSelectionRestart component should be rendered correctly 1`] = `
+<EcogestureSelectionRestart
+ listLength={10}
+ restart={[MockFunction]}
+>
+ <div
+ className="eg-selection-restart-container"
+ >
+ <div
+ className="content"
+ >
+ <div
+ className="title text-21-bold"
+ >
+ ecogesture_selection.title
+ </div>
+ <StyledIcon
+ icon="test-file-stub"
+ size={120}
+ >
+ <Icon
+ aria-hidden={true}
+ icon="test-file-stub"
+ size={120}
+ spin={false}
+ >
+ <Component
+ aria-hidden={true}
+ className="styles__icon___23x3R"
+ height={120}
+ style={Object {}}
+ width={120}
+ >
+ <svg
+ aria-hidden={true}
+ className="styles__icon___23x3R"
+ height={120}
+ style={Object {}}
+ width={120}
+ >
+ <use
+ xlinkHref="#test-file-stub"
+ />
+ </svg>
+ </Component>
+ </Icon>
+ </StyledIcon>
+ <div
+ className="text text-16-normal"
+ >
+ ecogesture_selection.text
+ </div>
+ </div>
+ <div
+ className="buttons"
+ >
+ <WithStyles(ForwardRef(Button))
+ aria-label="ecogesture_selection.accessibility.button_go_to_ecogesture"
+ classes={
+ Object {
+ "label": "text-16-normal",
+ "root": "btn-secondary-negative",
+ }
+ }
+ onClick={[Function]}
+ >
+ <ForwardRef(Button)
+ aria-label="ecogesture_selection.accessibility.button_go_to_ecogesture"
+ classes={
+ Object {
+ "colorInherit": "MuiButton-colorInherit",
+ "contained": "MuiButton-contained",
+ "containedPrimary": "MuiButton-containedPrimary",
+ "containedSecondary": "MuiButton-containedSecondary",
+ "containedSizeLarge": "MuiButton-containedSizeLarge",
+ "containedSizeSmall": "MuiButton-containedSizeSmall",
+ "disableElevation": "MuiButton-disableElevation",
+ "disabled": "Mui-disabled",
+ "endIcon": "MuiButton-endIcon",
+ "focusVisible": "Mui-focusVisible",
+ "fullWidth": "MuiButton-fullWidth",
+ "iconSizeLarge": "MuiButton-iconSizeLarge",
+ "iconSizeMedium": "MuiButton-iconSizeMedium",
+ "iconSizeSmall": "MuiButton-iconSizeSmall",
+ "label": "MuiButton-label text-16-normal",
+ "outlined": "MuiButton-outlined",
+ "outlinedPrimary": "MuiButton-outlinedPrimary",
+ "outlinedSecondary": "MuiButton-outlinedSecondary",
+ "outlinedSizeLarge": "MuiButton-outlinedSizeLarge",
+ "outlinedSizeSmall": "MuiButton-outlinedSizeSmall",
+ "root": "MuiButton-root btn-secondary-negative",
+ "sizeLarge": "MuiButton-sizeLarge",
+ "sizeSmall": "MuiButton-sizeSmall",
+ "startIcon": "MuiButton-startIcon",
+ "text": "MuiButton-text",
+ "textPrimary": "MuiButton-textPrimary",
+ "textSecondary": "MuiButton-textSecondary",
+ "textSizeLarge": "MuiButton-textSizeLarge",
+ "textSizeSmall": "MuiButton-textSizeSmall",
+ }
+ }
+ onClick={[Function]}
+ >
+ <WithStyles(ForwardRef(ButtonBase))
+ aria-label="ecogesture_selection.accessibility.button_go_to_ecogesture"
+ className="MuiButton-root btn-secondary-negative MuiButton-text"
+ component="button"
+ disabled={false}
+ focusRipple={true}
+ focusVisibleClassName="Mui-focusVisible"
+ onClick={[Function]}
+ type="button"
+ >
+ <ForwardRef(ButtonBase)
+ aria-label="ecogesture_selection.accessibility.button_go_to_ecogesture"
+ className="MuiButton-root btn-secondary-negative MuiButton-text"
+ classes={
+ Object {
+ "disabled": "Mui-disabled",
+ "focusVisible": "Mui-focusVisible",
+ "root": "MuiButtonBase-root",
+ }
+ }
+ component="button"
+ disabled={false}
+ focusRipple={true}
+ focusVisibleClassName="Mui-focusVisible"
+ onClick={[Function]}
+ type="button"
+ >
+ <button
+ aria-label="ecogesture_selection.accessibility.button_go_to_ecogesture"
+ className="MuiButtonBase-root MuiButton-root btn-secondary-negative MuiButton-text"
+ disabled={false}
+ onBlur={[Function]}
+ onClick={[Function]}
+ onDragLeave={[Function]}
+ onFocus={[Function]}
+ onKeyDown={[Function]}
+ onKeyUp={[Function]}
+ onMouseDown={[Function]}
+ onMouseLeave={[Function]}
+ onMouseUp={[Function]}
+ onTouchEnd={[Function]}
+ onTouchMove={[Function]}
+ onTouchStart={[Function]}
+ tabIndex={0}
+ type="button"
+ >
+ <span
+ className="MuiButton-label text-16-normal"
+ >
+ ecogesture_selection.button_go_to_ecogesture
+ </span>
+ <NoSsr>
+ <WithStyles(memo)
+ center={false}
+ >
+ <ForwardRef(TouchRipple)
+ center={false}
+ classes={
+ Object {
+ "child": "MuiTouchRipple-child",
+ "childLeaving": "MuiTouchRipple-childLeaving",
+ "childPulsate": "MuiTouchRipple-childPulsate",
+ "ripple": "MuiTouchRipple-ripple",
+ "ripplePulsate": "MuiTouchRipple-ripplePulsate",
+ "rippleVisible": "MuiTouchRipple-rippleVisible",
+ "root": "MuiTouchRipple-root",
+ }
+ }
+ >
+ <span
+ className="MuiTouchRipple-root"
+ >
+ <TransitionGroup
+ childFactory={[Function]}
+ component={null}
+ exit={true}
+ />
+ </span>
+ </ForwardRef(TouchRipple)>
+ </WithStyles(memo)>
+ </NoSsr>
+ </button>
+ </ForwardRef(ButtonBase)>
+ </WithStyles(ForwardRef(ButtonBase))>
+ </ForwardRef(Button)>
+ </WithStyles(ForwardRef(Button))>
+ <WithStyles(ForwardRef(Button))
+ aria-label="ecogesture_selection.accessibility.button_continue"
+ classes={
+ Object {
+ "label": "text-16-bold",
+ "root": "btn-highlight",
+ }
+ }
+ onClick={[MockFunction]}
+ >
+ <ForwardRef(Button)
+ aria-label="ecogesture_selection.accessibility.button_continue"
+ classes={
+ Object {
+ "colorInherit": "MuiButton-colorInherit",
+ "contained": "MuiButton-contained",
+ "containedPrimary": "MuiButton-containedPrimary",
+ "containedSecondary": "MuiButton-containedSecondary",
+ "containedSizeLarge": "MuiButton-containedSizeLarge",
+ "containedSizeSmall": "MuiButton-containedSizeSmall",
+ "disableElevation": "MuiButton-disableElevation",
+ "disabled": "Mui-disabled",
+ "endIcon": "MuiButton-endIcon",
+ "focusVisible": "Mui-focusVisible",
+ "fullWidth": "MuiButton-fullWidth",
+ "iconSizeLarge": "MuiButton-iconSizeLarge",
+ "iconSizeMedium": "MuiButton-iconSizeMedium",
+ "iconSizeSmall": "MuiButton-iconSizeSmall",
+ "label": "MuiButton-label text-16-bold",
+ "outlined": "MuiButton-outlined",
+ "outlinedPrimary": "MuiButton-outlinedPrimary",
+ "outlinedSecondary": "MuiButton-outlinedSecondary",
+ "outlinedSizeLarge": "MuiButton-outlinedSizeLarge",
+ "outlinedSizeSmall": "MuiButton-outlinedSizeSmall",
+ "root": "MuiButton-root btn-highlight",
+ "sizeLarge": "MuiButton-sizeLarge",
+ "sizeSmall": "MuiButton-sizeSmall",
+ "startIcon": "MuiButton-startIcon",
+ "text": "MuiButton-text",
+ "textPrimary": "MuiButton-textPrimary",
+ "textSecondary": "MuiButton-textSecondary",
+ "textSizeLarge": "MuiButton-textSizeLarge",
+ "textSizeSmall": "MuiButton-textSizeSmall",
+ }
+ }
+ onClick={[MockFunction]}
+ >
+ <WithStyles(ForwardRef(ButtonBase))
+ aria-label="ecogesture_selection.accessibility.button_continue"
+ className="MuiButton-root btn-highlight MuiButton-text"
+ component="button"
+ disabled={false}
+ focusRipple={true}
+ focusVisibleClassName="Mui-focusVisible"
+ onClick={[MockFunction]}
+ type="button"
+ >
+ <ForwardRef(ButtonBase)
+ aria-label="ecogesture_selection.accessibility.button_continue"
+ className="MuiButton-root btn-highlight MuiButton-text"
+ classes={
+ Object {
+ "disabled": "Mui-disabled",
+ "focusVisible": "Mui-focusVisible",
+ "root": "MuiButtonBase-root",
+ }
+ }
+ component="button"
+ disabled={false}
+ focusRipple={true}
+ focusVisibleClassName="Mui-focusVisible"
+ onClick={[MockFunction]}
+ type="button"
+ >
+ <button
+ aria-label="ecogesture_selection.accessibility.button_continue"
+ className="MuiButtonBase-root MuiButton-root btn-highlight MuiButton-text"
+ disabled={false}
+ onBlur={[Function]}
+ onClick={[MockFunction]}
+ onDragLeave={[Function]}
+ onFocus={[Function]}
+ onKeyDown={[Function]}
+ onKeyUp={[Function]}
+ onMouseDown={[Function]}
+ onMouseLeave={[Function]}
+ onMouseUp={[Function]}
+ onTouchEnd={[Function]}
+ onTouchMove={[Function]}
+ onTouchStart={[Function]}
+ tabIndex={0}
+ type="button"
+ >
+ <span
+ className="MuiButton-label text-16-bold"
+ >
+ ecogesture_selection.button_continue
+ </span>
+ <NoSsr>
+ <WithStyles(memo)
+ center={false}
+ >
+ <ForwardRef(TouchRipple)
+ center={false}
+ classes={
+ Object {
+ "child": "MuiTouchRipple-child",
+ "childLeaving": "MuiTouchRipple-childLeaving",
+ "childPulsate": "MuiTouchRipple-childPulsate",
+ "ripple": "MuiTouchRipple-ripple",
+ "ripplePulsate": "MuiTouchRipple-ripplePulsate",
+ "rippleVisible": "MuiTouchRipple-rippleVisible",
+ "root": "MuiTouchRipple-root",
+ }
+ }
+ >
+ <span
+ className="MuiTouchRipple-root"
+ >
+ <TransitionGroup
+ childFactory={[Function]}
+ component={null}
+ exit={true}
+ />
+ </span>
+ </ForwardRef(TouchRipple)>
+ </WithStyles(memo)>
+ </NoSsr>
+ </button>
+ </ForwardRef(ButtonBase)>
+ </WithStyles(ForwardRef(ButtonBase))>
+ </ForwardRef(Button)>
+ </WithStyles(ForwardRef(Button))>
+ </div>
+ </div>
+</EcogestureSelectionRestart>
+`;
diff --git a/src/components/EcogestureSelection/ecogestureSelection.scss b/src/components/EcogestureSelection/ecogestureSelection.scss
new file mode 100644
index 0000000000000000000000000000000000000000..128410d01da72b40f7d06c50bffbcf9e58ee2dde
--- /dev/null
+++ b/src/components/EcogestureSelection/ecogestureSelection.scss
@@ -0,0 +1,19 @@
+@import '../../styles/base/color';
+@import '../../styles/base/breakpoint';
+
+.eg-selection-loader {
+ min-height: inherit;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ @media all and(min-width: $width-tablet) {
+ min-height: 80vh;
+ }
+}
+
+.eg-selection-header {
+ color: $grey-bright;
+ text-align: center;
+ margin-top: -1rem;
+ margin-bottom: 1rem;
+}
diff --git a/src/components/EcogestureSelection/ecogestureSelectionDetail.scss b/src/components/EcogestureSelection/ecogestureSelectionDetail.scss
new file mode 100644
index 0000000000000000000000000000000000000000..c186102dd259af0b740bb8692cd56b5cb938bae9
--- /dev/null
+++ b/src/components/EcogestureSelection/ecogestureSelectionDetail.scss
@@ -0,0 +1,55 @@
+@import '../../styles/base/color';
+@import '../../styles/base/breakpoint';
+
+.eg-selection-detail-container {
+ position: relative;
+ min-height: inherit;
+ margin: auto;
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
+ align-items: center;
+ text-align: center;
+ color: $grey-bright;
+ max-width: 45.75rem;
+ @media #{$large-phone} {
+ margin: 0 1rem;
+ max-width: unset;
+ }
+ .content {
+ display: flex;
+ flex-direction: column;
+ flex: 1;
+ justify-content: center;
+ align-items: center;
+ .icon {
+ margin: 5rem 0 0;
+ @media #{$large-phone} {
+ margin: 1rem 0 0;
+ }
+ }
+ .text {
+ min-height: 4.875rem;
+ display: flex;
+ align-items: center;
+ margin: 0 1rem;
+ }
+ }
+ .buttons {
+ margin: 1rem 0;
+ display: flex;
+ flex-direction: row;
+ justify-content: center;
+ width: 100%;
+ button.btn-secondary-negative {
+ padding: 0.75rem 0.25rem;
+ margin: 0 0.25rem;
+ height: 7.375rem;
+ width: 6.5rem;
+ border-radius: 0.25rem;
+ span {
+ flex-direction: column;
+ }
+ }
+ }
+}
diff --git a/src/components/EcogestureSelection/ecogestureSelectionEnd.scss b/src/components/EcogestureSelection/ecogestureSelectionEnd.scss
new file mode 100644
index 0000000000000000000000000000000000000000..1d9d3315659a459553e3761f34ac572c1d4f64b4
--- /dev/null
+++ b/src/components/EcogestureSelection/ecogestureSelectionEnd.scss
@@ -0,0 +1,48 @@
+@import '../../styles/base/color';
+@import '../../styles/base/breakpoint';
+
+.eg-selection-end-container {
+ position: relative;
+ min-height: inherit;
+ margin: auto;
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
+ align-items: center;
+ text-align: center;
+ color: $grey-bright;
+ max-width: 45.75rem;
+ @media #{$large-phone} {
+ margin: 0 1rem;
+ max-width: unset;
+ }
+ .content {
+ display: flex;
+ flex-direction: column;
+ flex: 1;
+ justify-content: center;
+ align-items: center;
+ .title {
+ color: $gold-shadow;
+ margin: 1rem;
+ @media all and(min-width: $width-tablet) {
+ margin: 5rem;
+ }
+ }
+ .text {
+ margin-top: 1rem;
+ }
+ }
+ .buttons {
+ margin: 1rem 0;
+ display: flex;
+ flex-direction: row;
+ justify-content: center;
+ width: 100%;
+ button.btn-highlight {
+ padding: 0.75rem 0.5rem;
+ margin: 0 0.5rem;
+ max-width: 25rem;
+ }
+ }
+}
diff --git a/src/components/EcogestureSelection/ecogestureSelectionModal.scss b/src/components/EcogestureSelection/ecogestureSelectionModal.scss
new file mode 100644
index 0000000000000000000000000000000000000000..99a08d67a118b774f5573f524763b6b34c06f7a2
--- /dev/null
+++ b/src/components/EcogestureSelection/ecogestureSelectionModal.scss
@@ -0,0 +1,19 @@
+@import '../../styles/base/color';
+
+.eg-selection-modal {
+ color: $grey-bright;
+ margin: 1rem 0;
+ text-align: center;
+ display: flex;
+ flex-direction: column;
+ .title {
+ margin: 1rem 0;
+ color: $gold-shadow;
+ }
+ .text {
+ margin: 1rem 0;
+ }
+ button.btn-highlight {
+ padding: 0.75rem 0.5rem;
+ }
+}
diff --git a/src/components/EcogestureSelection/ecogestureSelectionRestart.scss b/src/components/EcogestureSelection/ecogestureSelectionRestart.scss
new file mode 100644
index 0000000000000000000000000000000000000000..08c2885b01e7b35bcdb1d02bd7da499631e44a65
--- /dev/null
+++ b/src/components/EcogestureSelection/ecogestureSelectionRestart.scss
@@ -0,0 +1,51 @@
+@import '../../styles/base/color';
+@import '../../styles/base/breakpoint';
+
+.eg-selection-restart-container {
+ position: relative;
+ min-height: inherit;
+ margin: auto;
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
+ align-items: center;
+ text-align: center;
+ color: $grey-bright;
+ max-width: 45.75rem;
+ @media #{$large-phone} {
+ margin: 0 1rem;
+ max-width: unset;
+ }
+ .content {
+ display: flex;
+ flex-direction: column;
+ flex: 1;
+ justify-content: center;
+ align-items: center;
+ .title {
+ color: $gold-shadow;
+ margin: 1rem;
+ @media all and(min-width: $width-tablet) {
+ margin: 5rem;
+ }
+ }
+ .text {
+ margin-top: 3.25rem;
+ }
+ }
+ .buttons {
+ margin: 1rem 0;
+ display: flex;
+ flex-direction: row;
+ justify-content: space-between;
+ width: 100%;
+ button.btn-secondary-negative {
+ padding: 0.75rem 0.5rem;
+ margin: 0 0.25rem;
+ }
+ button.btn-highlight {
+ padding: 0.75rem 0.5rem;
+ margin: 0 0.5rem;
+ }
+ }
+}
diff --git a/src/components/Header/CozyBar.tsx b/src/components/Header/CozyBar.tsx
index fa14912e2d9559517ef9ce6ed659cce759c4aa9e..7f56b78d90ef4459a20e12eafad6d49dcddaccb1 100644
--- a/src/components/Header/CozyBar.tsx
+++ b/src/components/Header/CozyBar.tsx
@@ -1,4 +1,4 @@
-import React from 'react'
+import React, { useCallback } from 'react'
import { useI18n } from 'cozy-ui/transpiled/react/I18n'
import { useSelector, useDispatch } from 'react-redux'
import { AppStore } from 'store'
@@ -18,6 +18,7 @@ interface CozyBarProps {
displayBackArrow?: boolean
isBuilding?: boolean
isNotKey?: boolean
+ backFunction?: () => void
}
const CozyBar = ({
@@ -25,6 +26,7 @@ const CozyBar = ({
displayBackArrow = false,
isBuilding,
isNotKey,
+ backFunction,
}: CozyBarProps) => {
const { t } = useI18n()
const history = useHistory()
@@ -32,9 +34,13 @@ const CozyBar = ({
const { BarLeft, BarCenter, BarRight } = cozy.bar
const { screenType } = useSelector((state: AppStore) => state.ecolyo.global)
- const handleClickBack = () => {
- history.goBack()
- }
+ const handleClickBack = useCallback(() => {
+ if (backFunction) {
+ backFunction()
+ } else {
+ history.goBack()
+ }
+ }, [backFunction, history])
const handleClickFeedbacks = () => {
dispatch(updateModalIsFeedbacksOpen(true))
diff --git a/src/components/Header/Header.tsx b/src/components/Header/Header.tsx
index 0d198f9b9fbb5b51c381aacc6af1c4e10d94a079..d3045cc0f2c6ed573e0c156b368eaf7d2f7c23a7 100644
--- a/src/components/Header/Header.tsx
+++ b/src/components/Header/Header.tsx
@@ -24,6 +24,7 @@ interface HeaderProps {
setHeaderHeight(height: number): void
isBuilding?: boolean
isNotKey?: boolean
+ backFunction?: () => void
}
const Header: React.FC<HeaderProps> = ({
@@ -34,6 +35,7 @@ const Header: React.FC<HeaderProps> = ({
setHeaderHeight,
isBuilding,
isNotKey,
+ backFunction,
}: HeaderProps) => {
const { t } = useI18n()
const history = useHistory()
@@ -44,8 +46,12 @@ const Header: React.FC<HeaderProps> = ({
const cozyBarHeight = 48
const handleClickBack = useCallback(() => {
- history.goBack()
- }, [history])
+ if (backFunction) {
+ backFunction()
+ } else {
+ history.goBack()
+ }
+ }, [backFunction, history])
const handleClickFeedbacks = () => {
dispatch(updateModalIsFeedbacksOpen(true))
diff --git a/src/components/Routes/Routes.tsx b/src/components/Routes/Routes.tsx
index c87fc67ac633306318b270ed6daadcc16b7ead4b..5267763350f7d8d119a7449b05a224c363b4c20d 100644
--- a/src/components/Routes/Routes.tsx
+++ b/src/components/Routes/Routes.tsx
@@ -10,7 +10,7 @@ import UnSubscribe from 'components/Options/UnSubscribe'
import TermsView from 'components/Terms/TermsView'
import { TermsStatus } from 'models'
import EcogestureFormView from 'components/EcogestureForm/EcogestureFormView'
-import EcogestureSelection from 'components/EcogestureForm/EcogestureSelection'
+import EcogestureSelection from 'components/EcogestureSelection/EcogestureSelection'
const ConsumptionView = lazy(() => import('components/Home/ConsumptionView'))
diff --git a/src/components/Splash/SplashRoot.tsx b/src/components/Splash/SplashRoot.tsx
index 6f17748c36500c157f94ddde15adde88c99e9b83..c1305efcb2f20b33b525a0a8bed4dc0d5bcf6024 100644
--- a/src/components/Splash/SplashRoot.tsx
+++ b/src/components/Splash/SplashRoot.tsx
@@ -8,7 +8,7 @@ import React, {
import { useClient } from 'cozy-client'
import classNames from 'classnames'
import { useDispatch } from 'react-redux'
-import { FluidState, FluidType } from 'enum/fluid.enum'
+import { FluidState } from 'enum/fluid.enum'
import {
toggleAnalysisNotification,
@@ -58,7 +58,10 @@ import { ReleaseNotes } from 'models/releaseNotes.model'
import PartnersInfoService from 'services/partnersInfo.service'
import FluidService from 'services/fluid.service'
import { PartnersInfo } from 'models/partnersInfo.model'
-import { updateProfileEcogesture } from 'store/profileEcogesture/profileEcogesture.actions'
+import {
+ ProfileEcogestureActionTypes,
+ updateProfileEcogestureSuccess,
+} from 'store/profileEcogesture/profileEcogesture.actions'
interface SplashRootProps {
fadeTimer?: number
@@ -88,6 +91,7 @@ const SplashRoot = ({
| ChartActionTypes
| GlobalActionTypes
| ProfileActionTypes
+ | ProfileEcogestureActionTypes
| ProfileTypeActionTypes
> = useDispatch()
@@ -156,7 +160,7 @@ const SplashRoot = ({
dispatch(updateProfileType(profileType))
}
if (profileEcogesture) {
- dispatch(updateProfileEcogesture(profileEcogesture))
+ dispatch(updateProfileEcogestureSuccess(profileEcogesture))
}
dispatch(toggleAnalysisNotification(!profile.haveSeenLastAnalysis))
}
diff --git a/src/db/ecogestureData.json b/src/db/ecogestureData.json
index a32e71fcf16737fb943a116216aa5b0be3367718..9be2b2271c7fc2275435096854ac03ea2d69d03e 100644
--- a/src/db/ecogestureData.json
+++ b/src/db/ecogestureData.json
@@ -19,7 +19,8 @@
"actionName": null,
"actionDuration": 3,
"doing": false,
- "objective": false
+ "objective": false,
+ "viewedInSelection": false
},
{
"_id": "ECOGESTURE0002",
@@ -41,7 +42,8 @@
"actionName": null,
"actionDuration": 3,
"doing": false,
- "objective": false
+ "objective": false,
+ "viewedInSelection": false
},
{
"_id": "ECOGESTURE0003",
@@ -63,7 +65,8 @@
"actionName": "Je ferme les portes entre les pièces chauffées et moins chauffées.",
"actionDuration": 3,
"doing": false,
- "objective": false
+ "objective": false,
+ "viewedInSelection": false
},
{
"_id": "ECOGESTURE0004",
@@ -85,7 +88,8 @@
"actionName": "Je coupe l'eau de la douche pendant que je me savonne.",
"actionDuration": 3,
"doing": false,
- "objective": false
+ "objective": false,
+ "viewedInSelection": false
},
{
"_id": "ECOGESTURE0005",
@@ -107,7 +111,8 @@
"actionName": "Je ferme l’eau du robinet quand je me lave les dents.",
"actionDuration": 3,
"doing": false,
- "objective": false
+ "objective": false,
+ "viewedInSelection": false
},
{
"_id": "ECOGESTURE0006",
@@ -129,7 +134,8 @@
"actionName": "Je mets mon ordinateur en veille automatique au bout de 5/10min d'inactivité.",
"actionDuration": 3,
"doing": false,
- "objective": false
+ "objective": false,
+ "viewedInSelection": false
},
{
"_id": "ECOGESTURE0007",
@@ -151,7 +157,8 @@
"actionName": null,
"actionDuration": 3,
"doing": false,
- "objective": false
+ "objective": false,
+ "viewedInSelection": false
},
{
"_id": "ECOGESTURE0008",
@@ -173,7 +180,8 @@
"actionName": null,
"actionDuration": 3,
"doing": false,
- "objective": false
+ "objective": false,
+ "viewedInSelection": false
},
{
"_id": "ECOGESTURE0009",
@@ -195,7 +203,8 @@
"actionName": "Je dépoussière mes radiateurs.",
"actionDuration": 3,
"doing": false,
- "objective": false
+ "objective": false,
+ "viewedInSelection": false
},
{
"_id": "ECOGESTURE0010",
@@ -217,7 +226,8 @@
"actionName": "Je me lave les mains uniquement à l'eau froide.",
"actionDuration": 3,
"doing": false,
- "objective": false
+ "objective": false,
+ "viewedInSelection": false
},
{
"_id": "ECOGESTURE0011",
@@ -239,7 +249,8 @@
"actionName": "Je rince ma vaisselle à l'eau froide.",
"actionDuration": 3,
"doing": false,
- "objective": false
+ "objective": false,
+ "viewedInSelection": false
},
{
"_id": "ECOGESTURE0012",
@@ -261,7 +272,8 @@
"actionName": null,
"actionDuration": 3,
"doing": false,
- "objective": false
+ "objective": false,
+ "viewedInSelection": false
},
{
"_id": "ECOGESTURE0013",
@@ -283,7 +295,8 @@
"actionName": "J’utilise le cycle court à basse température pour laver le linge et la vaisselle.",
"actionDuration": 3,
"doing": false,
- "objective": false
+ "objective": false,
+ "viewedInSelection": false
},
{
"_id": "ECOGESTURE0014",
@@ -305,7 +318,8 @@
"actionName": "J’attends que les plats chauds aient refroidi avant de les mettre au réfrigérateur et je les couvre.",
"actionDuration": 3,
"doing": false,
- "objective": false
+ "objective": false,
+ "viewedInSelection": false
},
{
"_id": "ECOGESTURE0015",
@@ -327,7 +341,8 @@
"actionName": "Je remets systématiquement mes mitigeurs sur la position la plus froide.",
"actionDuration": 3,
"doing": false,
- "objective": false
+ "objective": false,
+ "viewedInSelection": false
},
{
"_id": "ECOGESTURE0016",
@@ -349,7 +364,8 @@
"actionName": "J’éteins systématiquement les lumières quand je sors d’une pièce.",
"actionDuration": 3,
"doing": false,
- "objective": false
+ "objective": false,
+ "viewedInSelection": false
},
{
"_id": "ECOGESTURE0017",
@@ -371,7 +387,8 @@
"actionName": null,
"actionDuration": 3,
"doing": false,
- "objective": false
+ "objective": false,
+ "viewedInSelection": false
},
{
"_id": "ECOGESTURE0018",
@@ -393,7 +410,8 @@
"actionName": "Je remplis complètement ma machine à laver et/ou mon lave-vaisselle avant de les faire tourner.",
"actionDuration": 3,
"doing": false,
- "objective": false
+ "objective": false,
+ "viewedInSelection": false
},
{
"_id": "ECOGESTURE0019",
@@ -415,7 +433,8 @@
"actionName": null,
"actionDuration": 3,
"doing": false,
- "objective": false
+ "objective": false,
+ "viewedInSelection": false
},
{
"_id": "ECOGESTURE0020",
@@ -437,7 +456,8 @@
"actionName": null,
"actionDuration": 3,
"doing": false,
- "objective": false
+ "objective": false,
+ "viewedInSelection": false
},
{
"_id": "ECOGESTURE0021",
@@ -459,7 +479,8 @@
"actionName": null,
"actionDuration": 3,
"doing": false,
- "objective": false
+ "objective": false,
+ "viewedInSelection": false
},
{
"_id": "ECOGESTURE0022",
@@ -481,7 +502,8 @@
"actionName": "Je nettoie le filtre de ma machine à laver.",
"actionDuration": 3,
"doing": false,
- "objective": false
+ "objective": false,
+ "viewedInSelection": false
},
{
"_id": "ECOGESTURE0023",
@@ -503,7 +525,8 @@
"actionName": null,
"actionDuration": 3,
"doing": false,
- "objective": false
+ "objective": false,
+ "viewedInSelection": false
},
{
"_id": "ECOGESTURE0024",
@@ -525,7 +548,8 @@
"actionName": null,
"actionDuration": 3,
"doing": false,
- "objective": false
+ "objective": false,
+ "viewedInSelection": false
},
{
"_id": "ECOGESTURE0025",
@@ -547,7 +571,8 @@
"actionName": "Je nettoie mes ampoules et luminaires.",
"actionDuration": 3,
"doing": false,
- "objective": false
+ "objective": false,
+ "viewedInSelection": false
},
{
"_id": "ECOGESTURE0026",
@@ -569,7 +594,8 @@
"actionName": "J’ouvre mes rideaux et mes volets dès qu’il fait jour et privilégie les apports de lumière naturelle.",
"actionDuration": 3,
"doing": false,
- "objective": false
+ "objective": false,
+ "viewedInSelection": false
},
{
"_id": "ECOGESTURE0027",
@@ -591,7 +617,8 @@
"actionName": "Je débranche mes chargeurs quand ils ne sont pas en fonctionnement.",
"actionDuration": 3,
"doing": false,
- "objective": false
+ "objective": false,
+ "viewedInSelection": false
},
{
"_id": "ECOGESTURE0028",
@@ -613,7 +640,8 @@
"actionName": "Je réfléchis à ce que je vais prendre avant d’ouvrir la porte de mon appareil de froid.",
"actionDuration": 3,
"doing": false,
- "objective": false
+ "objective": false,
+ "viewedInSelection": false
},
{
"_id": "ECOGESTURE0029",
@@ -635,7 +663,8 @@
"actionName": "J'adapte le programme d'essorage de ma machine à laver au type de linge.",
"actionDuration": 3,
"doing": false,
- "objective": false
+ "objective": false,
+ "viewedInSelection": false
},
{
"_id": "ECOGESTURE0030",
@@ -657,7 +686,8 @@
"actionName": "J’optimise le rangement dans mon réfrigérateur et/ou congélateur.",
"actionDuration": 3,
"doing": false,
- "objective": false
+ "objective": false,
+ "viewedInSelection": false
},
{
"_id": "ECOGESTURE0031",
@@ -679,7 +709,8 @@
"actionName": "Je décide de baisser de 2 °C la température de chauffage de mes pièces.",
"actionDuration": 3,
"doing": false,
- "objective": false
+ "objective": false,
+ "viewedInSelection": false
},
{
"_id": "ECOGESTURE0032",
@@ -701,7 +732,8 @@
"actionName": null,
"actionDuration": 3,
"doing": false,
- "objective": false
+ "objective": false,
+ "viewedInSelection": false
},
{
"_id": "ECOGESTURE0033",
@@ -723,7 +755,8 @@
"actionName": null,
"actionDuration": 3,
"doing": false,
- "objective": false
+ "objective": false,
+ "viewedInSelection": false
},
{
"_id": "ECOGESTURE0034",
@@ -745,7 +778,8 @@
"actionName": null,
"actionDuration": 3,
"doing": false,
- "objective": false
+ "objective": false,
+ "viewedInSelection": false
},
{
"_id": "ECOGESTURE0035",
@@ -767,7 +801,8 @@
"actionName": null,
"actionDuration": 3,
"doing": false,
- "objective": false
+ "objective": false,
+ "viewedInSelection": false
},
{
"_id": "ECOGESTURE0036",
@@ -789,7 +824,8 @@
"actionName": "Je met mon chauffage en mode réduit pendant la nuit ou pendant mon absence.",
"actionDuration": 3,
"doing": false,
- "objective": false
+ "objective": false,
+ "viewedInSelection": false
},
{
"_id": "ECOGESTURE0037",
@@ -811,7 +847,8 @@
"actionName": "Je décide de baisser d'1 °C la température de chauffage de mes pièces.",
"actionDuration": 3,
"doing": false,
- "objective": false
+ "objective": false,
+ "viewedInSelection": false
},
{
"_id": "ECOGESTURE0038",
@@ -833,7 +870,8 @@
"actionName": "Je ne chauffe que les pièces de vie (salon, cuisine, …)",
"actionDuration": 3,
"doing": false,
- "objective": false
+ "objective": false,
+ "viewedInSelection": false
},
{
"_id": "ECOGESTURE0039",
@@ -855,7 +893,8 @@
"actionName": null,
"actionDuration": 3,
"doing": false,
- "objective": false
+ "objective": false,
+ "viewedInSelection": false
},
{
"_id": "ECOGESTURE0040",
@@ -877,7 +916,8 @@
"actionName": "Je prends des douches de moins de 5 minutes.",
"actionDuration": 3,
"doing": false,
- "objective": false
+ "objective": false,
+ "viewedInSelection": false
},
{
"_id": "ECOGESTURE0041",
@@ -899,7 +939,8 @@
"actionName": null,
"actionDuration": 3,
"doing": false,
- "objective": false
+ "objective": false,
+ "viewedInSelection": false
},
{
"_id": "ECOGESTURE0042",
@@ -921,7 +962,8 @@
"actionName": null,
"actionDuration": 3,
"doing": false,
- "objective": false
+ "objective": false,
+ "viewedInSelection": false
},
{
"_id": "ECOGESTURE0043",
@@ -943,7 +985,8 @@
"actionName": "Je conserve au maximum la fraicheur de mon logement en fermant les volets et fenêtres quand je m’absente pendant la journée.",
"actionDuration": 3,
"doing": false,
- "objective": false
+ "objective": false,
+ "viewedInSelection": false
},
{
"_id": "ECOGESTURE0044",
@@ -965,7 +1008,8 @@
"actionName": null,
"actionDuration": 3,
"doing": false,
- "objective": false
+ "objective": false,
+ "viewedInSelection": false
},
{
"_id": "ECOGESTURE0045",
@@ -987,7 +1031,8 @@
"actionName": null,
"actionDuration": 3,
"doing": false,
- "objective": false
+ "objective": false,
+ "viewedInSelection": false
},
{
"_id": "ECOGESTURE0046",
@@ -1009,7 +1054,8 @@
"actionName": null,
"actionDuration": 3,
"doing": false,
- "objective": false
+ "objective": false,
+ "viewedInSelection": false
},
{
"_id": "ECOGESTURE0047",
@@ -1031,7 +1077,8 @@
"actionName": null,
"actionDuration": 3,
"doing": false,
- "objective": false
+ "objective": false,
+ "viewedInSelection": false
},
{
"_id": "ECOGESTURE0048",
@@ -1053,7 +1100,8 @@
"actionName": null,
"actionDuration": 3,
"doing": false,
- "objective": false
+ "objective": false,
+ "viewedInSelection": false
},
{
"_id": "ECOGESTURE0049",
@@ -1075,7 +1123,8 @@
"actionName": null,
"actionDuration": 3,
"doing": false,
- "objective": false
+ "objective": false,
+ "viewedInSelection": false
},
{
"_id": "ECOGESTURE0050",
@@ -1097,7 +1146,8 @@
"actionName": null,
"actionDuration": 3,
"doing": false,
- "objective": false
+ "objective": false,
+ "viewedInSelection": false
},
{
"_id": "ECOGESTURE0051",
@@ -1119,7 +1169,8 @@
"actionName": "Je diminue la luminosité de mon écran d’ordinateur tout en conservant un confort de vue.",
"actionDuration": 3,
"doing": false,
- "objective": false
+ "objective": false,
+ "viewedInSelection": false
},
{
"_id": "ECOGESTURE0052",
@@ -1141,7 +1192,8 @@
"actionName": null,
"actionDuration": 3,
"doing": false,
- "objective": false
+ "objective": false,
+ "viewedInSelection": false
},
{
"_id": "ECOGESTURE0053",
@@ -1163,7 +1215,8 @@
"actionName": null,
"actionDuration": 3,
"doing": false,
- "objective": false
+ "objective": false,
+ "viewedInSelection": false
},
{
"_id": "ECOGESTURE0054",
@@ -1185,7 +1238,8 @@
"actionName": null,
"actionDuration": 3,
"doing": false,
- "objective": false
+ "objective": false,
+ "viewedInSelection": false
},
{
"_id": "ECOGESTURE0055",
@@ -1207,7 +1261,8 @@
"actionName": "Je remplis mon congélateur, je ne surcharge pas mon réfrigérateur.",
"actionDuration": 3,
"doing": false,
- "objective": false
+ "objective": false,
+ "viewedInSelection": false
},
{
"_id": "ECOGESTURE0056",
@@ -1229,7 +1284,8 @@
"actionName": null,
"actionDuration": 3,
"doing": false,
- "objective": false
+ "objective": false,
+ "viewedInSelection": false
},
{
"_id": "ECOGESTURE0057",
@@ -1251,7 +1307,8 @@
"actionName": null,
"actionDuration": 3,
"doing": false,
- "objective": false
+ "objective": false,
+ "viewedInSelection": false
},
{
"_id": "ECOGESTURE0058",
@@ -1273,7 +1330,8 @@
"actionName": null,
"actionDuration": 3,
"doing": false,
- "objective": false
+ "objective": false,
+ "viewedInSelection": false
},
{
"_id": "ECOGESTURE0059",
@@ -1295,7 +1353,8 @@
"actionName": null,
"actionDuration": 3,
"doing": false,
- "objective": false
+ "objective": false,
+ "viewedInSelection": false
},
{
"_id": "ECOGESTURE0060",
@@ -1317,7 +1376,8 @@
"actionName": "Je dégivre mon réfrigérateur et/ou congélateur.",
"actionDuration": 3,
"doing": false,
- "objective": false
+ "objective": false,
+ "viewedInSelection": false
},
{
"_id": "ECOGESTURE0061",
@@ -1339,7 +1399,8 @@
"actionName": null,
"actionDuration": 3,
"doing": false,
- "objective": false
+ "objective": false,
+ "viewedInSelection": false
},
{
"_id": "ECOGESTURE0062",
@@ -1361,7 +1422,8 @@
"actionName": "Je nettoie la grille arrière de mon réfrigérateur.",
"actionDuration": 3,
"doing": false,
- "objective": false
+ "objective": false,
+ "viewedInSelection": false
},
{
"_id": "ECOGESTURE0063",
@@ -1383,7 +1445,8 @@
"actionName": null,
"actionDuration": 3,
"doing": false,
- "objective": false
+ "objective": false,
+ "viewedInSelection": false
},
{
"_id": "ECOGESTURE0064",
@@ -1405,7 +1468,8 @@
"actionName": null,
"actionDuration": 3,
"doing": false,
- "objective": false
+ "objective": false,
+ "viewedInSelection": false
},
{
"_id": "ECOGESTURE0065",
@@ -1427,7 +1491,8 @@
"actionName": null,
"actionDuration": 3,
"doing": false,
- "objective": false
+ "objective": false,
+ "viewedInSelection": false
},
{
"_id": "ECOGESTURE0066",
@@ -1449,7 +1514,8 @@
"actionName": null,
"actionDuration": 3,
"doing": false,
- "objective": false
+ "objective": false,
+ "viewedInSelection": false
},
{
"_id": "ECOGESTURE0067",
@@ -1471,7 +1537,8 @@
"actionName": null,
"actionDuration": 3,
"doing": false,
- "objective": false
+ "objective": false,
+ "viewedInSelection": false
},
{
"_id": "ECOGESTURE0068",
@@ -1493,7 +1560,8 @@
"actionName": null,
"actionDuration": 3,
"doing": false,
- "objective": false
+ "objective": false,
+ "viewedInSelection": false
},
{
"_id": "ECOGESTURE0069",
@@ -1515,7 +1583,8 @@
"actionName": null,
"actionDuration": 3,
"doing": false,
- "objective": false
+ "objective": false,
+ "viewedInSelection": false
},
{
"_id": "ECOGESTURE0070",
@@ -1537,7 +1606,8 @@
"actionName": null,
"actionDuration": 3,
"doing": false,
- "objective": false
+ "objective": false,
+ "viewedInSelection": false
},
{
"_id": "ECOGESTURE0071",
@@ -1559,7 +1629,8 @@
"actionName": null,
"actionDuration": 3,
"doing": false,
- "objective": false
+ "objective": false,
+ "viewedInSelection": false
},
{
"_id": "ECOGESTURE0072",
@@ -1581,7 +1652,8 @@
"actionName": null,
"actionDuration": 3,
"doing": false,
- "objective": false
+ "objective": false,
+ "viewedInSelection": false
},
{
"_id": "ECOGESTURE0073",
@@ -1603,7 +1675,8 @@
"actionName": null,
"actionDuration": 3,
"doing": false,
- "objective": false
+ "objective": false,
+ "viewedInSelection": false
},
{
"_id": "ECOGESTURE0074",
@@ -1625,7 +1698,8 @@
"actionName": null,
"actionDuration": 3,
"doing": false,
- "objective": false
+ "objective": false,
+ "viewedInSelection": false
},
{
"_id": "ECOGESTURE0075",
@@ -1647,7 +1721,8 @@
"actionName": "Je décide de supprimer une douche pendant la durée du défi.",
"actionDuration": 3,
"doing": false,
- "objective": false
+ "objective": false,
+ "viewedInSelection": false
},
{
"_id": "ECOGESTURE0076",
@@ -1669,7 +1744,8 @@
"actionName": null,
"actionDuration": 3,
"doing": false,
- "objective": false
+ "objective": false,
+ "viewedInSelection": false
},
{
"_id": "ECOGESTURE0077",
@@ -1691,6 +1767,7 @@
"actionName": null,
"actionDuration": 3,
"doing": false,
- "objective": false
+ "objective": false,
+ "viewedInSelection": false
}
]
diff --git a/src/locales/fr.json b/src/locales/fr.json
index aa1afa255406a6c27d550832c9af0e1d1261e812..3bb1f6490d678dbcbf6b85d1c9f6d92dd4929e84 100644
--- a/src/locales/fr.json
+++ b/src/locales/fr.json
@@ -367,6 +367,9 @@
"COLD_WATER": "Eau froide",
"ELECTRICITY_SPECIFIC": "Électricité courante",
"COOKING": "Cuisson",
+ "selection": "Sélectionner les écogestes les plus adaptés à votre consommation",
+ "selection_2": "vus sur",
+ "button_selection": "Continuer ma sélection",
"no_ecogesture": "Aucun écogeste ne correspond à votre filtrage",
"no_ecogesture_filter": {
"text1": "Nous n'avons pas trouvé d'écogestes adaptés à votre profil dans cette catégorie.",
@@ -377,7 +380,10 @@
"button_go_to_profil": "Ajuster mon profil"
},
"accessibility": {
- "button_go_to_profil": "Aller à la page de profil"
+ "window_title": "Fenêtre d'information'",
+ "button_go_to_profil": "Aller à la page de profil",
+ "button_close": "Fermer la fenetre",
+ "button_selection": "Aller à la page de sélection"
},
"doing": "Je fais déjà",
"objective": "Objectif",
@@ -468,6 +474,32 @@
"hydraulic_heating": "Chauffage hydraulique"
}
},
+ "ecogesture_selection": {
+ "header": "Sélection des écogestes",
+ "title": "Vous avez parcouru un groupe de %{smart_count} écogestes",
+ "text": "Voulez-vous continuer sur votre lancée ou remettre cette sélection à plus tard ?",
+ "title_final": "Félicitations !",
+ "text_final_1": "Vous avez terminé la sélection des écogestes adaptés à votre consommation.",
+ "text_final_2": "Vous pouvez les retrouver dans les sections “Objectifs” et “Je fais déjà” selon que vous les pratiquiez déjà ou non.",
+ "button_go_to_ecogesture": "Plus tard",
+ "button_ok": "J'ai compris",
+ "button_continue": "Poursuivre",
+ "button_objective": "Objectif",
+ "button_doing": "Je fais déjà",
+ "button_skip": "Pas interessé",
+ "accessibility": {
+ "window_title": "Fenêtre d'information'",
+ "button_close": "Fermer la fenetre",
+ "button_go_to_ecogesture": "Retourner aux ecogestes",
+ "button_continue": "Poursuivre",
+ "button_ok": "Fermer la sélection"
+ },
+ "selectionModal": {
+ "title": "Des écogestes correspondants à votre profil ont été trouvés !",
+ "text": "À vous de choisir ceux que vous souhaitez mettre en objectif et ceux que vous faites déjà.",
+ "button_close": "C'est parti !"
+ }
+ },
"exploration": {
"global_error": "Oups. Une erreur est survenue. Veuillez retourner à l'écran d’accueil des défis",
"button_go_back": "Retour",
diff --git a/src/models/ecogesture.model.ts b/src/models/ecogesture.model.ts
index 07d86ad5334011eecf014b616d0a2be7f58f84ca..79f82d677d19d3dc5bb59a9af046f8c988b2aab2 100644
--- a/src/models/ecogesture.model.ts
+++ b/src/models/ecogesture.model.ts
@@ -22,6 +22,7 @@ export interface Ecogesture {
actionDuration: number
objective: boolean
doing: boolean
+ viewedInSelection: boolean
_id: string
_rev?: string
_type?: string
diff --git a/src/services/ecogesture.service.ts b/src/services/ecogesture.service.ts
index ee4f73171f8f4ab361c73639a0027bd7dc6ed9a8..409b2e566549bcf49844c2a8b1d362b00a3fd34b 100644
--- a/src/services/ecogesture.service.ts
+++ b/src/services/ecogesture.service.ts
@@ -155,8 +155,15 @@ export default class EcogestureService {
filteredByUsage,
profileEcogesture
)
+ const filteredFlaggedEcogesture: Ecogesture[] = filteredByEquipment.filter(
+ (ecogesture: Ecogesture) =>
+ (ecogesture.objective === false &&
+ ecogesture.doing === false &&
+ ecogesture.viewedInSelection === false) ||
+ ecogesture.viewedInSelection === true
+ )
const sortedByDifficultyAndEfficiency: Ecogesture[] = orderBy(
- filteredByEquipment,
+ filteredFlaggedEcogesture,
[
ecogesture => {
return ecogesture.difficulty
diff --git a/src/services/initialization.service.ts b/src/services/initialization.service.ts
index 42d9da6db8660f05d8b7d9b268a08794a24045f9..923c9836d95a51d89a0bd91de10f9785cc8724f5 100644
--- a/src/services/initialization.service.ts
+++ b/src/services/initialization.service.ts
@@ -257,6 +257,9 @@ export default class InitializationService {
...ecogesture,
objective: loadedEcogestures[index].objective ? true : false,
doing: loadedEcogestures[index].doing ? true : false,
+ viewedInSelection: loadedEcogestures[index].viewedInSelection
+ ? true
+ : false,
}
: ecogesture
await this._client.create(ECOGESTURE_DOCTYPE, updateEcogesture)
diff --git a/src/store/profileEcogesture/profileEcogesture.actions.ts b/src/store/profileEcogesture/profileEcogesture.actions.ts
index bf38ae7299fc637e728087c703bc9462c42fff0d..ccf17080f183958a421ebb0008c7879acbcd16dc 100644
--- a/src/store/profileEcogesture/profileEcogesture.actions.ts
+++ b/src/store/profileEcogesture/profileEcogesture.actions.ts
@@ -57,7 +57,6 @@ export function newProfileEcogestureEntry(
getState: () => AppStore,
{ client }: { client: Client }
) => {
- console.log('client', client)
const { data: newProfileEcogesture } = await client.create(
PROFILEECOGESTURE_DOCTYPE,
upd
diff --git a/src/utils/hash.spec.ts b/src/utils/hash.spec.ts
index e9ec0c11d70589a635602a5768cab0ecc39cbb74..875565bcce2144fa3ba8cbfaae030449e8e6b294 100644
--- a/src/utils/hash.spec.ts
+++ b/src/utils/hash.spec.ts
@@ -5,7 +5,7 @@ describe('hash utilis test', () => {
describe('hashFile test', () => {
it('should return the correct hash of the file', () => {
const result = hashFile(ecogesturesData)
- expect(result).toBe('7d8b9916cb68f61dd4cd283585e790cf756e1b6d')
+ expect(result).toBe('a4bfebe7779dbf65f92591b2b6226ac7eb78097e')
})
})
})
diff --git a/tests/__mocks__/actionData.mock.ts b/tests/__mocks__/actionData.mock.ts
index d4c4ba2af35250894a3410e61850297789baec4e..538a3fba4841f3708bde6512d6188f904c7ad04b 100644
--- a/tests/__mocks__/actionData.mock.ts
+++ b/tests/__mocks__/actionData.mock.ts
@@ -16,7 +16,6 @@ export const defaultEcogestureData: Ecogesture[] = [
difficulty: 1,
room: [1, 2],
season: Season.NONE,
-
equipment: false,
equipmentType: [],
equipmentInstallation: true,
@@ -26,6 +25,7 @@ export const defaultEcogestureData: Ecogesture[] = [
actionDuration: 3,
doing: false,
objective: false,
+ viewedInSelection: false,
},
{
_id: 'ECOGESTURE0014',
@@ -53,6 +53,7 @@ export const defaultEcogestureData: Ecogesture[] = [
actionDuration: 3,
doing: false,
objective: false,
+ viewedInSelection: false,
},
{
id: 'ECOGESTURE0030',
@@ -79,6 +80,7 @@ export const defaultEcogestureData: Ecogesture[] = [
actionDuration: 3,
doing: false,
objective: false,
+ viewedInSelection: false,
},
]
@@ -105,6 +107,7 @@ export const ecogestureDefault: Ecogesture = {
actionDuration: 3,
doing: false,
objective: false,
+ viewedInSelection: false,
}
export const AllEcogestureData: Ecogesture[] = [
@@ -132,6 +135,7 @@ export const AllEcogestureData: Ecogesture[] = [
actionDuration: 3,
doing: false,
objective: false,
+ viewedInSelection: false,
},
{
_id: 'ECOGESTURE0002',
@@ -156,6 +160,7 @@ export const AllEcogestureData: Ecogesture[] = [
actionDuration: 3,
doing: false,
objective: false,
+ viewedInSelection: false,
},
{
_id: 'ECOGESTURE0003',
@@ -182,6 +187,7 @@ export const AllEcogestureData: Ecogesture[] = [
actionDuration: 3,
doing: false,
objective: false,
+ viewedInSelection: false,
},
{
_id: 'ECOGESTURE0004',
@@ -206,6 +212,7 @@ export const AllEcogestureData: Ecogesture[] = [
actionDuration: 3,
doing: false,
objective: false,
+ viewedInSelection: false,
},
{
_id: 'ECOGESTURE0005',
@@ -230,6 +237,7 @@ export const AllEcogestureData: Ecogesture[] = [
actionDuration: 3,
doing: false,
objective: false,
+ viewedInSelection: false,
},
{
_id: 'ECOGESTURE0006',
@@ -254,5 +262,6 @@ export const AllEcogestureData: Ecogesture[] = [
actionDuration: 3,
doing: false,
objective: false,
+ viewedInSelection: false,
},
]
diff --git a/tests/__mocks__/ecogesturesData.mock.ts b/tests/__mocks__/ecogesturesData.mock.ts
index 97f36951d53d0e04f85700e36f95972467660a84..e20933fb6b988babb8d6202932739e5914a4f7fe 100644
--- a/tests/__mocks__/ecogesturesData.mock.ts
+++ b/tests/__mocks__/ecogesturesData.mock.ts
@@ -26,6 +26,7 @@ export const ecogesturesData: Ecogesture[] = [
actionDuration: 3,
doing: false,
objective: false,
+ viewedInSelection: false,
_id: 'ECOGESTURE001',
_rev: '1-67f1ea36efdd892c96bf64a8943154cd',
_type: 'com.grandlyon.ecolyo.ecogesture',
@@ -52,6 +53,7 @@ export const ecogesturesData: Ecogesture[] = [
actionDuration: 3,
doing: false,
objective: false,
+ viewedInSelection: false,
_id: 'ECOGESTURE002',
_rev: '1-ef7ddd778254e3b7d331a88fd17f606d',
@@ -81,6 +83,7 @@ export const ecogesturesData: Ecogesture[] = [
actionDuration: 3,
doing: false,
objective: false,
+ viewedInSelection: false,
_id: 'ECOGESTURE0013',
_rev: '1-0b2761dd4aef79556c7aef144060fde6',
_type: 'com.grandlyon.ecolyo.ecogesture',
@@ -111,6 +114,7 @@ export const ecogesturesHeatingData: Ecogesture[] = [
actionDuration: 3,
doing: false,
objective: false,
+ viewedInSelection: false,
_id: 'ECOGESTURE001',
_rev: '1-67f1ea36efdd892c96bf64a8943154cd',
_type: 'com.grandlyon.ecolyo.ecogesture',
@@ -137,6 +141,7 @@ export const ecogesturesHeatingData: Ecogesture[] = [
actionDuration: 3,
doing: false,
objective: false,
+ viewedInSelection: false,
_id: 'ECOGESTURE002',
_rev: '1-ef7ddd778254e3b7d331a88fd17f606d',
_type: 'com.grandlyon.ecolyo.ecogesture',
@@ -165,6 +170,7 @@ export const ecogesturesHeatingData: Ecogesture[] = [
actionDuration: 3,
doing: false,
objective: false,
+ viewedInSelection: false,
_id: 'ECOGESTURE0013',
_rev: '1-0b2761dd4aef79556c7aef144060fde6',
_type: 'com.grandlyon.ecolyo.ecogesture',
@@ -195,6 +201,7 @@ export const ecogesturesECSData: Ecogesture[] = [
actionDuration: 3,
doing: false,
objective: false,
+ viewedInSelection: false,
_id: 'ECOGESTURE001',
_rev: '1-67f1ea36efdd892c96bf64a8943154cd',
_type: 'com.grandlyon.ecolyo.ecogesture',
@@ -221,6 +228,7 @@ export const ecogesturesECSData: Ecogesture[] = [
actionDuration: 3,
doing: false,
objective: false,
+ viewedInSelection: false,
_id: 'ECOGESTURE002',
_rev: '1-ef7ddd778254e3b7d331a88fd17f606d',
_type: 'com.grandlyon.ecolyo.ecogesture',
@@ -250,6 +258,7 @@ export const ecogesturesECSData: Ecogesture[] = [
actionDuration: 3,
doing: false,
objective: false,
+ viewedInSelection: false,
_id: 'ECOGESTURE0013',
_rev: '1-0b2761dd4aef79556c7aef144060fde6',
_type: 'com.grandlyon.ecolyo.ecogesture',
@@ -280,6 +289,7 @@ export const ecogesturesCookingData: Ecogesture[] = [
actionDuration: 3,
doing: false,
objective: false,
+ viewedInSelection: false,
_id: '001',
_rev: '1-67f1ea36efdd892c96bf64a8943154cd',
_type: 'com.grandlyon.ecolyo.ecogesture',
@@ -306,6 +316,7 @@ export const ecogesturesCookingData: Ecogesture[] = [
actionDuration: 3,
doing: false,
objective: false,
+ viewedInSelection: false,
_id: '002',
_rev: '1-ef7ddd778254e3b7d331a88fd17f606d',
_type: 'com.grandlyon.ecolyo.ecogesture',
@@ -334,6 +345,7 @@ export const ecogesturesCookingData: Ecogesture[] = [
actionDuration: 3,
doing: false,
objective: false,
+ viewedInSelection: false,
_id: '0013',
_rev: '1-0b2761dd4aef79556c7aef144060fde6',
_type: 'com.grandlyon.ecolyo.ecogesture',
@@ -362,6 +374,7 @@ export const ecogesturesCookingData: Ecogesture[] = [
actionDuration: 3,
doing: false,
objective: false,
+ viewedInSelection: false,
_id: '0014',
_rev: '1-0b2761dd4aef79556c7aef144060fde6',
_type: 'com.grandlyon.ecolyo.ecogesture',
@@ -392,6 +405,7 @@ export const ecogesturesElecSpecificData: Ecogesture[] = [
actionDuration: 3,
doing: false,
objective: false,
+ viewedInSelection: false,
_id: '001',
_rev: '1-67f1ea36efdd892c96bf64a8943154cd',
_type: 'com.grandlyon.ecolyo.ecogesture',
@@ -418,6 +432,7 @@ export const ecogesturesElecSpecificData: Ecogesture[] = [
actionDuration: 3,
doing: false,
objective: false,
+ viewedInSelection: false,
_id: '002',
_rev: '1-ef7ddd778254e3b7d331a88fd17f606d',
_type: 'com.grandlyon.ecolyo.ecogesture',
@@ -446,6 +461,7 @@ export const ecogesturesElecSpecificData: Ecogesture[] = [
actionDuration: 3,
doing: false,
objective: false,
+ viewedInSelection: false,
_id: '0013',
_rev: '1-0b2761dd4aef79556c7aef144060fde6',
_type: 'com.grandlyon.ecolyo.ecogesture',
@@ -476,6 +492,7 @@ export const ecogesturesAirConditioningData: Ecogesture[] = [
actionDuration: 3,
doing: false,
objective: false,
+ viewedInSelection: false,
_id: '001',
_rev: '1-67f1ea36efdd892c96bf64a8943154cd',
_type: 'com.grandlyon.ecolyo.ecogesture',
@@ -502,6 +519,7 @@ export const ecogesturesAirConditioningData: Ecogesture[] = [
actionDuration: 3,
doing: false,
objective: false,
+ viewedInSelection: false,
_id: '002',
_rev: '1-ef7ddd778254e3b7d331a88fd17f606d',
_type: 'com.grandlyon.ecolyo.ecogesture',
@@ -530,6 +548,7 @@ export const ecogesturesAirConditioningData: Ecogesture[] = [
actionDuration: 3,
doing: false,
objective: false,
+ viewedInSelection: false,
_id: '0013',
_rev: '1-0b2761dd4aef79556c7aef144060fde6',
_type: 'com.grandlyon.ecolyo.ecogesture',
@@ -560,6 +579,7 @@ export const ecogesturesColdWaterData: Ecogesture[] = [
actionDuration: 3,
doing: false,
objective: false,
+ viewedInSelection: false,
_id: '001',
_rev: '1-67f1ea36efdd892c96bf64a8943154cd',
_type: 'com.grandlyon.ecolyo.ecogesture',
@@ -586,6 +606,7 @@ export const ecogesturesColdWaterData: Ecogesture[] = [
actionDuration: 3,
doing: false,
objective: false,
+ viewedInSelection: false,
_id: '002',
_rev: '1-ef7ddd778254e3b7d331a88fd17f606d',
_type: 'com.grandlyon.ecolyo.ecogesture',