From 2eda51fc3fa89b832bc1c83bc9b47564e87e2e36 Mon Sep 17 00:00:00 2001
From: Marc Rutkowski <marc@attractive-media.fr>
Date: Tue, 17 Sep 2024 18:01:18 +0200
Subject: [PATCH 01/91] =?UTF-8?q?Met=20=C3=A0=20jour/compl=C3=A8te=20les?=
 =?UTF-8?q?=20pictos=20pour=20la=20landing=20page?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/Picto/BigBasketPicto.tsx       | 1672 +++++++++--------
 .../Picto/CollectiviteEngageePicto.tsx        |  214 +++
 .../components/Picto/DashboardPicto.tsx       | 1110 ++++++-----
 3 files changed, 1593 insertions(+), 1403 deletions(-)
 create mode 100644 packages/panier/components/Picto/CollectiviteEngageePicto.tsx

diff --git a/packages/panier/components/Picto/BigBasketPicto.tsx b/packages/panier/components/Picto/BigBasketPicto.tsx
index 23b57d0824..93599c65f3 100644
--- a/packages/panier/components/Picto/BigBasketPicto.tsx
+++ b/packages/panier/components/Picto/BigBasketPicto.tsx
@@ -9,1049 +9,1071 @@ const BigBasketPicto = ({className}: {className?: string}) => {
       xmlns="http://www.w3.org/2000/svg"
       xmlnsXlink="http://www.w3.org/1999/xlink"
     >
-      <path
-        opacity="0.6"
-        d="M485.5 285.5C485.5 407.831 375.831 441.5 253.5 441.5C131.169 441.5 47 398.831 47 276.5C47 154.169 141.169 83 263.5 83C385.831 83 485.5 163.169 485.5 285.5Z"
-        fill="#EEF4FF"
-      />
-      <path
-        d="M527 250.5C527 281.006 520.164 305.956 508.024 326.227C495.884 346.498 478.423 362.118 457.131 373.937C414.534 397.584 356.636 406 295.5 406C234.377 406 182.876 395.337 146.667 369.467C110.489 343.62 89.5 302.537 89.5 241.5C89.5 180.474 112.983 132.24 151.7 99.2565C190.426 66.265 244.428 48.5 305.5 48.5C427.618 48.5 527 128.504 527 250.5Z"
-        stroke="#EEF4FF"
-      />
-      <path
-        d="M438 227.5C438 258.006 431.164 282.956 419.024 303.227C406.884 323.498 389.423 339.118 368.131 350.937C325.534 374.584 267.636 383 206.5 383C145.377 383 93.876 372.337 57.6665 346.467C21.4889 320.62 0.5 279.537 0.5 218.5C0.5 157.474 23.9835 109.24 62.7001 76.2565C101.426 43.265 155.428 25.5 216.5 25.5C338.618 25.5 438 105.504 438 227.5Z"
-        stroke="#EEF4FF"
-      />
-      <path
-        d="M527 250.5C527 281.006 520.164 305.956 508.024 326.227C495.884 346.498 478.423 362.118 457.131 373.937C414.534 397.584 356.636 406 295.5 406C234.377 406 182.876 395.337 146.667 369.467C110.489 343.62 89.5 302.537 89.5 241.5C89.5 180.474 112.983 132.24 151.7 99.2565C190.426 66.265 244.428 48.5 305.5 48.5C427.618 48.5 527 128.504 527 250.5Z"
-        stroke="#EEF4FF"
-      />
-      <path
-        d="M438 227.5C438 258.006 431.164 282.956 419.024 303.227C406.884 323.498 389.423 339.118 368.131 350.937C325.534 374.584 267.636 383 206.5 383C145.377 383 93.876 372.337 57.6665 346.467C21.4889 320.62 0.5 279.537 0.5 218.5C0.5 157.474 23.9835 109.24 62.7001 76.2565C101.426 43.265 155.428 25.5 216.5 25.5C338.618 25.5 438 105.504 438 227.5Z"
-        stroke="#EEF4FF"
-      />
-      <g filter="url(#filter0_f_1506_6816)">
-        <ellipse cx="256.5" cy="294.855" rx="154.5" ry="124" fill="white" />
-      </g>
-      <path
-        d="M169.093 359.292C178.812 359.692 337.151 362.994 359.128 363.451C360.759 363.485 362.214 364.303 362.865 365.799C364.741 370.103 366.48 378.898 348.935 378.246C325.773 377.384 221.32 380.4 183.276 378.246C145.232 376.092 158.648 358.861 169.093 359.292Z"
-        fill="#EDEDED"
-      />
-      <rect
-        x="257.331"
-        y="178.122"
-        width="212.108"
-        height="94.3297"
-        rx="10.0755"
-        transform="rotate(60.013 257.331 178.122)"
-        fill="url(#paint0_linear_1506_6816)"
-        stroke="#F0F0FE"
-        strokeWidth="1.06058"
-      />
-      <rect
-        x="218.178"
-        y="224.114"
-        width="139.339"
-        height="8.76033"
-        rx="4.38017"
-        transform="rotate(60.013 218.178 224.114)"
-        fill="#7CD4A5"
-      />
-      <rect
-        x="228.295"
-        y="218.276"
-        width="65.5102"
-        height="8.76033"
-        rx="4.38017"
-        transform="rotate(60.013 228.295 218.276)"
-        fill="#F4F5FD"
-      />
-      <rect
-        x="329.409"
-        y="344.814"
-        width="17.6774"
-        height="8.76033"
-        rx="4.38017"
-        transform="rotate(60.013 329.409 344.814)"
-        fill="#7CD4A5"
-      />
-      <rect
-        x="206.375"
-        y="230.925"
-        width="107.104"
-        height="8.76033"
-        rx="4.38017"
-        transform="rotate(60.013 206.375 230.925)"
-        fill="#F4F5FD"
-      />
-      <path
-        d="M241.078 214.07L251.119 208.276L252.295 210.313L242.254 216.107L241.078 214.07ZM246.993 215.969C249.101 214.752 251.697 215.109 253.013 217.39C253.576 218.365 253.68 219.242 253.444 220.124L257.546 217.757L258.606 219.593L247.848 225.801L246.788 223.965L247.362 223.634C246.48 223.397 245.773 222.868 245.21 221.893C243.894 219.612 244.884 217.186 246.993 215.969ZM248.094 217.877C246.831 218.605 246.368 219.924 247.08 221.157C247.552 221.975 248.285 222.451 249.227 222.558L251.579 221.2C251.958 220.332 251.913 219.459 251.441 218.641C250.729 217.408 249.356 217.148 248.094 217.877ZM254.125 233.962C252.832 233.809 251.627 233.013 250.841 231.65C249.359 229.083 250.316 226.599 252.425 225.382C254.562 224.149 257.104 224.479 258.47 226.846C259.629 228.854 259.028 230.96 257.134 232.053C256.733 232.285 256.327 232.442 256.05 232.526L253.128 227.462C251.879 228.412 251.814 229.559 252.468 230.692C252.923 231.481 253.664 231.971 254.404 232.06L254.125 233.962ZM256.953 227.664C256.415 226.732 255.543 226.413 254.48 226.758L256.401 230.086C257.116 229.635 257.541 228.682 256.953 227.664ZM253.901 236.291L261.131 232.12L262.182 233.941L261.608 234.272C262.386 234.493 263.147 234.952 263.702 235.913C264.604 237.477 264.249 239.345 262.111 240.579L257.808 243.062L256.749 241.226L260.98 238.784C261.941 238.229 262.229 237.337 261.716 236.447C261.186 235.529 260.288 235.397 259.672 235.39L254.952 238.113L253.901 236.291ZM261.906 244.066L264.861 242.361L264.083 241.013L265.718 240.069L266.496 241.418L268.303 240.375L269.363 242.211L267.556 243.254L268.83 245.463L267.195 246.406L265.92 244.197L262.965 245.902C262.162 246.366 262.095 246.978 262.509 247.695C262.798 248.198 263.046 248.494 263.287 248.68L261.695 249.599C261.33 249.331 261.01 248.943 260.663 248.34C259.62 246.533 260.142 245.084 261.906 244.066ZM271.564 247.284C271.191 246.638 271.422 245.779 272.067 245.406C272.713 245.034 273.572 245.264 273.945 245.91C274.317 246.555 274.078 247.4 273.433 247.773C272.787 248.145 271.936 247.929 271.564 247.284ZM262.542 251.266L269.772 247.094L270.823 248.916L263.593 253.087L262.542 251.266ZM271.57 250.211L272.348 251.559L273.109 251.121C274.643 250.235 276.465 250.542 277.508 252.349C277.888 253.009 278.053 253.659 278.074 254.259L276.107 254.362C276.141 254.056 276.104 253.694 275.889 253.321C275.533 252.704 274.871 252.551 274.211 252.932L273.408 253.395L274.683 255.604L273.047 256.548L271.773 254.339L266.178 257.567L265.119 255.731L270.713 252.503L269.935 251.155L271.57 250.211ZM277.262 257.159C276.89 256.514 277.12 255.654 277.766 255.282C278.411 254.909 279.271 255.14 279.643 255.785C280.016 256.431 279.777 257.276 279.132 257.648C278.486 258.021 277.635 257.805 277.262 257.159ZM268.241 261.141L275.47 256.97L276.522 258.791L269.292 262.963L268.241 261.141ZM275.57 271.125C274.277 270.972 273.072 270.176 272.285 268.813C270.804 266.246 271.761 263.762 273.869 262.545C276.007 261.312 278.549 261.642 279.915 264.009C281.074 266.017 280.472 268.123 278.579 269.216C278.177 269.448 277.771 269.605 277.494 269.689L274.573 264.625C273.324 265.576 273.259 266.722 273.912 267.855C274.368 268.644 275.109 269.134 275.849 269.223L275.57 271.125ZM278.398 264.827C277.86 263.895 276.988 263.576 275.925 263.921L277.846 267.249C278.561 266.798 278.986 265.845 278.398 264.827ZM275.346 273.454L282.575 269.283L283.627 271.104L282.909 271.518C283.67 271.71 284.399 272.112 284.871 272.929C285.012 273.173 285.093 273.413 285.135 273.618L283.342 274.653C283.267 274.39 283.169 274.122 282.979 273.792C282.465 272.902 281.647 272.61 281.03 272.602L276.397 275.276L275.346 273.454ZM286.815 286.106L290.917 283.738L291.977 285.574L287.96 287.892C285.794 289.142 283.732 288.649 282.507 286.526C281.282 284.404 281.896 282.386 284.062 281.136L288.078 278.818L289.138 280.654L285.035 283.022C283.988 283.626 283.657 284.543 284.236 285.548C284.808 286.537 285.768 286.71 286.815 286.106ZM290.928 297.74C289.635 297.587 288.43 296.791 287.644 295.428C286.162 292.861 287.119 290.377 289.228 289.16C291.365 287.927 293.907 288.257 295.273 290.624C296.432 292.632 295.831 294.738 293.937 295.831C293.536 296.063 293.129 296.221 292.853 296.304L289.931 291.24C288.682 292.191 288.617 293.337 289.271 294.47C289.726 295.259 290.467 295.749 291.207 295.838L290.928 297.74ZM293.756 291.442C293.218 290.51 292.346 290.191 291.283 290.536L293.204 293.864C293.919 293.413 294.344 292.46 293.756 291.442Z"
-        fill="#3F72B5"
-      />
-      <path
-        d="M222.5 225.355C217.76 226.303 188.5 229.355 185.5 235.355L245 323.355L287.5 321.855L299 253.355V249.355L292 239.355L269.5 312.355L254 313.855L241.5 244.355C241.5 244.355 241.5 234.855 237 229.355C232.5 223.855 227.5 224.355 222.5 225.355Z"
-        fill="#544848"
-        fillOpacity="0.1"
-      />
-      <rect
-        x="234.549"
-        y="228.422"
-        width="204"
-        height="97"
-        rx="9.5"
-        transform="rotate(81.6925 234.549 228.422)"
-        fill="url(#paint1_linear_1506_6816)"
-        stroke="#F0F0FE"
-      />
-      <rect
-        x="179.48"
-        y="256.17"
-        width="134"
-        height="9"
-        rx="4.5"
-        transform="rotate(81.6925 179.48 256.17)"
-        fill="#C3C3FB"
-      />
-      <rect
-        x="191.354"
-        y="254.436"
-        width="63"
-        height="9"
-        rx="4.5"
-        transform="rotate(81.6925 191.354 254.436)"
-        fill="#F4F5FD"
-      />
-      <rect
-        x="238.343"
-        y="403.208"
-        width="17"
-        height="9"
-        rx="4.5"
-        transform="rotate(81.6925 238.343 403.208)"
-        fill="#7CD4A5"
-      />
-      <rect
-        x="165.627"
-        y="258.193"
-        width="103"
-        height="9"
-        rx="4.5"
-        transform="rotate(81.6925 165.627 258.193)"
-        fill="#F4F5FD"
-      />
-      <path
-        d="M206.574 254.85L217.39 253.271L217.789 256.006L213.632 259.311L218.561 261.29L218.96 264.025L208.144 265.604L207.824 263.41L215.58 262.277L211.18 260.458L210.954 258.913L214.651 255.912L206.894 257.044L206.574 254.85ZM210.845 275.239C209.766 274.655 208.987 273.537 208.773 272.07C208.369 269.304 210.072 267.461 212.344 267.13C214.646 266.793 216.758 267.968 217.131 270.518C217.446 272.681 216.186 274.317 214.147 274.615C213.714 274.678 213.303 274.675 213.032 274.651L212.235 269.197C210.81 269.594 210.354 270.576 210.532 271.797C210.656 272.647 211.135 273.334 211.752 273.67L210.845 275.239ZM215.517 270.706C215.37 269.702 214.717 269.119 213.666 269.051L214.189 272.636C214.973 272.49 215.677 271.803 215.517 270.706ZM212.751 277.266L215.934 276.802L215.722 275.349L217.483 275.092L217.695 276.544L219.642 276.26L219.931 278.238L217.984 278.522L218.331 280.902L216.57 281.159L216.222 278.779L213.039 279.244C212.174 279.371 211.902 279.884 212.015 280.656C212.094 281.197 212.207 281.543 212.354 281.79L210.639 282.041C210.412 281.679 210.268 281.227 210.173 280.578C209.889 278.631 210.85 277.544 212.751 277.266ZM213.733 283.996L216.916 283.531L216.704 282.079L218.466 281.822L218.678 283.274L220.625 282.99L220.913 284.968L218.966 285.252L219.314 287.631L217.552 287.889L217.205 285.509L214.022 285.974C213.157 286.1 212.885 286.613 212.997 287.386C213.076 287.927 213.19 288.273 213.337 288.52L211.621 288.77C211.395 288.409 211.25 287.957 211.155 287.308C210.871 285.361 211.833 284.274 213.733 283.996ZM211.783 290.526L219.571 289.389L219.857 291.351L219.084 291.464C219.684 291.897 220.183 292.503 220.312 293.383C220.35 293.646 220.337 293.885 220.303 294.079L218.371 294.361C218.397 294.105 218.405 293.835 218.353 293.48C218.213 292.522 217.598 291.981 217.06 291.759L212.07 292.488L211.783 290.526ZM214.965 303.455C213.886 302.871 213.107 301.754 212.893 300.286C212.489 297.52 214.192 295.678 216.464 295.346C218.766 295.01 220.878 296.185 221.251 298.734C221.567 300.897 220.306 302.533 218.267 302.831C217.834 302.894 217.423 302.891 217.152 302.868L216.355 297.413C214.93 297.811 214.474 298.793 214.652 300.013C214.776 300.863 215.255 301.551 215.872 301.887L214.965 303.455ZM219.637 298.923C219.49 297.918 218.837 297.335 217.786 297.268L218.309 300.852C219.093 300.706 219.797 300.02 219.637 298.923ZM216.88 316.567C215.8 315.983 215.022 314.866 214.807 313.398C214.403 310.633 216.107 308.79 218.378 308.458C220.681 308.122 222.793 309.297 223.165 311.847C223.481 314.01 222.221 315.646 220.181 315.943C219.749 316.007 219.338 316.003 219.066 315.98L218.27 310.526C216.845 310.923 216.388 311.905 216.566 313.126C216.691 313.976 217.17 314.663 217.787 314.999L216.88 316.567ZM221.552 312.035C221.405 311.031 220.752 310.447 219.7 310.38L220.224 313.965C221.007 313.819 221.712 313.132 221.552 312.035ZM215.872 318.531L223.66 317.394L223.946 319.356L223.328 319.446C223.933 319.91 224.44 320.578 224.591 321.613C224.837 323.297 223.875 324.811 221.573 325.147L216.937 325.824L216.648 323.846L221.207 323.181C222.242 323.029 222.805 322.348 222.665 321.39C222.521 320.401 221.78 319.972 221.242 319.751L216.159 320.493L215.872 318.531ZM214.07 332.772L225.658 331.08L225.945 333.042L225.311 333.134C226.002 333.649 226.452 334.356 226.608 335.423C226.969 337.895 225.254 339.66 222.983 339.992C220.711 340.323 218.563 339.122 218.202 336.65C218.047 335.584 218.276 334.777 218.791 334.086L214.356 334.734L214.07 332.772ZM224.713 335.415C224.58 334.504 224.07 333.821 223.272 333.432L220.83 333.789C220.165 334.422 219.885 335.205 220.016 336.101C220.21 337.43 221.325 338.151 222.685 337.952C224.045 337.754 224.907 336.744 224.713 335.415ZM219.351 342.356L230.94 340.664L231.226 342.627L219.638 344.319L219.351 342.356ZM220.07 348.9C219.842 347.339 220.583 346.142 222.02 345.932C223.194 345.761 224.208 346.544 224.73 348.172L225.479 350.493L225.68 350.464C226.498 350.344 226.934 349.649 226.803 348.753C226.692 347.996 226.251 347.461 225.618 347.127L226.506 345.53C227.565 346.085 228.319 347.143 228.527 348.564C228.856 350.82 227.681 352.175 225.966 352.426L220.929 353.161L220.643 351.199L221.4 351.089C220.725 350.682 220.203 349.811 220.07 348.9ZM222.397 347.866C221.871 347.942 221.592 348.409 221.689 349.074C221.82 349.97 222.332 350.558 223.007 350.854L224.104 350.694L223.524 348.885C223.265 348.086 222.876 347.796 222.397 347.866ZM223.348 358.922C223.461 359.695 223.907 360.261 224.502 360.553L223.551 362.254C222.487 361.667 221.702 360.614 221.494 359.193C221.102 356.504 222.798 354.615 225.07 354.284C227.341 353.952 229.507 355.277 229.9 357.965C230.107 359.387 229.656 360.621 228.804 361.487L227.406 360.128C227.893 359.679 228.158 359.009 228.041 358.205C227.854 356.923 226.727 356.125 225.367 356.323C223.992 356.524 223.156 357.609 223.348 358.922ZM224.767 370.586C223.688 370.002 222.909 368.885 222.695 367.417C222.291 364.651 223.995 362.809 226.266 362.477C228.568 362.141 230.681 363.316 231.053 365.865C231.369 368.028 230.109 369.664 228.069 369.962C227.636 370.025 227.226 370.022 226.954 369.999L226.158 364.544C224.732 364.942 224.276 365.924 224.454 367.144C224.578 367.994 225.057 368.682 225.675 369.018L224.767 370.586ZM229.439 366.053C229.293 365.049 228.639 364.466 227.588 364.399L228.111 367.983C228.895 367.837 229.6 367.15 229.439 366.053ZM225.303 383.009L233.971 381.743L232.377 379.688L233.709 378.436L236.128 381.491L236.423 383.515L225.608 385.095L225.303 383.009Z"
-        fill="#3F72B5"
-      />
-      <rect
-        x="386.227"
-        y="249.685"
-        width="184.605"
-        height="87.7778"
-        rx="8.5968"
-        transform="rotate(104.602 386.227 249.685)"
-        fill="url(#paint2_linear_1506_6816)"
-        stroke="#F0F0FE"
-        strokeWidth="0.904926"
-      />
-      <rect
-        x="330.55"
-        y="253.415"
-        width="121.26"
-        height="8.14434"
-        rx="4.07217"
-        transform="rotate(104.602 330.55 253.415)"
-        fill="#C3C3FB"
-      />
-      <rect
-        x="327.819"
-        y="396.714"
-        width="15.3837"
-        height="8.14434"
-        rx="4.07217"
-        transform="rotate(104.602 327.819 396.714)"
-        fill="#7CD4A5"
-      />
-      <rect
-        x="318.291"
-        y="250.221"
-        width="93.2074"
-        height="8.14434"
-        rx="4.07217"
-        transform="rotate(104.602 318.291 250.221)"
-        fill="#F4F5FD"
-      />
-      <path
-        d="M355.115 261.906L362.471 263.822L361.987 265.682L358.429 266.674L361.05 269.276L360.566 271.136L353.21 269.22L353.599 267.727L358.874 269.102L356.548 266.745L356.821 265.694L360.002 264.772L354.726 263.398L355.115 261.906ZM352.332 276.122C351.798 275.456 351.602 274.53 351.862 273.531C352.352 271.65 353.942 270.931 355.487 271.334C357.053 271.742 358.088 273.066 357.636 274.8C357.253 276.271 356.003 276.978 354.616 276.616C354.321 276.54 354.059 276.427 353.891 276.338L354.858 272.629C353.837 272.497 353.279 273.003 353.063 273.833C352.912 274.411 353.033 274.981 353.337 275.363L352.332 276.122ZM356.552 274.484C356.729 273.801 356.469 273.25 355.814 272.922L355.179 275.36C355.72 275.479 356.357 275.23 356.552 274.484ZM353.004 277.937L355.168 278.501L355.426 277.513L356.624 277.825L356.366 278.813L357.69 279.158L357.34 280.503L356.016 280.158L355.594 281.777L354.396 281.465L354.818 279.846L352.653 279.282C352.065 279.129 351.751 279.384 351.614 279.909C351.519 280.277 351.498 280.53 351.525 280.728L350.358 280.424C350.311 280.131 350.341 279.802 350.456 279.361C350.801 278.037 351.711 277.6 353.004 277.937ZM351.811 282.514L353.976 283.078L354.233 282.09L355.431 282.402L355.174 283.39L356.498 283.735L356.148 285.08L354.823 284.735L354.402 286.353L353.204 286.041L353.625 284.423L351.461 283.859C350.872 283.706 350.559 283.961 350.422 284.486C350.326 284.854 350.305 285.107 350.332 285.305L349.166 285.001C349.119 284.708 349.148 284.379 349.263 283.938C349.608 282.614 350.519 282.177 351.811 282.514ZM348.794 286.169L354.091 287.549L353.743 288.883L353.217 288.746C353.484 289.186 353.64 289.709 353.484 290.308C353.437 290.487 353.365 290.636 353.29 290.751L351.976 290.409C352.062 290.252 352.14 290.082 352.203 289.84C352.373 289.188 352.125 288.675 351.841 288.388L348.447 287.503L348.794 286.169ZM347.332 295.313C346.799 294.646 346.603 293.72 346.863 292.721C347.353 290.84 348.943 290.121 350.488 290.524C352.053 290.932 353.089 292.256 352.637 293.99C352.254 295.461 351.003 296.168 349.616 295.807C349.322 295.73 349.06 295.617 348.892 295.528L349.859 291.819C348.838 291.687 348.28 292.193 348.064 293.023C347.913 293.601 348.034 294.171 348.338 294.553L347.332 295.313ZM351.552 293.674C351.73 292.991 351.47 292.44 350.814 292.113L350.179 294.55C350.721 294.669 351.358 294.42 351.552 293.674ZM345.009 304.23C344.476 303.564 344.28 302.638 344.54 301.639C345.03 299.758 346.62 299.039 348.164 299.441C349.73 299.849 350.765 301.174 350.314 302.908C349.93 304.379 348.68 305.086 347.293 304.724C346.999 304.648 346.737 304.534 346.569 304.446L347.535 300.736C346.515 300.605 345.957 301.111 345.74 301.941C345.59 302.519 345.711 303.089 346.015 303.471L345.009 304.23ZM349.229 302.592C349.407 301.909 349.146 301.358 348.491 301.03L347.856 303.468C348.397 303.587 349.035 303.338 349.229 302.592ZM343.832 305.215L349.129 306.595L348.781 307.93L348.361 307.82C348.622 308.281 348.767 308.846 348.583 309.55C348.285 310.696 347.259 311.404 345.693 310.997L342.54 310.175L342.891 308.83L345.991 309.638C346.695 309.821 347.24 309.537 347.41 308.885C347.585 308.213 347.226 307.738 346.942 307.451L343.485 306.55L343.832 305.215ZM338.823 313.85L346.704 315.903L346.356 317.237L345.925 317.125C346.228 317.642 346.325 318.217 346.137 318.942C345.699 320.623 344.122 321.29 342.577 320.887C341.033 320.485 339.982 319.134 340.42 317.453C340.609 316.728 340.974 316.273 341.491 315.97L338.475 315.184L338.823 313.85ZM344.925 318.424C345.086 317.804 344.944 317.229 344.538 316.764L342.878 316.331C342.28 316.557 341.889 316.983 341.73 317.592C341.495 318.496 342.014 319.259 342.939 319.5C343.864 319.741 344.689 319.328 344.925 318.424ZM339.611 321.419L347.492 323.472L347.145 324.807L339.263 322.754L339.611 321.419ZM338.3 325.805C338.577 324.744 339.375 324.178 340.352 324.432C341.151 324.64 341.588 325.416 341.482 326.6L341.333 328.29L341.47 328.326C342.027 328.471 342.494 328.143 342.653 327.534C342.787 327.019 342.649 326.557 342.334 326.172L343.335 325.389C343.863 326.031 344.06 326.913 343.808 327.88C343.408 329.414 342.289 329.964 341.122 329.66L337.697 328.768L338.044 327.433L338.559 327.567C338.237 327.124 338.139 326.425 338.3 325.805ZM340.07 325.773C339.713 325.68 339.408 325.903 339.29 326.355C339.131 326.964 339.3 327.48 339.652 327.852L340.398 328.046L340.517 326.731C340.567 326.149 340.396 325.858 340.07 325.773ZM337.687 333.113C337.55 333.638 337.682 334.121 337.984 334.469L336.915 335.302C336.392 334.638 336.174 333.751 336.426 332.784C336.902 330.956 338.5 330.205 340.045 330.607C341.59 331.01 342.619 332.445 342.142 334.273C341.891 335.24 341.268 335.908 340.487 336.232L339.96 334.984C340.393 334.828 340.745 334.47 340.887 333.924C341.114 333.052 340.609 332.235 339.684 331.995C338.749 331.751 337.92 332.219 337.687 333.113ZM335.438 340.969C334.905 340.302 334.709 339.376 334.969 338.377C335.459 336.496 337.049 335.777 338.594 336.18C340.159 336.588 341.194 337.912 340.743 339.646C340.36 341.117 339.109 341.824 337.722 341.463C337.428 341.386 337.166 341.273 336.998 341.184L337.964 337.475C336.944 337.343 336.386 337.849 336.169 338.679C336.019 339.257 336.14 339.827 336.444 340.209L335.438 340.969ZM339.658 339.33C339.836 338.647 339.575 338.096 338.92 337.769L338.285 340.207C338.827 340.325 339.464 340.076 339.658 339.33ZM334.906 348.872L337.911 349.654L337.561 351L334.618 350.233C333.031 349.82 332.295 348.64 332.7 347.085C333.105 345.53 334.321 344.87 335.908 345.284L338.85 346.05L338.5 347.395L335.494 346.612C334.727 346.412 334.15 346.688 333.959 347.424C333.77 348.149 334.138 348.672 334.906 348.872ZM331.88 351.097L337.176 352.477L336.828 353.811L336.408 353.702C336.669 354.163 336.814 354.728 336.63 355.432C336.332 356.577 335.306 357.286 333.74 356.878L330.587 356.057L330.938 354.712L334.038 355.52C334.742 355.703 335.287 355.419 335.457 354.767C335.632 354.095 335.273 353.62 334.989 353.332L331.532 352.432L331.88 351.097ZM329.843 363.222C329.706 363.747 329.838 364.23 330.14 364.578L329.071 365.411C328.548 364.747 328.33 363.86 328.582 362.893C329.058 361.065 330.657 360.314 332.201 360.716C333.746 361.119 334.775 362.554 334.299 364.382C334.047 365.349 333.424 366.017 332.644 366.341L332.116 365.093C332.55 364.937 332.901 364.579 333.043 364.033C333.27 363.161 332.765 362.344 331.84 362.104C330.905 361.86 330.076 362.328 329.843 363.222ZM332.852 369.934C332.403 371.657 330.825 372.503 329.239 372.089C327.652 371.676 326.687 370.168 327.136 368.444C327.585 366.721 329.163 365.875 330.75 366.289C332.336 366.702 333.301 368.21 332.852 369.934ZM328.391 368.794C328.17 369.645 328.686 370.464 329.6 370.702C330.525 370.943 331.364 370.477 331.586 369.626C331.816 368.743 331.313 367.917 330.388 367.676C329.464 367.435 328.621 367.911 328.391 368.794ZM326.273 372.617L331.57 373.996L331.222 375.331L330.823 375.227C331.076 375.675 331.221 376.195 331.052 376.846C330.876 377.519 330.429 378.031 329.771 378.23C330.135 378.728 330.403 379.337 330.17 380.23C329.885 381.323 328.904 381.988 327.412 381.599L324.154 380.75L324.505 379.405L327.71 380.24C328.351 380.407 328.841 380.164 328.997 379.565C329.147 378.987 328.83 378.568 328.527 378.265C328.451 378.256 328.378 378.237 328.294 378.215L325.036 377.366L325.386 376.021L328.591 376.856C329.232 377.023 329.722 376.781 329.878 376.182C330.037 375.572 329.667 375.139 329.383 374.852L325.926 373.951L326.273 372.617ZM329.803 384.567C329.927 384.094 330.43 383.798 330.903 383.922C331.376 384.045 331.671 384.548 331.548 385.021C331.425 385.494 330.924 385.779 330.451 385.655C329.978 385.532 329.68 385.039 329.803 384.567ZM323.758 382.273L329.054 383.653L328.706 384.988L323.41 383.608L323.758 382.273ZM324.839 386.048L327.004 386.612L327.261 385.624L328.459 385.937L328.202 386.924L329.526 387.269L329.175 388.614L327.851 388.269L327.43 389.888L326.232 389.576L326.653 387.957L324.489 387.393C323.9 387.24 323.587 387.495 323.45 388.02C323.354 388.388 323.333 388.641 323.36 388.839L322.194 388.535C322.147 388.242 322.176 387.913 322.291 387.472C322.636 386.148 323.546 385.712 324.839 386.048ZM327.184 394.278L327.518 392.996L328.977 394.543L328.599 395.994L327.184 394.278ZM321.44 394.701C320.907 394.034 320.711 393.108 320.971 392.11C321.461 390.229 323.051 389.51 324.595 389.912C326.161 390.32 327.196 391.644 326.745 393.378C326.361 394.849 325.111 395.556 323.724 395.195C323.43 395.118 323.168 395.005 323 394.916L323.966 391.207C322.946 391.076 322.388 391.581 322.171 392.411C322.021 392.989 322.142 393.559 322.446 393.942L321.44 394.701ZM325.66 393.062C325.838 392.379 325.577 391.829 324.922 391.501L324.287 393.939C324.828 394.057 325.466 393.808 325.66 393.062ZM322.272 398.83C323.817 399.232 324.865 400.594 324.43 402.265C324.244 402.979 323.889 403.437 323.372 403.74L326.378 404.523L326.027 405.868L318.146 403.814L318.496 402.469L318.917 402.579C318.614 402.062 318.527 401.49 318.713 400.775C319.148 399.104 320.728 398.427 322.272 398.83ZM321.908 400.227C320.983 399.986 320.16 400.389 319.925 401.293C319.769 401.892 319.892 402.452 320.283 402.935L322.006 403.384C322.583 403.152 322.963 402.724 323.119 402.125C323.355 401.221 322.833 400.468 321.908 400.227ZM317.32 410.515C316.787 409.848 316.591 408.922 316.851 407.924C317.341 406.043 318.931 405.323 320.476 405.726C322.041 406.134 323.077 407.458 322.625 409.192C322.242 410.663 320.992 411.37 319.604 411.009C319.31 410.932 319.048 410.819 318.88 410.73L319.847 407.021C318.826 406.89 318.268 407.395 318.052 408.225C317.901 408.803 318.022 409.373 318.326 409.756L317.32 410.515ZM321.54 408.876C321.718 408.193 321.458 407.643 320.802 407.315L320.167 409.753C320.709 409.871 321.346 409.622 321.54 408.876ZM336.153 256.663L344.034 258.716L343.687 260.051L343.256 259.938C343.559 260.455 343.656 261.03 343.467 261.755C343.029 263.437 341.453 264.103 339.908 263.701C338.363 263.298 337.313 261.947 337.751 260.266C337.939 259.541 338.305 259.086 338.821 258.783L335.805 257.997L336.153 256.663ZM342.255 261.238C342.417 260.618 342.275 260.042 341.869 259.577L340.208 259.144C339.611 259.37 339.22 259.796 339.061 260.405C338.825 261.309 339.345 262.073 340.269 262.314C341.194 262.554 342.02 262.141 342.255 261.238ZM342.987 266.526C343.111 266.053 343.614 265.757 344.087 265.881C344.56 266.004 344.855 266.507 344.732 266.98C344.609 267.453 344.108 267.738 343.635 267.615C343.162 267.491 342.864 266.998 342.987 266.526ZM336.942 264.232L342.238 265.612L341.89 266.947L336.594 265.567L336.942 264.232ZM336.177 267.167L344.058 269.221L343.711 270.555L335.829 268.502L336.177 267.167ZM340.262 274.059C339.813 275.782 338.235 276.628 336.648 276.215C335.061 275.801 334.096 274.293 334.545 272.57C334.994 270.846 336.572 270.001 338.159 270.414C339.746 270.827 340.711 272.335 340.262 274.059ZM335.801 272.919C335.579 273.77 336.095 274.589 337.009 274.827C337.934 275.068 338.774 274.603 338.995 273.751C339.225 272.869 338.723 272.042 337.798 271.801C336.873 271.56 336.031 272.036 335.801 272.919ZM335.545 277.52L337.709 278.084L337.967 277.096L339.165 277.409L338.907 278.396L340.231 278.741L339.881 280.086L338.557 279.741L338.135 281.36L336.937 281.048L337.359 279.429L335.194 278.865C334.606 278.712 334.293 278.967 334.156 279.493C334.06 279.86 334.039 280.113 334.066 280.311L332.9 280.007C332.852 279.714 332.882 279.385 332.997 278.944C333.342 277.62 334.252 277.184 335.545 277.52ZM331.981 282.626C332.258 281.565 333.056 280.999 334.034 281.253C334.832 281.461 335.27 282.237 335.163 283.421L335.015 285.111L335.151 285.147C335.708 285.292 336.175 284.964 336.334 284.355C336.468 283.84 336.33 283.378 336.016 282.993L337.016 282.21C337.545 282.852 337.741 283.734 337.489 284.701C337.09 286.235 335.97 286.785 334.804 286.481L331.378 285.589L331.726 284.254L332.241 284.388C331.918 283.945 331.82 283.246 331.981 282.626ZM333.752 282.594C333.394 282.501 333.089 282.724 332.972 283.176C332.813 283.785 332.982 284.301 333.334 284.673L334.08 284.867L334.198 283.552C334.248 282.97 334.078 282.679 333.752 282.594ZM330.192 286.351C330.717 286.487 331.069 286.86 331.293 287.423C331.558 287.267 331.872 287.226 332.145 287.297C332.565 287.406 332.855 287.673 333.045 288.149C333.512 287.777 334.104 287.661 334.692 287.815C335.722 288.083 336.344 289.098 335.999 290.422C335.892 290.832 335.726 291.17 335.51 291.439L335.006 293.372L333.871 293.077L334.115 292.142C333.933 292.15 333.759 292.128 333.581 292.081C332.54 291.81 331.902 290.813 332.258 289.447C332.305 289.269 332.359 289.103 332.431 288.954C332.357 288.811 332.257 288.718 332.142 288.688C331.932 288.633 331.796 288.721 331.733 288.963L331.386 290.297C331.038 291.632 330.135 292.171 329.147 291.913C327.97 291.607 327.359 290.247 327.789 288.597C328.23 286.905 329.078 286.06 330.192 286.351ZM333.261 289.731C333.116 290.288 333.37 290.736 333.895 290.873C334.421 291.009 334.85 290.74 334.995 290.183C335.146 289.605 334.889 289.168 334.374 289.034C333.849 288.897 333.412 289.153 333.261 289.731ZM330.053 287.661C329.548 287.529 329.107 287.931 328.863 288.866C328.612 289.833 328.84 290.42 329.366 290.557C329.765 290.661 330.112 290.493 330.279 289.852L330.706 288.212C330.569 287.964 330.378 287.746 330.053 287.661ZM329.112 297.82C328.578 297.154 328.382 296.228 328.642 295.229C329.132 293.348 330.722 292.629 332.267 293.032C333.833 293.439 334.868 294.764 334.416 296.498C334.033 297.969 332.783 298.676 331.396 298.314C331.101 298.238 330.839 298.124 330.671 298.036L331.638 294.326C330.617 294.195 330.059 294.701 329.843 295.531C329.692 296.109 329.813 296.679 330.117 297.061L329.112 297.82ZM333.331 296.182C333.509 295.499 333.249 294.948 332.594 294.62L331.958 297.058C332.5 297.177 333.137 296.928 333.331 296.182ZM329.043 302.478L331.208 303.042L331.465 302.054L332.663 302.366L332.406 303.354L333.73 303.699L333.379 305.044L332.055 304.699L331.634 306.317L330.436 306.005L330.857 304.387L328.693 303.823C328.104 303.669 327.791 303.924 327.654 304.45C327.558 304.818 327.537 305.07 327.564 305.268L326.398 304.964C326.351 304.671 326.38 304.343 326.495 303.901C326.84 302.577 327.75 302.141 329.043 302.478ZM326.026 306.133L331.322 307.512L330.975 308.847L330.449 308.71C330.716 309.15 330.872 309.673 330.716 310.272C330.669 310.45 330.596 310.6 330.522 310.715L329.208 310.373C329.294 310.216 329.372 310.045 329.435 309.804C329.605 309.152 329.357 308.639 329.073 308.351L325.678 307.467L326.026 306.133ZM324.434 311.596C324.711 310.535 325.509 309.968 326.487 310.223C327.285 310.431 327.723 311.207 327.616 312.391L327.468 314.081L327.604 314.116C328.161 314.261 328.628 313.934 328.787 313.325C328.921 312.81 328.783 312.348 328.468 311.963L329.469 311.18C329.997 311.822 330.194 312.704 329.942 313.671C329.543 315.205 328.423 315.755 327.257 315.451L323.831 314.558L324.179 313.224L324.694 313.358C324.371 312.915 324.273 312.216 324.434 311.596ZM326.205 311.564C325.847 311.47 325.542 311.694 325.425 312.146C325.266 312.755 325.435 313.271 325.786 313.643L326.533 313.837L326.651 312.521C326.701 311.94 326.53 311.648 326.205 311.564ZM323.433 316.087L328.729 317.466L328.381 318.801L327.961 318.692C328.223 319.152 328.367 319.717 328.184 320.422C327.885 321.567 326.859 322.276 325.293 321.868L322.141 321.047L322.491 319.702L325.591 320.509C326.295 320.693 326.841 320.408 327.01 319.757C327.185 319.084 326.827 318.609 326.542 318.322L323.085 317.421L323.433 316.087ZM322.633 322.3L323.202 323.39C322.707 323.609 322.312 323.921 322.181 324.426C322.068 324.857 322.263 325.143 322.578 325.225C323.503 325.466 323.816 322.843 325.676 323.328C326.611 323.571 327.11 324.543 326.822 325.646C326.612 326.456 326.031 327.09 325.418 327.334L324.87 326.249C325.278 326.063 325.641 325.788 325.748 325.378C325.857 324.957 325.678 324.697 325.405 324.626C324.501 324.391 324.157 327.006 322.328 326.529C321.22 326.218 320.843 325.166 321.103 324.168C321.35 323.222 321.903 322.648 322.633 322.3ZM326.001 327.937L325.629 329.366L321.487 329.757L324.915 332.108L324.54 333.548L319.747 330.235L320.204 328.48L326.001 327.937ZM318.632 338.048C318.098 337.381 317.902 336.455 318.162 335.457C318.652 333.576 320.242 332.856 321.787 333.259C323.353 333.667 324.388 334.991 323.936 336.725C323.553 338.196 322.303 338.903 320.916 338.542C320.622 338.465 320.359 338.352 320.192 338.263L321.158 334.554C320.137 334.423 319.579 334.928 319.363 335.758C319.212 336.336 319.333 336.906 319.638 337.289L318.632 338.048ZM322.852 336.409C323.03 335.726 322.769 335.176 322.114 334.848L321.479 337.286C322.02 337.404 322.657 337.155 322.852 336.409ZM317.455 339.033L322.751 340.412L322.404 341.747L321.878 341.61C322.145 342.05 322.301 342.573 322.145 343.172C322.098 343.351 322.025 343.5 321.951 343.615L320.637 343.273C320.723 343.116 320.801 342.945 320.864 342.704C321.034 342.052 320.786 341.539 320.502 341.252L317.107 340.367L317.455 339.033ZM317.23 343.039L317.799 344.13C317.304 344.349 316.909 344.661 316.778 345.166C316.665 345.596 316.86 345.883 317.175 345.965C318.1 346.206 318.413 343.583 320.273 344.068C321.208 344.311 321.707 345.283 321.419 346.386C321.209 347.195 320.628 347.83 320.015 348.074L319.467 346.988C319.875 346.803 320.238 346.527 320.345 346.117C320.454 345.697 320.275 345.437 320.002 345.366C319.098 345.131 318.754 347.745 316.925 347.269C315.817 346.958 315.44 345.906 315.7 344.907C315.947 343.962 316.5 343.388 317.23 343.039ZM314.556 349.515C314.833 348.453 315.631 347.887 316.608 348.141C317.407 348.35 317.844 349.126 317.738 350.31L317.589 351.999L317.726 352.035C318.283 352.18 318.75 351.853 318.909 351.243C319.043 350.728 318.905 350.266 318.59 349.881L319.591 349.098C320.119 349.741 320.316 350.622 320.064 351.589C319.664 353.123 318.545 353.673 317.378 353.369L313.953 352.477L314.3 351.142L314.815 351.276C314.493 350.833 314.395 350.135 314.556 349.515ZM316.326 349.482C315.969 349.389 315.664 349.612 315.546 350.064C315.387 350.674 315.556 351.189 315.908 351.561L316.654 351.756L316.773 350.44C316.823 349.858 316.652 349.567 316.326 349.482ZM313.555 354.005L321.436 356.058L321.088 357.393L313.207 355.34L313.555 354.005Z"
-        fill="#3F72B5"
-      />
-      <path
-        d="M194 321.855C167.6 320.655 248.5 343.855 243 322.855L158 285.855C147 281.855 144.166 284.855 145 288.355L149.5 319.355L194 321.855Z"
-        fill="#D9D9D9"
-        fillOpacity="0.39"
-      />
-      <g filter="url(#filter1_d_1506_6816)">
-        <rect
-          x="255.3"
-          y="51"
-          width="139.584"
-          height="66.7281"
-          rx="7.41907"
-          transform="rotate(32.9566 255.3 51)"
-          fill="white"
-        />
-        <rect
-          x="255.41"
-          y="51.5131"
-          width="138.842"
-          height="65.9862"
-          rx="7.04812"
-          transform="rotate(32.9566 255.41 51.5131)"
-          stroke="#F0F0FE"
-          strokeWidth="0.741907"
-        />
-      </g>
-      <g clipPath="url(#clip0_1506_6816)">
+      {' '}
+      <path fill="#C4C7C9" d="M0 0H538V432H0z"></path>
+      <g clipPath="url(#clip0_523_1843)">
         <path
-          d="M312.518 143.785C313.642 142.036 315.971 141.53 317.719 142.654L338.35 155.918C340.099 157.042 340.605 159.371 339.481 161.119L336.631 165.552C335.507 167.3 333.178 167.806 331.43 166.682L310.799 153.418C309.05 152.294 308.544 149.965 309.668 148.217L312.518 143.785Z"
-          fill="#6A6AF4"
-        />
+          fill="#fff"
+          d="M0 0H1700V1702.14H0z"
+          transform="translate(-1031 -119)"
+        ></path>
         <path
-          d="M316.67 151.37L319.387 149.358L320.093 149.812L319.39 153.118L318.817 152.75L319.007 151.895L317.943 151.211L317.244 151.738L316.67 151.37ZM318.406 150.859L319.135 151.327L319.413 150.094L318.406 150.859ZM321.533 151.317C321.362 151.207 321.31 150.97 321.42 150.799C321.53 150.628 321.767 150.577 321.938 150.687C322.106 150.794 322.157 151.031 322.047 151.202C321.937 151.373 321.7 151.425 321.533 151.317ZM320.202 153.93C319.894 154.409 319.499 154.531 319.017 154.221C318.857 154.118 318.759 154.028 318.691 153.925L318.962 153.504C319.006 153.569 319.087 153.643 319.22 153.729C319.41 153.851 319.578 153.84 319.72 153.62L321.083 151.5L321.565 151.81L320.202 153.93ZM323.104 152.693C323.727 153.093 323.857 153.826 323.488 154.4C323.119 154.974 322.398 155.16 321.775 154.759C321.152 154.359 321.022 153.625 321.391 153.052C321.76 152.478 322.481 152.292 323.104 152.693ZM322.076 154.308C322.384 154.506 322.774 154.408 322.987 154.078C323.202 153.743 323.126 153.351 322.819 153.153C322.5 152.948 322.108 153.04 321.893 153.374C321.678 153.708 321.757 154.103 322.076 154.308ZM325.107 155.623L325.805 154.536L326.291 154.849L325.607 155.913C325.239 156.486 324.677 156.625 324.115 156.263C323.553 155.902 323.449 155.336 323.818 154.762L324.502 153.699L324.988 154.011L324.29 155.098C324.111 155.375 324.146 155.639 324.412 155.81C324.674 155.978 324.928 155.9 325.107 155.623ZM326.195 156.505L326.698 155.723L326.341 155.493L326.62 155.06L326.977 155.29L327.284 154.811L327.771 155.124L327.463 155.602L328.048 155.978L327.77 156.412L327.185 156.035L326.681 156.818C326.545 157.031 326.605 157.188 326.795 157.31C326.928 157.395 327.025 157.436 327.107 157.451L326.835 157.873C326.714 157.854 326.587 157.799 326.428 157.697C325.949 157.389 325.895 156.973 326.195 156.505ZM329.175 158.969C328.843 159.093 328.451 159.051 328.09 158.819C327.41 158.382 327.332 157.66 327.691 157.102C328.055 156.536 328.712 156.298 329.339 156.701C329.871 157.043 329.988 157.629 329.666 158.13C329.597 158.236 329.519 158.325 329.462 158.38L328.121 157.518C327.937 157.904 328.065 158.191 328.365 158.383C328.574 158.518 328.815 158.544 329.005 158.473L329.175 158.969ZM329.074 157.089C328.827 156.93 328.575 156.962 328.361 157.178L329.242 157.745C329.359 157.546 329.343 157.262 329.074 157.089ZM329.412 159.561L330.643 157.647L331.125 157.957L331.003 158.147C331.212 158.098 331.439 158.105 331.655 158.244C331.72 158.285 331.769 158.333 331.805 158.378L331.5 158.853C331.449 158.798 331.392 158.746 331.304 158.689C331.069 158.538 330.834 158.569 330.683 158.645L329.894 159.872L329.412 159.561Z"
-          fill="white"
-        />
-      </g>
-      <rect
-        x="248.872"
-        y="90.1167"
-        width="39.7653"
-        height="6.12809"
-        rx="3.06405"
-        transform="rotate(32.9566 248.872 90.1167)"
-        fill="#C3C3FB"
-      />
-      <rect
-        x="239.687"
-        y="100.115"
-        width="27.7535"
-        height="6.12809"
-        rx="3.06405"
-        transform="rotate(32.9566 239.687 100.115)"
-        fill="#F4C447"
-      />
-      <path
-        d="M262.072 71.5868L261.316 71.097L262.49 70.7355L263.345 71.2898L262.072 71.5868ZM257.622 75.0237L260.28 70.9244L262.669 72.4735L262.221 73.1645L260.664 72.1546L260.033 73.1267L261.357 73.9847L260.909 74.6758L259.585 73.8177L258.902 74.8718L260.46 75.8817L260.012 76.5728L257.622 75.0237ZM260.879 77.1347L263.726 72.7426L264.47 73.2248L261.622 77.6169L260.879 77.1347ZM263.289 78.8221C262.697 78.4386 262.513 77.837 262.867 77.2924C263.155 76.8473 263.717 76.7375 264.418 77.0421L265.418 77.4746L265.468 77.3984C265.669 77.0881 265.564 76.7371 265.224 76.5169C264.937 76.3309 264.627 76.3213 264.329 76.4354L264.054 75.6666C264.553 75.4743 265.13 75.5328 265.669 75.882C266.524 76.4364 266.633 77.2306 266.211 77.8806L264.974 79.7897L264.23 79.3075L264.416 79.0206C264.081 79.1275 263.634 79.0461 263.289 78.8221ZM263.627 77.7356C263.498 77.9347 263.573 78.1661 263.824 78.3293C264.164 78.5495 264.513 78.5509 264.811 78.4116L265.08 77.9958L264.302 77.6573C263.957 77.5088 263.745 77.5541 263.627 77.7356ZM269.944 80.9163C269.386 81.7772 268.35 82.1447 267.413 81.5373C267.008 81.2753 266.805 80.9604 266.725 80.584L266.569 80.8241L265.825 80.3419L268.673 75.9498L269.417 76.432L268.327 78.1127C268.703 78.0324 269.074 78.0896 269.478 78.3515C270.415 78.959 270.503 80.0555 269.944 80.9163ZM268.917 78.9859C268.571 78.7619 268.186 78.7281 267.83 78.8798L267.222 79.8168C267.243 80.2211 267.429 80.5498 267.763 80.7662C268.266 81.0927 268.837 80.9305 269.171 80.4152C269.506 79.8998 269.421 79.3124 268.917 78.9859ZM273.063 80.6761C274.024 81.2987 274.22 82.4325 273.647 83.3168C273.074 84.2011 271.958 84.4844 270.998 83.8618C270.038 83.2391 269.841 82.1053 270.414 81.221C270.988 80.3368 272.103 80.0534 273.063 80.6761ZM271.465 83.1666C271.94 83.4742 272.544 83.3251 272.874 82.8156C273.208 82.3003 273.094 81.6939 272.619 81.3864C272.128 81.0675 271.521 81.2069 271.187 81.7222C270.853 82.2375 270.973 82.8477 271.465 83.1666ZM273.369 85.2323L275.282 82.2809L276.026 82.763L275.836 83.0559C276.158 82.982 276.509 82.993 276.843 83.2094C276.942 83.274 277.019 83.3485 277.074 83.4175L276.599 84.1495C276.521 84.0653 276.432 83.9832 276.298 83.8959C275.935 83.6605 275.571 83.7077 275.339 83.823L274.112 85.7145L273.369 85.2323ZM278.65 87.9747C278.136 88.1651 277.531 88.0974 276.975 87.7367C275.926 87.0571 275.81 85.9416 276.368 85.0808C276.933 84.2082 277.951 83.8448 278.917 84.4712C279.737 85.0028 279.915 85.9084 279.414 86.6814C279.308 86.8454 279.185 86.9825 279.097 87.0668L277.03 85.7266C276.744 86.3226 276.939 86.7654 277.402 87.0653C277.724 87.2741 278.096 87.3158 278.391 87.2075L278.65 87.9747ZM278.505 85.0689C278.124 84.8221 277.736 84.8697 277.403 85.203L278.762 86.0839C278.944 85.7776 278.92 85.3385 278.505 85.0689ZM279.013 88.8919L280.927 85.9404L281.67 86.4226L281.48 86.7154C281.803 86.6415 282.153 86.6525 282.487 86.869C282.587 86.9335 282.663 87.008 282.718 87.077L282.244 87.809C282.165 87.7249 282.077 87.6427 281.942 87.5554C281.579 87.32 281.216 87.3673 280.983 87.4825L279.757 89.374L279.013 88.8919ZM285.742 91.4415L286.828 89.7666L287.578 90.2526L286.515 91.8923C285.941 92.7766 285.073 92.9871 284.206 92.4252C283.34 91.8633 283.183 90.9883 283.757 90.1041L284.82 88.4644L285.569 88.9503L284.483 90.6252C284.206 91.0527 284.258 91.4605 284.668 91.7262C285.072 91.9882 285.465 91.869 285.742 91.4415ZM286.488 93.7378L288.401 90.7864L289.145 91.2685L288.993 91.5028C289.327 91.4366 289.701 91.4627 290.093 91.7171C290.732 92.131 290.956 92.9005 290.391 93.773L289.252 95.5299L288.502 95.0439L289.622 93.3164C289.876 92.924 289.813 92.5338 289.45 92.2984C289.076 92.0554 288.713 92.1781 288.48 92.2934L287.231 94.22L286.488 93.7378ZM293.125 97.3589C292.61 97.5494 292.005 97.4816 291.449 97.1209C290.401 96.4413 290.284 95.3258 290.842 94.465C291.408 93.5924 292.425 93.229 293.392 93.8555C294.211 94.387 294.389 95.2926 293.888 96.0656C293.782 96.2296 293.66 96.3667 293.572 96.4511L291.505 95.1108C291.218 95.7069 291.413 96.1496 291.876 96.4495C292.198 96.6583 292.57 96.7 292.865 96.5917L293.125 97.3589ZM292.979 94.4531C292.598 94.2063 292.21 94.2539 291.877 94.5872L293.236 95.4681C293.418 95.1618 293.395 94.7227 292.979 94.4531ZM294.132 100.74L296.979 96.3479L297.723 96.8301L297.567 97.0702C297.944 96.9899 298.314 97.0471 298.718 97.3091C299.655 97.9165 299.743 99.013 299.185 99.8739C298.627 100.735 297.59 101.102 296.653 100.495C296.249 100.233 296.046 99.918 295.965 99.5415L294.876 101.222L294.132 100.74ZM298.157 97.9435C297.812 97.7195 297.432 97.6895 297.066 97.8432L296.466 98.7685C296.483 99.1787 296.664 99.5035 297.003 99.7237C297.507 100.05 298.078 99.8881 298.412 99.3727C298.746 98.8574 298.661 98.27 298.157 97.9435ZM302.332 99.6521C303.293 100.275 303.489 101.409 302.916 102.293C302.343 103.177 301.227 103.461 300.267 102.838C299.307 102.215 299.11 101.081 299.683 100.197C300.257 99.3128 301.372 99.0295 302.332 99.6521ZM300.734 102.143C301.209 102.45 301.813 102.301 302.143 101.792C302.477 101.276 302.363 100.67 301.889 100.362C301.397 100.044 300.791 100.183 300.456 100.698C300.122 101.214 300.242 101.824 300.734 102.143ZM302.638 104.208L305.485 99.8163L306.229 100.299L303.381 104.691L302.638 104.208ZM306.896 102.045C306.632 101.874 306.554 101.507 306.725 101.244C306.896 100.98 307.262 100.902 307.526 101.073C307.789 101.244 307.862 101.607 307.691 101.87C307.52 102.134 307.159 102.216 306.896 102.045ZM304.273 105.269L306.187 102.317L306.93 102.8L305.017 105.751L304.273 105.269ZM306.795 105.373L307.577 104.167L307.026 103.81L307.459 103.142L308.01 103.499L308.488 102.761L309.238 103.247L308.759 103.985L309.661 104.57L309.228 105.238L308.327 104.653L307.544 105.859C307.332 106.187 307.424 106.43 307.717 106.62C307.922 106.753 308.072 106.816 308.198 106.84L307.776 107.49C307.588 107.46 307.393 107.375 307.147 107.215C306.41 106.737 306.328 106.094 306.795 105.373ZM311.036 104.729C310.773 104.559 310.694 104.192 310.865 103.928C311.036 103.665 311.403 103.586 311.666 103.757C311.93 103.928 312.002 104.291 311.831 104.555C311.661 104.818 311.3 104.9 311.036 104.729ZM308.414 107.953L310.327 105.002L311.071 105.484L309.157 108.435L308.414 107.953ZM310.795 107.401C311.353 106.54 312.39 106.173 313.327 106.78C313.725 107.038 313.929 107.353 314.009 107.73L314.165 107.49L314.914 107.976L312.067 112.368L311.317 111.882L312.407 110.201C312.03 110.281 311.66 110.224 311.262 109.966C310.325 109.359 310.237 108.262 310.795 107.401ZM311.568 107.902C311.234 108.418 311.313 109.001 311.817 109.328C312.162 109.552 312.548 109.586 312.904 109.434L313.512 108.497C313.491 108.093 313.305 107.764 312.971 107.548C312.467 107.221 311.902 107.387 311.568 107.902ZM316.664 111.489L317.75 109.814L318.5 110.3L317.437 111.94C316.863 112.824 315.995 113.035 315.128 112.473C314.261 111.911 314.105 111.036 314.678 110.152L315.741 108.512L316.491 108.998L315.405 110.673C315.128 111.1 315.18 111.508 315.59 111.774C315.994 112.036 316.387 111.917 316.664 111.489ZM320.438 115.067C319.924 115.257 319.319 115.19 318.762 114.829C317.714 114.149 317.597 113.034 318.155 112.173C318.721 111.3 319.739 110.937 320.705 111.564C321.525 112.095 321.703 113.001 321.202 113.774C321.095 113.938 320.973 114.075 320.885 114.159L318.818 112.819C318.531 113.415 318.727 113.858 319.189 114.158C319.511 114.366 319.884 114.408 320.178 114.3L320.438 115.067ZM320.292 112.161C319.912 111.914 319.523 111.962 319.191 112.295L320.549 113.176C320.731 112.87 320.708 112.431 320.292 112.161ZM323.125 115.395C323.683 114.534 324.726 114.17 325.657 114.774C326.055 115.032 326.262 115.341 326.343 115.718L327.429 114.043L328.178 114.529L325.331 118.921L324.581 118.435L324.733 118.201C324.356 118.281 323.99 118.218 323.592 117.96C322.66 117.356 322.567 116.256 323.125 115.395ZM323.904 115.9C323.57 116.415 323.649 116.999 324.153 117.325C324.486 117.542 324.853 117.58 325.226 117.439L325.849 116.479C325.825 116.081 325.641 115.762 325.307 115.545C324.803 115.219 324.238 115.385 323.904 115.9ZM329.251 120.781C328.736 120.971 328.131 120.903 327.575 120.543C326.527 119.863 326.41 118.747 326.968 117.887C327.534 117.014 328.551 116.651 329.518 117.277C330.337 117.809 330.516 118.714 330.014 119.487C329.908 119.651 329.786 119.788 329.698 119.873L327.631 118.532C327.344 119.128 327.539 119.571 328.002 119.871C328.324 120.08 328.696 120.122 328.991 120.013L329.251 120.781ZM329.105 117.875C328.725 117.628 328.336 117.676 328.003 118.009L329.362 118.89C329.544 118.583 329.521 118.144 329.105 117.875ZM252.588 81.8784L253.368 81.7522C253.402 82.0983 253.512 82.4028 253.793 82.585C254.033 82.7407 254.247 82.6799 254.361 82.5042C254.695 81.9889 253.159 81.2671 253.831 80.2306C254.169 79.7094 254.862 79.6018 255.477 80.0004C255.928 80.2928 256.198 80.7752 256.222 81.1988L255.45 81.3133C255.419 81.0272 255.324 80.7496 255.096 80.6015C254.862 80.4497 254.667 80.5064 254.568 80.6586C254.242 81.1623 255.767 81.9016 255.106 82.9205C254.692 83.5337 253.974 83.5506 253.418 83.1899C252.891 82.8482 252.653 82.3944 252.588 81.8784ZM256.177 83.2818L256.959 82.0754L256.408 81.7185L256.841 81.0509L257.391 81.4078L257.87 80.67L258.619 81.1559L258.141 81.8938L259.043 82.4785L258.61 83.1461L257.708 82.5614L256.926 83.7678C256.713 84.0957 256.806 84.3384 257.098 84.5283C257.303 84.6612 257.453 84.7251 257.579 84.7486L257.158 85.3986C256.97 85.3681 256.775 85.2835 256.529 85.1241C255.791 84.6457 255.71 84.0021 256.177 83.2818ZM258.57 86.4888C257.979 86.1053 257.795 85.5037 258.148 84.9591C258.436 84.514 258.998 84.4042 259.699 84.7088L260.7 85.1413L260.749 85.0651C260.95 84.7548 260.845 84.4038 260.505 84.1836C260.218 83.9975 259.909 83.988 259.61 84.1021L259.335 83.3332C259.834 83.141 260.411 83.1994 260.95 83.5487C261.805 84.1031 261.914 84.8973 261.493 85.5473L260.255 87.4564L259.511 86.9742L259.697 86.6873C259.362 86.7942 258.916 86.7128 258.57 86.4888ZM258.908 85.4023C258.779 85.6014 258.854 85.8328 259.106 85.996C259.445 86.2162 259.794 86.2176 260.092 86.0782L260.362 85.6625L259.583 85.324C259.238 85.1755 259.026 85.2208 258.908 85.4023ZM261.993 87.0525L262.775 85.8462L262.224 85.4893L262.657 84.8217L263.208 85.1786L263.686 84.4407L264.435 84.9267L263.957 85.6645L264.859 86.2492L264.426 86.9168L263.524 86.3321L262.742 87.5385C262.53 87.8664 262.622 88.1092 262.915 88.299C263.119 88.4319 263.269 88.4958 263.395 88.5194L262.974 89.1694C262.786 89.1389 262.591 89.0543 262.345 88.8948C261.607 88.4164 261.526 87.7728 261.993 87.0525ZM266.234 86.4087C265.97 86.2379 265.892 85.871 266.063 85.6075C266.234 85.344 266.601 85.2657 266.864 85.4366C267.128 85.6074 267.2 85.9705 267.029 86.234C266.858 86.4975 266.497 86.5796 266.234 86.4087ZM263.611 89.6325L265.525 86.6811L266.269 87.1632L264.355 90.1147L263.611 89.6325ZM268.642 88.5355C269.602 89.1582 269.799 90.292 269.226 91.1763C268.652 92.0606 267.537 92.3439 266.577 91.7213C265.616 91.0986 265.42 89.9648 265.993 89.0805C266.566 88.1962 267.682 87.9129 268.642 88.5355ZM267.044 91.0261C267.518 91.3337 268.122 91.1846 268.453 90.6751C268.787 90.1598 268.672 89.5534 268.198 89.2459C267.706 88.927 267.1 89.0663 266.766 89.5817C266.432 90.097 266.552 90.7072 267.044 91.0261ZM268.947 93.0918L270.861 90.1404L271.604 90.6225L271.453 90.8568C271.787 90.7906 272.161 90.8167 272.553 91.0711C273.191 91.485 273.416 92.2545 272.85 93.127L271.711 94.8839L270.962 94.3979L272.082 92.6703C272.336 92.278 272.273 91.8878 271.91 91.6524C271.535 91.4094 271.173 91.5321 270.94 91.6474L269.691 93.574L268.947 93.0918ZM272.556 95.4314L274.469 92.4799L275.213 92.9621L275.061 93.1963C275.395 93.1301 275.769 93.1563 276.162 93.4107C276.8 93.8245 277.025 94.594 276.459 95.4666L275.32 97.2234L274.57 96.7375L275.69 95.0099C275.945 94.6176 275.882 94.2273 275.519 93.9919C275.144 93.7489 274.781 93.8717 274.549 93.9869L273.299 95.9136L272.556 95.4314ZM279.193 99.0524C278.678 99.2429 278.074 99.1752 277.517 98.8145C276.469 98.1349 276.352 97.0194 276.91 96.1585C277.476 95.286 278.493 94.9226 279.46 95.549C280.28 96.0806 280.458 96.9862 279.956 97.7592C279.85 97.9232 279.728 98.0602 279.64 98.1446L277.573 96.8044C277.286 97.4004 277.482 97.8432 277.944 98.1431C278.266 98.3519 278.639 98.3936 278.933 98.2853L279.193 99.0524ZM279.047 96.1467C278.667 95.8999 278.278 95.9475 277.946 96.2808L279.304 97.1616C279.486 96.8554 279.463 96.4162 279.047 96.1467ZM279.556 99.9696L281.469 97.0182L282.213 97.5003L282.069 97.7229C282.393 97.6587 282.74 97.6756 283.103 97.911C283.478 98.1539 283.699 98.5305 283.687 98.9721C284.065 98.8511 284.491 98.8108 284.988 99.1335C285.598 99.5284 285.804 100.261 285.265 101.093L284.088 102.908L283.339 102.422L284.497 100.636C284.728 100.279 284.679 99.9311 284.345 99.7147C284.023 99.5059 283.703 99.6145 283.457 99.7377C283.437 99.7825 283.41 99.8235 283.38 99.8704L282.203 101.686L281.453 101.2L282.611 99.4137C282.843 99.0564 282.794 98.7086 282.46 98.4922C282.12 98.272 281.781 98.4099 281.548 98.5252L280.299 100.452L279.556 99.9696ZM287.966 104.74C287.451 104.931 286.846 104.863 286.29 104.502C285.242 103.823 285.125 102.707 285.683 101.846C286.249 100.974 287.266 100.61 288.232 101.237C289.052 101.768 289.23 102.674 288.729 103.447C288.623 103.611 288.501 103.748 288.413 103.832L286.346 102.492C286.059 103.088 286.254 103.531 286.717 103.831C287.039 104.04 287.411 104.081 287.706 103.973L287.966 104.74ZM287.82 101.834C287.439 101.588 287.051 101.635 286.718 101.968L288.077 102.849C288.259 102.543 288.236 102.104 287.82 101.834ZM288.328 105.657L290.242 102.706L290.986 103.188L290.834 103.422C291.168 103.356 291.542 103.382 291.934 103.637C292.572 104.05 292.797 104.82 292.231 105.692L291.092 107.449L290.343 106.963L291.463 105.236C291.717 104.843 291.654 104.453 291.291 104.218C290.916 103.975 290.554 104.098 290.321 104.213L289.072 106.139L288.328 105.657ZM292.823 107.041L293.605 105.834L293.055 105.478L293.487 104.81L294.038 105.167L294.516 104.429L295.266 104.915L294.787 105.653L295.689 106.238L295.256 106.905L294.355 106.32L293.573 107.527C293.36 107.855 293.452 108.097 293.745 108.287C293.95 108.42 294.1 108.484 294.226 108.508L293.804 109.158C293.616 109.127 293.422 109.043 293.176 108.883C292.438 108.405 292.356 107.761 292.823 107.041ZM297.512 107.419L298.309 107.936L297.709 110.541L299.837 108.927L300.639 109.447L297.648 111.7L296.67 111.066L297.512 107.419ZM302.555 110.522C303.515 111.145 303.712 112.279 303.138 113.163C302.565 114.047 301.45 114.331 300.489 113.708C299.529 113.085 299.333 111.952 299.906 111.067C300.479 110.183 301.594 109.9 302.555 110.522ZM300.957 113.013C301.431 113.32 302.035 113.171 302.365 112.662C302.699 112.147 302.585 111.54 302.111 111.233C301.619 110.914 301.013 111.053 300.679 111.568C300.345 112.084 300.465 112.694 300.957 113.013ZM302.86 115.079L305.707 110.686L306.451 111.169L303.604 115.561L302.86 115.079ZM307.891 113.982C308.851 114.604 309.047 115.738 308.474 116.622C307.901 117.507 306.785 117.79 305.825 117.167C304.865 116.545 304.668 115.411 305.242 114.527C305.815 113.642 306.93 113.359 307.891 113.982ZM306.292 116.472C306.767 116.78 307.371 116.631 307.701 116.121C308.035 115.606 307.921 114.999 307.447 114.692C306.955 114.373 306.349 114.512 306.015 115.028C305.68 115.543 305.8 116.153 306.292 116.472ZM308.196 118.538L310.109 115.586L310.853 116.069L310.701 116.303C311.035 116.237 311.409 116.263 311.801 116.517C312.44 116.931 312.664 117.701 312.099 118.573L310.96 120.33L310.21 119.844L311.33 118.116C311.585 117.724 311.522 117.334 311.158 117.098C310.784 116.855 310.421 116.978 310.189 117.093L308.939 119.02L308.196 118.538ZM312.69 119.921L313.472 118.715L312.922 118.358L313.355 117.691L313.905 118.047L314.384 117.31L315.133 117.796L314.655 118.533L315.557 119.118L315.124 119.786L314.222 119.201L313.44 120.407C313.227 120.735 313.319 120.978 313.612 121.168C313.817 121.301 313.967 121.365 314.093 121.388L313.672 122.038C313.484 122.008 313.289 121.923 313.043 121.764C312.305 121.285 312.223 120.642 312.69 119.921ZM315.084 123.128C314.492 122.745 314.308 122.143 314.662 121.599C314.95 121.154 315.512 121.044 316.213 121.348L317.213 121.781L317.263 121.705C317.464 121.394 317.359 121.043 317.019 120.823C316.732 120.637 316.422 120.628 316.124 120.742L315.849 119.973C316.348 119.781 316.925 119.839 317.464 120.188C318.319 120.743 318.428 121.537 318.006 122.187L316.769 124.096L316.025 123.614L316.211 123.327C315.876 123.434 315.429 123.352 315.084 123.128ZM315.422 122.042C315.293 122.241 315.368 122.472 315.619 122.636C315.959 122.856 316.308 122.857 316.606 122.718L316.875 122.302L316.097 121.964C315.752 121.815 315.54 121.86 315.422 122.042ZM317.62 124.648L319.534 121.697L320.278 122.179L320.088 122.472C320.41 122.398 320.761 122.409 321.094 122.625C321.194 122.69 321.27 122.764 321.326 122.833L320.851 123.565C320.772 123.481 320.684 123.399 320.55 123.312C320.186 123.076 319.823 123.124 319.59 123.239L318.364 125.13L317.62 124.648ZM322.622 122.967C322.358 122.796 322.28 122.429 322.451 122.166C322.622 121.902 322.989 121.824 323.252 121.995C323.516 122.165 323.588 122.529 323.417 122.792C323.246 123.056 322.885 123.138 322.622 122.967ZM319.999 126.191L321.913 123.239L322.657 123.721L320.743 126.673L319.999 126.191ZM321.614 126.63L322.395 126.504C322.428 126.85 322.539 127.155 322.82 127.337C323.06 127.493 323.274 127.432 323.388 127.256C323.722 126.741 322.185 126.019 322.857 124.983C323.195 124.461 323.889 124.354 324.504 124.753C324.955 125.045 325.224 125.527 325.249 125.951L324.476 126.065C324.445 125.779 324.351 125.502 324.122 125.354C323.888 125.202 323.693 125.258 323.595 125.411C323.268 125.914 324.793 126.654 324.133 127.673C323.719 128.286 323.001 128.303 322.444 127.942C321.917 127.6 321.679 127.147 321.614 126.63ZM325.203 128.034L325.985 126.828L325.435 126.471L325.868 125.803L326.418 126.16L326.896 125.422L327.646 125.908L327.168 126.646L328.069 127.231L327.637 127.898L326.735 127.314L325.953 128.52C325.74 128.848 325.832 129.091 326.125 129.28C326.33 129.413 326.48 129.477 326.606 129.501L326.185 130.151C325.996 130.12 325.802 130.036 325.556 129.876C324.818 129.398 324.736 128.754 325.203 128.034ZM329.793 131.858C329.279 132.049 328.674 131.981 328.118 131.62C327.07 130.941 326.953 129.825 327.511 128.964C328.076 128.092 329.094 127.728 330.06 128.355C330.88 128.886 331.058 129.792 330.557 130.565C330.451 130.729 330.328 130.866 330.241 130.95L328.173 129.61C327.887 130.206 328.082 130.649 328.545 130.949C328.867 131.158 329.239 131.199 329.534 131.091L329.793 131.858ZM329.648 128.953C329.267 128.706 328.879 128.753 328.546 129.087L329.905 129.967C330.087 129.661 330.064 129.222 329.648 128.953Z"
-        fill="#3F72B5"
-      />
-      <path
-        d="M357.47 125.894C358.107 125.346 359.072 125.933 358.879 126.751L358.624 127.832C358.537 128.198 358.696 128.577 359.017 128.773L359.967 129.35C360.685 129.786 360.425 130.886 359.587 130.955L358.48 131.046C358.105 131.077 357.793 131.345 357.707 131.711L357.451 132.793C357.258 133.61 356.132 133.703 355.808 132.928L355.379 131.903C355.234 131.556 354.882 131.342 354.508 131.373L353.4 131.464C352.563 131.533 352.126 130.49 352.763 129.943L353.606 129.218C353.891 128.973 353.985 128.572 353.84 128.226L353.411 127.201C353.087 126.426 353.944 125.688 354.662 126.125L355.611 126.702C355.932 126.897 356.343 126.864 356.627 126.619L357.47 125.894Z"
-        fill="#FECD8C"
-      />
-      <rect
-        x="107.263"
-        y="184.421"
-        width="82.8027"
-        height="36.8245"
-        rx="3.9333"
-        transform="rotate(-19.2516 107.263 184.421)"
-        fill="url(#paint3_linear_1506_6816)"
-        stroke="#A5A5F8"
-        strokeWidth="0.414031"
-      />
-      <rect
-        x="122.056"
-        y="202.782"
-        width="54.3953"
-        height="3.41986"
-        rx="1.70993"
-        transform="rotate(-19.2516 122.056 202.782)"
-        fill="#7CD4A5"
-      />
-      <rect
-        x="120.553"
-        y="198.477"
-        width="25.5739"
-        height="3.41986"
-        rx="1.70993"
-        transform="rotate(-19.2516 120.553 198.477)"
-        fill="#F4F5FD"
-      />
-      <rect
-        x="176.439"
-        y="168.897"
-        width="6.9009"
-        height="3.41986"
-        rx="1.70993"
-        transform="rotate(-19.2516 176.439 168.897)"
-        fill="#7CD4A5"
-      />
-      <rect
-        x="123.811"
-        y="207.804"
-        width="41.8113"
-        height="3.41986"
-        rx="1.70993"
-        transform="rotate(-19.2516 123.811 207.804)"
-        fill="#F4F5FD"
-      />
-      <path
-        d="M119.42 192.751L118.496 190.108L119.033 189.92L119.956 192.564L119.42 192.751ZM120.136 191.433C119.942 190.878 120.144 190.278 120.744 190.068C121.001 189.979 121.214 189.993 121.413 190.089L121.035 189.009L121.519 188.84L122.508 191.672L122.024 191.841L121.972 191.69C121.876 191.889 121.719 192.033 121.462 192.123C120.861 192.332 120.33 191.988 120.136 191.433ZM120.639 191.258C120.755 191.59 121.047 191.759 121.371 191.646C121.587 191.57 121.733 191.418 121.8 191.199L121.584 190.58C121.395 190.451 121.186 190.422 120.971 190.498C120.646 190.611 120.522 190.925 120.639 191.258ZM124.727 190.55C124.632 190.85 124.389 191.1 124.031 191.225C123.355 191.461 122.808 191.123 122.614 190.568C122.418 190.005 122.611 189.416 123.234 189.199C123.763 189.014 124.235 189.252 124.409 189.75C124.446 189.856 124.465 189.959 124.473 190.029L123.14 190.494C123.309 190.833 123.578 190.9 123.876 190.796C124.084 190.724 124.234 190.57 124.288 190.398L124.727 190.55ZM123.36 189.595C123.114 189.681 122.999 189.874 123.033 190.142L123.91 189.836C123.835 189.646 123.628 189.502 123.36 189.595ZM125.27 190.708L124.605 188.805L125.085 188.637L125.137 188.788C125.225 188.614 125.368 188.453 125.621 188.365C126.032 188.221 126.46 188.39 126.656 188.953L127.052 190.085L126.569 190.254L126.18 189.14C126.091 188.887 125.892 188.779 125.658 188.86C125.417 188.945 125.345 189.152 125.315 189.298L125.749 190.54L125.27 190.708ZM127.475 189.158L127.203 188.38L126.848 188.504L126.698 188.074L127.053 187.95L126.887 187.474L127.37 187.305L127.536 187.781L128.118 187.578L128.268 188.008L127.687 188.211L127.958 188.989C128.032 189.201 128.174 189.244 128.363 189.178C128.495 189.132 128.577 189.087 128.632 189.038L128.778 189.457C128.698 189.532 128.592 189.59 128.433 189.645C127.957 189.812 127.637 189.623 127.475 189.158ZM128.673 187.011C128.503 187.07 128.309 186.977 128.25 186.807C128.191 186.637 128.284 186.444 128.454 186.384C128.624 186.325 128.814 186.42 128.873 186.59C128.932 186.759 128.843 186.952 128.673 187.011ZM129.212 189.331L128.547 187.428L129.027 187.26L129.692 189.164L129.212 189.331ZM129.368 187.141L129.723 187.017L129.653 186.817C129.512 186.413 129.666 185.995 130.142 185.828C130.316 185.768 130.478 185.758 130.621 185.78L130.557 186.251C130.486 186.23 130.398 186.222 130.3 186.256C130.138 186.313 130.072 186.463 130.132 186.637L130.206 186.848L130.788 186.645L130.938 187.076L130.357 187.279L130.871 188.752L130.388 188.921L129.873 187.448L129.518 187.572L129.368 187.141ZM131.273 186.103C131.103 186.162 130.909 186.069 130.85 185.899C130.791 185.729 130.884 185.536 131.054 185.476C131.224 185.417 131.414 185.512 131.473 185.682C131.532 185.851 131.443 186.044 131.273 186.103ZM131.812 188.423L131.147 186.52L131.627 186.352L132.291 188.256L131.812 188.423ZM134.511 187.133C134.416 187.433 134.173 187.683 133.814 187.808C133.138 188.045 132.592 187.706 132.398 187.151C132.202 186.588 132.395 185.999 133.018 185.782C133.546 185.597 134.019 185.835 134.193 186.333C134.23 186.439 134.249 186.542 134.257 186.612L132.923 187.077C133.093 187.416 133.362 187.483 133.66 187.379C133.868 187.307 134.018 187.153 134.072 186.981L134.511 187.133ZM133.143 186.179C132.898 186.264 132.783 186.457 132.817 186.725L133.693 186.419C133.619 186.229 133.412 186.085 133.143 186.179ZM135.053 187.291L134.389 185.388L134.868 185.22L134.934 185.409C135.014 185.237 135.142 185.082 135.357 185.007C135.422 184.985 135.482 184.976 135.533 184.975L135.698 185.447C135.632 185.453 135.564 185.465 135.477 185.495C135.243 185.577 135.137 185.758 135.107 185.904L135.533 187.123L135.053 187.291ZM138.572 185.139L138.194 184.059L138.678 183.89L139.047 184.947C139.246 185.517 139.037 185.985 138.478 186.18C137.919 186.375 137.468 186.139 137.268 185.568L136.899 184.511L137.383 184.342L137.76 185.422C137.856 185.698 138.059 185.818 138.323 185.725C138.584 185.634 138.668 185.414 138.572 185.139ZM139.873 185.608L139.209 183.704L139.688 183.537L139.741 183.688C139.828 183.513 139.972 183.353 140.225 183.265C140.636 183.121 141.064 183.29 141.26 183.852L141.656 184.985L141.172 185.154L140.783 184.04C140.695 183.787 140.496 183.678 140.262 183.76C140.02 183.845 139.949 184.052 139.919 184.198L140.353 185.44L139.873 185.608ZM141.664 183.491C141.624 183.375 141.627 183.283 141.674 183.216C141.721 183.146 141.789 183.095 141.88 183.064C141.968 183.033 142.052 183.031 142.131 183.056C142.21 183.08 142.27 183.149 142.31 183.265C142.349 183.376 142.346 183.467 142.3 183.54C142.254 183.61 142.187 183.66 142.099 183.691C142.008 183.722 141.923 183.725 141.843 183.699C141.763 183.671 141.703 183.601 141.664 183.491ZM144.921 183.497C144.827 183.797 144.584 184.047 144.225 184.173C143.549 184.409 143.003 184.07 142.809 183.515C142.612 182.952 142.805 182.364 143.428 182.146C143.957 181.961 144.43 182.199 144.604 182.697C144.641 182.803 144.66 182.906 144.667 182.976L143.334 183.441C143.503 183.781 143.773 183.848 144.071 183.743C144.279 183.671 144.428 183.517 144.483 183.345L144.921 183.497ZM143.554 182.543C143.309 182.628 143.194 182.821 143.228 183.089L144.104 182.783C144.029 182.593 143.822 182.449 143.554 182.543ZM146.818 180.708L146.358 180.869L146.531 180.105L147.052 179.923L146.818 180.708ZM148.126 182.378C148.032 182.678 147.789 182.928 147.43 183.053C146.754 183.289 146.208 182.951 146.014 182.395C145.817 181.833 146.01 181.244 146.633 181.027C147.162 180.842 147.634 181.079 147.808 181.578C147.845 181.684 147.865 181.787 147.872 181.857L146.539 182.322C146.708 182.661 146.977 182.728 147.276 182.624C147.483 182.552 147.633 182.398 147.687 182.226L148.126 182.378ZM146.759 181.423C146.513 181.509 146.398 181.702 146.433 181.969L147.309 181.663C147.234 181.474 147.027 181.33 146.759 181.423ZM148.669 182.536L147.68 179.704L148.159 179.536L149.148 182.368L148.669 182.536ZM150.69 180.906L150.313 179.826L150.796 179.658L151.165 180.715C151.364 181.285 151.155 181.752 150.596 181.948C150.037 182.143 149.586 181.906 149.387 181.336L149.017 180.279L149.501 180.11L149.878 181.19C149.974 181.466 150.177 181.585 150.441 181.493C150.702 181.402 150.786 181.182 150.69 180.906ZM152.328 178.784L151.867 178.944L152.041 178.18L152.562 177.998L152.328 178.784ZM153.636 180.454C153.541 180.754 153.298 181.004 152.939 181.129C152.263 181.365 151.717 181.026 151.523 180.471C151.327 179.909 151.52 179.32 152.143 179.102C152.671 178.918 153.144 179.155 153.318 179.654C153.355 179.759 153.374 179.863 153.382 179.932L152.048 180.398C152.218 180.737 152.487 180.804 152.785 180.7C152.993 180.627 153.143 180.473 153.197 180.302L153.636 180.454ZM152.268 179.499C152.023 179.585 151.908 179.778 151.942 180.045L152.818 179.739C152.744 179.549 152.537 179.406 152.268 179.499ZM154.178 180.612L153.514 178.708L153.993 178.541L154.059 178.73C154.139 178.558 154.267 178.403 154.482 178.328C154.547 178.305 154.607 178.297 154.658 178.296L154.823 178.768C154.757 178.774 154.689 178.785 154.602 178.816C154.368 178.897 154.262 179.078 154.232 179.224L154.658 180.444L154.178 180.612ZM157.276 179.183C157.181 179.482 156.938 179.733 156.579 179.858C155.903 180.094 155.357 179.755 155.163 179.2C154.967 178.637 155.159 178.049 155.782 177.831C156.311 177.647 156.784 177.884 156.958 178.383C156.995 178.488 157.014 178.592 157.021 178.661L155.688 179.127C155.858 179.466 156.127 179.533 156.425 179.429C156.633 179.356 156.782 179.202 156.837 179.031L157.276 179.183ZM155.908 178.228C155.663 178.314 155.548 178.506 155.582 178.774L156.458 178.468C156.383 178.278 156.176 178.134 155.908 178.228ZM157.818 179.34L157.154 177.437L157.633 177.27L157.686 177.421C157.773 177.246 157.916 177.086 158.169 176.998C158.581 176.854 159.009 177.022 159.205 177.585L159.601 178.718L159.117 178.887L158.728 177.773C158.64 177.52 158.441 177.411 158.207 177.493C157.965 177.577 157.894 177.785 157.864 177.931L158.298 179.173L157.818 179.34ZM160.023 177.791L159.752 177.013L159.397 177.137L159.246 176.706L159.601 176.582L159.435 176.106L159.919 175.938L160.085 176.413L160.666 176.21L160.817 176.641L160.235 176.844L160.507 177.622C160.581 177.833 160.723 177.877 160.912 177.811C161.044 177.765 161.126 177.719 161.181 177.67L161.327 178.09C161.247 178.164 161.14 178.223 160.982 178.278C160.506 178.444 160.186 178.255 160.023 177.791ZM161.225 176.659C161.184 176.544 161.187 176.452 161.235 176.385C161.281 176.315 161.349 176.264 161.44 176.233C161.528 176.202 161.612 176.199 161.692 176.225C161.77 176.248 161.83 176.318 161.87 176.434C161.909 176.545 161.906 176.636 161.86 176.709C161.814 176.778 161.747 176.829 161.659 176.859C161.568 176.891 161.483 176.894 161.403 176.868C161.323 176.84 161.263 176.77 161.225 176.659ZM164.481 176.666C164.387 176.966 164.144 177.216 163.785 177.341C163.109 177.577 162.563 177.238 162.369 176.683C162.173 176.121 162.365 175.532 162.988 175.315C163.517 175.13 163.99 175.367 164.164 175.866C164.201 175.972 164.22 176.075 164.227 176.145L162.894 176.61C163.064 176.949 163.333 177.016 163.631 176.912C163.839 176.84 163.988 176.686 164.043 176.514L164.481 176.666ZM163.114 175.711C162.869 175.797 162.754 175.99 162.788 176.257L163.664 175.951C163.589 175.761 163.382 175.618 163.114 175.711Z"
-        fill="#3F72B5"
-      />
-      <g filter="url(#filter2_d_1506_6816)">
+          fill="#EEF4FF"
+          d="M495.5 260.5c0 122.331-109.669 156-232 156S57 373.831 57 251.5 151.169 58 273.5 58s222 80.169 222 202.5z"
+          opacity="0.6"
+        ></path>
+        <path
+          stroke="#EEF4FF"
+          d="M537 225.5c0 30.506-6.836 55.456-18.976 75.727-12.14 20.271-29.601 35.891-50.893 47.71C424.534 372.584 366.636 381 305.5 381c-61.123 0-112.624-10.663-148.833-36.533C120.489 318.62 99.5 277.537 99.5 216.5c0-61.026 23.483-109.26 62.2-142.243C200.426 41.265 254.428 23.5 315.5 23.5c122.118 0 221.5 80.004 221.5 202z"
+        ></path>
+        <path
+          stroke="#EEF4FF"
+          d="M448 202.5c0 30.506-6.836 55.456-18.976 75.727-12.14 20.271-29.601 35.891-50.893 47.71C335.534 349.584 277.636 358 216.5 358c-61.123 0-112.624-10.663-148.834-36.533C31.49 295.62 10.5 254.537 10.5 193.5c0-61.026 23.483-109.26 62.2-142.243C111.426 18.265 165.428.5 226.5.5 348.618.5 448 80.504 448 202.5z"
+        ></path>
+        <path
+          stroke="#EEF4FF"
+          d="M537 225.5c0 30.506-6.836 55.456-18.976 75.727-12.14 20.271-29.601 35.891-50.893 47.71C424.534 372.584 366.636 381 305.5 381c-61.123 0-112.624-10.663-148.833-36.533C120.489 318.62 99.5 277.537 99.5 216.5c0-61.026 23.483-109.26 62.2-142.243C200.426 41.265 254.428 23.5 315.5 23.5c122.118 0 221.5 80.004 221.5 202z"
+        ></path>
+        <path
+          stroke="#EEF4FF"
+          d="M448 202.5c0 30.506-6.836 55.456-18.976 75.727-12.14 20.271-29.601 35.891-50.893 47.71C335.534 349.584 277.636 358 216.5 358c-61.123 0-112.624-10.663-148.834-36.533C31.49 295.62 10.5 254.537 10.5 193.5c0-61.026 23.483-109.26 62.2-142.243C111.426 18.265 165.428.5 226.5.5 348.618.5 448 80.504 448 202.5z"
+        ></path>
+        <g filter="url(#filter0_f_523_1843)">
+          <ellipse
+            cx="266.5"
+            cy="269.855"
+            fill="#fff"
+            rx="154.5"
+            ry="124"
+          ></ellipse>
+        </g>
+        <path
+          fill="#EDEDED"
+          d="M179.093 334.292c9.719.4 168.058 3.702 190.035 4.159 1.631.034 3.086.852 3.737 2.348 1.876 4.304 3.615 13.099-13.93 12.447-23.162-.862-127.615 2.154-165.659 0s-24.628-19.385-14.183-18.954z"
+        ></path>
         <rect
-          x="164.117"
-          y="119.636"
-          width="45.0654"
-          height="20.0417"
-          rx="2.1407"
-          transform="rotate(-2.11625 164.117 119.636)"
-          fill="url(#paint4_linear_1506_6816)"
+          width="212.108"
+          height="94.33"
+          x="267.331"
+          y="153.122"
+          fill="url(#paint0_linear_523_1843)"
           stroke="#F0F0FE"
-          strokeWidth="0.225337"
-        />
+          strokeWidth="1.061"
+          rx="10.075"
+          transform="rotate(60.013 267.331 153.122)"
+        ></rect>
         <rect
-          x="168.866"
-          y="131.558"
-          width="29.6047"
-          height="1.86126"
-          rx="0.930631"
-          transform="rotate(-2.11625 168.866 131.558)"
-          fill="#C3C3FB"
-        />
+          width="139.339"
+          height="8.76"
+          x="228.178"
+          y="199.114"
+          fill="#7CD4A5"
+          rx="4.38"
+          transform="rotate(60.013 228.178 199.114)"
+        ></rect>
         <rect
-          x="168.774"
-          y="129.078"
-          width="13.9186"
-          height="1.86126"
-          rx="0.930631"
-          transform="rotate(-2.11625 168.774 129.078)"
+          width="65.51"
+          height="8.76"
+          x="238.295"
+          y="193.276"
           fill="#F4F5FD"
-        />
+          rx="4.38"
+          transform="rotate(60.013 238.295 193.276)"
+        ></rect>
         <rect
-          x="202.583"
-          y="122.655"
-          width="3.75582"
-          height="1.86126"
-          rx="0.930631"
-          transform="rotate(-2.11625 202.583 122.655)"
+          width="17.677"
+          height="8.76"
+          x="339.409"
+          y="319.814"
           fill="#7CD4A5"
-        />
+          rx="4.38"
+          transform="rotate(60.013 339.409 319.814)"
+        ></rect>
         <rect
-          x="168.973"
-          y="134.451"
-          width="22.7558"
-          height="1.86126"
-          rx="0.930631"
-          transform="rotate(-2.11625 168.973 134.451)"
+          width="107.104"
+          height="8.76"
+          x="216.375"
+          y="205.925"
           fill="#F4F5FD"
-        />
+          rx="4.38"
+          transform="rotate(60.013 216.375 205.925)"
+        ></rect>
         <path
-          d="M169.093 125.653L169.037 124.13L169.346 124.119L169.402 125.642L169.093 125.653ZM169.677 125.082C169.665 124.763 169.866 124.483 170.212 124.47C170.36 124.465 170.469 124.506 170.557 124.588L170.534 123.966L170.812 123.956L170.872 125.587L170.594 125.597L170.591 125.51C170.509 125.598 170.404 125.648 170.256 125.654C169.91 125.666 169.689 125.402 169.677 125.082ZM169.967 125.072C169.974 125.263 170.099 125.398 170.286 125.391C170.41 125.386 170.51 125.33 170.58 125.228L170.567 124.871C170.489 124.774 170.385 124.725 170.261 124.73C170.074 124.737 169.96 124.88 169.967 125.072ZM172.206 125.359C172.109 125.5 171.943 125.591 171.736 125.599C171.347 125.613 171.117 125.349 171.105 125.03C171.093 124.705 171.288 124.43 171.647 124.417C171.951 124.406 172.159 124.605 172.17 124.892C172.172 124.953 172.165 125.01 172.158 125.047L171.39 125.076C171.424 125.279 171.553 125.357 171.725 125.351C171.844 125.347 171.947 125.29 172.003 125.21L172.206 125.359ZM171.648 124.644C171.507 124.649 171.416 124.731 171.391 124.875L171.896 124.857C171.887 124.746 171.803 124.638 171.648 124.644ZM172.463 125.528L172.423 124.432L172.699 124.422L172.702 124.509C172.776 124.432 172.876 124.372 173.022 124.366C173.259 124.357 173.454 124.514 173.466 124.838L173.49 125.49L173.212 125.501L173.188 124.859C173.183 124.713 173.097 124.625 172.962 124.63C172.823 124.635 172.752 124.731 172.713 124.802L172.74 125.518L172.463 125.528ZM173.859 125.076L173.842 124.628L173.638 124.635L173.629 124.387L173.833 124.38L173.823 124.106L174.101 124.095L174.112 124.37L174.447 124.357L174.456 124.605L174.121 124.618L174.137 125.066C174.142 125.188 174.209 125.233 174.318 125.229C174.394 125.226 174.443 125.216 174.48 125.199L174.489 125.44C174.435 125.466 174.37 125.48 174.279 125.483C174.005 125.493 173.869 125.344 173.859 125.076ZM174.826 124.151C174.728 124.155 174.643 124.075 174.639 123.978C174.635 123.88 174.715 123.794 174.813 123.79C174.911 123.787 174.994 123.866 174.998 123.964C175.002 124.062 174.924 124.148 174.826 124.151ZM174.735 125.444L174.694 124.348L174.97 124.338L175.011 125.434L174.735 125.444ZM175.167 124.331L175.371 124.323L175.367 124.208C175.358 123.975 175.506 123.782 175.78 123.772C175.88 123.768 175.966 123.789 176.037 123.823L175.928 124.058C175.894 124.036 175.85 124.018 175.794 124.02C175.7 124.023 175.642 124.091 175.645 124.191L175.65 124.313L175.985 124.3L175.994 124.548L175.659 124.561L175.69 125.409L175.412 125.419L175.38 124.571L175.176 124.579L175.167 124.331ZM176.324 124.096C176.226 124.1 176.14 124.02 176.137 123.922C176.133 123.824 176.213 123.739 176.311 123.735C176.409 123.731 176.492 123.811 176.496 123.909C176.499 124.007 176.422 124.092 176.324 124.096ZM176.232 125.389L176.192 124.293L176.468 124.282L176.509 125.379L176.232 125.389ZM177.843 125.151C177.746 125.292 177.579 125.383 177.372 125.391C176.983 125.405 176.753 125.141 176.741 124.821C176.729 124.497 176.924 124.222 177.283 124.209C177.588 124.198 177.795 124.397 177.806 124.684C177.808 124.745 177.802 124.802 177.794 124.839L177.026 124.867C177.06 125.071 177.189 125.149 177.361 125.143C177.481 125.138 177.583 125.082 177.639 125.002L177.843 125.151ZM177.285 124.435C177.143 124.441 177.053 124.522 177.028 124.667L177.532 124.648C177.524 124.538 177.439 124.43 177.285 124.435ZM178.1 125.32L178.059 124.224L178.336 124.213L178.34 124.322C178.409 124.246 178.5 124.186 178.624 124.181C178.661 124.18 178.694 124.185 178.72 124.193L178.73 124.465C178.695 124.457 178.658 124.452 178.608 124.454C178.473 124.459 178.389 124.536 178.35 124.607L178.376 125.31L178.1 125.32ZM180.275 124.765L180.252 124.143L180.53 124.132L180.553 124.742C180.565 125.07 180.381 125.279 180.059 125.291C179.737 125.303 179.54 125.108 179.528 124.779L179.506 124.17L179.784 124.16L179.807 124.782C179.813 124.941 179.899 125.036 180.051 125.03C180.202 125.025 180.281 124.924 180.275 124.765ZM180.877 125.218L180.836 124.121L181.112 124.111L181.116 124.198C181.189 124.121 181.289 124.061 181.435 124.055C181.672 124.047 181.867 124.203 181.879 124.527L181.903 125.18L181.625 125.19L181.601 124.548C181.596 124.402 181.51 124.314 181.375 124.319C181.236 124.324 181.165 124.42 181.126 124.492L181.153 125.207L180.877 125.218ZM182.147 124.404C182.145 124.337 182.161 124.29 182.197 124.262C182.232 124.234 182.276 124.218 182.328 124.216C182.379 124.214 182.423 124.227 182.46 124.253C182.497 124.278 182.517 124.323 182.52 124.39C182.522 124.454 182.505 124.501 182.47 124.531C182.435 124.56 182.392 124.576 182.341 124.577C182.289 124.579 182.244 124.567 182.207 124.541C182.17 124.513 182.15 124.468 182.147 124.404ZM183.84 124.929C183.743 125.07 183.577 125.161 183.37 125.169C182.98 125.183 182.751 124.92 182.739 124.6C182.727 124.276 182.922 124 183.28 123.987C183.585 123.976 183.793 124.175 183.803 124.462C183.806 124.523 183.799 124.58 183.792 124.617L183.024 124.646C183.057 124.849 183.187 124.927 183.359 124.921C183.478 124.917 183.581 124.861 183.637 124.78L183.84 124.929ZM183.282 124.214C183.141 124.219 183.05 124.301 183.025 124.445L183.53 124.427C183.521 124.316 183.437 124.208 183.282 124.214ZM185.274 123.783L185.009 123.793L185.222 123.423L185.522 123.412L185.274 123.783ZM185.687 124.861C185.589 125.002 185.423 125.093 185.216 125.101C184.827 125.115 184.597 124.851 184.585 124.531C184.573 124.207 184.768 123.932 185.127 123.919C185.431 123.908 185.639 124.107 185.65 124.394C185.652 124.455 185.645 124.512 185.638 124.549L184.87 124.578C184.904 124.781 185.033 124.859 185.205 124.853C185.324 124.848 185.427 124.792 185.483 124.712L185.687 124.861ZM185.129 124.145C184.987 124.151 184.896 124.232 184.871 124.377L185.376 124.358C185.368 124.248 185.283 124.14 185.129 124.145ZM185.944 125.03L185.883 123.399L186.16 123.388L186.22 125.02L185.944 125.03ZM187.256 124.507L187.233 123.885L187.511 123.874L187.534 124.484C187.546 124.812 187.362 125.021 187.04 125.033C186.718 125.045 186.521 124.85 186.509 124.521L186.487 123.912L186.765 123.902L186.788 124.524C186.794 124.683 186.88 124.778 187.033 124.772C187.183 124.767 187.262 124.666 187.256 124.507ZM188.448 123.665L188.183 123.675L188.396 123.306L188.696 123.295L188.448 123.665ZM188.861 124.744C188.763 124.885 188.597 124.976 188.39 124.983C188.001 124.998 187.771 124.734 187.759 124.414C187.747 124.09 187.942 123.815 188.301 123.802C188.605 123.79 188.813 123.99 188.824 124.277C188.826 124.338 188.819 124.395 188.812 124.432L188.044 124.46C188.078 124.664 188.207 124.742 188.379 124.736C188.498 124.731 188.601 124.675 188.657 124.595L188.861 124.744ZM188.303 124.028C188.161 124.033 188.071 124.115 188.045 124.26L188.55 124.241C188.542 124.13 188.457 124.022 188.303 124.028ZM189.118 124.913L189.077 123.817L189.353 123.806L189.357 123.915C189.426 123.838 189.518 123.778 189.642 123.774C189.679 123.773 189.712 123.778 189.738 123.786L189.748 124.058C189.713 124.05 189.676 124.045 189.626 124.047C189.491 124.052 189.407 124.129 189.368 124.2L189.394 124.903L189.118 124.913ZM190.957 124.666C190.86 124.807 190.694 124.898 190.487 124.906C190.098 124.92 189.868 124.657 189.856 124.337C189.844 124.013 190.039 123.737 190.398 123.724C190.702 123.713 190.91 123.912 190.921 124.199C190.923 124.26 190.916 124.317 190.909 124.354L190.141 124.383C190.175 124.586 190.304 124.664 190.476 124.658C190.595 124.654 190.698 124.598 190.754 124.517L190.957 124.666ZM190.4 123.951C190.258 123.956 190.167 124.038 190.142 124.182L190.647 124.164C190.639 124.053 190.554 123.945 190.4 123.951ZM191.214 124.836L191.174 123.739L191.45 123.729L191.453 123.816C191.527 123.739 191.627 123.679 191.773 123.673C192.01 123.665 192.205 123.821 192.217 124.145L192.241 124.798L191.963 124.808L191.939 124.166C191.934 124.02 191.848 123.932 191.713 123.937C191.574 123.942 191.503 124.038 191.464 124.11L191.491 124.825L191.214 124.836ZM192.61 124.383L192.593 123.935L192.389 123.943L192.38 123.694L192.584 123.687L192.574 123.413L192.853 123.403L192.863 123.677L193.198 123.664L193.207 123.912L192.872 123.925L192.888 124.373C192.893 124.495 192.96 124.54 193.069 124.536C193.145 124.533 193.195 124.523 193.231 124.506L193.24 124.748C193.186 124.774 193.122 124.787 193.03 124.79C192.756 124.8 192.62 124.651 192.61 124.383ZM193.416 123.987C193.414 123.921 193.43 123.874 193.465 123.846C193.5 123.817 193.544 123.802 193.596 123.8C193.647 123.798 193.691 123.81 193.728 123.836C193.766 123.861 193.786 123.907 193.788 123.974C193.79 124.037 193.774 124.084 193.739 124.115C193.704 124.144 193.661 124.159 193.61 124.161C193.558 124.163 193.513 124.151 193.476 124.125C193.438 124.097 193.418 124.051 193.416 123.987ZM195.109 124.513C195.012 124.654 194.845 124.745 194.638 124.753C194.249 124.767 194.019 124.503 194.007 124.183C193.995 123.859 194.19 123.584 194.549 123.571C194.854 123.56 195.061 123.759 195.072 124.046C195.074 124.107 195.068 124.164 195.06 124.201L194.292 124.229C194.326 124.433 194.455 124.511 194.627 124.505C194.747 124.5 194.849 124.444 194.905 124.364L195.109 124.513ZM194.551 123.797C194.409 123.802 194.319 123.884 194.294 124.029L194.798 124.01C194.79 123.9 194.705 123.792 194.551 123.797Z"
           fill="#3F72B5"
-        />
-      </g>
-      <g filter="url(#filter3_d_1506_6816)">
+          d="M251.078 189.07l10.041-5.794 1.176 2.037-10.041 5.794-1.176-2.037zm5.915 1.899c2.108-1.217 4.704-.86 6.02 1.421.563.975.667 1.852.431 2.734l4.102-2.367 1.06 1.836-10.758 6.208-1.06-1.836.574-.331c-.882-.237-1.589-.766-2.152-1.741-1.316-2.281-.326-4.707 1.783-5.924zm1.101 1.908c-1.263.728-1.726 2.047-1.014 3.28.472.818 1.205 1.294 2.147 1.401l2.352-1.358c.379-.868.334-1.741-.138-2.559-.712-1.233-2.085-1.493-3.347-.764zm6.031 16.085c-1.293-.153-2.498-.949-3.284-2.312-1.482-2.567-.525-5.051 1.584-6.268 2.137-1.233 4.679-.903 6.045 1.464 1.159 2.008.558 4.114-1.336 5.207a5.37 5.37 0 01-1.084.473l-2.922-5.064c-1.249.95-1.314 2.097-.66 3.23.455.789 1.196 1.279 1.936 1.368l-.279 1.902zm2.828-6.298c-.538-.932-1.41-1.251-2.473-.906l1.921 3.328c.715-.451 1.14-1.404.552-2.422zm-3.052 8.627l7.23-4.171 1.051 1.821-.574.331c.778.221 1.539.68 2.094 1.641.902 1.564.547 3.432-1.591 4.666l-4.303 2.483-1.059-1.836 4.231-2.442c.961-.555 1.249-1.447.736-2.337-.53-.918-1.428-1.05-2.044-1.057l-4.72 2.723-1.051-1.822zm8.005 7.775l2.955-1.705-.778-1.348 1.635-.944.778 1.349 1.807-1.043 1.06 1.836-1.807 1.043 1.274 2.209-1.635.943-1.275-2.209-2.955 1.705c-.803.464-.87 1.076-.456 1.793.289.503.537.799.778.985l-1.592.919c-.365-.268-.685-.656-1.032-1.259-1.043-1.807-.521-3.256 1.243-4.274zm9.658 3.218a1.393 1.393 0 01.503-1.878 1.393 1.393 0 011.878.504c.372.645.133 1.49-.512 1.863-.646.372-1.497.156-1.869-.489zm-9.022 3.982l7.23-4.172 1.051 1.822-7.23 4.171-1.051-1.821zm9.028-1.055l.778 1.348.761-.438c1.534-.886 3.356-.579 4.399 1.228.38.66.545 1.31.566 1.91l-1.967.103a1.672 1.672 0 00-.218-1.041c-.356-.617-1.018-.77-1.678-.389l-.803.463 1.275 2.209-1.636.944-1.274-2.209-5.595 3.228-1.059-1.836 5.594-3.228-.778-1.348 1.635-.944zm5.692 6.948a1.392 1.392 0 01.504-1.877 1.392 1.392 0 011.877.503c.373.646.134 1.491-.511 1.863-.646.373-1.497.157-1.87-.489zm-9.021 3.982l7.229-4.171 1.052 1.821-7.23 4.172-1.051-1.822zm7.329 9.984c-1.293-.153-2.498-.949-3.285-2.312-1.481-2.567-.524-5.051 1.584-6.268 2.138-1.233 4.68-.903 6.046 1.464 1.159 2.008.557 4.114-1.336 5.207a5.398 5.398 0 01-1.085.473l-2.921-5.064c-1.249.951-1.314 2.097-.661 3.23.456.789 1.197 1.279 1.937 1.368l-.279 1.902zm2.828-6.298c-.538-.932-1.41-1.251-2.473-.906l1.921 3.328c.715-.451 1.14-1.404.552-2.422zm-3.052 8.627l7.229-4.171 1.052 1.821-.718.414c.761.192 1.49.594 1.962 1.411.141.244.222.484.264.689l-1.793 1.035a3.63 3.63 0 00-.363-.861c-.514-.89-1.332-1.182-1.949-1.19l-4.633 2.674-1.051-1.822zm11.469 12.652l4.102-2.368 1.06 1.836-4.017 2.318c-2.166 1.25-4.228.757-5.453-1.366-1.225-2.122-.611-4.14 1.555-5.39l4.016-2.318 1.06 1.836-4.103 2.368c-1.047.604-1.378 1.521-.799 2.526.572.989 1.532 1.162 2.579.558zm4.113 11.634c-1.293-.153-2.498-.949-3.284-2.312-1.482-2.567-.525-5.051 1.584-6.268 2.137-1.233 4.679-.903 6.045 1.464 1.159 2.008.558 4.114-1.336 5.207-.401.232-.808.39-1.084.473l-2.922-5.064c-1.249.951-1.314 2.097-.66 3.23.455.789 1.196 1.279 1.936 1.368l-.279 1.902zm2.828-6.298c-.538-.932-1.41-1.251-2.473-.906l1.921 3.328c.715-.451 1.14-1.404.552-2.422z"
+        ></path>
+        <path
+          fill="#544848"
+          fillOpacity="0.1"
+          d="M232.5 200.355c-4.74.948-34 4-37 10l59.5 88 42.5-1.5 11.5-68.5v-4l-7-10-22.5 73-15.5 1.5-12.5-69.5s0-9.5-4.5-15-9.5-5-14.5-4z"
+        ></path>
         <rect
-          x="403.62"
-          y="164.132"
-          width="45.0654"
-          height="20.0417"
-          rx="2.1407"
-          transform="rotate(-15.3789 403.62 164.132)"
-          fill="url(#paint5_linear_1506_6816)"
+          width="204"
+          height="97"
+          x="244.549"
+          y="203.422"
+          fill="url(#paint1_linear_523_1843)"
           stroke="#F0F0FE"
-          strokeWidth="0.225337"
-        />
+          rx="9.5"
+          transform="rotate(81.692 244.549 203.422)"
+        ></rect>
         <rect
-          x="410.978"
-          y="174.646"
-          width="29.6047"
-          height="1.86126"
-          rx="0.930631"
-          transform="rotate(-15.3789 410.978 174.646)"
+          width="134"
+          height="9"
+          x="189.48"
+          y="231.17"
           fill="#C3C3FB"
-        />
+          rx="4.5"
+          transform="rotate(81.692 189.48 231.17)"
+        ></rect>
         <rect
-          x="410.32"
-          y="172.253"
-          width="13.9186"
-          height="1.86126"
-          rx="0.930631"
-          transform="rotate(-15.3789 410.32 172.253)"
+          width="63"
+          height="9"
+          x="201.354"
+          y="229.436"
           fill="#F4F5FD"
-        />
+          rx="4.5"
+          transform="rotate(81.692 201.354 229.436)"
+        ></rect>
         <rect
-          x="441.754"
-          y="158.245"
-          width="3.75582"
-          height="1.86126"
-          rx="0.930631"
-          transform="rotate(-15.3789 441.754 158.245)"
+          width="17"
+          height="9"
+          x="248.343"
+          y="378.208"
           fill="#7CD4A5"
-        />
+          rx="4.5"
+          transform="rotate(81.692 248.343 378.208)"
+        ></rect>
         <rect
-          x="411.746"
-          y="177.438"
-          width="22.7558"
-          height="1.86126"
-          rx="0.930631"
-          transform="rotate(-15.3789 411.746 177.438)"
+          width="103"
+          height="9"
+          x="175.627"
+          y="233.193"
           fill="#F4F5FD"
-        />
+          rx="4.5"
+          transform="rotate(81.692 175.627 233.193)"
+        ></rect>
         <path
-          d="M409.844 168.846L409.44 167.377L409.738 167.295L410.142 168.764L409.844 168.846ZM410.282 168.157C410.197 167.848 410.329 167.53 410.662 167.438C410.805 167.399 410.92 167.415 411.024 167.474L410.859 166.874L411.128 166.8L411.561 168.374L411.292 168.448L411.269 168.364C411.21 168.468 411.119 168.541 410.976 168.58C410.643 168.672 410.367 168.466 410.282 168.157ZM410.561 168.08C410.612 168.265 410.764 168.367 410.945 168.318C411.065 168.285 411.149 168.207 411.194 168.091L411.099 167.747C411.002 167.67 410.889 167.647 410.769 167.68C410.589 167.729 410.51 167.895 410.561 168.08ZM412.807 167.846C412.745 168.006 412.604 168.133 412.404 168.187C412.029 168.291 411.744 168.087 411.659 167.778C411.573 167.465 411.7 167.153 412.046 167.058C412.34 166.977 412.588 167.123 412.664 167.4C412.68 167.459 412.687 167.516 412.688 167.554L411.947 167.758C412.027 167.948 412.171 167.994 412.336 167.949C412.452 167.917 412.539 167.839 412.575 167.748L412.807 167.846ZM412.1 167.278C411.963 167.315 411.894 167.416 411.903 167.562L412.39 167.428C412.356 167.322 412.249 167.237 412.1 167.278ZM413.096 167.952L412.805 166.894L413.072 166.821L413.095 166.905C413.149 166.813 413.232 166.731 413.373 166.693C413.602 166.63 413.828 166.737 413.914 167.05L414.087 167.679L413.818 167.753L413.648 167.134C413.609 166.993 413.505 166.927 413.375 166.963C413.241 167 413.194 167.11 413.173 167.188L413.363 167.879L413.096 167.952ZM414.351 167.191L414.232 166.759L414.034 166.813L413.968 166.574L414.166 166.52L414.093 166.255L414.362 166.181L414.434 166.446L414.758 166.357L414.824 166.596L414.5 166.685L414.619 167.118C414.652 167.235 414.727 167.264 414.832 167.235C414.906 167.215 414.952 167.193 414.983 167.169L415.047 167.402C415.001 167.439 414.941 167.467 414.853 167.491C414.588 167.564 414.422 167.45 414.351 167.191ZM415.08 166.07C414.986 166.096 414.884 166.038 414.858 165.943C414.832 165.849 414.89 165.747 414.984 165.721C415.079 165.695 415.178 165.754 415.204 165.848C415.23 165.943 415.174 166.044 415.08 166.07ZM415.287 167.349L414.996 166.291L415.263 166.218L415.554 167.276L415.287 167.349ZM415.453 166.166L415.65 166.112L415.619 166C415.557 165.776 415.657 165.554 415.921 165.481C416.018 165.455 416.106 165.455 416.183 165.473L416.131 165.726C416.093 165.712 416.046 165.705 415.991 165.72C415.901 165.744 415.86 165.824 415.886 165.92L415.919 166.038L416.242 165.949L416.308 166.188L415.984 166.277L416.21 167.096L415.941 167.169L415.716 166.351L415.518 166.405L415.453 166.166ZM416.525 165.672C416.431 165.698 416.329 165.64 416.303 165.546C416.277 165.451 416.335 165.35 416.429 165.324C416.524 165.298 416.623 165.356 416.649 165.451C416.675 165.545 416.62 165.646 416.525 165.672ZM416.733 166.952L416.442 165.894L416.708 165.82L416.999 166.878L416.733 166.952ZM418.245 166.35C418.183 166.51 418.042 166.637 417.843 166.692C417.467 166.795 417.183 166.591 417.098 166.282C417.012 165.97 417.138 165.657 417.484 165.562C417.778 165.481 418.026 165.627 418.102 165.904C418.119 165.963 418.125 166.02 418.127 166.058L417.386 166.262C417.465 166.452 417.609 166.498 417.775 166.453C417.89 166.421 417.977 166.343 418.013 166.252L418.245 166.35ZM417.538 165.782C417.402 165.819 417.332 165.92 417.341 166.066L417.828 165.932C417.794 165.827 417.687 165.741 417.538 165.782ZM418.534 166.456L418.243 165.398L418.51 165.325L418.539 165.43C418.588 165.339 418.664 165.26 418.783 165.227C418.819 165.217 418.852 165.215 418.88 165.216L418.952 165.479C418.916 165.48 418.879 165.483 418.83 165.496C418.7 165.532 418.636 165.627 418.614 165.705L418.801 166.383L418.534 166.456ZM420.524 165.417L420.359 164.816L420.627 164.742L420.789 165.33C420.876 165.647 420.745 165.893 420.435 165.979C420.124 166.064 419.888 165.919 419.8 165.602L419.639 165.014L419.907 164.941L420.073 165.541C420.115 165.694 420.22 165.767 420.367 165.726C420.512 165.686 420.566 165.57 420.524 165.417ZM421.214 165.719L420.923 164.661L421.189 164.588L421.212 164.672C421.266 164.58 421.35 164.499 421.49 164.46C421.719 164.397 421.945 164.504 422.031 164.817L422.204 165.447L421.936 165.521L421.765 164.901C421.727 164.761 421.623 164.695 421.492 164.73C421.358 164.767 421.312 164.877 421.29 164.955L421.48 165.646L421.214 165.719ZM422.264 164.636C422.246 164.571 422.251 164.522 422.279 164.487C422.307 164.451 422.346 164.426 422.396 164.412C422.445 164.398 422.491 164.4 422.533 164.417C422.575 164.433 422.605 164.472 422.623 164.537C422.64 164.598 422.635 164.648 422.607 164.686C422.58 164.722 422.541 164.747 422.492 164.76C422.442 164.774 422.396 164.772 422.353 164.755C422.311 164.737 422.281 164.697 422.264 164.636ZM424.032 164.759C423.97 164.918 423.829 165.045 423.629 165.1C423.254 165.203 422.969 164.999 422.884 164.691C422.798 164.378 422.925 164.065 423.271 163.97C423.565 163.889 423.813 164.036 423.889 164.313C423.905 164.372 423.912 164.428 423.913 164.466L423.172 164.67C423.252 164.861 423.396 164.907 423.561 164.861C423.677 164.829 423.764 164.751 423.8 164.66L424.032 164.759ZM423.325 164.19C423.188 164.228 423.119 164.328 423.128 164.475L423.615 164.341C423.581 164.235 423.474 164.149 423.325 164.19ZM425.165 163.314L424.909 163.384L425.031 162.976L425.321 162.896L425.165 163.314ZM425.813 164.269C425.751 164.428 425.61 164.555 425.411 164.61C425.035 164.713 424.751 164.509 424.666 164.201C424.58 163.888 424.706 163.576 425.052 163.48C425.346 163.399 425.594 163.546 425.67 163.823C425.687 163.882 425.693 163.938 425.695 163.976L424.954 164.18C425.033 164.371 425.177 164.417 425.343 164.371C425.458 164.34 425.545 164.261 425.581 164.17L425.813 164.269ZM425.106 163.7C424.97 163.738 424.9 163.838 424.909 163.985L425.396 163.851C425.362 163.745 425.255 163.659 425.106 163.7ZM426.102 164.375L425.669 162.8L425.936 162.727L426.369 164.301L426.102 164.375ZM427.26 163.564L427.095 162.964L427.363 162.89L427.525 163.478C427.612 163.794 427.481 164.041 427.17 164.126C426.86 164.211 426.623 164.066 426.536 163.749L426.375 163.162L426.643 163.088L426.808 163.688C426.851 163.841 426.956 163.914 427.103 163.873C427.248 163.834 427.302 163.717 427.26 163.564ZM428.227 162.472L427.971 162.542L428.094 162.134L428.383 162.054L428.227 162.472ZM428.876 163.427C428.814 163.586 428.672 163.713 428.473 163.768C428.097 163.871 427.813 163.667 427.728 163.358C427.642 163.046 427.769 162.733 428.115 162.638C428.409 162.557 428.657 162.703 428.733 162.98C428.749 163.039 428.756 163.096 428.757 163.134L428.016 163.338C428.096 163.528 428.239 163.575 428.405 163.529C428.521 163.497 428.608 163.419 428.643 163.328L428.876 163.427ZM428.169 162.858C428.032 162.895 427.963 162.996 427.971 163.142L428.458 163.009C428.425 162.903 428.318 162.817 428.169 162.858ZM429.165 163.532L428.874 162.474L429.141 162.401L429.169 162.506C429.219 162.416 429.294 162.336 429.414 162.303C429.45 162.293 429.483 162.291 429.51 162.292L429.582 162.555C429.547 162.556 429.509 162.559 429.461 162.573C429.331 162.608 429.266 162.703 429.245 162.781L429.431 163.459L429.165 163.532ZM430.899 162.87C430.837 163.029 430.696 163.156 430.496 163.211C430.121 163.315 429.836 163.11 429.752 162.802C429.665 162.489 429.792 162.177 430.138 162.081C430.432 162.001 430.68 162.147 430.756 162.424C430.772 162.483 430.779 162.54 430.78 162.578L430.039 162.781C430.119 162.972 430.263 163.018 430.428 162.972C430.544 162.941 430.631 162.863 430.667 162.771L430.899 162.87ZM430.192 162.301C430.055 162.339 429.986 162.439 429.995 162.586L430.482 162.452C430.448 162.346 430.341 162.26 430.192 162.301ZM431.188 162.976L430.897 161.918L431.164 161.844L431.187 161.928C431.241 161.837 431.324 161.755 431.465 161.716C431.694 161.654 431.92 161.761 432.006 162.074L432.179 162.703L431.91 162.777L431.74 162.158C431.701 162.017 431.597 161.951 431.467 161.987C431.333 162.024 431.286 162.134 431.265 162.212L431.455 162.902L431.188 162.976ZM432.443 162.215L432.324 161.783L432.126 161.837L432.06 161.598L432.258 161.544L432.185 161.279L432.454 161.205L432.526 161.47L432.85 161.381L432.916 161.62L432.592 161.709L432.711 162.141C432.744 162.259 432.819 162.288 432.924 162.259C432.998 162.239 433.044 162.217 433.075 162.193L433.139 162.426C433.093 162.463 433.033 162.491 432.945 162.515C432.68 162.588 432.514 162.473 432.443 162.215ZM433.136 161.645C433.119 161.581 433.124 161.531 433.152 161.496C433.18 161.46 433.219 161.435 433.269 161.421C433.318 161.408 433.364 161.41 433.406 161.427C433.448 161.442 433.478 161.482 433.495 161.546C433.512 161.608 433.507 161.658 433.48 161.695C433.452 161.731 433.414 161.756 433.365 161.77C433.314 161.784 433.268 161.782 433.226 161.765C433.183 161.747 433.153 161.707 433.136 161.645ZM434.905 161.768C434.842 161.928 434.701 162.055 434.502 162.11C434.126 162.213 433.842 162.009 433.757 161.7C433.671 161.387 433.797 161.075 434.144 160.98C434.437 160.899 434.685 161.045 434.762 161.322C434.778 161.381 434.784 161.438 434.786 161.476L434.045 161.68C434.124 161.87 434.268 161.916 434.434 161.871C434.549 161.839 434.636 161.761 434.672 161.67L434.905 161.768ZM434.197 161.2C434.061 161.237 433.991 161.338 434 161.484L434.487 161.35C434.453 161.244 434.346 161.159 434.197 161.2Z"
           fill="#3F72B5"
-        />
-      </g>
-      <g filter="url(#filter4_d_1506_6816)">
+          d="M216.574 229.85l10.816-1.579.399 2.735-4.157 3.305 4.929 1.979.399 2.735-10.816 1.579-.32-2.194 7.756-1.133-4.4-1.819-.226-1.545 3.697-3.001-7.757 1.132-.32-2.194zm4.271 20.389c-1.079-.584-1.858-1.702-2.072-3.169-.404-2.766 1.299-4.609 3.571-4.94 2.302-.337 4.414.838 4.787 3.388.315 2.163-.945 3.799-2.984 4.097a5.03 5.03 0 01-1.115.036l-.797-5.454c-1.425.397-1.881 1.379-1.703 2.6.124.85.603 1.537 1.22 1.873l-.907 1.569zm4.672-4.533c-.147-1.004-.8-1.587-1.851-1.655l.523 3.585c.784-.146 1.488-.833 1.328-1.93zm-2.766 6.56l3.183-.464-.212-1.453 1.761-.257.212 1.452 1.947-.284.289 1.978-1.947.284.347 2.38-1.761.257-.348-2.38-3.183.465c-.865.127-1.137.64-1.024 1.412.079.541.192.887.339 1.134l-1.715.251c-.227-.362-.371-.814-.466-1.463-.284-1.947.677-3.034 2.578-3.312zm.982 6.73l3.183-.465-.212-1.452 1.762-.257.212 1.452 1.947-.284.288 1.978-1.947.284.348 2.379-1.762.258-.347-2.38-3.183.465c-.865.126-1.137.639-1.025 1.412.079.541.193.887.34 1.134l-1.716.25c-.226-.361-.371-.813-.466-1.462-.284-1.947.678-3.034 2.578-3.312zm-1.95 6.53l7.788-1.137.286 1.962-.773.113c.6.433 1.099 1.039 1.228 1.919.038.263.025.502-.009.696l-1.932.282a3.397 3.397 0 00-.018-.881c-.14-.958-.755-1.499-1.293-1.721l-4.99.729-.287-1.962zm3.182 12.929c-1.079-.584-1.858-1.701-2.072-3.169-.404-2.766 1.299-4.608 3.571-4.94 2.302-.336 4.414.839 4.787 3.388.316 2.163-.945 3.799-2.984 4.097a5.1 5.1 0 01-1.115.037l-.797-5.455c-1.425.398-1.881 1.38-1.703 2.6.124.85.603 1.538 1.22 1.874l-.907 1.568zm4.672-4.532c-.147-1.005-.8-1.588-1.851-1.655l.523 3.584c.784-.146 1.488-.832 1.328-1.929zm-2.757 17.644c-1.08-.584-1.858-1.701-2.073-3.169-.404-2.765 1.3-4.608 3.571-4.94 2.303-.336 4.415.839 4.787 3.389.316 2.163-.944 3.799-2.984 4.096-.432.064-.843.06-1.115.037l-.796-5.454c-1.425.397-1.882 1.379-1.704 2.6.125.85.604 1.537 1.221 1.873l-.907 1.568zm4.672-4.532c-.147-1.004-.8-1.588-1.852-1.655l.524 3.585c.783-.146 1.488-.833 1.328-1.93zm-5.68 6.496l7.788-1.137.286 1.962-.618.09c.605.464 1.112 1.132 1.263 2.167.246 1.684-.716 3.198-3.018 3.534l-4.636.677-.289-1.978 4.559-.665c1.035-.152 1.598-.833 1.458-1.791-.144-.989-.885-1.418-1.423-1.639l-5.083.742-.287-1.962zm-1.802 14.241l11.588-1.692.287 1.962-.634.092c.691.515 1.141 1.222 1.297 2.289.361 2.472-1.354 4.237-3.625 4.569-2.272.331-4.42-.87-4.781-3.342-.155-1.066.074-1.873.589-2.564l-4.435.648-.286-1.962zm10.643 2.643c-.133-.911-.643-1.594-1.441-1.983l-2.442.357c-.665.633-.945 1.416-.814 2.312.194 1.329 1.309 2.05 2.669 1.851 1.36-.198 2.222-1.208 2.028-2.537zm-5.362 6.941l11.589-1.692.286 1.963-11.588 1.692-.287-1.963zm.719 6.544c-.228-1.561.513-2.758 1.95-2.968 1.174-.171 2.188.612 2.71 2.24l.749 2.321.201-.029c.818-.12 1.254-.815 1.123-1.711-.111-.757-.552-1.292-1.185-1.626l.888-1.597c1.059.555 1.813 1.613 2.021 3.034.329 2.256-.846 3.611-2.561 3.862l-5.037.735-.286-1.962.757-.11c-.675-.407-1.197-1.278-1.33-2.189zm2.327-1.034c-.526.076-.805.543-.708 1.208.131.896.643 1.484 1.318 1.78l1.097-.16-.58-1.809c-.259-.799-.648-1.089-1.127-1.019zm.951 11.056c.113.773.559 1.339 1.154 1.631l-.951 1.701c-1.064-.587-1.849-1.64-2.057-3.061-.392-2.689 1.304-4.578 3.576-4.909 2.271-.332 4.437.993 4.83 3.681.207 1.422-.244 2.656-1.096 3.522l-1.398-1.359c.487-.449.752-1.119.635-1.923-.187-1.282-1.314-2.08-2.674-1.882-1.375.201-2.211 1.286-2.019 2.599zm1.419 11.664c-1.079-.584-1.858-1.701-2.072-3.169-.404-2.766 1.3-4.608 3.571-4.94 2.302-.336 4.415.839 4.787 3.388.316 2.163-.944 3.799-2.984 4.097a5.1 5.1 0 01-1.115.037l-.796-5.455c-1.426.398-1.882 1.38-1.704 2.6.124.85.603 1.538 1.221 1.874l-.908 1.568zm4.672-4.533c-.146-1.004-.8-1.587-1.851-1.654l.523 3.584c.784-.146 1.489-.833 1.328-1.93zm-4.136 16.956l8.668-1.266-1.594-2.055 1.332-1.252 2.419 3.055.295 2.024-10.815 1.58-.305-2.086z"
+        ></path>
         <rect
-          x="81.2"
-          y="104.148"
-          width="45.0654"
-          height="20.0417"
-          rx="2.1407"
-          transform="rotate(23.6867 81.2 104.148)"
-          fill="url(#paint6_linear_1506_6816)"
+          width="184.605"
+          height="87.778"
+          x="396.227"
+          y="224.685"
+          fill="url(#paint2_linear_523_1843)"
           stroke="#F0F0FE"
-          strokeWidth="0.225337"
-        />
+          strokeWidth="0.905"
+          rx="8.597"
+          transform="rotate(104.602 396.227 224.685)"
+        ></rect>
         <rect
-          x="80.2866"
-          y="116.949"
-          width="29.6047"
-          height="1.86126"
-          rx="0.930631"
-          transform="rotate(23.6867 80.2866 116.949)"
+          width="121.26"
+          height="8.144"
+          x="340.55"
+          y="228.415"
           fill="#C3C3FB"
-        />
-        <rect
-          x="81.2837"
-          y="114.676"
-          width="13.9186"
-          height="1.86126"
-          rx="0.930631"
-          transform="rotate(23.6867 81.2837 114.676)"
-          fill="#F4F5FD"
-        />
+          rx="4.072"
+          transform="rotate(104.602 340.55 228.415)"
+        ></rect>
         <rect
-          x="114.518"
-          y="123.61"
-          width="3.75582"
-          height="1.86126"
-          rx="0.930631"
-          transform="rotate(23.6867 114.518 123.61)"
+          width="15.384"
+          height="8.144"
+          x="337.819"
+          y="371.714"
           fill="#7CD4A5"
-        />
+          rx="4.072"
+          transform="rotate(104.602 337.819 371.714)"
+        ></rect>
         <rect
-          x="79.1235"
-          y="119.6"
-          width="22.7558"
-          height="1.86126"
-          rx="0.930631"
-          transform="rotate(23.6867 79.1235 119.6)"
+          width="93.207"
+          height="8.144"
+          x="328.291"
+          y="225.221"
           fill="#F4F5FD"
-        />
+          rx="4.072"
+          transform="rotate(104.602 328.291 225.221)"
+        ></rect>
         <path
-          d="M83.0617 111.731L83.6739 110.336L83.957 110.46L83.3447 111.856L83.0617 111.731ZM83.8359 111.472C83.9645 111.179 84.2672 111.015 84.5842 111.154C84.7197 111.213 84.799 111.298 84.8427 111.41L85.0928 110.839L85.348 110.951L84.6921 112.447L84.4369 112.335L84.4719 112.255C84.36 112.299 84.244 112.298 84.1084 112.238C83.7914 112.099 83.7074 111.765 83.8359 111.472ZM84.1011 111.588C84.0241 111.764 84.0778 111.939 84.2492 112.015C84.3629 112.064 84.4775 112.058 84.5856 111.996L84.729 111.669C84.7014 111.547 84.6287 111.458 84.5151 111.409C84.3436 111.333 84.178 111.413 84.1011 111.588ZM85.9923 112.822C85.8435 112.907 85.6539 112.916 85.4645 112.833C85.1077 112.677 85.0157 112.339 85.1442 112.046C85.2745 111.749 85.5695 111.586 85.8984 111.73C86.1775 111.853 86.2779 112.122 86.1624 112.386C86.1379 112.441 86.1072 112.49 86.0844 112.52L85.3806 112.211C85.3224 112.409 85.4048 112.536 85.5622 112.605C85.6719 112.653 85.7886 112.647 85.8739 112.599L85.9923 112.822ZM85.8015 111.935C85.6719 111.878 85.5547 111.912 85.4691 112.032L85.9316 112.234C85.9722 112.131 85.9431 111.997 85.8015 111.935ZM86.1501 113.086L86.5909 112.081L86.8441 112.193L86.8091 112.272C86.9086 112.235 87.025 112.224 87.1586 112.283C87.3759 112.378 87.4838 112.604 87.3534 112.901L87.0911 113.499L86.8359 113.387L87.0939 112.799C87.1525 112.665 87.1135 112.548 86.9899 112.494C86.8623 112.438 86.7569 112.494 86.691 112.541L86.4033 113.197L86.1501 113.086ZM87.6033 113.286L87.7834 112.876L87.5961 112.793L87.6958 112.566L87.8832 112.648L87.9933 112.397L88.2485 112.509L88.1383 112.76L88.4453 112.895L88.3456 113.122L88.0386 112.988L87.8585 113.398C87.8095 113.51 87.8501 113.58 87.9497 113.624C88.0195 113.654 88.0689 113.667 88.1089 113.667L88.0118 113.889C87.9523 113.889 87.8882 113.873 87.8044 113.836C87.5532 113.726 87.4957 113.532 87.6033 113.286ZM88.8766 112.875C88.7869 112.836 88.7444 112.727 88.7838 112.637C88.8231 112.547 88.9321 112.505 89.0218 112.544C89.1115 112.583 89.1521 112.692 89.1127 112.781C89.0734 112.871 88.9664 112.914 88.8766 112.875ZM88.2313 113.999L88.6721 112.995L88.9253 113.106L88.4845 114.11L88.2313 113.999ZM89.1053 113.185L89.2927 113.267L89.339 113.161C89.4326 112.948 89.6494 112.838 89.9006 112.949C89.9923 112.989 90.0604 113.045 90.1093 113.107L89.909 113.271C89.8887 113.236 89.8567 113.2 89.8049 113.178C89.7191 113.14 89.6371 113.175 89.5968 113.267L89.5479 113.379L89.8549 113.513L89.7552 113.741L89.4482 113.606L89.1071 114.383L88.8519 114.272L89.193 113.494L89.0056 113.412L89.1053 113.185ZM90.2492 113.477C90.1595 113.438 90.117 113.329 90.1563 113.239C90.1957 113.149 90.3047 113.107 90.3944 113.146C90.4841 113.186 90.5246 113.294 90.4853 113.383C90.4459 113.473 90.3389 113.517 90.2492 113.477ZM89.6038 114.601L90.0446 113.597L90.2978 113.708L89.857 114.712L89.6038 114.601ZM91.1574 115.088C91.0086 115.172 90.819 115.182 90.6296 115.099C90.2727 114.942 90.1807 114.605 90.3093 114.312C90.4396 114.015 90.7346 113.852 91.0635 113.996C91.3426 114.118 91.4429 114.388 91.3275 114.652C91.303 114.707 91.2723 114.756 91.2494 114.786L90.5457 114.477C90.4874 114.675 90.5698 114.802 90.7273 114.871C90.837 114.919 90.9536 114.913 91.039 114.865L91.1574 115.088ZM90.9666 114.201C90.837 114.144 90.7198 114.178 90.6341 114.297L91.0967 114.5C91.1373 114.397 91.1081 114.263 90.9666 114.201ZM91.3152 115.352L91.7559 114.347L92.0091 114.458L91.9654 114.558C92.0609 114.519 92.1694 114.505 92.283 114.555C92.3169 114.57 92.3442 114.589 92.3646 114.607L92.2553 114.856C92.2269 114.834 92.1956 114.814 92.1498 114.794C92.0262 114.739 91.9167 114.772 91.8508 114.819L91.5683 115.463L91.3152 115.352ZM93.5149 115.799L93.7651 115.229L94.0202 115.341L93.7754 115.899C93.6433 116.2 93.3865 116.308 93.0915 116.179C92.7964 116.05 92.7043 115.788 92.8364 115.487L93.0813 114.929L93.3364 115.041L93.0863 115.611C93.0225 115.756 93.0589 115.879 93.1984 115.941C93.336 116.001 93.4511 115.944 93.5149 115.799ZM93.8597 116.468L94.3005 115.464L94.5537 115.575L94.5187 115.654C94.6182 115.617 94.7347 115.607 94.8682 115.665C95.0855 115.76 95.1934 115.986 95.0631 116.283L94.8007 116.881L94.5455 116.769L94.8035 116.181C94.8621 116.048 94.8231 115.931 94.6995 115.876C94.5719 115.82 94.4665 115.876 94.4006 115.924L94.1129 116.579L93.8597 116.468ZM95.3582 116.289C95.385 116.228 95.4203 116.193 95.464 116.183C95.5083 116.173 95.5544 116.178 95.6022 116.199C95.6487 116.219 95.6831 116.249 95.7052 116.289C95.7279 116.328 95.7259 116.377 95.6991 116.439C95.6734 116.497 95.6382 116.532 95.5933 116.544C95.549 116.555 95.5036 116.55 95.457 116.53C95.4092 116.509 95.3742 116.478 95.352 116.438C95.3305 116.397 95.3325 116.347 95.3582 116.289ZM96.6534 117.499C96.5046 117.584 96.315 117.593 96.1256 117.51C95.7688 117.353 95.6767 117.016 95.8053 116.723C95.9356 116.426 96.2306 116.263 96.5595 116.407C96.8386 116.53 96.939 116.799 96.8235 117.063C96.799 117.118 96.7683 117.167 96.7455 117.197L96.0417 116.888C95.9835 117.086 96.0658 117.213 96.2233 117.282C96.333 117.33 96.4497 117.324 96.535 117.276L96.6534 117.499ZM96.4626 116.612C96.333 116.555 96.2158 116.589 96.1302 116.708L96.5927 116.911C96.6333 116.808 96.6041 116.674 96.4626 116.612ZM98.4434 117.091L98.2002 116.984L98.5527 116.744L98.8278 116.865L98.4434 117.091ZM98.3453 118.241C98.1965 118.326 98.0069 118.335 97.8175 118.252C97.4606 118.096 97.3686 117.758 97.4971 117.465C97.6275 117.168 97.9224 117.005 98.2514 117.149C98.5305 117.272 98.6308 117.542 98.5154 117.805C98.4909 117.861 98.4602 117.909 98.4373 117.939L97.7336 117.631C97.6753 117.828 97.7577 117.955 97.9152 118.024C98.0248 118.072 98.1415 118.066 98.2268 118.018L98.3453 118.241ZM98.1544 117.354C98.0249 117.297 97.9076 117.331 97.822 117.451L98.2845 117.654C98.3251 117.55 98.296 117.416 98.1544 117.354ZM98.503 118.505L99.159 117.01L99.4121 117.121L98.7562 118.616L98.503 118.505ZM99.9124 118.605L100.162 118.035L100.418 118.147L100.173 118.705C100.041 119.006 99.784 119.115 99.4889 118.985C99.1939 118.856 99.1017 118.595 99.2338 118.293L99.4787 117.735L99.7339 117.847L99.4837 118.417C99.4199 118.563 99.4563 118.686 99.5958 118.747C99.7334 118.807 99.8485 118.751 99.9124 118.605ZM101.352 118.367L101.109 118.26L101.461 118.02L101.736 118.141L101.352 118.367ZM101.254 119.517C101.105 119.602 100.915 119.611 100.726 119.528C100.369 119.372 100.277 119.034 100.406 118.741C100.536 118.444 100.831 118.281 101.16 118.425C101.439 118.548 101.539 118.818 101.424 119.081C101.4 119.137 101.369 119.185 101.346 119.215L100.642 118.907C100.584 119.104 100.666 119.231 100.824 119.3C100.933 119.348 101.05 119.342 101.135 119.294L101.254 119.517ZM101.063 118.63C100.933 118.573 100.816 118.607 100.731 118.727L101.193 118.93C101.234 118.826 101.205 118.692 101.063 118.63ZM101.412 119.781L101.852 118.777L102.106 118.888L102.062 118.987C102.157 118.948 102.266 118.934 102.38 118.984C102.413 118.999 102.441 119.018 102.461 119.037L102.352 119.286C102.323 119.264 102.292 119.243 102.246 119.223C102.123 119.169 102.013 119.201 101.947 119.249L101.665 119.892L101.412 119.781ZM103.175 120.36C103.027 120.445 102.837 120.454 102.648 120.371C102.291 120.215 102.199 119.877 102.327 119.584C102.458 119.287 102.753 119.124 103.082 119.268C103.361 119.391 103.461 119.661 103.346 119.924C103.321 119.98 103.29 120.028 103.268 120.058L102.564 119.75C102.505 119.947 102.588 120.074 102.745 120.143C102.855 120.191 102.972 120.185 103.057 120.137L103.175 120.36ZM102.985 119.473C102.855 119.416 102.738 119.45 102.652 119.57L103.115 119.773C103.155 119.669 103.126 119.535 102.985 119.473ZM103.333 120.624L103.774 119.62L104.027 119.731L103.992 119.81C104.092 119.773 104.208 119.763 104.342 119.821C104.559 119.916 104.667 120.142 104.537 120.439L104.274 121.037L104.019 120.925L104.277 120.337C104.336 120.204 104.297 120.087 104.173 120.032C104.045 119.976 103.94 120.032 103.874 120.08L103.586 120.735L103.333 120.624ZM104.786 120.824L104.967 120.414L104.779 120.332L104.879 120.104L105.066 120.187L105.176 119.935L105.432 120.047L105.321 120.298L105.628 120.433L105.529 120.66L105.222 120.526L105.042 120.936C104.993 121.048 105.033 121.118 105.133 121.162C105.203 121.193 105.252 121.205 105.292 121.206L105.195 121.427C105.135 121.427 105.071 121.411 104.988 121.374C104.736 121.264 104.679 121.07 104.786 120.824ZM105.684 120.819C105.711 120.758 105.746 120.723 105.79 120.713C105.835 120.703 105.881 120.708 105.928 120.729C105.975 120.749 106.009 120.779 106.031 120.819C106.054 120.858 106.052 120.907 106.025 120.969C106 121.027 105.964 121.062 105.92 121.074C105.875 121.085 105.83 121.08 105.783 121.06C105.735 121.039 105.7 121.008 105.678 120.968C105.657 120.927 105.659 120.878 105.684 120.819ZM106.98 122.029C106.831 122.114 106.641 122.123 106.452 122.04C106.095 121.884 106.003 121.546 106.132 121.253C106.262 120.956 106.557 120.793 106.886 120.937C107.165 121.06 107.265 121.329 107.15 121.593C107.125 121.648 107.095 121.697 107.072 121.727L106.368 121.418C106.31 121.616 106.392 121.743 106.55 121.812C106.659 121.86 106.776 121.854 106.861 121.806L106.98 122.029ZM106.789 121.142C106.659 121.085 106.542 121.119 106.456 121.239L106.919 121.441C106.96 121.338 106.93 121.204 106.789 121.142Z"
           fill="#3F72B5"
-        />
-      </g>
-      <g filter="url(#filter5_d_1506_6816)">
-        <rect
-          x="219.035"
-          y="148.934"
-          width="22.564"
-          height="10.0348"
-          rx="1.07184"
-          transform="rotate(36.4098 219.035 148.934)"
-          fill="url(#paint7_linear_1506_6816)"
-          stroke="#F0F0FE"
-          strokeWidth="0.112825"
-        />
+          d="M365.115 236.906l7.356 1.916-.484 1.86-3.558.992 2.621 2.602-.484 1.86-7.356-1.916.389-1.493 5.275 1.375-2.326-2.357.273-1.051 3.181-.922-5.276-1.374.389-1.492zm-2.783 14.216c-.534-.666-.73-1.592-.47-2.591.49-1.881 2.08-2.6 3.625-2.197 1.566.408 2.601 1.732 2.149 3.466-.383 1.471-1.633 2.178-3.02 1.816a3.457 3.457 0 01-.725-.278l.967-3.709c-1.021-.132-1.579.374-1.795 1.204-.151.578-.03 1.148.274 1.53l-1.005.759zm4.22-1.638c.177-.683-.083-1.234-.738-1.562l-.635 2.438c.541.119 1.178-.13 1.373-.876zm-3.548 3.453l2.164.564.258-.988 1.198.312-.258.988 1.324.345-.35 1.345-1.324-.345-.422 1.619-1.198-.312.422-1.619-2.165-.564c-.588-.153-.902.102-1.039.627-.095.368-.116.621-.089.819l-1.167-.304c-.047-.293-.017-.622.098-1.063.345-1.324 1.255-1.761 2.548-1.424zm-1.193 4.577l2.165.564.257-.988 1.198.312-.257.988 1.324.345-.35 1.345-1.325-.345-.421 1.618-1.198-.312.421-1.618-2.164-.564c-.589-.153-.902.102-1.039.627-.096.368-.117.621-.09.819l-1.166-.304c-.047-.293-.018-.622.097-1.063.345-1.324 1.256-1.761 2.548-1.424zm-3.017 3.655l5.297 1.38-.348 1.334-.526-.137c.267.44.423.963.267 1.562a1.52 1.52 0 01-.194.443l-1.314-.342a2.36 2.36 0 00.227-.569c.17-.652-.078-1.165-.362-1.452l-3.394-.885.347-1.334zm-1.462 9.144c-.533-.667-.729-1.593-.469-2.592.49-1.881 2.08-2.6 3.625-2.197 1.565.408 2.601 1.732 2.149 3.466-.383 1.471-1.634 2.178-3.021 1.817a3.52 3.52 0 01-.724-.279l.967-3.709c-1.021-.132-1.579.374-1.795 1.204-.151.578-.03 1.148.274 1.53l-1.006.76zm4.22-1.639c.178-.683-.082-1.234-.738-1.561l-.635 2.437c.542.119 1.179-.13 1.373-.876zm-6.543 10.556c-.533-.666-.729-1.592-.469-2.591.49-1.881 2.08-2.6 3.624-2.198 1.566.408 2.601 1.733 2.15 3.467-.384 1.471-1.634 2.178-3.021 1.816a3.525 3.525 0 01-.724-.278l.966-3.71c-1.02-.131-1.578.375-1.795 1.205-.15.578-.029 1.148.275 1.53l-1.006.759zm4.22-1.638c.178-.683-.083-1.234-.738-1.562l-.635 2.438c.541.119 1.179-.13 1.373-.876zm-5.397 2.623l5.297 1.38-.348 1.335-.42-.11c.261.461.406 1.026.222 1.73-.298 1.146-1.324 1.854-2.89 1.447l-3.153-.822.351-1.345 3.1.808c.704.183 1.249-.101 1.419-.753.175-.672-.184-1.147-.468-1.434l-3.457-.901.347-1.335zm-5.009 8.635l7.881 2.053-.348 1.334-.431-.112c.303.517.4 1.092.212 1.817-.438 1.681-2.015 2.348-3.56 1.945-1.544-.402-2.595-1.753-2.157-3.434.189-.725.554-1.18 1.071-1.483l-3.016-.786.348-1.334zm6.102 4.574a1.759 1.759 0 00-.387-1.66l-1.66-.433c-.598.226-.989.652-1.148 1.261-.235.904.284 1.667 1.209 1.908.925.241 1.75-.172 1.986-1.076zm-5.314 2.995l7.881 2.053-.347 1.335-7.882-2.053.348-1.335zm-1.311 4.386c.277-1.061 1.075-1.627 2.052-1.373.799.208 1.236.984 1.13 2.168l-.149 1.69.137.036c.557.145 1.024-.183 1.183-.792.134-.515-.004-.977-.319-1.362l1.001-.783c.528.642.725 1.524.473 2.491-.4 1.534-1.519 2.084-2.686 1.78l-3.425-.892.347-1.335.515.134c-.322-.443-.42-1.142-.259-1.762zm1.77-.032c-.357-.093-.662.13-.78.582-.159.609.01 1.125.362 1.497l.746.194.119-1.315c.05-.582-.121-.873-.447-.958zm-2.383 7.34c-.137.525-.005 1.008.297 1.356l-1.069.833c-.523-.664-.741-1.551-.489-2.518.476-1.828 2.074-2.579 3.619-2.177 1.545.403 2.574 1.838 2.097 3.666-.251.967-.874 1.635-1.655 1.959l-.527-1.248c.433-.156.785-.514.927-1.06.227-.872-.278-1.689-1.203-1.929-.935-.244-1.764.224-1.997 1.118zm-2.249 7.856c-.533-.667-.729-1.593-.469-2.592.49-1.881 2.08-2.6 3.625-2.197 1.565.408 2.6 1.732 2.149 3.466-.383 1.471-1.634 2.178-3.021 1.817a3.52 3.52 0 01-.724-.279l.966-3.709c-1.02-.132-1.578.374-1.795 1.204-.15.578-.029 1.148.275 1.53l-1.006.76zm4.22-1.639c.178-.683-.083-1.234-.738-1.561l-.635 2.438c.542.118 1.179-.131 1.373-.877zm-4.752 9.542l3.005.782-.35 1.346-2.943-.767c-1.587-.413-2.323-1.593-1.918-3.148.405-1.555 1.621-2.215 3.208-1.801l2.942.766-.35 1.345-3.006-.783c-.767-.2-1.344.076-1.535.812-.189.725.179 1.248.947 1.448zm-3.026 2.225l5.296 1.38-.348 1.334-.42-.109c.261.461.406 1.026.222 1.73-.298 1.145-1.324 1.854-2.89 1.446l-3.153-.821.351-1.345 3.1.808c.704.183 1.249-.101 1.419-.753.175-.672-.184-1.147-.468-1.435l-3.457-.9.348-1.335zm-2.037 12.125c-.137.525-.005 1.008.297 1.356l-1.069.833c-.523-.664-.741-1.551-.489-2.518.476-1.828 2.075-2.579 3.619-2.177 1.545.403 2.574 1.838 2.098 3.666-.252.967-.875 1.635-1.655 1.959l-.528-1.248c.434-.156.785-.514.927-1.06.227-.872-.278-1.689-1.203-1.929-.935-.244-1.764.224-1.997 1.118zm3.009 6.712c-.449 1.723-2.027 2.569-3.613 2.155-1.587-.413-2.552-1.921-2.103-3.645.449-1.723 2.027-2.569 3.614-2.155 1.586.413 2.551 1.921 2.102 3.645zm-4.461-1.14c-.221.851.295 1.67 1.209 1.908.925.241 1.764-.225 1.986-1.076.23-.883-.273-1.709-1.198-1.95-.924-.241-1.767.235-1.997 1.118zm-2.118 3.823l5.297 1.379-.348 1.335-.399-.104c.253.448.398.968.229 1.619-.176.673-.623 1.185-1.281 1.384.364.498.632 1.107.399 2-.285 1.093-1.266 1.758-2.758 1.369l-3.258-.849.351-1.345 3.205.835c.641.167 1.131-.076 1.287-.675.15-.578-.167-.997-.47-1.3a1.716 1.716 0 01-.233-.05l-3.258-.849.35-1.345 3.205.835c.641.167 1.131-.075 1.287-.674.159-.61-.211-1.043-.495-1.33l-3.457-.901.347-1.334zm3.53 11.95a.913.913 0 011.1-.645.913.913 0 01.645 1.099.903.903 0 01-1.097.634.903.903 0 01-.648-1.088zm-6.045-2.294l5.296 1.38-.348 1.335-5.296-1.38.348-1.335zm1.081 3.775l2.165.564.257-.988 1.198.313-.257.987 1.324.345-.351 1.345-1.324-.345-.421 1.619-1.198-.312.421-1.619-2.164-.564c-.589-.153-.902.102-1.039.627-.096.368-.117.621-.09.819l-1.166-.304c-.047-.293-.018-.622.097-1.063.345-1.324 1.255-1.76 2.548-1.424zm2.345 8.23l.334-1.282 1.459 1.547-.378 1.451-1.415-1.716zm-5.744.423c-.533-.667-.729-1.593-.469-2.591.49-1.881 2.08-2.6 3.624-2.198 1.566.408 2.601 1.732 2.15 3.466-.384 1.471-1.634 2.178-3.021 1.817a3.52 3.52 0 01-.724-.279l.966-3.709c-1.02-.131-1.578.374-1.795 1.204-.15.578-.029 1.148.275 1.531l-1.006.759zm4.22-1.639c.178-.683-.083-1.233-.738-1.561l-.635 2.438c.541.118 1.179-.131 1.373-.877zm-3.388 5.768c1.545.402 2.593 1.764 2.158 3.435-.186.714-.541 1.172-1.058 1.475l3.006.783-.351 1.345-7.881-2.054.35-1.345.421.11c-.303-.517-.39-1.089-.204-1.804.435-1.671 2.015-2.348 3.559-1.945zm-.364 1.397c-.925-.241-1.748.162-1.983 1.066a1.789 1.789 0 00.358 1.642l1.723.449a1.79 1.79 0 001.113-1.259c.236-.904-.286-1.657-1.211-1.898zm-4.588 10.288c-.533-.667-.729-1.593-.469-2.591.49-1.881 2.08-2.601 3.625-2.198 1.565.408 2.601 1.732 2.149 3.466-.383 1.471-1.633 2.178-3.021 1.817a3.52 3.52 0 01-.724-.279l.967-3.709c-1.021-.131-1.579.374-1.795 1.204-.151.578-.03 1.148.274 1.531l-1.006.759zm4.22-1.639c.178-.683-.082-1.233-.738-1.561l-.635 2.438c.542.118 1.179-.131 1.373-.877zm14.613-152.213l7.881 2.053-.347 1.335-.431-.113c.303.517.4 1.092.211 1.817-.438 1.682-2.014 2.348-3.559 1.946-1.545-.403-2.595-1.754-2.157-3.435.188-.725.554-1.18 1.07-1.483l-3.016-.786.348-1.334zm6.102 4.575c.162-.62.02-1.196-.386-1.661l-1.661-.433c-.597.226-.988.652-1.147 1.261-.236.904.284 1.668 1.208 1.909.925.24 1.751-.173 1.986-1.076zm.732 5.288a.913.913 0 011.1-.645.913.913 0 01.645 1.099.904.904 0 01-1.097.635.905.905 0 01-.648-1.089zm-6.045-2.294l5.296 1.38-.348 1.335-5.296-1.38.348-1.335zm-.765 2.935l7.881 2.054-.347 1.334-7.882-2.053.348-1.335zm4.085 6.892c-.449 1.723-2.027 2.569-3.614 2.156-1.587-.414-2.552-1.922-2.103-3.645.449-1.724 2.027-2.569 3.614-2.156 1.587.413 2.552 1.921 2.103 3.645zm-4.461-1.14c-.222.851.294 1.67 1.208 1.908.925.241 1.765-.224 1.986-1.076.23-.882-.272-1.709-1.197-1.95-.925-.241-1.767.235-1.997 1.118zm-.256 4.601l2.164.564.258-.988 1.198.313-.258.987 1.324.345-.35 1.345-1.324-.345-.422 1.619-1.198-.312.422-1.619-2.165-.564c-.588-.153-.901.102-1.038.628-.096.367-.117.62-.09.818l-1.166-.304c-.048-.293-.018-.622.097-1.063.345-1.324 1.255-1.76 2.548-1.424zm-3.564 5.106c.277-1.061 1.075-1.627 2.053-1.373.798.208 1.236.984 1.129 2.168l-.148 1.69.136.036c.557.145 1.024-.183 1.183-.792.134-.515-.004-.977-.318-1.362l1-.783c.529.642.725 1.524.473 2.491-.399 1.534-1.519 2.084-2.685 1.78l-3.426-.892.348-1.335.515.134c-.323-.443-.421-1.142-.26-1.762zm1.771-.032c-.358-.093-.663.13-.78.582-.159.609.01 1.125.362 1.497l.746.194.118-1.315c.05-.582-.12-.873-.446-.958zm-3.56 3.757c.525.136.877.509 1.101 1.072.265-.156.579-.197.852-.126.42.109.71.376.9.852a1.846 1.846 0 011.647-.334c1.03.268 1.652 1.283 1.307 2.607-.107.41-.273.748-.489 1.017l-.504 1.933-1.135-.295.244-.935a1.758 1.758 0 01-.534-.061c-1.041-.271-1.679-1.268-1.323-2.634.047-.178.101-.344.173-.493-.074-.143-.174-.236-.289-.266-.21-.055-.346.033-.409.275l-.347 1.334c-.348 1.335-1.251 1.874-2.239 1.616-1.177-.306-1.788-1.666-1.358-3.316.441-1.692 1.289-2.537 2.403-2.246zm3.069 3.38c-.145.557.109 1.005.634 1.142.526.136.955-.133 1.1-.69.151-.578-.106-1.015-.621-1.149-.525-.137-.962.119-1.113.697zm-3.208-2.07c-.505-.132-.946.27-1.19 1.205-.251.967-.023 1.554.503 1.691.399.104.746-.064.913-.705l.427-1.64c-.137-.248-.328-.466-.653-.551zm-.941 10.159c-.534-.666-.73-1.592-.47-2.591.49-1.881 2.08-2.6 3.625-2.197 1.566.407 2.601 1.732 2.149 3.466-.383 1.471-1.633 2.178-3.02 1.816a3.514 3.514 0 01-.725-.278l.967-3.71c-1.021-.131-1.579.375-1.795 1.205-.151.578-.03 1.148.274 1.53l-1.005.759zm4.219-1.638c.178-.683-.082-1.234-.737-1.562l-.636 2.438c.542.119 1.179-.13 1.373-.876zm-4.288 6.296l2.165.564.257-.988 1.198.312-.257.988 1.324.345-.351 1.345-1.324-.345-.421 1.618-1.198-.312.421-1.618-2.164-.564c-.589-.154-.902.101-1.039.627-.096.368-.117.62-.09.818l-1.166-.304c-.047-.293-.018-.621.097-1.063.345-1.324 1.255-1.76 2.548-1.423zm-3.017 3.655l5.296 1.379-.347 1.335-.526-.137c.267.44.423.963.267 1.562a1.56 1.56 0 01-.194.443l-1.314-.342c.086-.157.164-.328.227-.569.17-.652-.078-1.165-.362-1.453l-3.395-.884.348-1.334zm-1.592 5.463c.277-1.061 1.075-1.628 2.053-1.373.798.208 1.236.984 1.129 2.168l-.148 1.69.136.035c.557.145 1.024-.182 1.183-.791.134-.515-.004-.977-.319-1.362l1.001-.783c.528.642.725 1.524.473 2.491-.399 1.534-1.519 2.084-2.685 1.78l-3.426-.893.348-1.334.515.134c-.323-.443-.421-1.142-.26-1.762zm1.771-.032c-.358-.094-.663.13-.78.582-.159.609.01 1.125.361 1.497l.747.194.118-1.316c.05-.581-.121-.873-.446-.957zm-2.772 4.523l5.296 1.379-.348 1.335-.42-.109c.262.46.406 1.025.223 1.73-.299 1.145-1.325 1.854-2.891 1.446l-3.152-.821.35-1.345 3.1.807c.704.184 1.25-.101 1.419-.752.175-.673-.183-1.148-.468-1.435l-3.457-.901.348-1.334zm-.8 6.213l.569 1.09c-.495.219-.89.531-1.021 1.036-.113.431.082.717.397.799.925.241 1.238-2.382 3.098-1.897.935.243 1.434 1.215 1.146 2.318-.21.81-.791 1.444-1.404 1.688l-.548-1.085c.408-.186.771-.461.878-.871.109-.421-.07-.681-.343-.752-.904-.235-1.248 2.38-3.077 1.903-1.108-.311-1.485-1.363-1.225-2.361.247-.946.8-1.52 1.53-1.868zm3.368 5.637l-.372 1.429-4.142.391 3.428 2.351-.375 1.44-4.793-3.313.457-1.755 5.797-.543zm-7.369 10.111c-.534-.667-.73-1.593-.47-2.591.49-1.881 2.08-2.601 3.625-2.198 1.566.408 2.601 1.732 2.149 3.466-.383 1.471-1.633 2.178-3.02 1.817a3.497 3.497 0 01-.724-.279l.966-3.709c-1.021-.131-1.579.374-1.795 1.204-.151.578-.03 1.148.275 1.531l-1.006.759zm4.22-1.639c.178-.683-.083-1.233-.738-1.561l-.635 2.438c.541.118 1.178-.131 1.373-.877zm-5.397 2.624l5.296 1.379-.347 1.335-.526-.137c.267.44.423.963.267 1.562-.047.179-.12.328-.194.443l-1.314-.342c.086-.157.164-.328.227-.569.17-.652-.078-1.165-.362-1.452l-3.395-.885.348-1.334zm-.225 4.006l.569 1.091c-.495.219-.89.531-1.021 1.036-.113.43.082.717.397.799.925.241 1.238-2.382 3.098-1.897.935.243 1.434 1.215 1.146 2.318-.21.809-.791 1.444-1.404 1.688l-.548-1.086c.408-.185.771-.461.878-.871.109-.42-.07-.68-.343-.751-.904-.235-1.248 2.379-3.077 1.903-1.108-.311-1.485-1.363-1.225-2.362.247-.945.8-1.519 1.53-1.868zm-2.674 6.476c.277-1.062 1.075-1.628 2.052-1.374.799.209 1.236.985 1.13 2.169l-.149 1.689.137.036c.557.145 1.024-.182 1.183-.792.134-.515-.004-.977-.319-1.362l1.001-.783c.528.643.725 1.524.473 2.491-.4 1.534-1.519 2.084-2.686 1.78l-3.425-.892.347-1.335.515.134c-.322-.443-.42-1.141-.259-1.761zm1.77-.033c-.357-.093-.662.13-.78.582-.159.61.01 1.125.362 1.497l.746.195.119-1.316c.05-.582-.121-.873-.447-.958zm-2.771 4.523l7.881 2.053-.348 1.335-7.881-2.053.348-1.335z"
+        ></path>
+        <path
+          fill="#D9D9D9"
+          fillOpacity="0.39"
+          d="M204 296.855c-26.4-1.2 54.5 22 49 1l-85-37c-11-4-13.834-1-13 2.5l4.5 31 44.5 2.5z"
+        ></path>
+        <g filter="url(#filter1_d_523_1843)">
+          <rect
+            width="139.584"
+            height="66.728"
+            x="265.3"
+            y="26"
+            fill="#fff"
+            rx="7.419"
+            transform="rotate(32.957 265.3 26)"
+          ></rect>
+          <rect
+            width="138.842"
+            height="65.986"
+            x="265.41"
+            y="26.513"
+            stroke="#F0F0FE"
+            strokeWidth="0.742"
+            rx="7.048"
+            transform="rotate(32.957 265.41 26.513)"
+          ></rect>
+        </g>
+        <g clipPath="url(#clip1_523_1843)">
+          <path
+            fill="#6A6AF4"
+            d="M322.518 118.785a3.763 3.763 0 015.201-1.131l20.631 13.264a3.763 3.763 0 011.131 5.201l-2.85 4.433a3.764 3.764 0 01-5.201 1.13l-20.631-13.264a3.763 3.763 0 01-1.131-5.201l2.85-4.432z"
+          ></path>
+          <path
+            fill="#fff"
+            d="M326.67 126.37l2.717-2.012.706.454-.703 3.306-.573-.368.19-.855-1.064-.684-.699.527-.574-.368zm1.736-.512l.729.469.278-1.233-1.007.764zm3.127.459a.38.38 0 01-.113-.518.38.38 0 01.518-.112.377.377 0 01.109.515.378.378 0 01-.514.115zm-1.331 2.613c-.308.479-.703.601-1.185.29a1.03 1.03 0 01-.326-.295l.271-.421a.895.895 0 00.258.225c.19.122.358.111.5-.109l1.363-2.12.482.31-1.363 2.12zm2.902-1.237c.623.4.753 1.133.384 1.707-.369.574-1.09.76-1.713.359-.623-.4-.753-1.134-.384-1.707.369-.574 1.09-.76 1.713-.359zm-1.028 1.615c.308.198.698.1.911-.23.215-.335.139-.727-.168-.925-.319-.205-.711-.113-.926.221-.215.334-.136.729.183.934zm3.031 1.315l.698-1.087.486.313-.684 1.064c-.368.573-.93.712-1.492.35-.562-.361-.666-.927-.297-1.501l.684-1.063.486.312-.698 1.087c-.179.277-.144.541.122.712.262.168.516.09.695-.187zm1.088.882l.503-.782-.357-.23.279-.433.357.23.307-.479.487.313-.308.478.585.376-.278.434-.585-.377-.504.783c-.136.213-.076.37.114.492.133.085.23.126.312.141l-.272.422a1.086 1.086 0 01-.407-.176c-.479-.308-.533-.724-.233-1.192zm2.98 2.464c-.332.124-.724.082-1.085-.15-.68-.437-.758-1.159-.399-1.717.364-.566 1.021-.804 1.648-.401.532.342.649.928.327 1.429a1.499 1.499 0 01-.204.25l-1.341-.862c-.184.386-.056.672.244.865.209.135.45.161.64.09l.17.496zm-.101-1.88c-.247-.159-.499-.127-.713.089l.881.567a.471.471 0 00-.168-.656zm.338 2.472l1.231-1.914.482.31-.122.19a.817.817 0 01.652.097.606.606 0 01.15.134l-.305.475a.977.977 0 00-.196-.164.62.62 0 00-.621-.044l-.789 1.227-.482-.311z"
+          ></path>
+        </g>
         <rect
-          x="217.177"
-          y="155.085"
-          width="14.8229"
-          height="0.931923"
-          rx="0.465962"
-          transform="rotate(36.4098 217.177 155.085)"
+          width="39.765"
+          height="6.128"
+          x="258.872"
+          y="65.117"
           fill="#C3C3FB"
-        />
+          rx="3.064"
+          transform="rotate(32.957 258.872 65.117)"
+        ></rect>
+        <rect
+          width="27.753"
+          height="6.128"
+          x="249.687"
+          y="75.115"
+          fill="#F4C447"
+          rx="3.064"
+          transform="rotate(32.957 249.687 75.115)"
+        ></rect>
+        <path
+          fill="#3F72B5"
+          d="M272.072 46.587l-.756-.49 1.174-.361.855.554-1.273.297zm-4.45 3.437l2.658-4.1 2.389 1.55-.448.69-1.557-1.01-.631.973 1.324.858-.448.69-1.324-.857-.683 1.054 1.558 1.01-.448.69-2.39-1.548zm3.257 2.11l2.847-4.391.744.482-2.848 4.392-.743-.482zm2.41 1.688c-.592-.383-.776-.985-.422-1.53.288-.445.85-.555 1.551-.25l1 .433.05-.077c.201-.31.096-.66-.244-.881a.954.954 0 00-.895-.082l-.275-.768c.499-.193 1.076-.134 1.615.215.855.554.964 1.349.542 1.999l-1.237 1.909-.744-.483.186-.286c-.335.106-.782.025-1.127-.199zm.338-1.086c-.129.199-.054.43.197.593.34.22.689.222.987.083l.269-.416-.778-.339c-.345-.148-.557-.103-.675.079zm6.317 3.18c-.558.861-1.594 1.229-2.531.621-.405-.262-.608-.577-.688-.953l-.156.24-.744-.482 2.848-4.392.744.482-1.09 1.68c.376-.08.747-.022 1.151.24.937.607 1.025 1.704.466 2.564zm-1.027-1.93a1.13 1.13 0 00-1.087-.106l-.608.937c.021.404.207.733.541.95.503.326 1.074.163 1.408-.352.335-.515.25-1.103-.254-1.43zm4.146 1.69c.961.623 1.157 1.756.584 2.64-.573.885-1.689 1.168-2.649.546-.96-.623-1.157-1.757-.584-2.641.574-.884 1.689-1.168 2.649-.545zm-1.598 2.49c.475.308 1.079.16 1.409-.35.334-.516.22-1.122-.255-1.43-.491-.319-1.098-.18-1.432.336-.334.515-.214 1.126.278 1.445zm1.904 2.066l1.913-2.951.744.482-.19.293c.322-.074.673-.063 1.007.153.099.065.176.14.231.208l-.475.733a1.527 1.527 0 00-.301-.254.96.96 0 00-.959-.073l-1.227 1.892-.743-.483zm5.281 2.743c-.514.19-1.119.122-1.675-.238-1.049-.68-1.165-1.795-.607-2.656.565-.873 1.583-1.236 2.549-.61.82.532.998 1.437.497 2.21a2.24 2.24 0 01-.317.386l-2.067-1.34c-.286.596-.091 1.038.372 1.338.322.21.694.25.989.143l.259.767zm-.145-2.906c-.381-.247-.769-.2-1.102.134l1.359.88c.182-.305.158-.744-.257-1.014zm.508 3.823l1.914-2.952.743.483-.19.292c.323-.074.673-.063 1.007.154.1.065.176.139.231.208l-.474.732a1.54 1.54 0 00-.302-.254.96.96 0 00-.959-.072l-1.226 1.891-.744-.482zm6.729 2.55l1.086-1.675.75.486-1.063 1.64c-.574.884-1.442 1.094-2.309.532-.866-.562-1.023-1.437-.449-2.32l1.063-1.64.749.485-1.086 1.675c-.277.428-.225.835.185 1.101.404.262.797.143 1.074-.284zm.746 2.296l1.913-2.952.744.483-.152.234c.334-.066.708-.04 1.1.214.639.414.863 1.183.298 2.056l-1.139 1.757-.75-.486 1.12-1.728c.254-.392.191-.782-.172-1.018-.374-.243-.737-.12-.97-.005l-1.249 1.927-.743-.482zm6.637 3.62c-.515.191-1.12.124-1.676-.237-1.048-.68-1.165-1.795-.607-2.656.566-.873 1.583-1.236 2.55-.61.819.532.997 1.438.496 2.21a2.246 2.246 0 01-.316.386l-2.067-1.34c-.287.596-.092 1.039.371 1.338.322.21.694.251.989.143l.26.767zm-.146-2.905c-.381-.247-.769-.2-1.102.134l1.359.881c.182-.306.159-.745-.257-1.015zm1.153 6.287l2.847-4.392.744.482-.156.24c.377-.08.747-.023 1.151.24.937.606 1.025 1.703.467 2.564-.558.86-1.595 1.228-2.532.62-.404-.261-.607-.576-.688-.953l-1.089 1.681-.744-.482zm4.025-2.796a1.13 1.13 0 00-1.091-.1l-.6.925c.017.41.198.734.537.955.504.326 1.075.164 1.409-.351.334-.516.249-1.103-.255-1.43zm4.175 1.708c.961.623 1.157 1.757.584 2.64-.573.885-1.689 1.168-2.649.546-.96-.623-1.157-1.757-.584-2.64.574-.885 1.689-1.168 2.649-.546zm-1.598 2.49c.475.308 1.079.16 1.409-.35.334-.516.22-1.122-.254-1.43-.492-.319-1.098-.18-1.433.336-.334.516-.214 1.126.278 1.445zm1.904 2.066l2.847-4.392.744.483-2.848 4.392-.743-.483zm4.258-2.163a.586.586 0 01-.171-.801.587.587 0 01.801-.171c.263.17.336.534.165.797a.58.58 0 01-.795.175zm-2.623 3.224l1.914-2.952.743.483-1.913 2.951-.744-.482zm2.522.104l.782-1.206-.551-.357.433-.668.551.357.478-.738.75.486-.479.738.902.585-.433.668-.901-.585-.783 1.206c-.212.328-.12.57.173.76.205.134.355.198.481.221l-.422.65c-.188-.03-.383-.115-.629-.274-.737-.479-.819-1.122-.352-1.843zm4.241-.644a.587.587 0 01-.171-.8.587.587 0 01.801-.172.58.58 0 01-.63.972zm-2.622 3.224l1.913-2.951.744.482-1.914 2.951-.743-.482zm2.381-.552c.558-.86 1.595-1.228 2.532-.62.398.257.602.572.682.949l.156-.24.749.486-2.847 4.392-.75-.486 1.09-1.68c-.377.08-.747.022-1.145-.236-.937-.607-1.025-1.704-.467-2.565zm.773.501c-.334.516-.255 1.1.249 1.426a1.13 1.13 0 001.087.106l.608-.937a1.159 1.159 0 00-.541-.95c-.504-.326-1.069-.16-1.403.355zm5.096 3.587l1.086-1.675.75.486-1.063 1.64c-.574.884-1.442 1.095-2.309.533-.867-.562-1.023-1.437-.45-2.321l1.063-1.64.75.486-1.086 1.675c-.277.427-.225.835.185 1.1.404.263.797.144 1.074-.284zm3.774 3.578c-.514.19-1.119.123-1.676-.238-1.048-.68-1.165-1.795-.607-2.656.566-.873 1.584-1.236 2.55-.61.82.532.998 1.438.497 2.21a2.295 2.295 0 01-.317.386l-2.067-1.34c-.287.596-.091 1.039.371 1.339.322.208.695.25.989.142l.26.767zm-.146-2.906c-.38-.247-.769-.2-1.101.134l1.358.881c.182-.306.159-.745-.257-1.015zm2.833 3.234c.558-.86 1.601-1.225 2.532-.62.398.257.605.566.686.943l1.086-1.675.749.486-2.847 4.392-.75-.486.152-.234c-.377.08-.743.017-1.141-.241-.932-.604-1.025-1.704-.467-2.565zm.779.505c-.334.515-.255 1.099.249 1.425.333.217.7.255 1.073.114l.623-.96a1.148 1.148 0 00-.542-.934c-.504-.326-1.069-.16-1.403.355zm5.347 4.88c-.515.191-1.12.123-1.676-.237-1.048-.68-1.165-1.796-.607-2.656.566-.873 1.583-1.236 2.55-.61.819.532.998 1.437.496 2.21a2.249 2.249 0 01-.316.386l-2.067-1.34c-.287.596-.092 1.038.371 1.338.322.209.694.25.989.142l.26.767zm-.146-2.905c-.38-.247-.769-.2-1.102.134l1.359.88c.182-.306.159-.745-.257-1.014zm-76.517-35.997l.78-.126c.034.346.144.65.425.833.24.156.454.095.568-.08.334-.516-1.202-1.238-.53-2.274.338-.522 1.031-.63 1.646-.23.451.292.721.774.745 1.198l-.772.114c-.031-.286-.126-.563-.354-.712-.234-.151-.429-.095-.528.058-.326.503 1.199 1.243.538 2.261-.414.614-1.132.63-1.688.27-.527-.342-.765-.796-.83-1.312zm3.589 1.404l.782-1.207-.551-.357.433-.667.55.357.479-.738.749.486-.478.738.902.584-.433.668-.902-.585-.782 1.207c-.213.328-.12.57.172.76.205.133.355.197.481.22l-.421.65c-.188-.03-.383-.115-.629-.274-.738-.478-.819-1.122-.352-1.842zm2.393 3.207c-.591-.384-.775-.985-.422-1.53.288-.445.85-.555 1.551-.25l1.001.432.049-.076c.201-.31.096-.661-.244-.881a.953.953 0 00-.895-.082l-.275-.769c.499-.192 1.076-.134 1.615.216.855.554.964 1.348.543 1.998l-1.238 1.91-.744-.483.186-.287c-.335.107-.781.026-1.127-.198zm.338-1.087c-.129.2-.054.43.198.594.339.22.688.222.986.082l.27-.416-.779-.338c-.345-.148-.557-.103-.675.078zm3.085 1.65l.782-1.206-.551-.357.433-.667.551.357.478-.738.749.486-.478.737.902.585-.433.668-.902-.585-.782 1.206c-.212.328-.12.571.173.761.204.133.354.197.48.22l-.421.65c-.188-.03-.383-.115-.629-.274-.738-.479-.819-1.122-.352-1.843zm4.241-.643a.586.586 0 01-.171-.801.587.587 0 01.801-.171.58.58 0 01-.63.972zm-2.623 3.223l1.914-2.95.744.481-1.914 2.952-.744-.483zm5.031-1.097c.96.623 1.157 1.757.584 2.641-.574.885-1.689 1.168-2.649.545-.961-.622-1.157-1.756-.584-2.64.573-.885 1.689-1.168 2.649-.546zm-1.598 2.491c.474.308 1.078.159 1.409-.35.334-.516.219-1.123-.255-1.43-.492-.319-1.098-.18-1.432.336-.334.515-.214 1.125.278 1.444zm1.903 2.066l1.914-2.952.743.483-.151.234c.334-.066.708-.04 1.1.214.638.414.863 1.183.297 2.056l-1.139 1.757-.749-.486 1.12-1.728c.254-.392.191-.782-.172-1.018-.375-.243-.737-.12-.97-.005l-1.249 1.927-.744-.482zm3.609 2.34l1.913-2.952.744.482-.152.234c.334-.066.708-.04 1.101.215.638.413.863 1.183.297 2.056l-1.139 1.756-.75-.486 1.12-1.727c.255-.392.192-.783-.171-1.018-.375-.243-.738-.12-.97-.005l-1.25 1.927-.743-.483zm6.637 3.62c-.515.19-1.119.123-1.676-.238-1.048-.68-1.165-1.795-.607-2.655.566-.873 1.583-1.236 2.55-.61.82.532.998 1.437.496 2.21a2.245 2.245 0 01-.316.386l-2.067-1.34c-.287.595-.091 1.038.371 1.338.322.209.695.25.989.142l.26.767zm-.146-2.905c-.38-.247-.769-.2-1.101.134l1.358.88c.182-.306.159-.745-.257-1.014zm.509 3.823l1.913-2.952.744.482-.144.223a1.328 1.328 0 011.034.188c.375.243.596.62.584 1.061.378-.12.804-.161 1.301.162.61.394.816 1.127.277 1.959l-1.177 1.815-.749-.486 1.158-1.786c.231-.357.182-.705-.152-.921-.322-.21-.642-.1-.888.023-.02.044-.047.085-.077.132l-1.177 1.816-.75-.486 1.158-1.786c.232-.358.183-.705-.151-.922-.34-.22-.679-.082-.912.033l-1.249 1.927-.743-.482zm8.41 4.77c-.515.19-1.12.123-1.676-.238-1.048-.68-1.165-1.795-.607-2.656.566-.872 1.583-1.236 2.549-.61.82.532.998 1.438.497 2.21a2.241 2.241 0 01-.316.386l-2.067-1.34c-.287.596-.092 1.039.371 1.339.322.209.694.25.989.142l.26.767zm-.146-2.906c-.381-.246-.769-.199-1.102.134l1.359.881c.182-.306.159-.745-.257-1.015zm.508 3.823l1.914-2.951.744.482-.152.234c.334-.066.708-.04 1.1.215.638.413.863 1.183.297 2.055l-1.139 1.757-.749-.486 1.12-1.727c.254-.393.191-.783-.172-1.018-.375-.243-.737-.12-.97-.005l-1.249 1.927-.744-.483zm4.495 1.384l.782-1.206-.55-.357.432-.668.551.357.478-.738.75.486-.479.738.902.584-.433.668-.901-.585-.782 1.207c-.213.328-.121.57.172.76.205.133.355.197.481.22l-.422.65c-.188-.03-.382-.114-.628-.274-.738-.478-.82-1.122-.353-1.842zm4.689.378l.797.517-.6 2.605 2.128-1.614.802.52-2.991 2.253-.978-.634.842-3.647zm5.043 3.103c.96.623 1.157 1.757.583 2.641-.573.884-1.688 1.168-2.649.545-.96-.623-1.156-1.757-.583-2.64.573-.885 1.688-1.168 2.649-.546zm-1.598 2.49c.474.308 1.078.16 1.408-.35.334-.516.22-1.122-.254-1.43-.492-.318-1.098-.179-1.432.336-.334.516-.214 1.126.278 1.445zm1.903 2.067l2.847-4.392.744.482-2.847 4.392-.744-.482zm5.031-1.097c.96.622 1.156 1.756.583 2.64-.573.885-1.689 1.168-2.649.545-.96-.622-1.157-1.756-.583-2.64.573-.885 1.688-1.168 2.649-.545zm-1.599 2.49c.475.308 1.079.159 1.409-.35.334-.516.22-1.123-.254-1.43-.492-.319-1.098-.18-1.432.336-.335.515-.215 1.125.277 1.444zm1.904 2.066l1.913-2.952.744.483-.152.234c.334-.066.708-.04 1.1.214.639.414.863 1.184.298 2.056l-1.139 1.757-.75-.486 1.12-1.728c.255-.392.192-.782-.172-1.018-.374-.243-.737-.12-.969-.005l-1.25 1.927-.743-.482zm4.494 1.383l.782-1.206-.55-.357.433-.667.55.356.479-.737.749.486-.478.737.902.585-.433.668-.902-.585-.782 1.206c-.213.328-.121.571.172.76.205.134.355.198.481.221l-.421.65c-.188-.03-.383-.115-.629-.274-.738-.479-.82-1.122-.353-1.843zm2.394 3.207c-.592-.383-.776-.985-.422-1.53.288-.444.85-.554 1.551-.25l1 .433.05-.076c.201-.31.096-.662-.244-.882a.954.954 0 00-.895-.081l-.275-.77c.499-.191 1.076-.133 1.615.216.855.555.964 1.349.542 1.999l-1.237 1.909-.744-.482.186-.287c-.335.107-.782.025-1.127-.199zm.338-1.086c-.129.199-.054.43.197.594.34.22.689.221.987.082l.269-.416-.778-.338c-.345-.149-.557-.104-.675.078zm2.198 2.606l1.914-2.951.744.482-.19.293c.322-.074.673-.063 1.006.153a.99.99 0 01.232.208l-.475.732a1.564 1.564 0 00-.301-.253.961.961 0 00-.96-.073l-1.226 1.891-.744-.482zm5.002-1.681a.586.586 0 01-.171-.801.587.587 0 01.801-.171.58.58 0 01-.63.972zm-2.623 3.224l1.914-2.952.744.482-1.914 2.952-.744-.482zm1.615.439l.781-.126c.033.346.144.651.425.833.24.156.454.095.568-.081.334-.515-1.203-1.237-.531-2.273.338-.522 1.032-.63 1.647-.23.451.292.72.774.745 1.198l-.773.114c-.031-.286-.125-.563-.354-.711-.234-.152-.429-.096-.527.057-.327.503 1.198 1.243.538 2.262-.414.613-1.132.63-1.689.269-.527-.342-.765-.795-.83-1.312zm3.589 1.404l.782-1.206-.55-.357.433-.668.55.357.478-.738.75.486-.478.738.901.585-.432.667-.902-.584-.782 1.206c-.213.328-.121.571.172.76.205.133.355.197.481.221l-.421.65c-.189-.031-.383-.115-.629-.275-.738-.478-.82-1.122-.353-1.842zm4.59 3.824c-.514.191-1.119.123-1.675-.238-1.048-.679-1.165-1.795-.607-2.656.565-.872 1.583-1.236 2.549-.609.82.531.998 1.437.497 2.21a2.271 2.271 0 01-.316.385l-2.068-1.34c-.286.596-.091 1.039.372 1.339.322.209.694.25.989.142l.259.767zm-.145-2.905c-.381-.247-.769-.2-1.102.134l1.359.88c.182-.306.159-.745-.257-1.014z"
+        ></path>
+        <path
+          fill="#FECD8C"
+          d="M367.47 100.894c.637-.548 1.602.039 1.409.857l-.255 1.081a.867.867 0 00.393.941l.95.577c.718.436.458 1.536-.38 1.605l-1.107.091a.866.866 0 00-.773.665l-.256 1.082c-.193.817-1.319.91-1.643.135l-.429-1.025a.867.867 0 00-.871-.53l-1.108.091c-.837.069-1.274-.974-.637-1.521l.843-.725a.867.867 0 00.234-.992l-.429-1.025c-.324-.775.533-1.513 1.251-1.076l.949.577a.867.867 0 001.016-.083l.843-.725z"
+        ></path>
         <rect
-          x="217.915"
-          y="154.085"
-          width="6.96897"
-          height="0.931923"
-          rx="0.465962"
-          transform="rotate(36.4098 217.915 154.085)"
+          width="82.803"
+          height="36.825"
+          x="117.263"
+          y="159.421"
+          fill="url(#paint3_linear_523_1843)"
+          stroke="#A5A5F8"
+          strokeWidth="0.414"
+          rx="3.933"
+          transform="rotate(-19.252 117.263 159.421)"
+        ></rect>
+        <rect
+          width="54.395"
+          height="3.42"
+          x="132.056"
+          y="177.782"
+          fill="#7CD4A5"
+          rx="1.71"
+          transform="rotate(-19.252 132.056 177.782)"
+        ></rect>
+        <rect
+          width="25.574"
+          height="3.42"
+          x="130.553"
+          y="173.477"
           fill="#F4F5FD"
-        />
+          rx="1.71"
+          transform="rotate(-19.252 130.553 173.477)"
+        ></rect>
         <rect
-          x="233.161"
-          y="162.113"
-          width="1.88051"
-          height="0.931923"
-          rx="0.465962"
-          transform="rotate(36.4098 233.161 162.113)"
+          width="6.901"
+          height="3.42"
+          x="186.439"
+          y="143.897"
           fill="#7CD4A5"
-        />
+          rx="1.71"
+          transform="rotate(-19.252 186.439 143.897)"
+        ></rect>
         <rect
-          x="216.317"
-          y="156.252"
-          width="11.3937"
-          height="0.931923"
-          rx="0.465962"
-          transform="rotate(36.4098 216.317 156.252)"
+          width="41.811"
+          height="3.42"
+          x="133.811"
+          y="182.804"
           fill="#F4F5FD"
-        />
+          rx="1.71"
+          transform="rotate(-19.252 133.811 182.804)"
+        ></rect>
         <path
-          d="M218.812 153.244L219.265 152.63L219.39 152.722L218.937 153.336L218.812 153.244ZM219.219 153.203C219.314 153.074 219.48 153.027 219.62 153.13C219.679 153.174 219.709 153.224 219.718 153.283L219.903 153.032L220.015 153.115L219.53 153.773L219.418 153.69L219.443 153.655C219.384 153.664 219.327 153.651 219.268 153.607C219.128 153.504 219.124 153.331 219.219 153.203ZM219.336 153.289C219.279 153.366 219.286 153.458 219.361 153.513C219.411 153.55 219.468 153.559 219.528 153.541L219.634 153.397C219.634 153.335 219.608 153.283 219.558 153.246C219.482 153.191 219.393 153.211 219.336 153.289ZM220.123 154.1C220.041 154.125 219.948 154.108 219.865 154.047C219.707 153.931 219.7 153.756 219.795 153.627C219.891 153.496 220.053 153.449 220.198 153.556C220.321 153.647 220.34 153.79 220.255 153.905C220.237 153.93 220.216 153.95 220.202 153.962L219.892 153.734C219.842 153.824 219.868 153.895 219.937 153.946C219.986 153.982 220.043 153.992 220.09 153.978L220.123 154.1ZM220.128 153.645C220.071 153.603 220.01 153.607 219.955 153.656L220.159 153.806C220.19 153.76 220.19 153.691 220.128 153.645ZM220.171 154.246L220.497 153.804L220.609 153.886L220.583 153.921C220.636 153.914 220.694 153.922 220.753 153.965C220.848 154.036 220.876 154.158 220.78 154.288L220.585 154.552L220.473 154.469L220.664 154.21C220.707 154.151 220.701 154.09 220.647 154.05C220.591 154.008 220.533 154.024 220.496 154.04L220.283 154.328L220.171 154.246ZM220.859 154.504L220.992 154.323L220.91 154.263L220.984 154.163L221.066 154.223L221.148 154.113L221.26 154.196L221.178 154.306L221.313 154.406L221.24 154.506L221.105 154.406L220.971 154.587C220.935 154.636 220.947 154.675 220.991 154.707C221.022 154.73 221.045 154.741 221.064 154.746L220.992 154.843C220.963 154.837 220.934 154.822 220.897 154.795C220.786 154.713 220.78 154.612 220.859 154.504ZM221.526 154.444C221.487 154.415 221.478 154.357 221.507 154.317C221.536 154.278 221.594 154.269 221.634 154.298C221.673 154.327 221.681 154.384 221.652 154.424C221.623 154.463 221.566 154.473 221.526 154.444ZM221.087 154.922L221.413 154.479L221.525 154.562L221.199 155.004L221.087 154.922ZM221.604 154.62L221.686 154.681L221.721 154.634C221.79 154.54 221.908 154.511 222.018 154.592C222.059 154.622 222.086 154.657 222.103 154.693L221.987 154.751C221.981 154.731 221.969 154.711 221.946 154.694C221.909 154.666 221.865 154.674 221.835 154.715L221.799 154.764L221.934 154.863L221.86 154.963L221.725 154.864L221.473 155.206L221.36 155.123L221.613 154.781L221.53 154.72L221.604 154.62ZM222.13 154.889C222.091 154.86 222.082 154.802 222.111 154.763C222.14 154.723 222.198 154.714 222.238 154.743C222.277 154.773 222.285 154.83 222.256 154.869C222.227 154.909 222.17 154.918 222.13 154.889ZM221.691 155.367L222.017 154.925L222.129 155.007L221.803 155.449L221.691 155.367ZM222.396 155.776C222.314 155.801 222.221 155.785 222.137 155.723C221.98 155.607 221.973 155.432 222.068 155.303C222.164 155.173 222.326 155.126 222.471 155.232C222.594 155.323 222.613 155.466 222.527 155.582C222.509 155.606 222.489 155.626 222.474 155.639L222.165 155.41C222.115 155.5 222.141 155.571 222.21 155.622C222.258 155.658 222.316 155.668 222.363 155.654L222.396 155.776ZM222.401 155.322C222.344 155.28 222.283 155.283 222.228 155.332L222.431 155.482C222.463 155.436 222.463 155.368 222.401 155.322ZM222.444 155.922L222.77 155.48L222.882 155.562L222.849 155.606C222.9 155.598 222.955 155.603 223.005 155.64C223.02 155.651 223.031 155.663 223.039 155.674L222.958 155.784C222.947 155.77 222.934 155.756 222.913 155.742C222.859 155.701 222.802 155.705 222.765 155.721L222.556 156.005L222.444 155.922ZM223.469 156.383L223.654 156.132L223.767 156.215L223.585 156.461C223.488 156.593 223.35 156.618 223.221 156.522C223.091 156.426 223.075 156.288 223.172 156.156L223.353 155.91L223.466 155.993L223.281 156.244C223.233 156.308 223.238 156.372 223.299 156.417C223.36 156.462 223.422 156.447 223.469 156.383ZM223.564 156.748L223.89 156.306L224.001 156.388L223.975 156.423C224.028 156.416 224.086 156.424 224.145 156.467C224.241 156.538 224.268 156.66 224.172 156.79L223.978 157.054L223.866 156.971L224.056 156.712C224.1 156.653 224.094 156.592 224.039 156.552C223.983 156.51 223.925 156.526 223.888 156.542L223.675 156.83L223.564 156.748ZM224.315 156.826C224.335 156.799 224.356 156.786 224.379 156.786C224.402 156.785 224.424 156.793 224.445 156.809C224.465 156.824 224.479 156.842 224.485 156.864C224.492 156.885 224.485 156.909 224.465 156.936C224.446 156.962 224.425 156.975 224.402 156.976C224.379 156.977 224.358 156.969 224.337 156.954C224.316 156.939 224.302 156.92 224.296 156.898C224.29 156.876 224.296 156.851 224.315 156.826ZM224.815 157.56C224.733 157.584 224.639 157.568 224.556 157.507C224.399 157.391 224.391 157.216 224.486 157.087C224.582 156.956 224.744 156.909 224.889 157.016C225.012 157.106 225.031 157.249 224.946 157.365C224.928 157.39 224.907 157.41 224.893 157.422L224.583 157.194C224.533 157.284 224.559 157.355 224.629 157.406C224.677 157.442 224.734 157.452 224.781 157.438L224.815 157.56ZM224.819 157.105C224.762 157.063 224.701 157.067 224.646 157.116L224.85 157.266C224.881 157.22 224.882 157.151 224.819 157.105ZM225.734 157.558L225.627 157.479L225.825 157.4L225.947 157.49L225.734 157.558ZM225.559 158.109C225.477 158.133 225.383 158.117 225.3 158.056C225.143 157.94 225.135 157.765 225.23 157.636C225.327 157.505 225.489 157.458 225.634 157.565C225.756 157.656 225.776 157.798 225.69 157.914C225.672 157.939 225.652 157.959 225.637 157.971L225.328 157.743C225.277 157.833 225.304 157.904 225.373 157.955C225.421 157.991 225.479 158.001 225.526 157.987L225.559 158.109ZM225.564 157.654C225.507 157.612 225.446 157.616 225.391 157.665L225.594 157.815C225.625 157.769 225.626 157.7 225.564 157.654ZM225.607 158.255L226.092 157.597L226.204 157.679L225.718 158.337L225.607 158.255ZM226.284 158.459L226.469 158.208L226.582 158.291L226.4 158.537C226.303 158.669 226.165 158.694 226.036 158.598C225.906 158.502 225.89 158.365 225.987 158.232L226.168 157.986L226.281 158.069L226.096 158.32C226.048 158.384 226.053 158.448 226.114 158.494C226.175 158.538 226.237 158.523 226.284 158.459ZM227.014 158.502L226.907 158.423L227.105 158.344L227.226 158.434L227.014 158.502ZM226.839 159.053C226.757 159.077 226.663 159.061 226.58 159C226.423 158.884 226.415 158.709 226.51 158.58C226.607 158.449 226.769 158.402 226.914 158.509C227.036 158.599 227.056 158.742 226.97 158.858C226.952 158.883 226.932 158.903 226.917 158.915L226.608 158.687C226.557 158.777 226.584 158.848 226.653 158.899C226.701 158.935 226.759 158.945 226.806 158.931L226.839 159.053ZM226.844 158.598C226.787 158.556 226.726 158.56 226.671 158.609L226.874 158.759C226.905 158.713 226.906 158.644 226.844 158.598ZM226.887 159.199L227.213 158.757L227.324 158.839L227.292 158.883C227.343 158.874 227.397 158.879 227.448 158.916C227.462 158.927 227.474 158.94 227.482 158.951L227.401 159.061C227.389 159.047 227.376 159.033 227.356 159.018C227.302 158.978 227.245 158.982 227.207 158.998L226.998 159.281L226.887 159.199ZM227.684 159.676C227.602 159.701 227.509 159.685 227.426 159.623C227.268 159.508 227.261 159.333 227.356 159.204C227.452 159.073 227.614 159.026 227.759 159.133C227.882 159.223 227.901 159.366 227.816 159.482C227.798 159.506 227.777 159.527 227.763 159.539L227.453 159.31C227.403 159.401 227.429 159.472 227.498 159.523C227.547 159.558 227.604 159.568 227.651 159.554L227.684 159.676ZM227.689 159.222C227.632 159.18 227.571 159.184 227.516 159.232L227.72 159.382C227.751 159.336 227.751 159.268 227.689 159.222ZM227.732 159.823L228.058 159.38L228.17 159.463L228.144 159.498C228.197 159.491 228.255 159.498 228.314 159.541C228.409 159.612 228.437 159.734 228.341 159.865L228.146 160.128L228.034 160.045L228.225 159.786C228.268 159.728 228.262 159.666 228.208 159.626C228.152 159.585 228.094 159.6 228.057 159.616L227.844 159.905L227.732 159.823ZM228.42 160.081L228.553 159.9L228.471 159.839L228.545 159.739L228.627 159.8L228.709 159.689L228.821 159.772L228.739 159.883L228.874 159.982L228.801 160.082L228.666 159.983L228.532 160.163C228.496 160.212 228.508 160.251 228.552 160.284C228.583 160.306 228.606 160.318 228.625 160.322L228.553 160.42C228.524 160.413 228.495 160.398 228.458 160.371C228.347 160.29 228.341 160.188 228.42 160.081ZM228.859 160.177C228.879 160.15 228.9 160.137 228.923 160.137C228.945 160.137 228.967 160.144 228.988 160.16C229.009 160.175 229.022 160.193 229.029 160.215C229.036 160.237 229.029 160.261 229.009 160.288C228.99 160.313 228.969 160.327 228.946 160.328C228.923 160.328 228.901 160.32 228.881 160.305C228.86 160.29 228.846 160.271 228.84 160.249C228.834 160.227 228.84 160.203 228.859 160.177ZM229.358 160.911C229.276 160.936 229.183 160.919 229.099 160.858C228.942 160.742 228.935 160.567 229.03 160.438C229.126 160.307 229.288 160.26 229.433 160.367C229.556 160.458 229.575 160.601 229.49 160.716C229.472 160.741 229.451 160.761 229.437 160.773L229.127 160.545C229.077 160.635 229.103 160.706 229.172 160.757C229.221 160.793 229.278 160.803 229.325 160.789L229.358 160.911ZM229.363 160.456C229.306 160.414 229.245 160.418 229.19 160.467L229.394 160.617C229.425 160.571 229.425 160.502 229.363 160.456Z"
           fill="#3F72B5"
-        />
-      </g>
-      <g clipPath="url(#clip1_1506_6816)">
-        <path
-          d="M148 302.855L149.914 325.452L364.779 330.855L371 306.785L148 302.855Z"
-          fill="#615858"
-          fillOpacity="0.1"
-        />
-        <path
-          d="M326.9 456.795H190.84C177.98 456.795 167.08 447.345 165.26 434.615L151.22 336.225H366.52L352.47 434.615C350.65 447.335 339.75 456.785 326.9 456.795Z"
-          fill="#9498F6"
-        />
-        <g filter="url(#filter6_f_1506_6816)">
+          d="M129.42 167.751l-.924-2.643.537-.188.923 2.644-.536.187zm.716-1.318c-.194-.555.008-1.155.608-1.365.257-.089.47-.075.669.021l-.378-1.08.484-.169.989 2.832-.484.169-.052-.151c-.096.199-.253.343-.51.433-.601.209-1.132-.135-1.326-.69zm.503-.175c.116.332.408.501.732.388a.658.658 0 00.429-.447l-.216-.619a.656.656 0 00-.613-.082c-.325.113-.449.427-.332.76zm4.088-.708c-.095.3-.338.55-.696.675-.676.236-1.223-.102-1.417-.657-.196-.563-.003-1.152.62-1.369.529-.185 1.001.053 1.175.551.037.106.056.209.064.279l-1.333.465c.169.339.438.406.736.302a.643.643 0 00.412-.398l.439.152zm-1.367-.955c-.246.086-.361.279-.327.547l.877-.306a.419.419 0 00-.55-.241zm1.91 1.113l-.665-1.903.48-.168.052.151a.823.823 0 01.484-.423c.411-.144.839.025 1.035.588l.396 1.132-.483.169-.389-1.114c-.089-.253-.288-.361-.522-.28-.241.085-.313.292-.343.438l.434 1.242-.479.168zm2.205-1.55l-.272-.778-.355.124-.15-.43.355-.124-.166-.476.483-.169.166.476.582-.203.15.43-.581.203.271.778c.074.212.216.255.405.189a.788.788 0 00.269-.14l.146.419a.928.928 0 01-.345.188c-.476.167-.796-.022-.958-.487zm1.198-2.147a.337.337 0 01-.423-.204.337.337 0 01.204-.423.333.333 0 01.219.627zm.539 2.32l-.665-1.903.48-.168.665 1.904-.48.167zm.156-2.19l.355-.124-.07-.2c-.141-.404.013-.822.489-.989a.995.995 0 01.479-.048l-.064.471a.412.412 0 00-.257.005c-.162.057-.228.207-.168.381l.074.211.582-.203.15.431-.581.203.514 1.473-.483.169-.515-1.473-.355.124-.15-.431zm1.905-1.038a.337.337 0 01-.423-.204.337.337 0 01.204-.423.333.333 0 01.219.627zm.539 2.32l-.665-1.903.48-.168.664 1.904-.479.167zm2.699-1.29c-.095.3-.338.55-.697.675-.676.237-1.222-.102-1.416-.657-.196-.563-.003-1.152.62-1.369.528-.185 1.001.053 1.175.551.037.106.056.209.064.279l-1.334.465c.17.339.439.406.737.302a.643.643 0 00.412-.398l.439.152zm-1.368-.954c-.245.085-.36.278-.326.546l.876-.306a.417.417 0 00-.55-.24zm1.91 1.112l-.664-1.903.479-.168.066.189a.725.725 0 01.423-.402.588.588 0 01.176-.032l.165.472a.895.895 0 00-.221.048.552.552 0 00-.37.409l.426 1.219-.48.168zm3.519-2.152l-.378-1.08.484-.169.369 1.057c.199.57-.01 1.038-.569 1.233-.559.195-1.01-.041-1.21-.612l-.369-1.057.484-.169.377 1.08c.096.276.299.396.563.303.261-.091.345-.311.249-.586zm1.301.469l-.664-1.904.479-.167.053.151a.816.816 0 01.484-.423c.411-.144.839.025 1.035.587l.396 1.133-.484.169-.389-1.114c-.088-.253-.287-.362-.521-.28-.242.085-.313.292-.343.438l.434 1.242-.48.168zm1.791-2.117c-.04-.116-.037-.208.01-.275a.39.39 0 01.206-.152.388.388 0 01.251-.008c.079.024.139.093.179.209.039.111.036.202-.01.275a.384.384 0 01-.201.151.396.396 0 01-.256.008c-.08-.028-.14-.098-.179-.208zm3.257.006c-.094.3-.337.55-.696.676-.676.236-1.222-.103-1.416-.658-.197-.563-.004-1.151.619-1.369.529-.185 1.002.053 1.176.551.037.106.056.209.063.279l-1.333.465c.169.34.439.407.737.302a.646.646 0 00.412-.398l.438.152zm-1.367-.954c-.245.085-.36.278-.326.546l.876-.306a.417.417 0 00-.55-.24zm3.264-1.835l-.46.161.173-.764.521-.182-.234.785zm1.308 1.67c-.094.3-.337.55-.696.675-.676.236-1.222-.102-1.416-.658-.197-.562-.004-1.151.619-1.368.529-.185 1.001.052 1.175.551.037.106.057.209.064.279l-1.333.465c.169.339.438.406.737.302a.644.644 0 00.411-.398l.439.152zm-1.367-.955c-.246.086-.361.279-.326.546l.876-.306a.419.419 0 00-.55-.24zm1.91 1.113l-.989-2.832.479-.168.989 2.832-.479.168zm2.021-1.63l-.377-1.08.483-.168.369 1.057c.199.57-.01 1.037-.569 1.233-.559.195-1.01-.042-1.209-.612l-.37-1.057.484-.169.377 1.08c.096.276.299.395.563.303.261-.091.345-.311.249-.587zm1.638-2.122l-.461.16.174-.764.521-.182-.234.786zm1.308 1.67c-.095.3-.338.55-.697.675-.676.236-1.222-.103-1.416-.658-.196-.562-.003-1.151.62-1.369.528-.184 1.001.053 1.175.552.037.105.056.209.064.278l-1.334.466c.17.339.439.406.737.302a.648.648 0 00.412-.398l.439.152zm-1.368-.955c-.245.086-.36.279-.326.546l.876-.306a.417.417 0 00-.55-.24zm1.91 1.113l-.664-1.904.479-.167.066.189a.725.725 0 01.423-.402.558.558 0 01.176-.032l.165.472a.851.851 0 00-.221.048.55.55 0 00-.37.408l.426 1.22-.48.168zm3.098-1.429c-.095.299-.338.55-.697.675-.676.236-1.222-.103-1.416-.658-.196-.563-.004-1.151.619-1.369.529-.184 1.002.053 1.176.552.037.105.056.209.063.278l-1.333.466c.17.339.439.406.737.302a.65.65 0 00.412-.398l.439.152zm-1.368-.955c-.245.086-.36.278-.326.546l.876-.306a.417.417 0 00-.55-.24zm1.91 1.112l-.664-1.903.479-.167.053.151a.814.814 0 01.483-.423c.412-.144.84.024 1.036.587l.396 1.133-.484.169-.389-1.114c-.088-.253-.287-.362-.521-.28-.242.084-.313.292-.343.438l.434 1.242-.48.167zm2.205-1.549l-.271-.778-.355.124-.151-.431.355-.124-.166-.476.484-.168.166.475.581-.203.151.431-.582.203.272.778c.074.211.216.255.405.189a.786.786 0 00.269-.141l.146.42a.95.95 0 01-.345.188c-.476.166-.796-.023-.959-.487zm1.202-1.132c-.041-.115-.038-.207.01-.274a.384.384 0 01.205-.152.384.384 0 01.252-.008c.078.023.138.093.178.209.039.111.036.202-.01.275a.382.382 0 01-.201.15.39.39 0 01-.256.009c-.08-.028-.14-.098-.178-.209zm3.256.007c-.094.3-.337.55-.696.675-.676.236-1.222-.103-1.416-.658-.196-.562-.004-1.151.619-1.368.529-.185 1.002.052 1.176.551.037.106.056.209.063.279l-1.333.465c.17.339.439.406.737.302a.646.646 0 00.412-.398l.438.152zm-1.367-.955c-.245.086-.36.279-.326.546l.876-.306a.418.418 0 00-.55-.24z"
+        ></path>
+        <g filter="url(#filter2_d_523_1843)">
+          <rect
+            width="45.065"
+            height="20.042"
+            x="174.117"
+            y="94.636"
+            fill="url(#paint4_linear_523_1843)"
+            stroke="#F0F0FE"
+            strokeWidth="0.225"
+            rx="2.141"
+            transform="rotate(-2.116 174.117 94.636)"
+          ></rect>
+          <rect
+            width="29.605"
+            height="1.861"
+            x="178.866"
+            y="106.558"
+            fill="#C3C3FB"
+            rx="0.931"
+            transform="rotate(-2.116 178.866 106.558)"
+          ></rect>
           <rect
-            x="149"
-            y="317.855"
-            width="229"
-            height="5"
-            fill="#426FA3"
-            fillOpacity="0.6"
-          />
+            width="13.919"
+            height="1.861"
+            x="178.774"
+            y="104.078"
+            fill="#F4F5FD"
+            rx="0.931"
+            transform="rotate(-2.116 178.774 104.078)"
+          ></rect>
+          <rect
+            width="3.756"
+            height="1.861"
+            x="212.583"
+            y="97.655"
+            fill="#7CD4A5"
+            rx="0.931"
+            transform="rotate(-2.116 212.583 97.655)"
+          ></rect>
+          <rect
+            width="22.756"
+            height="1.861"
+            x="178.973"
+            y="109.451"
+            fill="#F4F5FD"
+            rx="0.931"
+            transform="rotate(-2.116 178.973 109.451)"
+          ></rect>
+          <path
+            fill="#3F72B5"
+            d="M179.093 100.653l-.056-1.523.309-.011.056 1.523-.309.011zm.584-.571c-.012-.32.189-.6.535-.612a.452.452 0 01.345.118l-.023-.622.278-.01.06 1.631-.278.01-.003-.087a.455.455 0 01-.335.144c-.346.012-.567-.252-.579-.572zm.29-.01c.007.191.132.326.319.319a.36.36 0 00.294-.163l-.013-.357a.36.36 0 00-.306-.141c-.187.007-.301.15-.294.342zm2.239.287a.581.581 0 01-.47.24c-.389.014-.619-.25-.631-.569-.012-.325.183-.6.542-.613.304-.011.512.188.523.475a.734.734 0 01-.012.155l-.768.029c.034.203.163.281.335.275a.354.354 0 00.278-.141l.203.149zm-.558-.715c-.141.005-.232.087-.257.231l.505-.018a.228.228 0 00-.248-.213zm.815.884l-.04-1.096.276-.01.003.087a.448.448 0 01.32-.143c.237-.008.432.148.444.472l.024.652-.278.011-.024-.642c-.005-.146-.091-.234-.226-.23-.139.006-.21.102-.249.173l.027.716-.277.01zm1.396-.452l-.017-.448-.204.007-.009-.248.204-.007-.01-.274.278-.01.011.273.335-.012.009.248-.335.013.016.448c.005.122.072.167.181.163a.426.426 0 00.162-.03l.009.241a.51.51 0 01-.21.043c-.274.01-.41-.139-.42-.407zm.967-.925a.183.183 0 01-.187-.173.183.183 0 01.174-.188.181.181 0 01.013.361zm-.091 1.293l-.041-1.096.276-.01.041 1.096-.276.01zm.432-1.113l.204-.008-.004-.115c-.009-.233.139-.426.413-.436.1-.004.186.017.257.051l-.109.235a.221.221 0 00-.134-.038c-.094.003-.152.07-.149.17l.005.123.335-.013.009.248-.335.013.031.848-.278.01-.032-.848-.204.008-.009-.248zm1.157-.235a.182.182 0 01-.187-.174.183.183 0 01.174-.187.181.181 0 01.185.174.182.182 0 01-.172.187zm-.092 1.293l-.04-1.096.276-.01.041 1.096-.277.01zm1.611-.238a.583.583 0 01-.471.24c-.389.014-.619-.25-.631-.57-.012-.324.183-.599.542-.612.305-.011.512.188.523.475a.678.678 0 01-.012.155l-.768.029c.034.203.163.281.335.275a.355.355 0 00.278-.141l.204.149zm-.558-.716c-.142.005-.232.087-.257.232l.504-.019a.227.227 0 00-.247-.213zm.815.885l-.041-1.096.277-.01.004.108a.393.393 0 01.284-.141.301.301 0 01.096.012l.01.272a.476.476 0 00-.122-.011.3.3 0 00-.258.153l.026.703-.276.01zm2.175-.555l-.023-.622.278-.01.023.609c.012.328-.172.537-.494.549-.322.012-.519-.183-.531-.512l-.022-.609.278-.01.023.622c.006.159.092.254.244.248.151-.005.23-.106.224-.265zm.602.453l-.041-1.097.276-.01.004.087a.443.443 0 01.319-.143c.237-.008.432.148.444.472l.024.653-.278.01-.024-.642c-.005-.146-.091-.234-.226-.229-.139.005-.21.101-.249.173l.027.715-.276.011zm1.27-.814c-.002-.067.014-.114.05-.141a.213.213 0 01.131-.047.209.209 0 01.132.037c.037.025.057.07.06.137.002.064-.015.11-.05.141a.209.209 0 01-.129.046.213.213 0 01-.134-.036c-.037-.028-.057-.073-.06-.137zm1.693.525a.582.582 0 01-.47.24c-.39.014-.619-.25-.631-.57-.012-.323.183-.599.541-.612.305-.011.513.188.523.475a.686.686 0 01-.011.156l-.768.028c.033.203.163.281.335.275a.353.353 0 00.278-.141l.203.15zm-.558-.715c-.141.005-.232.087-.257.231l.505-.018a.228.228 0 00-.248-.213zm1.992-.431l-.265.01.213-.37.3-.011-.248.37zm.413 1.078a.585.585 0 01-.471.24c-.389.014-.619-.25-.631-.57-.012-.324.183-.599.542-.612.304-.011.512.188.523.475a.74.74 0 01-.012.155l-.768.029c.034.203.163.281.335.275a.353.353 0 00.278-.141l.204.15zm-.558-.716c-.142.006-.233.087-.258.232l.505-.018a.227.227 0 00-.247-.214zm.815.885l-.061-1.631.277-.01.06 1.631-.276.01zm1.312-.523l-.023-.622.278-.01.023.609c.012.328-.172.537-.494.549-.322.012-.519-.183-.531-.512l-.022-.609.278-.01.023.622c.006.159.092.254.245.248.15-.005.229-.106.223-.265zm1.192-.842l-.265.01.213-.37.3-.01-.248.37zm.413 1.079a.584.584 0 01-.471.24c-.389.014-.619-.25-.631-.57-.012-.324.183-.6.542-.612.304-.012.512.188.523.475a.74.74 0 01-.012.155l-.768.028c.034.204.163.282.335.276a.353.353 0 00.278-.142l.204.15zm-.558-.716c-.142.005-.232.087-.258.232l.505-.019a.227.227 0 00-.247-.213zm.815.885l-.041-1.096.276-.01.004.108a.395.395 0 01.285-.141.298.298 0 01.096.012l.01.272a.471.471 0 00-.122-.011.3.3 0 00-.258.153l.026.703-.276.01zm1.839-.247a.58.58 0 01-.47.24c-.389.014-.619-.25-.631-.57-.012-.323.183-.599.542-.612.304-.011.512.188.523.475a.74.74 0 01-.012.156l-.768.028c.034.203.163.281.335.275a.353.353 0 00.278-.141l.203.15zm-.557-.715c-.142.005-.233.087-.258.231l.505-.018a.227.227 0 00-.247-.213zm.814.885l-.04-1.097.276-.01.003.087a.448.448 0 01.32-.143c.237-.008.432.148.444.472l.024.653-.278.01-.024-.642c-.005-.146-.091-.234-.226-.229-.139.005-.21.101-.249.173l.027.715-.277.01zm1.396-.453l-.017-.448-.204.007-.009-.247.204-.008-.01-.274.279-.01.01.274.335-.013.009.248-.335.013.016.448c.005.122.072.167.181.163a.426.426 0 00.162-.03l.009.242a.516.516 0 01-.21.042c-.274.01-.41-.14-.42-.407zm.806-.396c-.002-.066.014-.113.049-.14a.213.213 0 01.131-.047.209.209 0 01.132.036c.038.025.058.07.06.138.002.063-.014.11-.049.14a.209.209 0 01-.129.047.213.213 0 01-.134-.036c-.038-.028-.058-.074-.06-.138zm1.693.526a.583.583 0 01-.471.24c-.389.014-.619-.25-.631-.57-.012-.324.183-.599.542-.612.305-.011.512.188.523.475a.678.678 0 01-.012.155l-.768.028c.034.204.163.282.335.276a.352.352 0 00.278-.141l.204.149zm-.558-.716c-.142.005-.232.087-.257.232l.504-.019a.227.227 0 00-.247-.213z"
+          ></path>
         </g>
-        <path
-          d="M228.26 344.835H178.91L179.43 348.405C185.48 390.835 221.82 422.355 264.69 422.335H348.44C350.43 422.345 352.41 422.115 354.34 421.645L352.49 434.605C350.64 447.315 339.76 456.755 326.91 456.785H190.84C177.99 456.755 167.11 447.325 165.26 434.605L151.22 336.225H366.52L365.27 344.835H265.11C265.22 346.015 265.08 347.205 264.68 348.325C263.13 352.815 258.24 355.205 253.74 353.665L228.26 344.835Z"
-          fill="#8589E3"
-        />
-        <path
-          d="M142.61 319.005H375.13C379.89 319.005 383.74 322.865 383.74 327.615C383.74 332.375 379.88 336.225 375.13 336.225H142.61C137.86 336.225 134 332.365 134 327.615C134 322.855 137.86 319.005 142.61 319.005Z"
-          fill="#DDDFFF"
-        />
-        <path
-          d="M258.87 370.675C263.63 370.675 267.48 374.535 267.48 379.285V430.955C267.48 435.715 263.62 439.565 258.87 439.565C254.11 439.565 250.26 435.705 250.26 430.955V379.285C250.26 374.525 254.12 370.675 258.87 370.675Z"
-          fill="#47479F"
-        />
-        <path
-          d="M293.32 370.675C298.08 370.675 301.93 374.535 301.93 379.285V430.955C301.93 435.715 298.07 439.565 293.32 439.565C288.56 439.565 284.71 435.705 284.71 430.955V379.285C284.71 374.525 288.56 370.675 293.32 370.675Z"
-          fill="#47479F"
-        />
-        <path
-          d="M189.98 370.675C194.74 370.675 198.59 374.535 198.59 379.285V430.955C198.59 435.715 194.73 439.565 189.98 439.565C185.22 439.565 181.37 435.705 181.37 430.955V379.285C181.36 374.525 185.22 370.675 189.98 370.675Z"
-          fill="#47479F"
-        />
-        <path
-          d="M224.42 370.675C229.18 370.675 233.03 374.535 233.03 379.285V430.955C233.03 435.715 229.17 439.565 224.42 439.565C219.66 439.565 215.81 435.705 215.81 430.955V379.285C215.81 374.525 219.67 370.675 224.42 370.675Z"
-          fill="#47479F"
-        />
-        <path
-          d="M383.74 327.615C383.7 332.355 379.87 336.195 375.13 336.225H142.61C137.86 336.215 134.01 332.365 134 327.615C134.04 322.875 137.87 319.035 142.61 319.005H143.94C144.34 323.445 148.05 326.865 152.51 326.885H196.9L174.12 319.005H261.23L262.09 319.305C276.59 324.305 291.83 326.875 307.17 326.885H383.69C383.74 327.125 383.75 327.365 383.74 327.615Z"
-          fill="#9498F6"
-        />
-        <path
-          d="M138.77 294.655C140.33 290.165 145.23 287.775 149.72 289.335L263.66 328.755C268.15 330.315 270.54 335.215 268.98 339.705C267.42 344.195 262.52 346.585 258.03 345.025L144.09 305.605C139.6 304.055 137.22 299.145 138.77 294.655Z"
-          fill="#DDDFFF"
-        />
-        <path
-          d="M268.99 339.715C267.44 344.205 262.55 346.595 258.05 345.055L144.12 305.615C140.24 304.295 137.84 300.415 138.39 296.355C138.84 296.625 139.32 296.835 139.81 297.005L253.74 336.445C258.23 337.985 263.13 335.595 264.68 331.105C264.85 330.555 264.98 329.995 265.07 329.425C268.7 331.445 270.36 335.785 268.99 339.715Z"
-          fill="#9498F6"
-        />
-        <rect
-          x="338.684"
-          y="348.358"
-          width="12.4"
-          height="15.4"
-          rx="1.7"
-          transform="rotate(12.475 338.684 348.358)"
-          fill="url(#pattern0)"
-          fillOpacity="0.8"
-          stroke="#6A6DB6"
-          strokeWidth="0.6"
-        />
-      </g>
-      <path
-        d="M223.47 241.894C224.107 241.346 225.073 241.933 224.88 242.751L224.624 243.832C224.538 244.198 224.697 244.577 225.018 244.773L225.967 245.35C226.685 245.786 226.425 246.886 225.588 246.955L224.48 247.046C224.106 247.077 223.794 247.345 223.708 247.711L223.452 248.793C223.259 249.61 222.132 249.703 221.808 248.928L221.379 247.903C221.234 247.556 220.882 247.342 220.508 247.373L219.4 247.464C218.563 247.533 218.127 246.49 218.764 245.943L219.606 245.218C219.891 244.973 219.986 244.572 219.841 244.226L219.412 243.201C219.088 242.426 219.944 241.688 220.662 242.125L221.612 242.702C221.933 242.897 222.343 242.864 222.628 242.619L223.47 241.894Z"
-        fill="#FECD8C"
-      />
-      <path
-        d="M406.931 214.063C408.183 212.985 410.083 214.14 409.703 215.748C409.533 216.468 409.846 217.214 410.477 217.598C411.889 218.457 411.378 220.62 409.731 220.756C408.994 220.816 408.381 221.344 408.211 222.063C407.831 223.671 405.615 223.854 404.977 222.329C404.692 221.648 404 221.227 403.264 221.288C401.617 221.423 400.759 219.372 402.012 218.295C402.572 217.813 402.758 217.025 402.473 216.343C401.835 214.819 403.52 213.369 404.932 214.227C405.564 214.611 406.371 214.545 406.931 214.063Z"
-        fill="white"
-      />
-      <path
-        d="M373.47 257.894C374.107 257.346 375.073 257.933 374.88 258.751L374.624 259.832C374.538 260.198 374.697 260.577 375.018 260.773L375.967 261.35C376.685 261.786 376.425 262.886 375.588 262.955L374.48 263.046C374.106 263.077 373.794 263.345 373.708 263.711L373.452 264.793C373.259 265.61 372.132 265.703 371.808 264.928L371.379 263.903C371.234 263.556 370.882 263.342 370.508 263.373L369.4 263.464C368.563 263.533 368.127 262.49 368.764 261.943L369.606 261.218C369.891 260.973 369.986 260.572 369.841 260.226L369.412 259.201C369.088 258.426 369.944 257.688 370.662 258.125L371.612 258.702C371.933 258.897 372.343 258.864 372.628 258.619L373.47 257.894Z"
-        fill="#FECD8C"
-      />
-      <g filter="url(#filter7_d_1506_6816)">
-        <g clipPath="url(#clip2_1506_6816)">
+        <g filter="url(#filter3_d_523_1843)">
+          <rect
+            width="45.065"
+            height="20.042"
+            x="413.62"
+            y="139.132"
+            fill="url(#paint5_linear_523_1843)"
+            stroke="#F0F0FE"
+            strokeWidth="0.225"
+            rx="2.141"
+            transform="rotate(-15.379 413.62 139.132)"
+          ></rect>
+          <rect
+            width="29.605"
+            height="1.861"
+            x="420.978"
+            y="149.646"
+            fill="#C3C3FB"
+            rx="0.931"
+            transform="rotate(-15.379 420.978 149.646)"
+          ></rect>
+          <rect
+            width="13.919"
+            height="1.861"
+            x="420.32"
+            y="147.253"
+            fill="#F4F5FD"
+            rx="0.931"
+            transform="rotate(-15.379 420.32 147.253)"
+          ></rect>
+          <rect
+            width="3.756"
+            height="1.861"
+            x="451.754"
+            y="133.245"
+            fill="#7CD4A5"
+            rx="0.931"
+            transform="rotate(-15.379 451.754 133.245)"
+          ></rect>
+          <rect
+            width="22.756"
+            height="1.861"
+            x="421.746"
+            y="152.438"
+            fill="#F4F5FD"
+            rx="0.931"
+            transform="rotate(-15.379 421.746 152.438)"
+          ></rect>
           <path
-            d="M101 383C101 377.477 105.477 373 111 373H206C211.523 373 216 377.477 216 383V397C216 402.523 211.523 407 206 407H111C105.477 407 101 402.523 101 397V383Z"
-            fill="white"
-          />
+            fill="#3F72B5"
+            d="M419.844 143.846l-.404-1.469.298-.082.404 1.469-.298.082zm.438-.689c-.085-.309.047-.627.38-.719a.453.453 0 01.362.036l-.165-.6.269-.074.433 1.574-.269.074-.023-.084a.447.447 0 01-.293.216c-.333.092-.609-.114-.694-.423zm.279-.077c.051.185.203.288.384.238a.36.36 0 00.249-.227l-.095-.344a.357.357 0 00-.33-.067c-.18.049-.259.215-.208.4zm2.246-.234a.577.577 0 01-.403.341c-.375.104-.66-.1-.745-.409-.086-.313.041-.625.387-.72.294-.081.542.065.618.342a.692.692 0 01.024.154l-.741.204c.08.19.224.236.389.191a.354.354 0 00.239-.201l.232.098zm-.707-.568c-.137.037-.206.138-.197.284l.487-.134a.227.227 0 00-.29-.15zm.996.674l-.291-1.058.267-.073.023.084a.441.441 0 01.278-.212c.229-.063.455.044.541.357l.173.629-.269.074-.17-.619c-.039-.141-.143-.207-.273-.171-.134.037-.181.147-.202.225l.19.691-.267.073zm1.255-.761l-.119-.432-.198.054-.066-.239.198-.054-.073-.265.269-.074.072.265.324-.089.066.239-.324.089.119.433c.033.117.108.146.213.117a.425.425 0 00.151-.066l.064.233a.517.517 0 01-.194.089c-.265.073-.431-.041-.502-.3zm.729-1.121a.183.183 0 01-.222-.127.183.183 0 01.126-.222.181.181 0 01.096.349zm.207 1.279l-.291-1.058.267-.073.291 1.058-.267.073zm.166-1.183l.197-.054-.031-.112c-.062-.224.038-.446.302-.519a.547.547 0 01.262-.008l-.052.253a.224.224 0 00-.14-.006c-.09.024-.131.104-.105.2l.033.118.323-.089.066.239-.324.089.226.819-.269.074-.225-.819-.198.054-.065-.239zm1.072-.494a.183.183 0 01-.222-.126.183.183 0 01.126-.222.18.18 0 01.096.348zm.208 1.28l-.291-1.058.266-.073.291 1.057-.266.074zm1.512-.601a.582.582 0 01-.402.341c-.376.103-.66-.101-.745-.41-.086-.312.04-.625.386-.72.294-.081.542.065.618.342a.703.703 0 01.025.154l-.741.204c.079.19.223.237.389.191a.354.354 0 00.238-.201l.232.099zm-.707-.569c-.136.037-.206.138-.197.284l.487-.134a.228.228 0 00-.29-.15zm.996.674l-.291-1.058.267-.073.029.105a.392.392 0 01.244-.203.317.317 0 01.097-.011l.072.263a.5.5 0 00-.122.017.302.302 0 00-.216.209l.187.678-.267.073zm1.99-1.039l-.165-.601.268-.073.162.587c.087.317-.044.563-.354.649-.311.085-.547-.06-.635-.377l-.161-.588.268-.073.166.6c.042.153.147.226.294.185.145-.04.199-.156.157-.309zm.69.302l-.291-1.058.266-.073.023.084a.447.447 0 01.278-.212c.229-.063.455.044.541.357l.173.63-.268.074-.171-.62c-.038-.14-.142-.206-.273-.171-.134.037-.18.147-.202.225l.19.691-.266.073zm1.05-1.083c-.018-.065-.013-.114.015-.149a.217.217 0 01.117-.075.206.206 0 01.137.005c.042.016.072.056.09.12.017.061.012.111-.016.149a.205.205 0 01-.115.074.219.219 0 01-.139-.004c-.042-.019-.072-.059-.089-.12zm1.768.123a.581.581 0 01-.403.341c-.375.103-.66-.101-.745-.409-.086-.313.041-.626.387-.721.294-.081.542.066.618.343a.685.685 0 01.024.153l-.741.204c.08.191.224.237.389.191a.351.351 0 00.239-.201l.232.099zm-.707-.569c-.137.038-.206.138-.197.285l.487-.134a.228.228 0 00-.29-.151zm1.84-.876l-.256.07.122-.408.29-.08-.156.418zm.648.955a.582.582 0 01-.402.341c-.376.103-.66-.101-.745-.409-.086-.313.04-.625.386-.721.294-.081.542.066.618.343a.695.695 0 01.025.153l-.741.204c.079.191.223.237.389.191a.351.351 0 00.238-.201l.232.099zm-.707-.569c-.136.038-.206.138-.197.285l.487-.134a.228.228 0 00-.29-.151zm.996.675l-.433-1.575.267-.073.433 1.574-.267.074zm1.158-.811l-.165-.6.268-.074.162.588c.087.317-.044.563-.355.648-.31.085-.547-.06-.634-.377l-.161-.587.268-.074.165.6c.043.153.148.226.295.186.145-.04.199-.157.157-.31zm.967-1.092l-.256.07.123-.408.289-.08-.156.418zm.649.955a.583.583 0 01-.403.341c-.376.103-.66-.101-.745-.41-.086-.312.041-.625.387-.72.294-.081.542.065.618.342a.692.692 0 01.024.154l-.741.204c.08.19.223.237.389.191a.35.35 0 00.238-.201l.233.099zm-.707-.569c-.137.038-.206.138-.198.285l.487-.134a.226.226 0 00-.289-.151zm.996.674l-.291-1.058.267-.073.028.105c.05-.09.125-.17.245-.203a.283.283 0 01.096-.01l.072.262a.454.454 0 00-.121.018.298.298 0 00-.216.208l.186.678-.266.073zm1.734-.662a.581.581 0 01-.403.341c-.375.104-.66-.101-.744-.409-.087-.313.04-.625.386-.721.294-.08.542.066.618.343a.692.692 0 01.024.154l-.741.203c.08.191.224.237.389.192a.354.354 0 00.239-.201l.232.098zm-.707-.569c-.137.038-.206.138-.197.285l.487-.134a.229.229 0 00-.29-.151zm.996.675l-.291-1.058.267-.073.023.083a.443.443 0 01.278-.211c.229-.063.455.044.541.357l.173.629-.269.074-.17-.619c-.039-.141-.143-.207-.273-.171-.134.037-.181.147-.202.225l.19.69-.267.074zm1.255-.761l-.119-.432-.198.054-.066-.239.198-.054-.073-.265.269-.074.072.265.324-.089.066.239-.324.089.119.432c.033.118.108.147.213.118a.425.425 0 00.151-.066l.064.233a.517.517 0 01-.194.089c-.265.073-.431-.042-.502-.3zm.693-.57c-.017-.064-.012-.114.016-.149a.217.217 0 01.117-.075.213.213 0 01.137.006c.042.015.072.055.089.119.017.062.012.112-.015.149a.216.216 0 01-.115.075.212.212 0 01-.139-.005c-.043-.018-.073-.058-.09-.12zm1.769.123a.584.584 0 01-.403.342c-.376.103-.66-.101-.745-.41-.086-.313.04-.625.387-.72.293-.081.541.065.618.342a.757.757 0 01.024.154l-.741.204c.079.19.223.236.389.191a.354.354 0 00.238-.201l.233.098zm-.708-.568c-.136.037-.206.138-.197.284l.487-.134a.228.228 0 00-.29-.15z"
+          ></path>
+        </g>
+        <g filter="url(#filter4_d_523_1843)">
+          <rect
+            width="45.065"
+            height="20.042"
+            x="91.2"
+            y="79.148"
+            fill="url(#paint6_linear_523_1843)"
+            stroke="#F0F0FE"
+            strokeWidth="0.225"
+            rx="2.141"
+            transform="rotate(23.687 91.2 79.148)"
+          ></rect>
+          <rect
+            width="29.605"
+            height="1.861"
+            x="90.287"
+            y="91.949"
+            fill="#C3C3FB"
+            rx="0.931"
+            transform="rotate(23.687 90.287 91.949)"
+          ></rect>
+          <rect
+            width="13.919"
+            height="1.861"
+            x="91.284"
+            y="89.676"
+            fill="#F4F5FD"
+            rx="0.931"
+            transform="rotate(23.687 91.284 89.676)"
+          ></rect>
+          <rect
+            width="3.756"
+            height="1.861"
+            x="124.518"
+            y="98.61"
+            fill="#7CD4A5"
+            rx="0.931"
+            transform="rotate(23.687 124.518 98.61)"
+          ></rect>
+          <rect
+            width="22.756"
+            height="1.861"
+            x="89.124"
+            y="94.6"
+            fill="#F4F5FD"
+            rx="0.931"
+            transform="rotate(23.687 89.124 94.6)"
+          ></rect>
           <path
-            d="M122.236 395V386.6H125.536C128.2 386.6 130 388.532 130 390.8C130 393.068 128.2 395 125.536 395H122.236ZM125.56 388.148H123.94V393.452H125.56C127.12 393.452 128.248 392.288 128.248 390.8C128.248 389.3 127.12 388.148 125.56 388.148ZM134.991 387.992H133.527L134.775 386H136.431L134.991 387.992ZM137.043 394.016C136.479 394.772 135.543 395.24 134.403 395.24C132.255 395.24 131.043 393.74 131.043 391.976C131.043 390.188 132.171 388.712 134.151 388.712C135.831 388.712 136.935 389.852 136.935 391.436C136.935 391.772 136.887 392.084 136.839 392.288H132.603C132.747 393.416 133.443 393.872 134.391 393.872C135.051 393.872 135.627 393.584 135.951 393.152L137.043 394.016ZM134.115 389.96C133.335 389.96 132.819 390.392 132.651 391.184H135.435C135.411 390.572 134.967 389.96 134.115 389.96ZM139.168 387.896C138.628 387.896 138.172 387.44 138.172 386.9C138.172 386.36 138.628 385.904 139.168 385.904C139.696 385.904 140.152 386.36 140.152 386.9C140.152 387.44 139.696 387.896 139.168 387.896ZM139.948 395.648C139.948 397.16 139.24 398 137.716 398C137.212 398 136.864 397.94 136.564 397.808V396.476C136.756 396.56 137.044 396.608 137.464 396.608C138.064 396.608 138.424 396.344 138.424 395.648V388.952H139.948V395.648ZM143.443 387.992L142.003 386H143.659L144.895 387.992H143.443ZM143.479 395.18C142.267 395.18 141.439 394.484 141.439 393.368C141.439 392.456 142.147 391.772 143.443 391.556L145.291 391.244V391.088C145.291 390.452 144.811 390.044 144.115 390.044C143.527 390.044 143.071 390.32 142.747 390.764L141.631 389.912C142.171 389.168 143.059 388.712 144.163 388.712C145.915 388.712 146.815 389.756 146.815 391.088V395H145.291V394.412C144.907 394.88 144.187 395.18 143.479 395.18ZM142.951 393.296C142.951 393.704 143.275 393.968 143.791 393.968C144.487 393.968 144.991 393.644 145.291 393.164V392.312L143.851 392.552C143.215 392.66 142.951 392.924 142.951 393.296ZM151.795 395V388.952H153.319V389.552C153.715 389.144 154.231 388.832 154.915 388.832C155.119 388.832 155.299 388.868 155.443 388.916V390.416C155.251 390.368 155.047 390.332 154.771 390.332C154.027 390.332 153.547 390.74 153.319 391.124V395H151.795ZM159.928 387.992H158.464L159.712 386H161.368L159.928 387.992ZM161.98 394.016C161.416 394.772 160.48 395.24 159.34 395.24C157.192 395.24 155.98 393.74 155.98 391.976C155.98 390.188 157.108 388.712 159.088 388.712C160.768 388.712 161.872 389.852 161.872 391.436C161.872 391.772 161.824 392.084 161.776 392.288H157.54C157.684 393.416 158.38 393.872 159.328 393.872C159.988 393.872 160.564 393.584 160.888 393.152L161.98 394.016ZM159.052 389.96C158.272 389.96 157.756 390.392 157.588 391.184H160.372C160.348 390.572 159.904 389.96 159.052 389.96ZM164.983 395.18C163.771 395.18 162.943 394.484 162.943 393.368C162.943 392.456 163.651 391.772 164.947 391.556L166.795 391.244V391.088C166.795 390.452 166.315 390.044 165.619 390.044C165.031 390.044 164.575 390.32 164.251 390.764L163.135 389.912C163.675 389.168 164.563 388.712 165.667 388.712C167.419 388.712 168.319 389.756 168.319 391.088V395H166.795V394.412C166.411 394.88 165.691 395.18 164.983 395.18ZM164.455 393.296C164.455 393.704 164.779 393.968 165.295 393.968C165.991 393.968 166.495 393.644 166.795 393.164V392.312L165.355 392.552C164.719 392.66 164.455 392.924 164.455 393.296ZM170.064 395V386H171.588V395H170.064ZM174.184 387.896C173.644 387.896 173.188 387.44 173.188 386.9C173.188 386.36 173.644 385.904 174.184 385.904C174.724 385.904 175.168 386.36 175.168 386.9C175.168 387.44 174.724 387.896 174.184 387.896ZM173.416 395V388.952H174.94V395H173.416ZM176.157 394.124L177.165 393.212C177.537 393.68 177.981 394.016 178.557 394.016C179.049 394.016 179.301 393.728 179.301 393.368C179.301 392.312 176.409 392.708 176.409 390.584C176.409 389.516 177.309 388.712 178.569 388.712C179.493 388.712 180.333 389.156 180.765 389.744L179.757 390.632C179.445 390.248 179.049 389.936 178.581 389.936C178.101 389.936 177.873 390.2 177.873 390.512C177.873 391.544 180.765 391.184 180.765 393.272C180.741 394.544 179.721 395.24 178.581 395.24C177.501 395.24 176.733 394.808 176.157 394.124ZM185.662 387.992H184.198L185.446 386H187.102L185.662 387.992ZM187.714 394.016C187.15 394.772 186.214 395.24 185.074 395.24C182.926 395.24 181.714 393.74 181.714 391.976C181.714 390.188 182.842 388.712 184.822 388.712C186.502 388.712 187.606 389.852 187.606 391.436C187.606 391.772 187.558 392.084 187.51 392.288H183.274C183.418 393.416 184.114 393.872 185.062 393.872C185.722 393.872 186.298 393.584 186.622 393.152L187.714 394.016ZM184.786 389.96C184.006 389.96 183.49 390.392 183.322 391.184H186.106C186.082 390.572 185.638 389.96 184.786 389.96ZM194.617 394.016C194.053 394.772 193.117 395.24 191.977 395.24C189.829 395.24 188.617 393.74 188.617 391.976C188.617 390.188 189.745 388.712 191.725 388.712C193.405 388.712 194.509 389.852 194.509 391.436C194.509 391.772 194.461 392.084 194.413 392.288H190.177C190.321 393.416 191.017 393.872 191.965 393.872C192.625 393.872 193.201 393.584 193.525 393.152L194.617 394.016ZM191.689 389.96C190.909 389.96 190.393 390.392 190.225 391.184H193.009C192.985 390.572 192.541 389.96 191.689 389.96Z"
-            fill="#6A6AF4"
-          />
+            fill="#3F72B5"
+            d="M93.062 86.731l.612-1.395.283.124-.612 1.396-.283-.125zm.774-.259c.129-.293.431-.457.748-.318.136.06.215.144.259.256l.25-.57.255.111-.656 1.496-.255-.112.035-.08a.451.451 0 01-.364-.017c-.317-.139-.4-.473-.272-.766zm.265.116c-.077.176-.023.351.148.427.114.05.229.043.337-.02l.143-.326a.359.359 0 00-.214-.26c-.171-.076-.337.004-.414.18zm1.891 1.234a.582.582 0 01-.528.011c-.356-.156-.448-.494-.32-.787.13-.297.425-.46.754-.316.28.123.38.392.264.656a.71.71 0 01-.078.134l-.703-.308c-.059.197.024.324.181.393.11.048.227.042.312-.006l.118.223zm-.19-.887c-.13-.057-.247-.023-.333.096l.463.203a.227.227 0 00-.13-.3zm.348 1.151l.44-1.004.254.11-.035.08a.446.446 0 01.35.011c.217.095.325.32.194.618l-.262.598-.255-.112.258-.588c.059-.134.02-.25-.104-.305-.128-.056-.233 0-.299.047l-.288.656-.253-.11zm1.453.2l.18-.41-.187-.083.1-.227.187.082.11-.25.256.111-.11.251.306.135-.1.227-.306-.134-.18.41c-.05.112-.009.182.09.226.07.03.12.043.16.043l-.097.222a.514.514 0 01-.208-.053c-.25-.11-.308-.304-.2-.55zm1.274-.411a.183.183 0 01-.093-.238.183.183 0 01.238-.093c.09.04.13.148.09.237a.181.181 0 01-.235.094zm-.646 1.124l.441-1.004.253.11-.44 1.005-.254-.11zm.874-.814l.188.082.046-.106c.094-.213.31-.323.562-.212.091.04.159.096.208.158l-.2.164a.22.22 0 00-.104-.093c-.086-.038-.168-.003-.208.09l-.05.11.308.135-.1.228-.307-.135-.34.778-.256-.112.341-.778-.187-.082.1-.228zm1.144.292a.183.183 0 01-.093-.238.184.184 0 01.238-.093.18.18 0 01-.145.331zm-.645 1.124l.441-1.004.253.11-.441 1.006-.253-.112zm1.553.487a.58.58 0 01-.527.01c-.357-.156-.449-.493-.321-.786.131-.297.426-.46.755-.316.279.123.379.392.263.656a.674.674 0 01-.078.134l-.703-.309c-.059.198.024.325.181.394.11.048.227.042.312-.006l.118.223zm-.19-.887c-.13-.057-.247-.023-.333.096l.463.203a.228.228 0 00-.13-.3zm.348 1.151l.441-1.005.253.111-.044.1a.395.395 0 01.318-.003.315.315 0 01.082.052l-.11.25a.457.457 0 00-.105-.064.3.3 0 00-.299.026l-.283.644-.253-.11zm2.2.447l.25-.57.255.112-.245.558c-.132.3-.388.41-.684.28-.295-.13-.387-.391-.255-.692l.245-.558.255.112-.25.57c-.064.145-.027.268.112.33.138.06.253.004.317-.142zm.345.67l.441-1.005.253.11-.035.08a.444.444 0 01.349.011c.218.095.325.321.195.618l-.262.598-.255-.112.258-.588c.058-.133.019-.25-.105-.305-.127-.056-.232 0-.298.048l-.288.655-.253-.11zm1.498-.18c.027-.061.062-.096.106-.106a.212.212 0 01.138.016c.047.02.081.05.103.09.023.039.021.088-.006.15-.026.058-.061.093-.106.105a.21.21 0 01-.136-.014.212.212 0 01-.105-.092c-.022-.04-.019-.09.006-.149zm1.295 1.21a.58.58 0 01-.527.011c-.357-.157-.449-.494-.321-.787.131-.297.426-.46.755-.316.279.123.379.392.264.656a.721.721 0 01-.079.134l-.703-.309c-.059.198.024.325.181.394.11.048.227.042.312-.006l.118.223zm-.19-.887c-.13-.057-.247-.023-.333.097l.463.202a.228.228 0 00-.13-.3zm1.98.479l-.243-.107.353-.24.275.12-.385.227zm-.098 1.15a.582.582 0 01-.528.011c-.356-.156-.448-.494-.32-.787.13-.297.425-.46.754-.316.279.123.38.393.264.656a.673.673 0 01-.078.134l-.703-.308c-.059.198.024.324.181.393.11.048.227.042.312-.006l.118.223zm-.191-.887c-.129-.057-.246-.023-.332.097l.463.203a.228.228 0 00-.131-.3zm.349 1.151l.656-1.495.253.111-.656 1.496-.253-.112zm1.409.1l.25-.57.256.112-.245.558c-.132.302-.389.41-.684.28-.295-.129-.387-.39-.255-.692l.245-.558.255.112-.25.57c-.064.146-.028.269.112.33.137.06.253.004.316-.142zm1.44-.238l-.243-.107.352-.24.275.12-.384.227zm-.098 1.15a.582.582 0 01-.528.011c-.357-.156-.449-.494-.32-.787.13-.297.425-.46.754-.316.279.123.379.393.264.656a.673.673 0 01-.078.134l-.704-.308c-.058.198.024.324.182.393a.35.35 0 00.311-.006l.119.223zm-.191-.887c-.13-.057-.247-.023-.332.097l.462.203a.227.227 0 00-.13-.3zm.349 1.151l.44-1.004.254.11-.044.1a.395.395 0 01.318-.003.31.31 0 01.081.053l-.109.249a.494.494 0 00-.106-.063.3.3 0 00-.299.026l-.282.644-.253-.112zm1.763.58a.58.58 0 01-.527.01c-.357-.156-.449-.494-.321-.787.131-.297.426-.46.755-.316.279.123.379.393.264.656a.786.786 0 01-.078.134l-.704-.308c-.059.198.024.324.181.393.11.048.227.042.312-.006l.118.223zm-.19-.888c-.13-.057-.247-.023-.333.097l.463.203a.228.228 0 00-.13-.3zm.348 1.151l.441-1.004.253.11-.035.08a.447.447 0 01.35.011c.217.096.325.321.195.618l-.263.598-.255-.112.258-.588c.059-.133.02-.25-.104-.305-.128-.056-.233 0-.299.048l-.288.656-.253-.112zm1.453.2l.181-.41-.188-.082.1-.228.187.082.11-.25.256.111-.111.252.307.134-.099.227-.307-.134-.18.41c-.049.112-.009.182.091.226.07.03.119.043.159.044l-.097.22a.507.507 0 01-.207-.052c-.252-.11-.309-.304-.202-.55zm.898-.005c.027-.061.062-.096.106-.106a.211.211 0 01.138.016c.047.02.081.05.103.09.023.039.021.088-.006.15-.025.058-.061.093-.105.105a.212.212 0 01-.137-.014.212.212 0 01-.105-.091c-.021-.042-.019-.091.006-.15zm1.296 1.21a.583.583 0 01-.528.011c-.357-.157-.449-.494-.32-.787.13-.297.425-.46.754-.316.279.123.379.392.264.656a.726.726 0 01-.078.134l-.704-.309c-.058.198.024.325.182.394a.35.35 0 00.311-.006l.119.223zm-.191-.887c-.13-.057-.247-.023-.333.097l.463.202a.227.227 0 00-.13-.3z"
+          ></path>
         </g>
-        <path
-          d="M101.5 383C101.5 377.753 105.753 373.5 111 373.5H206C211.247 373.5 215.5 377.753 215.5 383V397C215.5 402.247 211.247 406.5 206 406.5H111C105.753 406.5 101.5 402.247 101.5 397V383Z"
-          stroke="#4380F5"
-        />
-      </g>
-      <g filter="url(#filter8_d_1506_6816)">
-        <g clipPath="url(#clip3_1506_6816)">
+        <g filter="url(#filter5_d_523_1843)">
+          <rect
+            width="22.564"
+            height="10.035"
+            x="229.035"
+            y="123.934"
+            fill="url(#paint7_linear_523_1843)"
+            stroke="#F0F0FE"
+            strokeWidth="0.113"
+            rx="1.072"
+            transform="rotate(36.41 229.035 123.934)"
+          ></rect>
+          <rect
+            width="14.823"
+            height="0.932"
+            x="227.177"
+            y="130.085"
+            fill="#C3C3FB"
+            rx="0.466"
+            transform="rotate(36.41 227.177 130.085)"
+          ></rect>
+          <rect
+            width="6.969"
+            height="0.932"
+            x="227.915"
+            y="129.085"
+            fill="#F4F5FD"
+            rx="0.466"
+            transform="rotate(36.41 227.915 129.085)"
+          ></rect>
+          <rect
+            width="1.881"
+            height="0.932"
+            x="243.161"
+            y="137.113"
+            fill="#7CD4A5"
+            rx="0.466"
+            transform="rotate(36.41 243.161 137.113)"
+          ></rect>
+          <rect
+            width="11.394"
+            height="0.932"
+            x="226.317"
+            y="131.252"
+            fill="#F4F5FD"
+            rx="0.466"
+            transform="rotate(36.41 226.317 131.252)"
+          ></rect>
           <path
-            d="M434 277.619C434 273.411 437.411 270 441.619 270H506.381C510.589 270 514 273.411 514 277.619V288.286C514 292.494 510.589 295.905 506.381 295.905H441.619C437.411 295.905 434 292.494 434 288.286V277.619Z"
-            fill="#4380F5"
-          />
+            fill="#3F72B5"
+            d="M228.812 128.244l.453-.614.125.092-.453.614-.125-.092zm.407-.041c.095-.129.261-.176.401-.073a.228.228 0 01.098.153l.185-.251.112.083-.485.658-.112-.083.025-.035a.224.224 0 01-.175-.048c-.14-.103-.144-.276-.049-.404zm.117.086c-.057.077-.05.169.025.224.05.037.107.046.167.028l.106-.144a.18.18 0 00-.076-.151c-.076-.055-.165-.035-.222.043zm.787.811a.29.29 0 01-.258-.053c-.158-.116-.165-.291-.07-.42.096-.131.258-.178.403-.071.123.091.142.234.057.349a.337.337 0 01-.053.057l-.31-.228c-.05.09-.024.161.045.212a.176.176 0 00.153.032l.033.122zm.005-.455c-.057-.042-.118-.038-.173.011l.204.15a.115.115 0 00-.031-.161zm.043.601l.326-.442.112.082-.026.035a.227.227 0 01.17.044c.095.071.123.193.027.323l-.195.264-.112-.083.191-.259c.043-.059.037-.12-.017-.16-.056-.042-.114-.026-.151-.01l-.213.288-.112-.082zm.688.258l.133-.181-.082-.06.074-.1.082.06.082-.11.112.083-.082.11.135.1-.073.1-.135-.1-.134.181c-.036.049-.024.088.02.12a.219.219 0 00.073.039l-.072.097a.249.249 0 01-.095-.048c-.111-.082-.117-.183-.038-.291zm.667-.06a.093.093 0 01-.019-.127.093.093 0 01.127-.019.091.091 0 01.018.126.092.092 0 01-.126.02zm-.439.478l.326-.443.112.083-.326.442-.112-.082zm.517-.302l.082.061.035-.047c.069-.094.187-.123.297-.042.041.03.068.065.085.101l-.116.058a.108.108 0 00-.041-.057c-.037-.028-.081-.02-.111.021l-.036.049.135.099-.074.1-.135-.099-.252.342-.113-.083.253-.342-.083-.061.074-.1zm.526.269a.092.092 0 01-.019-.126.092.092 0 01.127-.02.09.09 0 01-.108.146zm-.439.478l.326-.442.112.082-.326.442-.112-.082zm.705.409a.29.29 0 01-.259-.053c-.157-.116-.164-.291-.069-.42.096-.13.258-.177.403-.071.123.091.142.234.056.35a.379.379 0 01-.053.057l-.309-.229c-.05.09-.024.161.045.212a.176.176 0 00.153.032l.033.122zm.005-.454c-.057-.042-.118-.039-.173.01l.203.15c.032-.046.032-.114-.03-.16zm.043.6l.326-.442.112.082-.033.044a.2.2 0 01.156.034.156.156 0 01.034.034l-.081.11a.185.185 0 00-.045-.042.146.146 0 00-.148-.021l-.209.284-.112-.083zm1.025.461l.185-.251.113.083-.182.246c-.097.132-.235.157-.364.061-.13-.096-.146-.234-.049-.366l.181-.246.113.083-.185.251c-.048.064-.043.128.018.173.061.045.123.03.17-.034zm.095.365l.326-.442.111.082-.026.035a.227.227 0 01.17.044c.096.071.123.193.027.323l-.194.264-.112-.083.19-.259c.044-.059.038-.12-.017-.16-.056-.042-.114-.026-.151-.01l-.213.288-.111-.082zm.751.078c.02-.027.041-.04.064-.04a.1.1 0 01.066.023c.02.015.034.033.04.055.007.021 0 .045-.02.072-.019.026-.04.039-.063.04a.102.102 0 01-.065-.022.102.102 0 01-.041-.056c-.006-.022 0-.047.019-.072zm.5.734a.295.295 0 01-.259-.053c-.157-.116-.165-.291-.07-.42.096-.131.258-.178.403-.071.123.09.142.233.057.349a.337.337 0 01-.053.057l-.31-.228c-.05.09-.024.161.046.212a.174.174 0 00.152.032l.034.122zm.004-.455c-.057-.042-.118-.038-.173.011l.204.15a.114.114 0 00-.031-.161zm.915.453l-.107-.079.198-.079.122.09-.213.068zm-.175.551a.295.295 0 01-.259-.053c-.157-.116-.165-.291-.07-.42.097-.131.259-.178.404-.071.122.091.142.233.056.349a.3.3 0 01-.053.057l-.309-.228c-.051.09-.024.161.045.212a.176.176 0 00.153.032l.033.122zm.005-.455c-.057-.042-.118-.038-.173.011l.203.15a.115.115 0 00-.03-.161zm.043.601l.485-.658.112.082-.486.658-.111-.082zm.677.204l.185-.251.113.083-.182.246c-.097.132-.235.157-.364.061-.13-.096-.146-.233-.049-.366l.181-.246.113.083-.185.251c-.048.064-.043.128.018.174.061.044.123.029.17-.035zm.73.043l-.107-.079.198-.079.121.09-.212.068zm-.175.551a.295.295 0 01-.259-.053c-.157-.116-.165-.291-.07-.42.097-.131.259-.178.404-.071.122.09.142.233.056.349a.3.3 0 01-.053.057l-.309-.228c-.051.09-.024.161.045.212a.176.176 0 00.153.032l.033.122zm.005-.455c-.057-.042-.118-.038-.173.011l.203.15a.115.115 0 00-.03-.161zm.043.601l.326-.442.111.082-.032.044a.196.196 0 01.156.033.184.184 0 01.034.035l-.081.11a.268.268 0 00-.045-.043.15.15 0 00-.149-.02l-.209.283-.111-.082zm.797.477a.287.287 0 01-.258-.053c-.158-.115-.165-.29-.07-.419.096-.131.258-.178.403-.071.123.09.142.233.057.349a.381.381 0 01-.053.057l-.31-.229c-.05.091-.024.162.045.213a.179.179 0 00.153.031l.033.122zm.005-.454c-.057-.042-.118-.038-.173.01l.204.15a.114.114 0 00-.031-.16zm.043.601l.326-.443.112.083-.026.035a.226.226 0 01.17.043c.095.071.123.193.027.324l-.195.263-.112-.083.191-.259c.043-.058.037-.12-.017-.16-.056-.041-.114-.026-.151-.01l-.213.289-.112-.082zm.688.258l.133-.181-.082-.061.074-.1.082.061.082-.111.112.083-.082.111.135.099-.073.1-.135-.099-.134.18c-.036.049-.024.088.02.121a.212.212 0 00.073.038l-.072.098a.27.27 0 01-.095-.049c-.111-.081-.117-.183-.038-.29zm.439.096c.02-.027.041-.04.064-.04.022 0 .044.007.065.023a.105.105 0 01.041.055c.007.022 0 .046-.02.073-.019.025-.04.039-.063.04a.107.107 0 01-.065-.023.102.102 0 01-.041-.056c-.006-.022 0-.046.019-.072zm.499.734a.293.293 0 01-.259-.053c-.157-.116-.164-.291-.069-.42.096-.131.258-.178.403-.071.123.091.142.234.057.349a.337.337 0 01-.053.057l-.31-.228c-.05.09-.024.161.045.212a.176.176 0 00.153.032l.033.122zm.005-.455c-.057-.042-.118-.038-.173.011l.204.15a.115.115 0 00-.031-.161z"
+          ></path>
+        </g>
+        <g clipPath="url(#clip2_523_1843)">
+          <path
+            fill="#615858"
+            fillOpacity="0.1"
+            d="M158 277.855l1.914 22.597 214.865 5.403 6.221-24.07-223-3.93z"
+          ></path>
+          <path
+            fill="#9498F6"
+            d="M336.9 431.795H200.84c-12.86 0-23.76-9.45-25.58-22.18l-14.04-98.39h215.3l-14.05 98.39c-1.82 12.72-12.72 22.17-25.57 22.18z"
+          ></path>
+          <g filter="url(#filter6_f_523_1843)">
+            <path
+              fill="#426FA3"
+              fillOpacity="0.6"
+              d="M159 292.855H388V297.855H159z"
+            ></path>
+          </g>
+          <path
+            fill="#8589E3"
+            d="M238.26 319.835h-49.35l.52 3.57c6.05 42.43 42.39 73.95 85.26 73.93h83.75c1.99.01 3.97-.22 5.9-.69l-1.85 12.96c-1.85 12.71-12.73 22.15-25.58 22.18H200.84c-12.85-.03-23.73-9.46-25.58-22.18l-14.04-98.38h215.3l-1.25 8.61H275.11c.11 1.18-.03 2.37-.43 3.49a8.618 8.618 0 01-10.94 5.34l-25.48-8.83z"
+          ></path>
+          <path
+            fill="#DDDFFF"
+            d="M152.61 294.005h232.52a8.61 8.61 0 010 17.22H152.61c-4.75 0-8.61-3.86-8.61-8.61a8.61 8.61 0 018.61-8.61z"
+          ></path>
           <path
-            fillRule="evenodd"
-            clipRule="evenodd"
-            d="M457 278.19L459.381 280.571V287.242C459.381 287.503 459.169 287.714 458.908 287.714H451.282C451.022 287.712 450.812 287.502 450.81 287.242V278.663C450.81 278.402 451.021 278.19 451.282 278.19H457ZM455.571 281.048H454.619V282.476H453.191V283.429H454.619V284.857H455.571V283.429H457V282.476H455.571V281.048Z"
-            fill="#FDFDFD"
-          />
+            fill="#47479F"
+            d="M268.87 345.675a8.61 8.61 0 018.61 8.61v51.67a8.61 8.61 0 01-17.22 0v-51.67a8.61 8.61 0 018.61-8.61zM303.32 345.675a8.61 8.61 0 018.61 8.61v51.67a8.61 8.61 0 01-17.22 0v-51.67c0-4.76 3.85-8.61 8.61-8.61zM199.98 345.675a8.61 8.61 0 018.61 8.61v51.67a8.61 8.61 0 01-17.22 0v-51.67c-.01-4.76 3.85-8.61 8.61-8.61zM234.42 345.675a8.61 8.61 0 018.61 8.61v51.67a8.61 8.61 0 01-17.22 0v-51.67a8.61 8.61 0 018.61-8.61z"
+          ></path>
           <path
-            d="M464.756 286.952L467.179 280.552H468.88L471.303 286.952H469.922L469.309 285.288H466.749L466.137 286.952H464.756ZM467.152 284.182H468.907L468.029 281.778L467.152 284.182ZM472.979 281.54C472.568 281.54 472.22 281.192 472.22 280.781C472.22 280.37 472.568 280.022 472.979 280.022C473.381 280.022 473.729 280.37 473.729 280.781C473.729 281.192 473.381 281.54 472.979 281.54ZM473.573 287.446C473.573 288.598 473.034 289.238 471.873 289.238C471.489 289.238 471.224 289.192 470.995 289.092V288.077C471.141 288.141 471.361 288.178 471.681 288.178C472.138 288.178 472.412 287.976 472.412 287.446V282.344H473.573V287.446ZM477.16 282.162C478.659 282.162 479.683 283.268 479.683 284.648C479.683 286.029 478.659 287.135 477.16 287.135C475.661 287.135 474.637 286.029 474.637 284.648C474.637 283.268 475.661 282.162 477.16 282.162ZM477.178 286.038C477.919 286.038 478.477 285.444 478.477 284.648C478.477 283.844 477.919 283.259 477.178 283.259C476.41 283.259 475.843 283.844 475.843 284.648C475.843 285.453 476.41 286.038 477.178 286.038ZM483.778 284.959V282.344H484.948V284.904C484.948 286.285 484.144 287.135 482.791 287.135C481.437 287.135 480.642 286.285 480.642 284.904V282.344H481.812V284.959C481.812 285.627 482.16 286.038 482.8 286.038C483.431 286.038 483.778 285.627 483.778 284.959ZM486.598 285.27V283.387H485.738V282.344H486.598V281.192H487.768V282.344H489.176V283.387H487.768V285.27C487.768 285.782 488.042 285.983 488.499 285.983C488.819 285.983 489.03 285.947 489.185 285.883V286.898C488.956 286.998 488.682 287.044 488.298 287.044C487.146 287.044 486.598 286.395 486.598 285.27ZM494.369 286.203C493.939 286.779 493.226 287.135 492.357 287.135C490.721 287.135 489.797 285.992 489.797 284.648C489.797 283.286 490.657 282.162 492.165 282.162C493.445 282.162 494.287 283.03 494.287 284.237C494.287 284.493 494.25 284.731 494.213 284.886H490.986C491.096 285.746 491.626 286.093 492.348 286.093C492.851 286.093 493.29 285.874 493.537 285.544L494.369 286.203ZM492.138 283.112C491.544 283.112 491.15 283.442 491.022 284.045H493.144C493.125 283.579 492.787 283.112 492.138 283.112ZM495.421 286.952V282.344H496.582V282.802C496.884 282.491 497.277 282.253 497.798 282.253C497.954 282.253 498.091 282.28 498.201 282.317V283.46C498.054 283.423 497.899 283.396 497.689 283.396C497.122 283.396 496.756 283.707 496.582 283.999V286.952H495.421Z"
-            fill="white"
-          />
+            fill="#9498F6"
+            d="M393.74 302.615c-.04 4.74-3.87 8.58-8.61 8.61H152.61a8.63 8.63 0 01-8.61-8.61c.04-4.74 3.87-8.58 8.61-8.61h1.33c.4 4.44 4.11 7.86 8.57 7.88h44.39l-22.78-7.88h87.11l.86.3c14.5 5 29.74 7.57 45.08 7.58h76.52c.05.24.06.48.05.73z"
+          ></path>
+          <path
+            fill="#DDDFFF"
+            d="M148.77 269.655c1.56-4.49 6.46-6.88 10.95-5.32l113.94 39.42c4.49 1.56 6.88 6.46 5.32 10.95-1.56 4.49-6.46 6.88-10.95 5.32l-113.94-39.42c-4.49-1.55-6.87-6.46-5.32-10.95z"
+          ></path>
+          <path
+            fill="#9498F6"
+            d="M278.99 314.715a8.618 8.618 0 01-10.94 5.34l-113.93-39.44a8.565 8.565 0 01-5.73-9.26c.45.27.93.48 1.42.65l113.93 39.44c4.49 1.54 9.39-.85 10.94-5.34.17-.55.3-1.11.39-1.68a8.555 8.555 0 013.92 10.29z"
+          ></path>
+          <rect
+            width="12.4"
+            height="15.4"
+            x="348.684"
+            y="323.358"
+            fill="url(#pattern0_523_1843)"
+            fillOpacity="0.8"
+            stroke="#6A6DB6"
+            strokeWidth="0.6"
+            rx="1.7"
+            transform="rotate(12.475 348.684 323.358)"
+          ></rect>
+        </g>
+        <path
+          fill="#FECD8C"
+          d="M233.47 216.894c.637-.548 1.603.039 1.41.857l-.256 1.081a.87.87 0 00.394.941l.949.577c.718.436.458 1.536-.379 1.605l-1.108.091a.866.866 0 00-.772.665l-.256 1.082c-.193.817-1.32.91-1.644.135l-.429-1.025a.867.867 0 00-.871-.53l-1.108.091c-.837.069-1.273-.974-.636-1.521l.842-.725a.867.867 0 00.235-.992l-.429-1.025c-.324-.775.532-1.513 1.25-1.076l.95.577a.867.867 0 001.016-.083l.842-.725z"
+        ></path>
+        <path
+          fill="#fff"
+          d="M416.931 189.063c1.252-1.078 3.152.077 2.772 1.685-.17.72.143 1.466.774 1.85 1.412.859.901 3.022-.746 3.158-.737.06-1.35.588-1.52 1.307-.38 1.608-2.596 1.791-3.234.266a1.705 1.705 0 00-1.713-1.041c-1.647.135-2.505-1.916-1.252-2.993.56-.482.746-1.27.461-1.952-.638-1.524 1.047-2.974 2.459-2.116a1.706 1.706 0 001.999-.164z"
+        ></path>
+        <path
+          fill="#FECD8C"
+          d="M383.47 232.894c.637-.548 1.603.039 1.41.857l-.256 1.081a.87.87 0 00.394.941l.949.577c.718.436.458 1.536-.379 1.605l-1.108.091a.866.866 0 00-.772.665l-.256 1.082c-.193.817-1.32.91-1.644.135l-.429-1.025a.867.867 0 00-.871-.53l-1.108.091c-.837.069-1.273-.974-.636-1.521l.842-.725a.867.867 0 00.235-.992l-.429-1.025c-.324-.775.532-1.513 1.25-1.076l.95.577a.867.867 0 001.016-.083l.842-.725z"
+        ></path>
+        <g filter="url(#filter7_d_523_1843)">
+          <g clipPath="url(#clip3_523_1843)">
+            <path
+              fill="#fff"
+              d="M111 358c0-5.523 4.477-10 10-10h95c5.523 0 10 4.477 10 10v14c0 5.523-4.477 10-10 10h-95c-5.523 0-10-4.477-10-10v-14z"
+            ></path>
+            <path
+              fill="#6A6AF4"
+              d="M132.236 370v-8.4h3.3c2.664 0 4.464 1.932 4.464 4.2 0 2.268-1.8 4.2-4.464 4.2h-3.3zm3.324-6.852h-1.62v5.304h1.62c1.56 0 2.688-1.164 2.688-2.652 0-1.5-1.128-2.652-2.688-2.652zm9.431-.156h-1.464l1.248-1.992h1.656l-1.44 1.992zm2.052 6.024c-.564.756-1.5 1.224-2.64 1.224-2.148 0-3.36-1.5-3.36-3.264 0-1.788 1.128-3.264 3.108-3.264 1.68 0 2.784 1.14 2.784 2.724 0 .336-.048.648-.096.852h-4.236c.144 1.128.84 1.584 1.788 1.584.66 0 1.236-.288 1.56-.72l1.092.864zm-2.928-4.056c-.78 0-1.296.432-1.464 1.224h2.784c-.024-.612-.468-1.224-1.32-1.224zm5.053-2.064a1.01 1.01 0 01-.996-.996c0-.54.456-.996.996-.996.528 0 .984.456.984.996s-.456.996-.984.996zm.78 7.752c0 1.512-.708 2.352-2.232 2.352-.504 0-.852-.06-1.152-.192v-1.332c.192.084.48.132.9.132.6 0 .96-.264.96-.96v-6.696h1.524v6.696zm3.495-7.656l-1.44-1.992h1.656l1.236 1.992h-1.452zm.036 7.188c-1.212 0-2.04-.696-2.04-1.812 0-.912.708-1.596 2.004-1.812l1.848-.312v-.156c0-.636-.48-1.044-1.176-1.044-.588 0-1.044.276-1.368.72l-1.116-.852c.54-.744 1.428-1.2 2.532-1.2 1.752 0 2.652 1.044 2.652 2.376V370h-1.524v-.588c-.384.468-1.104.768-1.812.768zm-.528-1.884c0 .408.324.672.84.672.696 0 1.2-.324 1.5-.804v-.852l-1.44.24c-.636.108-.9.372-.9.744zm8.844 1.704v-6.048h1.524v.6c.396-.408.912-.72 1.596-.72.204 0 .384.036.528.084v1.5a2.625 2.625 0 00-.672-.084c-.744 0-1.224.408-1.452.792V370h-1.524zm8.133-7.008h-1.464l1.248-1.992h1.656l-1.44 1.992zm2.052 6.024c-.564.756-1.5 1.224-2.64 1.224-2.148 0-3.36-1.5-3.36-3.264 0-1.788 1.128-3.264 3.108-3.264 1.68 0 2.784 1.14 2.784 2.724 0 .336-.048.648-.096.852h-4.236c.144 1.128.84 1.584 1.788 1.584.66 0 1.236-.288 1.56-.72l1.092.864zm-2.928-4.056c-.78 0-1.296.432-1.464 1.224h2.784c-.024-.612-.468-1.224-1.32-1.224zm5.931 5.22c-1.212 0-2.04-.696-2.04-1.812 0-.912.708-1.596 2.004-1.812l1.848-.312v-.156c0-.636-.48-1.044-1.176-1.044-.588 0-1.044.276-1.368.72l-1.116-.852c.54-.744 1.428-1.2 2.532-1.2 1.752 0 2.652 1.044 2.652 2.376V370h-1.524v-.588c-.384.468-1.104.768-1.812.768zm-.528-1.884c0 .408.324.672.84.672.696 0 1.2-.324 1.5-.804v-.852l-1.44.24c-.636.108-.9.372-.9.744zm5.609 1.704v-9h1.524v9h-1.524zm4.12-7.104a1.01 1.01 0 01-.996-.996c0-.54.456-.996.996-.996s.984.456.984.996-.444.996-.984.996zm-.768 7.104v-6.048h1.524V370h-1.524zm2.741-.876l1.008-.912c.372.468.816.804 1.392.804.492 0 .744-.288.744-.648 0-1.056-2.892-.66-2.892-2.784 0-1.068.9-1.872 2.16-1.872.924 0 1.764.444 2.196 1.032l-1.008.888c-.312-.384-.708-.696-1.176-.696-.48 0-.708.264-.708.576 0 1.032 2.892.672 2.892 2.76-.024 1.272-1.044 1.968-2.184 1.968-1.08 0-1.848-.432-2.424-1.116zm9.505-6.132h-1.464l1.248-1.992h1.656l-1.44 1.992zm2.052 6.024c-.564.756-1.5 1.224-2.64 1.224-2.148 0-3.36-1.5-3.36-3.264 0-1.788 1.128-3.264 3.108-3.264 1.68 0 2.784 1.14 2.784 2.724 0 .336-.048.648-.096.852h-4.236c.144 1.128.84 1.584 1.788 1.584.66 0 1.236-.288 1.56-.72l1.092.864zm-2.928-4.056c-.78 0-1.296.432-1.464 1.224h2.784c-.024-.612-.468-1.224-1.32-1.224zm9.831 4.056c-.564.756-1.5 1.224-2.64 1.224-2.148 0-3.36-1.5-3.36-3.264 0-1.788 1.128-3.264 3.108-3.264 1.68 0 2.784 1.14 2.784 2.724 0 .336-.048.648-.096.852h-4.236c.144 1.128.84 1.584 1.788 1.584.66 0 1.236-.288 1.56-.72l1.092.864zm-2.928-4.056c-.78 0-1.296.432-1.464 1.224h2.784c-.024-.612-.468-1.224-1.32-1.224z"
+            ></path>
+          </g>
+          <path
+            stroke="#4380F5"
+            d="M111.5 358a9.5 9.5 0 019.5-9.5h95a9.5 9.5 0 019.5 9.5v14a9.5 9.5 0 01-9.5 9.5h-95a9.5 9.5 0 01-9.5-9.5v-14z"
+          ></path>
+        </g>
+        <g filter="url(#filter8_d_523_1843)">
+          <g clipPath="url(#clip4_523_1843)">
+            <path
+              fill="#4380F5"
+              d="M444 252.619a7.619 7.619 0 017.619-7.619h64.762a7.619 7.619 0 017.619 7.619v10.667a7.619 7.619 0 01-7.619 7.619h-64.762a7.619 7.619 0 01-7.619-7.619v-10.667z"
+            ></path>
+            <path
+              fill="#FDFDFD"
+              fillRule="evenodd"
+              d="M467 253.19l2.381 2.381v6.671a.472.472 0 01-.473.472h-7.626a.475.475 0 01-.472-.472v-8.579c0-.261.211-.473.472-.473H467zm-1.429 2.858h-.952v1.428h-1.428v.953h1.428v1.428h.952v-1.428H467v-.953h-1.429v-1.428z"
+              clipRule="evenodd"
+            ></path>
+            <path
+              fill="#fff"
+              d="M474.756 261.952l2.423-6.4h1.701l2.423 6.4h-1.381l-.613-1.664h-2.56l-.612 1.664h-1.381zm2.396-2.77h1.755l-.878-2.404-.877 2.404zm5.827-2.642a.77.77 0 01-.759-.759.77.77 0 01.759-.759c.402 0 .75.348.75.759a.768.768 0 01-.75.759zm.594 5.906c0 1.152-.539 1.792-1.7 1.792-.384 0-.649-.046-.878-.146v-1.015c.146.064.366.101.686.101.457 0 .731-.202.731-.732v-5.102h1.161v5.102zm3.587-5.284c1.499 0 2.523 1.106 2.523 2.486 0 1.381-1.024 2.487-2.523 2.487s-2.523-1.106-2.523-2.487c0-1.38 1.024-2.486 2.523-2.486zm.018 3.876c.741 0 1.299-.594 1.299-1.39 0-.804-.558-1.389-1.299-1.389-.768 0-1.335.585-1.335 1.389 0 .805.567 1.39 1.335 1.39zm6.6-1.079v-2.615h1.17v2.56c0 1.381-.804 2.231-2.157 2.231-1.354 0-2.149-.85-2.149-2.231v-2.56h1.17v2.615c0 .668.348 1.079.988 1.079.631 0 .978-.411.978-1.079zm2.82.311v-1.883h-.86v-1.043h.86v-1.152h1.17v1.152h1.408v1.043h-1.408v1.883c0 .512.274.713.731.713.32 0 .531-.036.686-.1v1.015c-.229.1-.503.146-.887.146-1.152 0-1.7-.649-1.7-1.774zm7.771.933c-.43.576-1.143.932-2.012.932-1.636 0-2.56-1.143-2.56-2.487 0-1.362.86-2.486 2.368-2.486 1.28 0 2.122.868 2.122 2.075 0 .256-.037.494-.074.649h-3.227c.11.86.64 1.207 1.362 1.207.503 0 .942-.219 1.189-.549l.832.659zm-2.231-3.091c-.594 0-.988.33-1.116.933h2.122c-.019-.466-.357-.933-1.006-.933zm3.283 3.84v-4.608h1.161v.458c.302-.311.695-.549 1.216-.549.156 0 .293.027.403.064v1.143a1.987 1.987 0 00-.512-.064 1.26 1.26 0 00-1.107.603v2.953h-1.161z"
+            ></path>
+          </g>
+        </g>
+        <g filter="url(#filter9_d_523_1843)">
+          <g clipPath="url(#clip5_523_1843)">
+            <path
+              fill="#4380F5"
+              d="M0 95.12A8.12 8.12 0 018.12 87H198.88A8.12 8.12 0 01207 95.12v18.408a8.12 8.12 0 01-8.119 8.12H8.119A8.12 8.12 0 010 113.528V95.119z"
+            ></path>
+            <g clipPath="url(#clip6_523_1843)">
+              <path
+                fill="#fff"
+                d="M27.503 98.074a3.75 3.75 0 013.75 3.75v.625h2.5v1.25h-.73l-.472 5.677a.625.625 0 01-.623.573h-8.85a.625.625 0 01-.623-.573l-.473-5.677h-.73v-1.25h2.5v-.625a3.75 3.75 0 013.75-3.75zm4.266 5.625h-8.533l.417 5h7.7l.416-5zm-3.641 1.25v2.5h-1.25v-2.5h1.25zm-2.5 0v2.5h-1.25v-2.5h1.25zm5 0v2.5h-1.25v-2.5h1.25zm-3.125-5.625a2.5 2.5 0 00-2.497 2.375l-.003.125v.625h5v-.625a2.5 2.5 0 00-2.375-2.497l-.125-.003z"
+              ></path>
+            </g>
+            <path
+              fill="#fff"
+              d="M41.236 109.324v-8.4h2.772c1.848 0 2.976.948 2.976 2.508 0 1.548-1.128 2.496-2.976 2.496H42.94v3.396h-1.704zm2.844-6.984h-1.14v2.172h1.14c.72 0 1.152-.42 1.152-1.104 0-.636-.432-1.068-1.152-1.068zm5.579 7.164c-1.212 0-2.04-.696-2.04-1.812 0-.912.708-1.596 2.004-1.812l1.848-.312v-.156c0-.636-.48-1.044-1.176-1.044-.588 0-1.044.276-1.368.72l-1.116-.852c.54-.744 1.428-1.2 2.532-1.2 1.752 0 2.652 1.044 2.652 2.376v3.912h-1.524v-.588c-.384.468-1.104.768-1.812.768zm-.528-1.884c0 .408.324.672.84.672.696 0 1.2-.324 1.5-.804v-.852l-1.44.24c-.636.108-.9.372-.9.744zm5.61 1.704v-6.048h1.523v.48c.42-.408.984-.72 1.788-.72 1.308 0 2.352.9 2.352 2.688v3.6h-1.536v-3.54c0-.804-.456-1.308-1.2-1.308-.768 0-1.176.516-1.404.9v3.948H54.74zm8.162-7.104a1.01 1.01 0 01-.996-.996c0-.54.456-.996.996-.996s.984.456.984.996-.444.996-.984.996zm-.768 7.104v-6.048h1.524v6.048h-1.524zm8.92-.984c-.565.756-1.5 1.224-2.64 1.224-2.149 0-3.36-1.5-3.36-3.264 0-1.788 1.127-3.264 3.107-3.264 1.68 0 2.784 1.14 2.784 2.724 0 .336-.048.648-.096.852h-4.236c.144 1.128.84 1.584 1.788 1.584.66 0 1.236-.288 1.56-.72l1.092.864zm-2.929-4.056c-.78 0-1.296.432-1.464 1.224h2.784c-.024-.612-.468-1.224-1.32-1.224zm4.31 5.04v-6.048h1.523v.6c.396-.408.912-.72 1.596-.72.204 0 .384.036.528.084v1.5a2.625 2.625 0 00-.672-.084c-.744 0-1.224.408-1.452.792v3.876h-1.524zm7.677-3.024c0-1.764 1.164-3.264 3.072-3.264.816 0 1.404.252 1.872.72v-3.432h1.536v9h-1.536v-.48c-.468.468-1.056.72-1.872.72-1.908 0-3.072-1.5-3.072-3.264zm1.596 0c0 1.056.66 1.824 1.692 1.824.684 0 1.248-.288 1.656-.84v-1.968c-.408-.552-.972-.84-1.656-.84-1.032 0-1.692.768-1.692 1.824zm7.525-1.92h-1.416l1.08-3.456h1.728l-1.392 3.456zm3.738 5.124c-1.212 0-2.04-.696-2.04-1.812 0-.912.707-1.596 2.004-1.812l1.847-.312v-.156c0-.636-.48-1.044-1.175-1.044-.589 0-1.044.276-1.368.72l-1.116-.852c.54-.744 1.428-1.2 2.532-1.2 1.751 0 2.651 1.044 2.651 2.376v3.912h-1.523v-.588c-.385.468-1.105.768-1.813.768zm-.528-1.884c0 .408.323.672.84.672.695 0 1.2-.324 1.5-.804v-.852l-1.44.24c-.636.108-.9.372-.9.744zm8.513.504c.6 0 1.08-.276 1.368-.696l1.188.912c-.564.744-1.452 1.224-2.556 1.224-2.088 0-3.336-1.5-3.336-3.264 0-1.764 1.248-3.264 3.336-3.264 1.104 0 1.992.48 2.556 1.224l-1.188.912c-.288-.42-.768-.696-1.392-.696-.996 0-1.728.768-1.728 1.824 0 1.068.732 1.824 1.752 1.824zm4.136-1.008v-2.472h-1.128v-1.368h1.128v-1.512h1.536v1.512h1.848v1.368h-1.848v2.472c0 .672.36.936.96.936.42 0 .696-.048.9-.132v1.332c-.3.132-.66.192-1.164.192-1.512 0-2.232-.852-2.232-2.328zm5.517-4.896a1.01 1.01 0 01-.996-.996c0-.54.456-.996.996-.996s.984.456.984.996-.444.996-.984.996zm-.768 7.104v-6.048h1.524v6.048h-1.524zm6.231-6.288c1.968 0 3.312 1.452 3.312 3.264 0 1.812-1.344 3.264-3.312 3.264-1.968 0-3.312-1.452-3.312-3.264 0-1.812 1.344-3.264 3.312-3.264zm.024 5.088c.972 0 1.704-.78 1.704-1.824 0-1.056-.732-1.824-1.704-1.824-1.008 0-1.752.768-1.752 1.824s.744 1.824 1.752 1.824zm4.678 1.2v-6.048h1.524v.48c.42-.408.984-.72 1.788-.72 1.308 0 2.352.9 2.352 2.688v3.6h-1.536v-3.54c0-.804-.456-1.308-1.2-1.308-.768 0-1.176.516-1.404.9v3.948h-1.524zm6.867-.876l1.008-.912c.372.468.816.804 1.392.804.492 0 .744-.288.744-.648 0-1.056-2.892-.66-2.892-2.784 0-1.068.9-1.872 2.16-1.872.924 0 1.764.444 2.196 1.032l-1.008.888c-.312-.384-.708-.696-1.176-.696-.48 0-.708.264-.708.576 0 1.032 2.892.672 2.892 2.76-.024 1.272-1.044 1.968-2.184 1.968-1.08 0-1.848-.432-2.424-1.116zm10.915-6.132l-1.44-1.992h1.656l1.236 1.992h-1.452zm.036 7.188c-1.212 0-2.04-.696-2.04-1.812 0-.912.708-1.596 2.004-1.812l1.848-.312v-.156c0-.636-.48-1.044-1.176-1.044-.588 0-1.044.276-1.368.72l-1.116-.852c.54-.744 1.428-1.2 2.532-1.2 1.752 0 2.652 1.044 2.652 2.376v3.912h-1.524v-.588c-.384.468-1.104.768-1.812.768zm-.528-1.884c0 .408.324.672.84.672.696 0 1.2-.324 1.5-.804v-.852l-1.44.24c-.636.108-.9.372-.9.744zm9.611-5.4a1.01 1.01 0 01-.996-.996c0-.54.456-.996.996-.996s.984.456.984.996-.444.996-.984.996zm-.768 7.104v-6.048h1.524v6.048h-1.524zm3.352 0v-6.048h1.524v.456c.408-.396.924-.696 1.668-.696.768 0 1.44.336 1.836.984.432-.528 1.008-.984 2.028-.984 1.248 0 2.232.864 2.232 2.568v3.72h-1.536v-3.66c0-.732-.396-1.188-1.08-1.188-.66 0-1.02.456-1.26.864.012.084.012.168.012.264v3.72h-1.536v-3.66c0-.732-.396-1.188-1.08-1.188-.696 0-1.056.516-1.284.9v3.948h-1.524zm11.027 2.952v-9h1.524v.492c.468-.468 1.056-.732 1.884-.732 1.92 0 3.072 1.5 3.072 3.264 0 1.764-1.152 3.264-3.072 3.264-.828 0-1.416-.264-1.884-.732v3.444h-1.524zm3.192-7.8c-.708 0-1.284.312-1.668.876v1.896c.408.576.972.876 1.668.876 1.032 0 1.704-.768 1.704-1.824s-.672-1.824-1.704-1.824zm6.246 5.028c-1.212 0-2.04-.696-2.04-1.812 0-.912.708-1.596 2.004-1.812l1.848-.312v-.156c0-.636-.48-1.044-1.176-1.044-.588 0-1.044.276-1.368.72l-1.116-.852c.54-.744 1.428-1.2 2.532-1.2 1.752 0 2.652 1.044 2.652 2.376v3.912h-1.524v-.588c-.384.468-1.104.768-1.812.768zm-.528-1.884c0 .408.324.672.84.672.696 0 1.2-.324 1.5-.804v-.852l-1.44.24c-.636.108-.9.372-.9.744zm8.514.504c.6 0 1.08-.276 1.368-.696l1.188.912c-.564.744-1.452 1.224-2.556 1.224-2.088 0-3.336-1.5-3.336-3.264 0-1.764 1.248-3.264 3.336-3.264 1.104 0 1.992.48 2.556 1.224l-1.188.912c-.288-.42-.768-.696-1.392-.696-.996 0-1.728.768-1.728 1.824 0 1.068.732 1.824 1.752 1.824zm4.136-1.008v-2.472h-1.128v-1.368h1.128v-1.512h1.536v1.512h1.848v1.368h-1.848v2.472c0 .672.36.936.96.936.42 0 .696-.048.9-.132v1.332c-.3.132-.66.192-1.164.192-1.512 0-2.232-.852-2.232-2.328z"
+            ></path>
+          </g>
         </g>
       </g>
       <defs>
         <filter
-          id="filter0_f_1506_6816"
-          x="51.9998"
-          y="120.855"
+          id="filter0_f_523_1843"
           width="409"
           height="348"
-          filterUnits="userSpaceOnUse"
+          x="62"
+          y="95.856"
           colorInterpolationFilters="sRGB"
+          filterUnits="userSpaceOnUse"
         >
-          <feFlood floodOpacity="0" result="BackgroundImageFix" />
+          <feFlood floodOpacity="0" result="BackgroundImageFix"></feFlood>
           <feBlend
-            mode="normal"
             in="SourceGraphic"
             in2="BackgroundImageFix"
             result="shape"
-          />
+          ></feBlend>
           <feGaussianBlur
+            result="effect1_foregroundBlur_523_1843"
             stdDeviation="25"
-            result="effect1_foregroundBlur_1506_6816"
-          />
+          ></feGaussianBlur>
         </filter>
         <filter
-          id="filter1_d_1506_6816"
-          x="163.681"
-          y="0.334206"
+          id="filter1_d_523_1843"
           width="264.06"
           height="242.562"
-          filterUnits="userSpaceOnUse"
+          x="173.681"
+          y="-24.666"
           colorInterpolationFilters="sRGB"
+          filterUnits="userSpaceOnUse"
         >
-          <feFlood floodOpacity="0" result="BackgroundImageFix" />
+          <feFlood floodOpacity="0" result="BackgroundImageFix"></feFlood>
           <feColorMatrix
             in="SourceAlpha"
-            type="matrix"
-            values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"
             result="hardAlpha"
-          />
-          <feOffset dy="4.65279" />
-          <feGaussianBlur stdDeviation="29.0799" />
-          <feComposite in2="hardAlpha" operator="out" />
-          <feColorMatrix
-            type="matrix"
-            values="0 0 0 0 0.904601 0 0 0 0 0.904601 0 0 0 0 0.94363 0 0 0 1 0"
-          />
+            values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"
+          ></feColorMatrix>
+          <feOffset dy="4.653"></feOffset>
+          <feGaussianBlur stdDeviation="29.08"></feGaussianBlur>
+          <feComposite in2="hardAlpha" operator="out"></feComposite>
+          <feColorMatrix values="0 0 0 0 0.904601 0 0 0 0 0.904601 0 0 0 0 0.94363 0 0 0 1 0"></feColorMatrix>
           <feBlend
-            mode="normal"
             in2="BackgroundImageFix"
-            result="effect1_dropShadow_1506_6816"
-          />
+            result="effect1_dropShadow_523_1843"
+          ></feBlend>
           <feBlend
-            mode="normal"
             in="SourceGraphic"
-            in2="effect1_dropShadow_1506_6816"
+            in2="effect1_dropShadow_523_1843"
             result="shape"
-          />
+          ></feBlend>
         </filter>
         <filter
-          id="filter2_d_1506_6816"
-          x="144"
-          y="101.855"
-          width="86.0083"
-          height="61.9257"
-          filterUnits="userSpaceOnUse"
+          id="filter2_d_523_1843"
+          width="86.008"
+          height="61.926"
+          x="154"
+          y="76.856"
           colorInterpolationFilters="sRGB"
+          filterUnits="userSpaceOnUse"
         >
-          <feFlood floodOpacity="0" result="BackgroundImageFix" />
+          <feFlood floodOpacity="0" result="BackgroundImageFix"></feFlood>
           <feColorMatrix
             in="SourceAlpha"
-            type="matrix"
-            values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"
             result="hardAlpha"
-          />
-          <feOffset dy="4" />
-          <feGaussianBlur stdDeviation="10" />
-          <feComposite in2="hardAlpha" operator="out" />
-          <feColorMatrix
-            type="matrix"
-            values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.05 0"
-          />
+            values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"
+          ></feColorMatrix>
+          <feOffset dy="4"></feOffset>
+          <feGaussianBlur stdDeviation="10"></feGaussianBlur>
+          <feComposite in2="hardAlpha" operator="out"></feComposite>
+          <feColorMatrix values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.05 0"></feColorMatrix>
           <feBlend
-            mode="normal"
             in2="BackgroundImageFix"
-            result="effect1_dropShadow_1506_6816"
-          />
+            result="effect1_dropShadow_523_1843"
+          ></feBlend>
           <feBlend
-            mode="normal"
             in="SourceGraphic"
-            in2="effect1_dropShadow_1506_6816"
+            in2="effect1_dropShadow_523_1843"
             result="shape"
-          />
+          ></feBlend>
         </filter>
         <filter
-          id="filter3_d_1506_6816"
-          x="383.482"
-          y="136.042"
-          width="89.0439"
-          height="71.5525"
-          filterUnits="userSpaceOnUse"
+          id="filter3_d_523_1843"
+          width="89.044"
+          height="71.552"
+          x="393.482"
+          y="111.042"
           colorInterpolationFilters="sRGB"
+          filterUnits="userSpaceOnUse"
         >
-          <feFlood floodOpacity="0" result="BackgroundImageFix" />
+          <feFlood floodOpacity="0" result="BackgroundImageFix"></feFlood>
           <feColorMatrix
             in="SourceAlpha"
-            type="matrix"
-            values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"
             result="hardAlpha"
-          />
-          <feOffset dy="4" />
-          <feGaussianBlur stdDeviation="10" />
-          <feComposite in2="hardAlpha" operator="out" />
-          <feColorMatrix
-            type="matrix"
-            values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.05 0"
-          />
+            values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"
+          ></feColorMatrix>
+          <feOffset dy="4"></feOffset>
+          <feGaussianBlur stdDeviation="10"></feGaussianBlur>
+          <feComposite in2="hardAlpha" operator="out"></feComposite>
+          <feColorMatrix values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.05 0"></feColorMatrix>
           <feBlend
-            mode="normal"
             in2="BackgroundImageFix"
-            result="effect1_dropShadow_1506_6816"
-          />
+            result="effect1_dropShadow_523_1843"
+          ></feBlend>
           <feBlend
-            mode="normal"
             in="SourceGraphic"
-            in2="effect1_dropShadow_1506_6816"
+            in2="effect1_dropShadow_523_1843"
             result="shape"
-          />
+          ></feBlend>
         </filter>
         <filter
-          id="filter4_d_1506_6816"
-          x="53"
-          y="88"
-          width="89.6174"
-          height="76.7546"
-          filterUnits="userSpaceOnUse"
+          id="filter4_d_523_1843"
+          width="89.617"
+          height="76.755"
+          x="63"
+          y="63"
           colorInterpolationFilters="sRGB"
+          filterUnits="userSpaceOnUse"
         >
-          <feFlood floodOpacity="0" result="BackgroundImageFix" />
+          <feFlood floodOpacity="0" result="BackgroundImageFix"></feFlood>
           <feColorMatrix
             in="SourceAlpha"
-            type="matrix"
-            values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"
             result="hardAlpha"
-          />
-          <feOffset dy="4" />
-          <feGaussianBlur stdDeviation="10" />
-          <feComposite in2="hardAlpha" operator="out" />
-          <feColorMatrix
-            type="matrix"
-            values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.05 0"
-          />
+            values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"
+          ></feColorMatrix>
+          <feOffset dy="4"></feOffset>
+          <feGaussianBlur stdDeviation="10"></feGaussianBlur>
+          <feComposite in2="hardAlpha" operator="out"></feComposite>
+          <feColorMatrix values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.05 0"></feColorMatrix>
           <feBlend
-            mode="normal"
             in2="BackgroundImageFix"
-            result="effect1_dropShadow_1506_6816"
-          />
+            result="effect1_dropShadow_523_1843"
+          ></feBlend>
           <feBlend
-            mode="normal"
             in="SourceGraphic"
-            in2="effect1_dropShadow_1506_6816"
+            in2="effect1_dropShadow_523_1843"
             result="shape"
-          />
+          ></feBlend>
         </filter>
         <filter
-          id="filter5_d_1506_6816"
-          x="193"
-          y="132.855"
-          width="64.2732"
-          height="61.6267"
-          filterUnits="userSpaceOnUse"
+          id="filter5_d_523_1843"
+          width="64.273"
+          height="61.627"
+          x="203"
+          y="107.855"
           colorInterpolationFilters="sRGB"
+          filterUnits="userSpaceOnUse"
         >
-          <feFlood floodOpacity="0" result="BackgroundImageFix" />
+          <feFlood floodOpacity="0" result="BackgroundImageFix"></feFlood>
           <feColorMatrix
             in="SourceAlpha"
-            type="matrix"
-            values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"
             result="hardAlpha"
-          />
-          <feOffset dy="4" />
-          <feGaussianBlur stdDeviation="10" />
-          <feComposite in2="hardAlpha" operator="out" />
-          <feColorMatrix
-            type="matrix"
-            values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.05 0"
-          />
+            values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"
+          ></feColorMatrix>
+          <feOffset dy="4"></feOffset>
+          <feGaussianBlur stdDeviation="10"></feGaussianBlur>
+          <feComposite in2="hardAlpha" operator="out"></feComposite>
+          <feColorMatrix values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.05 0"></feColorMatrix>
           <feBlend
-            mode="normal"
             in2="BackgroundImageFix"
-            result="effect1_dropShadow_1506_6816"
-          />
+            result="effect1_dropShadow_523_1843"
+          ></feBlend>
           <feBlend
-            mode="normal"
             in="SourceGraphic"
-            in2="effect1_dropShadow_1506_6816"
+            in2="effect1_dropShadow_523_1843"
             result="shape"
-          />
+          ></feBlend>
         </filter>
         <filter
-          id="filter6_f_1506_6816"
-          x="145"
-          y="313.855"
+          id="filter6_f_523_1843"
           width="237"
           height="13"
-          filterUnits="userSpaceOnUse"
+          x="155"
+          y="288.855"
           colorInterpolationFilters="sRGB"
+          filterUnits="userSpaceOnUse"
         >
-          <feFlood floodOpacity="0" result="BackgroundImageFix" />
+          <feFlood floodOpacity="0" result="BackgroundImageFix"></feFlood>
           <feBlend
-            mode="normal"
             in="SourceGraphic"
             in2="BackgroundImageFix"
             result="shape"
-          />
+          ></feBlend>
           <feGaussianBlur
+            result="effect1_foregroundBlur_523_1843"
             stdDeviation="2"
-            result="effect1_foregroundBlur_1506_6816"
-          />
+          ></feGaussianBlur>
         </filter>
         <pattern
-          id="pattern0"
-          patternContentUnits="objectBoundingBox"
+          id="pattern0_523_1843"
           width="1"
           height="1"
+          patternContentUnits="objectBoundingBox"
         >
           <use
-            xlinkHref="#image0_1506_6816"
-            transform="matrix(0.0112915 0 0 0.00917431 -0.0194072 0)"
-          />
+            transform="matrix(.0113 0 0 .00917 -.02 0)"
+            xlinkHref="#image0_523_1843"
+          ></use>
         </pattern>
         <filter
-          id="filter7_d_1506_6816"
-          x="81"
-          y="357"
+          id="filter7_d_523_1843"
           width="155"
           height="74"
-          filterUnits="userSpaceOnUse"
+          x="91"
+          y="332"
           colorInterpolationFilters="sRGB"
+          filterUnits="userSpaceOnUse"
         >
-          <feFlood floodOpacity="0" result="BackgroundImageFix" />
+          <feFlood floodOpacity="0" result="BackgroundImageFix"></feFlood>
           <feColorMatrix
             in="SourceAlpha"
-            type="matrix"
-            values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"
             result="hardAlpha"
-          />
-          <feOffset dy="4" />
-          <feGaussianBlur stdDeviation="10" />
-          <feComposite in2="hardAlpha" operator="out" />
-          <feColorMatrix
-            type="matrix"
-            values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.25 0"
-          />
+            values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"
+          ></feColorMatrix>
+          <feOffset dy="4"></feOffset>
+          <feGaussianBlur stdDeviation="10"></feGaussianBlur>
+          <feComposite in2="hardAlpha" operator="out"></feComposite>
+          <feColorMatrix values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.25 0"></feColorMatrix>
           <feBlend
-            mode="normal"
             in2="BackgroundImageFix"
-            result="effect1_dropShadow_1506_6816"
-          />
+            result="effect1_dropShadow_523_1843"
+          ></feBlend>
           <feBlend
-            mode="normal"
             in="SourceGraphic"
-            in2="effect1_dropShadow_1506_6816"
+            in2="effect1_dropShadow_523_1843"
             result="shape"
-          />
+          ></feBlend>
         </filter>
         <filter
-          id="filter8_d_1506_6816"
-          x="418.762"
-          y="257.81"
-          width="110.476"
-          height="56.3809"
-          filterUnits="userSpaceOnUse"
+          id="filter8_d_523_1843"
+          width="120"
+          height="65.905"
+          x="424"
+          y="229"
           colorInterpolationFilters="sRGB"
+          filterUnits="userSpaceOnUse"
         >
-          <feFlood floodOpacity="0" result="BackgroundImageFix" />
+          <feFlood floodOpacity="0" result="BackgroundImageFix"></feFlood>
           <feColorMatrix
             in="SourceAlpha"
-            type="matrix"
-            values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"
             result="hardAlpha"
-          />
-          <feOffset dy="3.04762" />
-          <feGaussianBlur stdDeviation="7.61905" />
-          <feComposite in2="hardAlpha" operator="out" />
+            values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"
+          ></feColorMatrix>
+          <feOffset dy="4"></feOffset>
+          <feGaussianBlur stdDeviation="10"></feGaussianBlur>
+          <feComposite in2="hardAlpha" operator="out"></feComposite>
+          <feColorMatrix values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.25 0"></feColorMatrix>
+          <feBlend
+            in2="BackgroundImageFix"
+            result="effect1_dropShadow_523_1843"
+          ></feBlend>
+          <feBlend
+            in="SourceGraphic"
+            in2="effect1_dropShadow_523_1843"
+            result="shape"
+          ></feBlend>
+        </filter>
+        <filter
+          id="filter9_d_523_1843"
+          width="247"
+          height="74.648"
+          x="-20"
+          y="71"
+          colorInterpolationFilters="sRGB"
+          filterUnits="userSpaceOnUse"
+        >
+          <feFlood floodOpacity="0" result="BackgroundImageFix"></feFlood>
           <feColorMatrix
-            type="matrix"
-            values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.25 0"
-          />
+            in="SourceAlpha"
+            result="hardAlpha"
+            values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"
+          ></feColorMatrix>
+          <feOffset dy="4"></feOffset>
+          <feGaussianBlur stdDeviation="10"></feGaussianBlur>
+          <feComposite in2="hardAlpha" operator="out"></feComposite>
+          <feColorMatrix values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.25 0"></feColorMatrix>
           <feBlend
-            mode="normal"
             in2="BackgroundImageFix"
-            result="effect1_dropShadow_1506_6816"
-          />
+            result="effect1_dropShadow_523_1843"
+          ></feBlend>
           <feBlend
-            mode="normal"
             in="SourceGraphic"
-            in2="effect1_dropShadow_1506_6816"
+            in2="effect1_dropShadow_523_1843"
             result="shape"
-          />
+          ></feBlend>
         </filter>
         <linearGradient
-          id="paint0_linear_1506_6816"
-          x1="480.052"
-          y1="219.74"
-          x2="257.546"
-          y2="225.849"
+          id="paint0_linear_523_1843"
+          x1="490.052"
+          x2="267.546"
+          y1="194.74"
+          y2="200.849"
           gradientUnits="userSpaceOnUse"
         >
-          <stop stopColor="white" />
-          <stop offset="0.0001" stopColor="#FEF5F5" />
-          <stop offset="0.910425" stopColor="white" />
+          <stop stopColor="#fff"></stop>
+          <stop offset="0" stopColor="#FEF5F5"></stop>
+          <stop offset="0.91" stopColor="#fff"></stop>
         </linearGradient>
         <linearGradient
-          id="paint1_linear_1506_6816"
-          x1="448.971"
-          y1="271.355"
-          x2="234.971"
-          y2="276.855"
+          id="paint1_linear_523_1843"
+          x1="458.971"
+          x2="244.971"
+          y1="246.355"
+          y2="251.855"
           gradientUnits="userSpaceOnUse"
         >
-          <stop stopColor="white" />
-          <stop offset="0.0001" stopColor="#FEF5F5" />
-          <stop offset="0.910425" stopColor="white" />
+          <stop stopColor="#fff"></stop>
+          <stop offset="0" stopColor="#FEF5F5"></stop>
+          <stop offset="0.91" stopColor="#fff"></stop>
         </linearGradient>
         <linearGradient
-          id="paint2_linear_1506_6816"
-          x1="580.434"
-          y1="288.725"
-          x2="386.779"
-          y2="293.703"
+          id="paint2_linear_523_1843"
+          x1="590.434"
+          x2="396.779"
+          y1="263.725"
+          y2="268.703"
           gradientUnits="userSpaceOnUse"
         >
-          <stop stopColor="white" />
-          <stop offset="0.0001" stopColor="#FEF5F5" />
-          <stop offset="0.910425" stopColor="white" />
+          <stop stopColor="#fff"></stop>
+          <stop offset="0" stopColor="#FEF5F5"></stop>
+          <stop offset="0.91" stopColor="#fff"></stop>
         </linearGradient>
         <linearGradient
-          id="paint3_linear_1506_6816"
-          x1="193.87"
-          y1="200.823"
-          x2="107.008"
-          y2="203.208"
+          id="paint3_linear_523_1843"
+          x1="203.87"
+          x2="117.008"
+          y1="175.823"
+          y2="178.208"
           gradientUnits="userSpaceOnUse"
         >
-          <stop stopColor="white" />
-          <stop offset="0.0001" stopColor="#FEF5F5" />
-          <stop offset="0.910425" stopColor="white" />
+          <stop stopColor="#fff"></stop>
+          <stop offset="0" stopColor="#FEF5F5"></stop>
+          <stop offset="0.91" stopColor="#fff"></stop>
         </linearGradient>
         <linearGradient
-          id="paint4_linear_1506_6816"
-          x1="211.279"
-          y1="128.524"
-          x2="164.004"
-          y2="129.822"
+          id="paint4_linear_523_1843"
+          x1="221.279"
+          x2="174.004"
+          y1="103.524"
+          y2="104.822"
           gradientUnits="userSpaceOnUse"
         >
-          <stop stopColor="white" />
-          <stop offset="0.0001" stopColor="#FEF5F5" />
-          <stop offset="0.910425" stopColor="white" />
+          <stop stopColor="#fff"></stop>
+          <stop offset="0" stopColor="#FEF5F5"></stop>
+          <stop offset="0.91" stopColor="#fff"></stop>
         </linearGradient>
         <linearGradient
-          id="paint5_linear_1506_6816"
-          x1="450.761"
-          y1="173.049"
-          x2="403.486"
-          y2="174.347"
+          id="paint5_linear_523_1843"
+          x1="460.761"
+          x2="413.486"
+          y1="148.049"
+          y2="149.347"
           gradientUnits="userSpaceOnUse"
         >
-          <stop stopColor="white" />
-          <stop offset="0.0001" stopColor="#FEF5F5" />
-          <stop offset="0.910425" stopColor="white" />
+          <stop stopColor="#fff"></stop>
+          <stop offset="0" stopColor="#FEF5F5"></stop>
+          <stop offset="0.91" stopColor="#fff"></stop>
         </linearGradient>
         <linearGradient
-          id="paint6_linear_1506_6816"
-          x1="128.421"
-          y1="112.996"
-          x2="81.1465"
-          y2="114.294"
+          id="paint6_linear_523_1843"
+          x1="138.421"
+          x2="91.147"
+          y1="87.996"
+          y2="89.294"
           gradientUnits="userSpaceOnUse"
         >
-          <stop stopColor="white" />
-          <stop offset="0.0001" stopColor="#FEF5F5" />
-          <stop offset="0.910425" stopColor="white" />
+          <stop stopColor="#fff"></stop>
+          <stop offset="0" stopColor="#FEF5F5"></stop>
+          <stop offset="0.91" stopColor="#fff"></stop>
         </linearGradient>
         <linearGradient
-          id="paint7_linear_1506_6816"
-          x1="242.695"
-          y1="153.36"
-          x2="219.025"
-          y2="154.01"
+          id="paint7_linear_523_1843"
+          x1="252.695"
+          x2="229.025"
+          y1="128.36"
+          y2="129.01"
           gradientUnits="userSpaceOnUse"
         >
-          <stop stopColor="white" />
-          <stop offset="0.0001" stopColor="#FEF5F5" />
-          <stop offset="0.910425" stopColor="white" />
+          <stop stopColor="#fff"></stop>
+          <stop offset="0" stopColor="#FEF5F5"></stop>
+          <stop offset="0.91" stopColor="#fff"></stop>
         </linearGradient>
-        <clipPath id="clip0_1506_6816">
+        <clipPath id="clip0_523_1843">
           <path
-            d="M312.518 143.785C313.642 142.036 315.971 141.53 317.719 142.654L338.35 155.918C340.099 157.042 340.605 159.371 339.481 161.119L336.631 165.552C335.507 167.3 333.178 167.806 331.43 166.682L310.799 153.418C309.05 152.294 308.544 149.965 309.668 148.217L312.518 143.785Z"
-            fill="white"
-          />
+            fill="#fff"
+            d="M0 0H1700V1702.14H0z"
+            transform="translate(-1031 -119)"
+          ></path>
         </clipPath>
-        <clipPath id="clip1_1506_6816">
-          <rect
-            width="249.74"
-            height="167.94"
-            fill="white"
-            transform="translate(134 288.855)"
-          />
+        <clipPath id="clip1_523_1843">
+          <path
+            fill="#fff"
+            d="M322.518 118.785a3.763 3.763 0 015.201-1.131l20.631 13.264a3.763 3.763 0 011.131 5.201l-2.85 4.433a3.764 3.764 0 01-5.201 1.13l-20.631-13.264a3.763 3.763 0 01-1.131-5.201l2.85-4.432z"
+          ></path>
+        </clipPath>
+        <clipPath id="clip2_523_1843">
+          <path
+            fill="#fff"
+            d="M0 0H249.74V167.94H0z"
+            transform="translate(144 263.855)"
+          ></path>
+        </clipPath>
+        <clipPath id="clip3_523_1843">
+          <path
+            fill="#fff"
+            d="M111 358c0-5.523 4.477-10 10-10h95c5.523 0 10 4.477 10 10v14c0 5.523-4.477 10-10 10h-95c-5.523 0-10-4.477-10-10v-14z"
+          ></path>
+        </clipPath>
+        <clipPath id="clip4_523_1843">
+          <path
+            fill="#fff"
+            d="M444 252.619a7.619 7.619 0 017.619-7.619h64.762a7.619 7.619 0 017.619 7.619v10.667a7.619 7.619 0 01-7.619 7.619h-64.762a7.619 7.619 0 01-7.619-7.619v-10.667z"
+          ></path>
         </clipPath>
-        <clipPath id="clip2_1506_6816">
+        <clipPath id="clip5_523_1843">
           <path
-            d="M101 383C101 377.477 105.477 373 111 373H206C211.523 373 216 377.477 216 383V397C216 402.523 211.523 407 206 407H111C105.477 407 101 402.523 101 397V383Z"
-            fill="white"
-          />
+            fill="#fff"
+            d="M0 95.12A8.12 8.12 0 018.12 87H198.88A8.12 8.12 0 01207 95.12v18.408a8.12 8.12 0 01-8.119 8.12H8.119A8.12 8.12 0 010 113.528V95.119z"
+          ></path>
         </clipPath>
-        <clipPath id="clip3_1506_6816">
+        <clipPath id="clip6_523_1843">
           <path
-            d="M434 277.619C434 273.411 437.411 270 441.619 270H506.381C510.589 270 514 273.411 514 277.619V288.286C514 292.494 510.589 295.905 506.381 295.905H441.619C437.411 295.905 434 292.494 434 288.286V277.619Z"
-            fill="white"
-          />
+            fill="#fff"
+            d="M0 0H15V15H0z"
+            transform="translate(20 96.824)"
+          ></path>
         </clipPath>
         <image
-          id="image0_1506_6816"
+          id="image0_523_1843"
           width="92"
           height="109"
           xlinkHref="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFwAAABtCAYAAAAsyQZQAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA/1pVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtbG5zOmRjPSJodHRwOi8vcHVybC5vcmcvZGMvZWxlbWVudHMvMS4xLyIgeG1wTU06T3JpZ2luYWxEb2N1bWVudElEPSJ1dWlkOjVEMjA4OTI0OTNCRkRCMTE5MTRBODU5MEQzMTUwOEM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjRCNjI2OTZBQTY4RjExRUI4Mzc3Qjk2Q0ZGN0I1ODQ0IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjRCNjI2OTY5QTY4RjExRUI4Mzc3Qjk2Q0ZGN0I1ODQ0IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIElsbHVzdHJhdG9yIDI0LjAgKE1hY2ludG9zaCkiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0idXVpZDo1OWMyYTBjMS1mMzYxLWU2NDMtYTBiMS0xYjQ5OWVkZjcwNTYiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6YTllYWU2MWQtY2QxYy00YjFlLWIxZTEtMDczM2Q1OTVjNmIxIi8+IDxkYzp0aXRsZT4gPHJkZjpBbHQ+IDxyZGY6bGkgeG1sOmxhbmc9IngtZGVmYXVsdCI+TG9nb0FkZW1lMjAyMF9SVkI8L3JkZjpsaT4gPC9yZGY6QWx0PiA8L2RjOnRpdGxlPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/PuiGWr4AACTuSURBVHja7F0HmFTV2X6nt93Z2d6BpXcQRFBBUImIGruoaNQkll9j8ts1mojtt0QTe0w0CoohVlQEAZUmVUF6hwW215md3mfu/33n7s7O7M4ioC5Z3fs899nZ2+97vvN+7/edc89RYOo/d0FCLlwBDyJRQKFA9/IDLhKtDKlZZ4JSWaemDSX0r86YaUpXKxWISlI3SD/goiADlghTTzAMKSoZ1fCHgtBpdO//aTKGlWTA6gh0o/QDLqlGDayuAKb+6TPYqp1BNSKSMPkRvTNRmGlCcVZKN0o/8FKSB2hUSiAchbKFZ8LM393Lj7IwtoKoybCVMW7vpu4fz2/GgavshqNzF/UPdqUIe+EoFGrN4aVlJAJE28hP/qlUdXweHS/Reezx0faQKFmPis5VKuNNStyHLUvRdl+snodbf6va3Jufj58z2f342gqlfM7xAjxqs8F29x0I798L8133wvjLCzo81vHEYwh8sw7KrGwBlhQlIHVaaIeNQMr0q+XtbRbX66/C++GHUBXky7oWrVU0XFWF1N9cD9MV01u37duHpvvvheT303WHwfLEXxLLvL4OTffeDclhB0wmZDz1DF27MLbft+gzOF94Vt7W5n4RelfdULrm/z15/AD3ffkFHLNmk2GQhZv+fljAvYsXw7NqLdRaJaKkkKIEOtufgl7c8585yH7nfah79ko4J7BmDZyLv4RWqyLDiwqjbjG8AP2jGTYyEfCGejg//Fg+5sul0E08HYazp8b2833sb70NJZ2roNjDcv+fEwAP7thB91tK91PKxs7HtVybfhv3Hzy+gHvff4cePgpNbgb8K1cguGUztCNGJj1WaUkDV0ZVRjr0Q4ZBmW5B4OuvqZZY4Vu3AbY770DOB3MTg4fUFHGOwpwCw4CBci0IBsU+XU01dAMHJh6vVkNtUNPxZkTqbHA8/VQMcMnrgfvNmWDmU5pSZLpRJcKgNBrk+6UYoC3sAXXvPrH7Re1NVMAjjh+Hh3btgn/pEqgzzUQNGoTqAvB+NLdDwBVarfxDo0LGk3+hl+lNFrUdjddMhxSsRmDFMkSIJlSFrRan0GiEhUk+Dyz33Q/d+AkyzwpzDFKBpLYpVSWdo6J7qaHpkQff8pXwvDNH1AL3rJnwb9kObc98up6vPX8LVNTiflGnH6k3nIO0+x5ovR9zv0Z7zHh9b5XiXTAfYZsLCqOeODNI1qGG77P5kEKhjjRSMxlGocrNhTIjE/oJE6EdPoIcI+32e8kqa5Ofw84zHKJaki4ctMRgG41ERynJcxjMPVxYiijcs98Utcj91iyodCrZSfN1k+nhlm3hiHCe4n60TWKwqYCU6enHz8J9C+bJBjt4uLBKz7/fQmDTVvi/+gqGM888bFYn6g+gxdeLl4iK5IP8YkkWVU4Ommb8CY6nnhAFGm2wQztqGHI+mp/8FhTdsRWrczIQ2r2LatHVVHsqBK2xQxWgH2ZRFefBO/9T+FetFAUtudxEMynInb8Iqrz8zgecuTew7mvx2zBlCowXXQLv3PcQsfvg/WTudwDeLssTJxGTVzyFTofQzj1Uq2UnFhZGHD1ciCd4Ourx0sP6yQiWE2Am4ngt1QwDItZGoh1Nx9Wfam24to4Kq1SmmGZKEIV1PCzc+8F7ZKUh0rp0oT59oe5VAs2AQYh8vRH+hQsQrZ8BJVnld4LcTDGxqCyaHMSo3YGUq66CeshQREnSRcl6NYVFHUv++iaYbr0CUiAI56v/goZ4O1xWA/Mffo9IbRU85JxV2R3TQ6SuHrqTxiFt8ll0PwfVqqDwJ0wxnQ541G4n/p4HZapeVFHX838V/Milry7IQrC0DL6Fn8F07XUdgq2Is+RIbY0cZ6johQyG5Pd0OWG6+lfQk8wDVXFRSJqOX0FiC09LI4BvJ2UyG77KehiKipB2512w/u/vyOMfPn8UsXuhHzMGabfdITtLSQ7YFAZj5wPuX7YEwT2lwttHiEvdS1cJP6VSq6AmecjBmGfex4cBXCkCIIkiVO/77wopqeAg1UyysaR38lNIHYT3EqUUFCHaZBP0E3U6oenXX9Sw5FZaJxxzxvPPwvP55zBTcKWiWhGpr28fRbalFBIjYQqSOJCK2m3CEUt+H5QkN7VjxnYu4N65c4UK4GquP/N0mIePJAt0iYfyLfwUUZ0V/uVLiP92QxOvk8lK+D055G66+x5Ar0eksR6KkB9hkrrpF18MZUpKUtXAjtXxxJOwP/MsHS/r4iBZccbNN8Py4IOJEoUiWPGLAOIl5brfwnj+hUQhOTE5KSxEUJmU9H6q/FyKOj+nwG5F7H6c+dMPHIC8pcs6D/AQWZmL+I9fSekNUNT1BDRslc3qItLYCN/eg4h63cST78Pypz/HWZxVODtU1pF1R2MtUMoUNdJuvomOnZEkdeAQ5yir6hElgOPhCQqurk/Eizg75AmL54tY7bFgSJWTG5OXkZoGsHCViOcRSlRFUadb7FNWWxGlffH34yPVh3G0PwrgUjCAtFtuIo9vFlpaSxFjQivHrbdC1bMHNylB079fwr6UG2+E7swzoNTLPK3gdACpAQ0FSrrRJ5IVZ7S7n/ESsvqiQlINRkFFzPVSjNddpIYmJxyv6dkTGQ/+mcAKQp8sAKNrmO+6C8b6WqINfTvHrp8wAZl/vA8qk1HmbJaqLe/uIx9VXHTMgCsw4UUnjNrUg29eiV65qUcGODlG4bFZx+q0coawTZWUPB65qtIxHJzEFxY4KGrJtklytk+h1XV8P67OgYCIAJNm/YiWEp6BgyKmElY7dN1YdJtQC/zyufx8dH6CYqLt4vxk92MK4khUpzty+RyKoMc1c1B/yOY6JgvnBxQPeRi5p0hJ6SC01wkQjup+HEofTTjNob3RdPhr6uj5O3oMBjQlFT/G0t0A0clLN+DdgHcD3r38gIv6v/0BHd4gam1eWJ0B8dsfiCAo2ivp4ck56rRKpBo0yEjRIdtiRH6GoRvwY1l2Vtixt9KOQ3UuNDr9CAQjIr0dS+3Sb5NOLTJ4gUAYGrUKZpMWRZlG9MhJwaAe6ci1GLoB/y5r/nxTFWoayaJdfihJGus0KmHBKXruBqmAiiSnWqWAlgC2uQNw+UIw6jXQaEgK0hHVVBuqrF7sq3ZiZO9MjOqbBZVS0Q142+WdNYfw8uwNOLSnHl6yzFRa82ktIIvNSTMI0LUCVAXCFNDUNfnw1bYaDCi24JwxPdBAtaDG7oPDHUQgHIXDE8C/l+5DRqoek4YX4Lqz+sNs0HQDXu3w485XVmPlgl2oclB0x6AQYDYCr4JoQ0vGadCqoTWSFROFcFAVocjN7fTBVWpF6sS+WG2owaq1h+CjfSGyeCX34UvTYwBZOPcGnruyFB9+uh1/+O04XHJyz58v4N8ctOH2hxdjzboygJwe8ii6I3ARisiZSFr9FEr7CUT4gq0dc9z0vz8ITWEaThqahxqy7op9DUC6UT7fH4Jap0L/IgsGFqXhxXk7ULXmoKg9ZXeejjsuHPrzA3zDARt+e8cn2L6zFigwA6k6OU/BK3OuStHmEbk3Fa3E85mFZvTOM2PU8HwM7WlBH38YtbX9sH5DBRWcCqDaECEr/3LVAawxalFT6wRKMlFe78LDMxaJWnPrBUN/PoCXkVO7/pHF2L6tGuiTRZ5RJWgkMbsU/0MhFwJZeXG+Gb16ZeCUIXnom5uKeqIkg1aFK6YMgJf279hBBZhlgkS1obLeQ6e7AXK4YDoqToeT1M+Mx75ABlHO9El9fx6Bz0PE2VuomiPDKFNEtIOuuwwyST6Q8gBxehHRQz/iZQ9ZtIlAbiLH6A+GhYPUUo246pxBGEEOErRfXDdFS9qRE19KuebwfXpYYKNr3jNjMb7aXvvTB3w1WeCcFaWwjCzEMFoFEMzZ7TpNQgDXm0D+xYQSUQNK6Dfr6wlk3bnpBqHNZcWnQD0VSD4V4OnjesoFxdeUmvvExZLZzbREyqaK9P3NVMsONXp+uoDvrXJgHjnIDApMLr5oKG67fCROGZoPuAJohziDQyAXEldfeEY/TCPO3V/pJD2uweh+Wdhf6xIKRCEaCIg1yOIr6t1Y9m1Fc469g1dr6eRTkoGd9CwPv7bupwk4a+clm6vI54XhJflXT+CkErdePKE38vJJnVAQIyyzBXeBoho7d9Vj1ZZqMvYohfFEI0QHr87bjlmvrMHOQ01IN8tJbd7noGts2dPQSkcdLaKLM+0nXzBnzrdYvrHypwf4VlIllVYPHCThnGzRSiWa6K+agxkjgcYanLla8G+zSiFrtJHEq7V7UdngRk6mCYsW7cKqRXsQIlVjNula2ooRDEWRTtuyyWG2c8DJFqYWCqiCZAAPz1r/0wKcDWolcTeH4Dv2WzFuWAHOPqkYVrLI+RSwWEi6TZkyEAUk9wTYxMeCZgg4iTR4AQF93rge2EaBTnlZE8aOL8EtvxmLfkVmNLn9VHYK+Mny8+m4YX0yuU3rCKsdlRZp9a/Ip6zd1jkOtFNkYWmNE2XkpEwURfoJ/akENkeSqzZVIYNC92GkkftSEDOa+Ly02oENW2tEmC6plUS1BvQtSEM2ybgzSHdrTizCyYNzSYCoYaVok0N9MxWYlo4NUgG5WdWojsKODFpEvXa8/NFWnDws76cB+Kb9jSK5tKfMhjwGmKTdu0v3wUX0cdGIQrjJij205lEVz7NQSE5WxwmoXeU2jB2UK6iigQpg8qgi0e0wRPRR0+QlkBWiIBZ+W4nCLCMUYQnbttSQHNQf+cOxSsox4dPVB1FH98zNNHZtwH3EkQzOgEILSkml7CdL9xLQRdkpCBCPujjHTfIuRC/OmT/ODmYQwLz2yDZRvKKE0yN3wvH45b+BYFQksswUUX5Lhbngiz1UU0xII/B9TBMc6BzNZ3mpejirnNhIof/UU3p1bQ7nzB2D+uXmapRS5Fe+twGLvy7DCIowGZPaJp/gYFXzGuLElcsvQOaULNME93Zi+ReiAuKVCyXLrEe1zYc5n2xHDue96dyDxO8iRXA0YLOYUatE/mXT3oauTykObwgfrS3D1vUViHDkRy+3aOUBcm5ZGExRH/fZYMARaVWDzMussTk/rqQNymaJp2iW0XzMt3sbodepMH5EAQwE+Fcc0vNx0aMAm7me7gGRHAuhjGpil1cpa8kBbly6F9xhjHtisQU6SIOz9s0koETjQIeRfXstrSGKsZGC2VneBDdZpYFkYA3JSaetObV7VMFBBGamL4pQC4YXoH+v9K5v4dsPWCmoISvqmdFa1Uke7qTqP4ZC9DST9og+O2/5ei+PQnoGvJZop3KtnRydBxGiGGiPwXYcfoygwOv0kYWiGS+baEoS7UqKrgu4O9TsxGJVXRLp0wZ62SjxsyXNGHOK30W1WgJ2HUWSG3bW4iBTSEsIz4GOUSNTioT2HJ7sg9vmvIpE61Citr2VDgI9IHcBV3ZhSom0kG5CMSsRIiutIevkHMh3KzdJUE8h0cem0kZsJqc7vF82zqNgaQDJRgNZJluriFQ9Abl0FM1Ac0TJaQOqEYKvOaji/5tTB6z7eWVpKkWlrk8pKQnWHWdxxJ8HKCAaNzTvO8HmMUc4uOHUgIUc74ChBTh3cn8UphsxuKcLdnLMB0nj7yOastFvZzQau6eGakU+0RCXe73DJ/jaS7XOwVlCjZrKiWOAsGiYVqkU4kPZLg24hfPRLf2LFYkKgQEQKVZl8s96WKmY9PIjLtlWg00kLTmE11NwtIITTgQQB0nDKZAa2jNdaPNldMy7C3cJP8H9vrPzzRhDEWyIbqCne/ahqNVO1j5/eSkqSAb6KXiSFPK9uCFD0dUtPJuCiqShNtGKlZwpf/6tVqkoCIq0Yx7uEpFq0uGTlaX4YsUBAYwgWCqo/UFZR+7YXY/1OSmwkLWPHZYvgiqRAONSJNnoo9+7dtchQBR28TmDMbjYAjdRS/oFBnyyeLdoM2Vdz9o/zaTr+pTSkyJKaFWtArpl0VF1plC6rN6Fwb0yUEVVXBW3nw/nkP5QrRPL15QJ54ZMg3wNrg5qpaANBwHpYF4mgFdvqoKOpOEJJxZjb6lVjDPVpAyhaV8DtFTT2IpZQvqIRgqolkw7dzAVUEjUPo52M1P1PzrgP7rTHN43CyayQBFcJAhqJcJED/NWHqTwP0LWpRGt9K2MIw+fs/zbCgT53Gxj69fFXPFFClcpt/ZTSM8qRSK14md5R4U8ZXwJlKyQmKupEH553mCUFKQKgPkSdRTkpFKhFxCni8EL6HoZZl3XBzybHNbo/tkAObx2nEFWd4isj1O0ah6QQNW6n5Nddg5wDtjkRuaOFIT4fLu5wYHDeuL8dXQ95v5Jp5QgkxTMpNP6YALRjdsbam4l4rKi65OisVIBhan2cEtSUZbpp5EPv5BenMgy0WlKspUz6MtWlKKMpJnJ2PqVQ4RA4Px5D/4MJhjGEXkzBp+s1kmyb9Gy/cgjSx91agnOHFUoKIkbn+OjV/7NwDu9AdEfkTOPPwnALz2jL9I5bGadrIijA67yBIKWgG37IJw95JHQzh3fG3rRIuQ/fLNZfGuHxYAGqh1Ll+9HxUErnEQjfL1kfQz5y2dOkI3um500ldAlAS8mK738nEEkhN3yHTnw4CY1iuzyyLIuP3+IsEZ3XMTJr26n4/oUmnH26X1Jt8udgHCkOpm4vXZ/gxjQhmkllKTZjQF20D05oBpektEZUHRem+b/XjoCaUwPFJwYSX5xnnsARYtXXzQcJw/MQZCsPdKGp9mJcrvnWWOK8QuqJRSxyM73cKC3RJfkLAsG5eHqXw6BQa0SWclkOp8jzImk01v0fpeXhS3LQApMfjP9BLwyawMuOau/4NteOakozDCgvsknEljKNkDy/z5SMlw4FxK1eAnwdVurRTe2DkHnzaSps8hqryKwsygyrbP72l2b6YUlYp8CCoz6Z3cWDJ3b1e32K0dBQ1rXRADmkhzjZrVq0uKKuJx3+5S1Ak0UIFno97VTB6KCVEX5nnrArE9u3UQRaaRWrrxgCPpRlFnT5Gnnb/maDk9I3PMicugGXefB0KkdgYozTbifqIUd2PZDNngC8kt/l69iucjnMKdHmVYO10hMx4ynwOfs0cVw+4OCuxVxN2CwWa04fUFccmpv9C9M60wIOr+rG+e/LyddLCzXGTyirxOY2tPJCS6nSLKytJG/NWlPI3wd4m0jhfhTx/XC7ioH9lQ6xPVbAOffHFHy4LuTRxZi0vD8zn7949OZcyiF8tMIdHZk/LGU6jBWztKaW+fZUrkzkdDuiiS5bpKNRqKGaWcPRHmtEy/M+gZbyUGnkrbnQ7iWeMkf1BKfnzIoBxee3Ot4vPrx+2zwlEG5BHpvKAkIbkhmQDuy9jzie07lVtc45FC+pYFBtIWSA7X5YDZoceVlw2Ehbv/ru5sQIXDZGSqbx+/mgmXFM44U0WUTeoumuuOxHNcvICYOLxCdgz5bXyGUhI67PhBwbI2R5i8gmIIcvjAWrj6EKEs7g7a1RyzrduLjbCqQC6cOInmZjVfm78SJg/Mw8YRC5JCD5pwJcza3Fk0+oQjnje0hsoPHaznu3/icSFo8j3h31Y5abKWokL9e05FuNhnUQj2EyDrfW7ALu3fVEZEbZIvm3lUhcoZUMAMH5OCsCSUYVmxBOQVWpw3LFz21GOj9VCv0BC7nzMcRjfC9jvfyX/EVGyeNrpjYB4N7pOMbknzcrZm7V/C3l9/ursfGlaWyDOScCg9FSBZekJ+C4SMKMYGsOYUKh8Fmn2DSa8hZ2kWqty9pbP50cNzA3E4LbLoE4LFULoXXg8hSNx+wYk+VXbSkG4hmeg/Ng4M7dhLYBtLYvQnIoT0zRM8sjz+Eqga3kJeiQxEd1zc/jaw6TYz63xkJqS4LuEjLkjNjZ8frwToX8XIu6s/sj3IClVv32bHyF8jsCO30Px/PHUG5J1Z287edPXNT/2ss+r8e8PilhIAriRuliGUd98bi/AenbxlsbfOXyqLttAssanShhXU2r0hHl126h+/oBrwb8O6lG/Cuu3wvp8njfId37YR6wMCEsQHDpfsQ3LYNmsFDoOk/QGzjwdJD+/aKsWJ5GFTdyadCYTAgtHOHGHdcmWah39uhzMmFqnnijTAdH6Tr82j7LfNChMvLECkvR8TeBHV+AbSjT2z3XDypBo9RKwUC0I07OTagu9heuh/RpiYoM7OgGzuu/bkV5eI8dd9+bV42itCO7WK7Qv99Br7hgSKn/FM6WOuUjnYJbN0ilY0cJvlWrYxtC5Xul2omTZAqB/eTGq6aJkWsjWK744XnpYrifKl++qVS3flnS+GaarG9ZsIpku3uO+TfE8dLrplviN/B/fuk2jNOkyp65kt1UydLEZtVbK+/fJpUNXqEVHveWZLtztuSPlfTIw9L5QU5UtWQ/pLtj/dJ0YBf3v6n+6XKvr3o/lOlxptvkKRopN25tjtvl+ovvqDd9uC+vVLZCcMl7+eLjxonfzAs5VzxloRxzzm/F6X4FsyHZ/M2+BYtim2zP/4YWepuZL36hugNxSPT8xLasgXhmjoxD4Ppyqtjw/qHK6pgffpvCG7cQNZVKUZDFtd5ZAaCe/ci87kXSQ+aEGloFNv9K7+C0pIB8023wDDl7KTPFVizmiw4B6m33Qn7E08itHWrvP2b9WLwdp6GhmdikZJ0aAzu24/A1u3t3/WzBfBs2krvuvD4cDhPCeBb8CkyJk9CcN0qSF75c43Qtq0wTZ9GlHEKomodwtU1YruqqACq9BT4v1wiBuMVI2PSoh0xCKqcbFjv/SMUZhPUxYXN19kGw+TJMFx4CXI++Jioqb8cifbjPi4e+JYs6XD0TYVeA/2p45B6/Y1QWYwIbpcBVPUqgpKCJN+yJYLOFKr2jKrKziD6KkjcyO86931614kIbt5EtOjofMB9CxfCt2odtCeOhn/VKnjJAsQFyXJDu/citH8v7DPfRGD1GpkbbTZEfQFoR46E0pwqzwTF77JnPyy/vhYKihrdm3cQonJrjtJiEaM4h8sOiYmMeER8cZ3aOgLUCN2o0R02JPPkH+FD5XTt3YjaveQTMmU/Ut8oOgTpRo6Sx75NYuF8bqS6FpHKCqp9ZXLNWP8NvCvWQEv3DKxdC/fs2Z0PuGfuB1D16weVOQ3Knn3gX7FCbDddfS3Rwxa4Xn4RpkH9YZg6RbY6LX9pRhYVDiK4dQsizQBGnR5oTxqH9EcegSI7KzZfTso115JzrEDT3bfDeutNMapR6FPEyPdRp10M8p5sURUUkSVupnPvgHboEGhbnKPOCElSiGG2g5s3iunG2p1LjjhUXgX7Yw/B+bQ8OZKfQFb17k21xQx1777wkgEc66JCz3P+CI1Kd9tFw2BJOfLOjJKtEeYbbxR8bDh5nJhsSDtsuJgeRt2rGOHdu5F2190wnCXzrKqwAOq8HERra0WzmH6crFJU+TnQkQrRDh8JXUYadGPGikHVtWSFfE6Ejk8jLmaKEpTSp4TO0wnLVxcUCqtrJ72IvpQEjjIrCxmPPhZTOJpePaDKTCelU0F/SaWMOyUJ4LlQF+aJNLAqOxf68adBcjuRevFFMP3q1zBMOh1KvVYMvX2k0xlzY8qzH22Dx+4LHtNw1t3L0S3xw1l3Bz5dJdL0r10D36fzEPx6nZheJtLQOi0AByY8W5X347mI1FQnDZiC33zdbj4cyR9AYN1aEWTwIO0s7+KP4ZmpAmtXwzNntnCICXKO1FH8Ng60+P4Bfr5PPkJgw/q4fTa6zprEKR75GuQcPf9+G5GqxPFTmNb4WWTHW0fHfd35gQ85FaksN12q6JErVY0aKgU2bYzta7zlJqk82yzVnjVJqrvgPClstSYGTN9ukA6kmSTf8qUJ28PV1dIhS4rkmfeJFCovk8rp+qFDB2P7HS+/JFUO6SfV/mKSZH/q8YRza848TWq4ZnproLJrp1Q9ZqRUXpglleVnSPZn/xrb513wqVSWlRYLpsQzbdkiVZ0wVKoYOFCqPffshH3u9/4jHTBqKFirkdwfvCNV9uvR+YFP2gMzkHLtdYi63ch558OEye4i5YdEWJ/+xNPwLl0uJshLkJTzPkZYSXr488WJ+pmkmhQMw3rP3fAv/QIKnqMnTrq558wheemA+fY7kXLZ5Ym1w+Uk9dE6fpVm4CBkvT5LhPHsdMVcPHExRNTuTOjkb3/0IXKyOchfuYKe60t4537YSgNaLULeEGz33iPEAKTjQCmy1+8t5shR9+uf4LFVpApCFCU23vI/MJ13NvRjx8a9bFDMb5Y2cTyBukzMABVPGYaTRhHwStjuf0DkVRA310LGE4/DMGE8nH97BvYXn5dnC2wprFRzu+lo1P0HiriApVxCwfJsU+mpCc8cra0hpTSMNHsOrWkUsFW17qPnMvXtId7J/uJL0AwYeHwA5+gy2mZKFzkBVAHtoEEiQRSpbUiYedD7wQfwfbtFzEjlX0ec+e5/Wq/n85I+dyLjyadEm2Vgx86E2azURcWwPPQoyblT0fTsCwnTyYipuxyuNg9Cet3alFAwLQUbbXImfLHM05oFN21GkLg+0mCFukevOA6vE7Ov8PQ4wUYbBUQVxwdwzsKpituP5Sq+Jhl+ArJffwPBPXtFRjAGODla/UmjkXLD9RR+nywi1taqoRIzEBom/wKZIhAqSKj2rn+8hMZf/4oi2xVIv/460tet91aaLcLK271gdn67WU544g9lfpEYTDJGkXffI2KLugvOERP5mS6b1noNvZ7oyg/jueciffrl9IzBzneawsk11EvBnTvoRzjRKW7eKAV3bJMd1KLPpODunbF9vi8/F5k3kVk8eFDyfb4oti/q9Ur+1SslKRKWon6f5F+xXIr6vK2ZyL27JecrL0nuOW9LVM3bOOL1UnD7tsQHjETENSK1NYmbGxvIYS9Lco0NkvPF52MZzth7VlZI/uaMKFGN/IzH6DS/V+DDlBJY/RX0p52ewLXdy48R+JBWZo3Lk3tGeRKiNiM4cEMDzw6YbIlarSLJn3g9SZ7MqIPRfJiHeYbDDvdZG5NmNJNNhsrzGrebE5Pv3zzfWuxZEk6KinfiRgz+2+kc7p0/H5733xVSzPXqPxIcI2famu67SySPwgdKEzOdmzbCevONcL7wN+EkY+9D8tLx3LPtjm8pPMeTj8F2++9p/4HEfW4XHE89DusfficHTfEJtvfeEWv8Ej5YCtttvxfXiweOZ9ZyvfySKDyKB+B87rmEQuF3tT/8IJpmPAD3a//sfMAdjz5GWvUjMZmnsK6WERsJ+MZfX4MAWb7/q5WwP/ZI60uRkqi/8nLh5V0vvkAF9UqCymgiKRjcubP9vR6ZAfcbr4lcdOO1VyfUDuczf4Fr5uvCapvuvSvBMl0vvUzr31vvT+c1XnuNaP5z/+s1cd3Y/V0u2EmFRAn48KFDsD3wQALg9gcfgvfDD6GyWBD1eTsfcEWakYKLvtCNOhGmaVfE2vnYAn1LliPzX7NQuHMPzDfc1BrwLFpEWnY/8td+g5Tf3gD366/HBT1KqMwGeYK7NovrzZlIe/AROm89/KvXIrR9W6vlzfk30u68G9kUfOlPPRXh8vJW0ZNlEWusdm3fDv/KNeL+lkcfh2vWzLgXouN5HlBSNEqTEWr+7j6O3vh9WafrJ0yC6ZJLjwPgPA9mXZ2Yxz4iggSpOU8SEgM+cNTIs7qqeE74GO2H6YXkvtk8eZzUZj5jeXrecIxH49HgWVpFCw1dW4ofsoknzjOZENy6Ga7ZbxGdVSZeLy4slLgW6hSQ3B5aXQLY+HtEvT5RC3hta8X8vOGaKnrf5YLHO73Vnl9MSbrXNG26SOiIRJBaA3VJCRQU3bnfng3l3PdFS0/mK6/JkemgwZA0elGdfZ99RhZzQpvw3Afv4oXyNL8Ummv6DWg+bwg8s2cjQrVHkZpGkWNJ6wv07S8mUzWefwFCTW4xJW+rc3SImhM7lp5NXVAM642/gefDT2A464zWcsvNoYJLJap7TgRUytzChOnU2S9xusB02XS59ekYx2o6Zgvn2Vd5qkbr7/8Hrrdeh9T84Q23M2a9SoAu/ZxAfychyc/5lozHHiVe/z8xh2bG08+0WhCdZzz/lwisWQPrXbeJ7F/LkvnKK+QcHXDPnImsv78U60Yhwv2/kvN1OSjcfxpZTz4O7QmjYvt0J46BdvSYOIrJRvrjTyC4fSuF5yWxxhH5AZTIeOov8PznbVJfa5D9xsyE9zVddClFoA2w/u56io7nHPPAWMeuw4kuIqQswGEz8R63oCTUgMZG+eOyjIzEadOpmrMF8TTnyjaRIVu2SEDRX7au+MmeRc6FQnJldvuvGNjieGJRnkw1Pj/S4lzbzn3J6VkxhaNW066PCaeZmQ45R9RWYrKSgp+ohs5RpR/5p+Lfez5NuX5qyGNTletgynFVVlYHRayQgenAL6g6mKcznira7yPHmGR3R5OMCiPoqM0xO/m08JzwUgmK+X5dd7tbfLpKi0/38n0AF3OedWP/Yy38maKiOY2qFpDTj0qrFzqtWgyj0b38cAt/EuPyhuShSfiLa0z5h58cma44yyR2RjthdMqfFYWQSGBMyxvdPOxIgCxceZCkWm7F/kYPDjcOSfdyjFlV2bJhMZigUtb9vwADAMUXgwpP/u1UAAAAAElFTkSuQmCC"
-        />
+        ></image>
       </defs>
     </svg>
   );
diff --git a/packages/panier/components/Picto/CollectiviteEngageePicto.tsx b/packages/panier/components/Picto/CollectiviteEngageePicto.tsx
new file mode 100644
index 0000000000..820c4e2d4f
--- /dev/null
+++ b/packages/panier/components/Picto/CollectiviteEngageePicto.tsx
@@ -0,0 +1,214 @@
+import React from 'react';
+
+const CollectiviteEngageePicto = () => (
+  <svg
+    xmlns="http://www.w3.org/2000/svg"
+    width="189"
+    height="134"
+    fill="none"
+    viewBox="0 0 189 134"
+  >
+    <g filter="url(#filter0_d_2639_10802)">
+      <rect
+        width="136"
+        height="97.347"
+        x="37"
+        y="14.795"
+        fill="#fff"
+        rx="2.687"
+        shapeRendering="crispEdges"
+      ></rect>
+      <rect
+        width="123.116"
+        height="71.579"
+        x="43.442"
+        y="32.69"
+        fill="#F4F5FD"
+        rx="3.272"
+      ></rect>
+      <path
+        fill="#C5C5C5"
+        d="M58.305 58.477a.377.377 0 00-.395 0l-1.224.753a.377.377 0 01-.569-.388l.294-1.622a.377.377 0 00-.103-.332l-1.132-1.151a.377.377 0 01.22-.638l1.47-.192a.377.377 0 00.298-.227l.596-1.42a.377.377 0 01.695 0l.596 1.42c.052.123.166.21.299.227l1.47.192c.308.04.438.416.22.638l-1.133 1.151a.377.377 0 00-.102.332l.293 1.622a.377.377 0 01-.569.388l-1.224-.753z"
+      ></path>
+      <path
+        fill="#E40D18"
+        d="M58.305 58.477a.377.377 0 00-.395 0l-1.224.753a.377.377 0 01-.569-.388l.294-1.622a.377.377 0 00-.103-.332l-1.132-1.151a.377.377 0 01.22-.638l1.47-.192a.377.377 0 00.298-.227l.596-1.42a.377.377 0 01.695 0l.596 1.42c.052.123.166.21.299.227l1.47.192c.308.04.438.416.22.638l-1.133 1.151a.377.377 0 00-.102.332l.293 1.622a.377.377 0 01-.569.388l-1.224-.753z"
+      ></path>
+      <path
+        fill="#C5C5C5"
+        d="M69.984 58.477a.377.377 0 00-.395 0l-1.224.753a.377.377 0 01-.569-.388l.294-1.622a.377.377 0 00-.103-.332l-1.132-1.151a.377.377 0 01.22-.638l1.47-.192a.377.377 0 00.298-.227l.596-1.42a.377.377 0 01.695 0l.596 1.42c.052.123.166.21.299.227l1.47.192c.308.04.438.416.22.638l-1.133 1.151a.377.377 0 00-.102.332l.293 1.622a.377.377 0 01-.569.388l-1.224-.753z"
+      ></path>
+      <path
+        fill="#E40D18"
+        d="M69.984 58.477a.377.377 0 00-.395 0l-1.224.753a.377.377 0 01-.569-.388l.294-1.622a.377.377 0 00-.103-.332l-1.132-1.151a.377.377 0 01.22-.638l1.47-.192a.377.377 0 00.298-.227l.596-1.42a.377.377 0 01.695 0l.596 1.42c.052.123.166.21.299.227l1.47.192c.308.04.438.416.22.638l-1.133 1.151a.377.377 0 00-.102.332l.293 1.622a.377.377 0 01-.569.388l-1.224-.753z"
+      ></path>
+      <path
+        fill="#C5C5C5"
+        d="M81.663 58.477a.377.377 0 00-.395 0l-1.224.753a.377.377 0 01-.569-.388l.294-1.622a.377.377 0 00-.103-.332l-1.132-1.151a.377.377 0 01.22-.638l1.47-.192a.377.377 0 00.298-.227l.596-1.42a.377.377 0 01.695 0l.596 1.42c.052.123.166.21.299.227l1.47.192c.308.04.438.416.22.638l-1.133 1.151a.377.377 0 00-.103.332l.294 1.622a.377.377 0 01-.569.388l-1.224-.753z"
+      ></path>
+      <path
+        fill="#E40D18"
+        d="M81.663 58.477a.377.377 0 00-.395 0l-1.224.753a.377.377 0 01-.569-.388l.294-1.622a.377.377 0 00-.103-.332l-1.132-1.151a.377.377 0 01.22-.638l1.47-.192a.377.377 0 00.298-.227l.596-1.42a.377.377 0 01.695 0l.596 1.42c.052.123.166.21.299.227l1.47.192c.308.04.438.416.22.638l-1.133 1.151a.377.377 0 00-.103.332l.294 1.622a.377.377 0 01-.569.388l-1.224-.753z"
+      ></path>
+      <path
+        fill="#C5C5C5"
+        d="M93.342 58.477a.377.377 0 00-.395 0l-1.224.753a.377.377 0 01-.569-.388l.294-1.622a.377.377 0 00-.103-.332l-1.132-1.151a.377.377 0 01.22-.638l1.47-.192a.377.377 0 00.298-.227l.596-1.42a.377.377 0 01.695 0l.596 1.42c.052.123.166.21.299.227l1.47.192c.308.04.438.416.22.638l-1.133 1.151a.377.377 0 00-.103.332l.294 1.622a.377.377 0 01-.569.388l-1.224-.753zM105.021 58.477a.377.377 0 00-.395 0l-1.224.753a.377.377 0 01-.569-.388l.294-1.622a.38.38 0 00-.103-.332l-1.132-1.151a.377.377 0 01.22-.638l1.469-.192a.377.377 0 00.299-.227l.596-1.42a.377.377 0 01.695 0l.596 1.42c.052.123.166.21.299.227l1.469.192c.309.04.439.416.22.638l-1.132 1.151a.38.38 0 00-.103.332l.294 1.622a.377.377 0 01-.569.388l-1.224-.753z"
+      ></path>
+      <rect
+        width="48.674"
+        height="6.442"
+        x="54.895"
+        y="39.132"
+        fill="#C3C3FB"
+        rx="2.65"
+      ></rect>
+      <rect
+        width="38.959"
+        height="5.031"
+        x="54.352"
+        y="65.398"
+        fill="#E1E1FD"
+        rx="2.515"
+      ></rect>
+      <rect
+        width="57.449"
+        height="5.031"
+        x="101.236"
+        y="65.398"
+        fill="#E1E1FD"
+        rx="2.515"
+      ></rect>
+      <rect
+        width="72.636"
+        height="5.031"
+        x="86.047"
+        y="74.087"
+        fill="#E1E1FD"
+        rx="2.515"
+      ></rect>
+      <rect
+        width="21.131"
+        height="5.031"
+        x="54.352"
+        y="74.087"
+        fill="#E1E1FD"
+        rx="2.515"
+      ></rect>
+      <rect
+        width="33.677"
+        height="5.031"
+        x="54.352"
+        y="81.862"
+        fill="#E1E1FD"
+        rx="2.515"
+      ></rect>
+      <rect
+        width="62.731"
+        height="5.031"
+        x="95.953"
+        y="81.862"
+        fill="#E1E1FD"
+        rx="2.515"
+      ></rect>
+      <rect
+        width="38.959"
+        height="5.031"
+        x="54.352"
+        y="90.551"
+        fill="#E1E1FD"
+        rx="2.515"
+      ></rect>
+      <rect
+        width="57.449"
+        height="5.031"
+        x="101.236"
+        y="90.551"
+        fill="#E1E1FD"
+        rx="2.515"
+      ></rect>
+      <rect
+        width="6.442"
+        height="1.432"
+        x="23.551"
+        y="115.42"
+        fill="#D0D0D0"
+        opacity="0.5"
+        rx="0.716"
+      ></rect>
+      <rect
+        width="6.442"
+        height="1.432"
+        x="51.467"
+        y="115.42"
+        fill="#D0D0D0"
+        opacity="0.5"
+        rx="0.716"
+      ></rect>
+      <path
+        fill="#F4C447"
+        d="M40.736 69.224c-.82 0-1.521.375-2.05.832-.529.457-.953 1.016-1.345 1.643-.785 1.254-1.45 2.807-2.1 4.392-.648 1.585-1.27 3.195-1.865 4.479-.594 1.283-1.28 2.23-1.448 2.348-.167.119-1.3.468-2.733.624-1.433.156-3.198.231-4.941.345-1.743.113-3.457.262-4.92.603-.731.171-1.409.386-2.017.736-.609.35-1.19.88-1.443 1.643-.254.763-.103 1.538.179 2.17.282.633.699 1.192 1.188 1.75.977 1.117 2.276 2.224 3.617 3.317 1.342 1.094 2.726 2.17 3.791 3.12 1.066.949 1.77 1.877 1.834 2.069.064.192.052 1.354-.239 2.734-.291 1.379-.76 3.041-1.188 4.696-.428 1.655-.819 3.293-.938 4.758-.06.732-.06 1.426.092 2.099.153.674.497 1.385 1.16 1.857.665.471 1.462.568 2.165.502.703-.066 1.372-.276 2.066-.558 1.389-.564 2.866-1.439 4.345-2.348 1.478-.91 2.95-1.854 4.203-2.552 1.253-.697 2.38-1.065 2.587-1.065.207 0 1.335.368 2.587 1.065 1.253.698 2.725 1.642 4.203 2.552 1.479.909 2.956 1.784 4.345 2.348.694.282 1.364.492 2.066.558.703.066 1.5-.031 2.164-.502.664-.472 1.008-1.183 1.161-1.857.153-.673.152-1.367.092-2.099-.12-1.465-.51-3.103-.938-4.758-.428-1.655-.897-3.317-1.188-4.696-.291-1.38-.302-2.542-.239-2.734.064-.192.768-1.12 1.834-2.07 1.065-.948 2.45-2.025 3.79-3.118 1.343-1.094 2.64-2.2 3.618-3.317.49-.559.907-1.118 1.188-1.75.282-.633.433-1.408.18-2.171-.254-.763-.835-1.293-1.444-1.643-.608-.35-1.286-.565-2.017-.736-1.463-.341-3.176-.49-4.92-.603-1.742-.114-3.508-.19-4.94-.345-1.433-.156-2.567-.505-2.734-.624-.167-.119-.854-1.065-1.448-2.348-.594-1.284-1.216-2.894-1.866-4.479-.649-1.585-1.314-3.138-2.099-4.392-.392-.627-.816-1.186-1.345-1.643-.528-.457-1.23-.832-2.05-.832z"
+      ></path>
+      <path
+        fill="#D1A42E"
+        d="M40.736 69.224c-.518 0-.98.156-1.389.38.24.132.466.283.662.452.528.457.953 1.016 1.345 1.643.784 1.254 1.45 2.806 2.099 4.391.649 1.585 1.271 3.195 1.865 4.478.595 1.284 1.281 2.23 1.448 2.348.168.119 1.301.468 2.734.624 1.432.155 3.198.231 4.94.345 1.744.113 3.457.261 4.92.603.731.171 1.409.385 2.017.735.609.35 1.19.88 1.443 1.644.254.762.103 1.542-.179 2.175-.282.633-.699 1.191-1.188 1.75-.977 1.116-2.275 2.223-3.617 3.316s-2.726 2.17-3.791 3.119c-1.066.949-1.77 1.877-1.833 2.069-.064.192-.053 1.353.238 2.733.291 1.38.76 3.041 1.188 4.696.428 1.655.819 3.292.938 4.757.06.732.06 1.425-.092 2.099-.153.674-.497 1.385-1.16 1.856-.16.113-.328.206-.5.279.367.107.735.188 1.112.223.703.066 1.5-.031 2.164-.502.664-.471 1.008-1.182 1.16-1.856.154-.674.153-1.367.093-2.099-.12-1.465-.51-3.102-.938-4.757-.428-1.655-.897-3.316-1.188-4.696-.291-1.38-.302-2.541-.238-2.733.063-.192.767-1.12 1.833-2.07 1.065-.948 2.449-2.025 3.79-3.118 1.342-1.093 2.64-2.2 3.618-3.317.489-.558.906-1.116 1.188-1.749.281-.633.432-1.413.179-2.175-.254-.763-.834-1.294-1.443-1.644-.608-.35-1.286-.564-2.017-.735-1.463-.342-3.176-.49-4.92-.603-1.742-.114-3.508-.19-4.94-.345-1.433-.156-2.567-.505-2.734-.624-.167-.119-.854-1.064-1.448-2.348-.594-1.283-1.216-2.893-1.865-4.478-.65-1.585-1.315-3.137-2.1-4.391-.392-.627-.816-1.186-1.344-1.643-.53-.457-1.23-.832-2.05-.832z"
+      ></path>
+      <circle
+        cx="45.508"
+        cy="23.304"
+        r="1.963"
+        fill="#FF4443"
+        stroke="#DF3A3B"
+        strokeWidth="0.327"
+      ></circle>
+      <circle
+        cx="52.053"
+        cy="23.304"
+        r="1.963"
+        fill="#FFBF00"
+        stroke="#E9A113"
+        strokeWidth="0.327"
+      ></circle>
+      <circle
+        cx="58.597"
+        cy="23.304"
+        r="1.963"
+        fill="#00D544"
+        stroke="#12B62F"
+        strokeWidth="0.327"
+      ></circle>
+    </g>
+    <defs>
+      <filter
+        id="filter0_d_2639_10802"
+        width="188.137"
+        height="132.938"
+        x="0.304"
+        y="0.664"
+        colorInterpolationFilters="sRGB"
+        filterUnits="userSpaceOnUse"
+      >
+        <feFlood floodOpacity="0" result="BackgroundImageFix"></feFlood>
+        <feColorMatrix
+          in="SourceAlpha"
+          result="hardAlpha"
+          values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"
+        ></feColorMatrix>
+        <feOffset dy="1.309"></feOffset>
+        <feGaussianBlur stdDeviation="7.72"></feGaussianBlur>
+        <feComposite in2="hardAlpha" operator="out"></feComposite>
+        <feColorMatrix values="0 0 0 0 0.25098 0 0 0 0 0.25098 0 0 0 0 0.572549 0 0 0 0.1 0"></feColorMatrix>
+        <feBlend
+          in2="BackgroundImageFix"
+          result="effect1_dropShadow_2639_10802"
+        ></feBlend>
+        <feBlend
+          in="SourceGraphic"
+          in2="effect1_dropShadow_2639_10802"
+          result="shape"
+        ></feBlend>
+      </filter>
+    </defs>
+  </svg>
+);
+
+export default CollectiviteEngageePicto;
diff --git a/packages/panier/components/Picto/DashboardPicto.tsx b/packages/panier/components/Picto/DashboardPicto.tsx
index 690220153e..180f1893c9 100644
--- a/packages/panier/components/Picto/DashboardPicto.tsx
+++ b/packages/panier/components/Picto/DashboardPicto.tsx
@@ -1,937 +1,891 @@
 const DashboardPicto = ({className}: {className?: string}) => {
   return (
     <svg
+      xmlns="http://www.w3.org/2000/svg"
       width="496"
-      height="422"
-      viewBox="0 0 496 422"
+      height="423"
       fill="none"
-      xmlns="http://www.w3.org/2000/svg"
+      viewBox="0 0 496 423"
     >
       <path
-        opacity="0.6"
-        d="M471.5 205.5C471.5 327.831 361.831 361.5 239.5 361.5C117.169 361.5 33 318.831 33 196.5C33 74.1689 127.169 3 249.5 3C371.831 3 471.5 83.1689 471.5 205.5Z"
         fill="#EEF4FF"
-      />
-      <g filter="url(#filter0_d_523_1843)">
+        d="M471.5 206.045c0 122.332-109.669 156-232 156S33 319.377 33 197.045c0-122.33 94.169-193.5 216.5-193.5s222 80.17 222 202.5z"
+        opacity="0.6"
+      ></path>
+      <g filter="url(#filter0_d_2639_10667)">
         <rect
-          x="420"
-          y="83"
           width="29"
           height="29"
-          rx="5.88406"
+          x="420"
+          y="83.546"
           fill="#F4C447"
-        />
+          rx="5.884"
+        ></rect>
       </g>
       <rect
-        x="424.77"
-        y="88.075"
-        width="19.8797"
+        width="19.88"
         height="18.85"
-        rx="3.36232"
-        fill="white"
-      />
-      <path
-        d="M434.5 92.425V102.575"
-        stroke="#F4C447"
-        strokeWidth="1.68116"
-        strokeLinecap="round"
-      />
-      <path
-        d="M430.875 94.2375L430.875 102.575"
-        stroke="#F4C447"
-        strokeWidth="1.68116"
-        strokeLinecap="round"
-      />
+        x="424.77"
+        y="88.621"
+        fill="#fff"
+        rx="3.362"
+      ></rect>
       <path
-        d="M438.125 96.4125V102.575"
         stroke="#F4C447"
-        strokeWidth="1.68116"
         strokeLinecap="round"
-      />
+        strokeWidth="1.681"
+        d="M434.5 92.97v10.15M430.875 94.783v8.337M438.125 96.958v6.162"
+      ></path>
       <path
-        d="M456.5 224.992C456.5 247.254 450.912 265.456 440.991 280.243C431.068 295.034 416.79 306.44 399.366 315.074C364.505 332.349 317.113 338.5 267.062 338.5C217.021 338.5 174.87 330.707 145.242 311.811C115.655 292.942 98.5 262.963 98.5 218.414C98.5 173.874 117.697 138.666 149.37 114.579C181.055 90.4827 225.253 77.5 275.249 77.5C375.245 77.5 456.5 135.972 456.5 224.992Z"
         stroke="#EEF4FF"
-      />
-      <g filter="url(#filter1_f_523_1843)">
-        <ellipse cx="248" cy="210.942" rx="187" ry="150.084" fill="white" />
+        d="M456.5 225.537c0 22.263-5.588 40.464-15.509 55.252-9.923 14.791-24.201 26.196-41.625 34.83-34.861 17.275-82.253 23.426-132.304 23.426-50.041 0-92.192-7.793-121.82-26.688-29.587-18.87-46.742-48.849-46.742-93.397 0-44.54 19.197-79.749 50.87-103.835 31.685-24.097 75.883-37.08 125.879-37.08 99.996 0 181.251 58.472 181.251 147.492z"
+      ></path>
+      <g filter="url(#filter1_f_2639_10667)">
+        <ellipse
+          cx="248"
+          cy="211.487"
+          fill="#fff"
+          rx="187"
+          ry="150.084"
+        ></ellipse>
       </g>
       <path
-        d="M383.5 207.992C383.5 230.254 377.912 248.456 367.991 263.243C358.068 278.034 343.79 289.44 326.366 298.074C291.505 315.349 244.113 321.5 194.062 321.5C144.021 321.5 101.87 313.707 72.2425 294.811C42.655 275.942 25.5 245.963 25.5 201.414C25.5 156.874 44.6972 121.666 76.3698 97.5792C108.055 73.4827 152.253 60.5 202.249 60.5C302.245 60.5 383.5 118.972 383.5 207.992Z"
         stroke="#EEF4FF"
-      />
-      <g filter="url(#filter2_d_523_1843)">
-        <g filter="url(#filter3_d_523_1843)">
-          <g clipPath="url(#clip0_523_1843)">
+        d="M383.5 208.537c0 22.263-5.588 40.464-15.509 55.252-9.923 14.791-24.201 26.196-41.625 34.83-34.861 17.275-82.253 23.426-132.304 23.426-50.041 0-92.192-7.793-121.82-26.688C42.656 276.487 25.5 246.508 25.5 201.96c0-44.54 19.197-79.749 50.87-103.835 31.685-24.097 75.883-37.08 125.879-37.08 99.996 0 181.251 58.472 181.251 147.492z"
+      ></path>
+      <g filter="url(#filter2_d_2639_10667)">
+        <g filter="url(#filter3_d_2639_10667)">
+          <g clipPath="url(#clip0_2639_10667)">
             <rect
-              x="141.533"
-              y="69"
               width="235"
               height="233"
-              rx="7.62617"
-              fill="white"
-            />
+              x="141.533"
+              y="69.546"
+              fill="#fff"
+              rx="7.626"
+            ></rect>
             <rect
-              x="151.065"
-              y="91.4019"
               width="213.533"
               height="30.028"
-              rx="4.76636"
+              x="151.065"
+              y="91.947"
               fill="#F4F5FD"
-            />
+              rx="4.766"
+            ></rect>
             <rect
-              x="157.262"
-              y="97.5981"
               width="133.458"
-              height="17.6355"
-              rx="2.85981"
+              height="17.636"
+              x="157.262"
+              y="98.144"
               fill="#A5A5F8"
-            />
+              rx="2.86"
+            ></rect>
             <path
-              d="M168.145 109.166C168.092 109.166 168.039 109.147 167.998 109.105L167.442 108.549C167.361 108.469 167.361 108.335 167.442 108.255C167.522 108.174 167.656 108.174 167.736 108.255L168.292 108.811C168.373 108.891 168.373 109.025 168.292 109.105C168.251 109.147 168.198 109.166 168.145 109.166Z"
               fill="#00E5CC"
-            />
+              d="M168.145 109.712a.207.207 0 01-.147-.061l-.557-.556a.211.211 0 010-.295.21.21 0 01.295 0l.556.556a.21.21 0 01-.147.356z"
+            ></path>
             <path
-              d="M167.958 108.364V103.693H169.139L170.28 105.655L171.422 103.693H172.603V108.364H171.655V105.015L170.614 106.763H169.947L168.906 105.015V108.364H167.958ZM175.349 104.868C176.443 104.868 177.19 105.675 177.19 106.683C177.19 107.691 176.443 108.498 175.349 108.498C174.254 108.498 173.507 107.691 173.507 106.683C173.507 105.675 174.254 104.868 175.349 104.868ZM175.362 107.697C175.903 107.697 176.31 107.263 176.31 106.683C176.31 106.096 175.903 105.669 175.362 105.669C174.802 105.669 174.388 106.096 174.388 106.683C174.388 107.27 174.802 107.697 175.362 107.697ZM177.963 108.364V105.001H178.811V105.268C179.044 105.041 179.358 104.868 179.805 104.868C180.532 104.868 181.113 105.368 181.113 106.363V108.364H180.259V106.396C180.259 105.949 180.005 105.669 179.592 105.669C179.165 105.669 178.938 105.956 178.811 106.169V108.364H177.963ZM183.874 110.006V105.001H184.721V105.275C184.982 105.015 185.309 104.868 185.769 104.868C186.837 104.868 187.477 105.702 187.477 106.683C187.477 107.664 186.837 108.498 185.769 108.498C185.309 108.498 184.982 108.351 184.721 108.091V110.006H183.874ZM185.649 105.669C185.255 105.669 184.935 105.842 184.721 106.156V107.21C184.948 107.53 185.262 107.697 185.649 107.697C186.223 107.697 186.596 107.27 186.596 106.683C186.596 106.096 186.223 105.669 185.649 105.669ZM188.253 108.364V103.36H189.1V108.364H188.253ZM191.064 108.465C190.39 108.465 189.93 108.078 189.93 107.457C189.93 106.95 190.324 106.569 191.044 106.449L192.072 106.276V106.189C192.072 105.835 191.805 105.609 191.418 105.609C191.091 105.609 190.837 105.762 190.657 106.009L190.037 105.535C190.337 105.121 190.831 104.868 191.445 104.868C192.419 104.868 192.919 105.448 192.919 106.189V108.364H192.072V108.038C191.858 108.298 191.458 108.465 191.064 108.465ZM190.771 107.417C190.771 107.644 190.951 107.791 191.238 107.791C191.625 107.791 191.905 107.61 192.072 107.344V106.87L191.271 107.003C190.917 107.063 190.771 107.21 190.771 107.417ZM193.89 108.364V105.001H194.737V105.268C194.971 105.041 195.284 104.868 195.731 104.868C196.459 104.868 197.039 105.368 197.039 106.363V108.364H196.185V106.396C196.185 105.949 195.932 105.669 195.518 105.669C195.091 105.669 194.864 105.956 194.737 106.169V108.364H193.89ZM200.728 104.468L199.927 103.36H200.848L201.535 104.468H200.728ZM200.748 108.465C200.074 108.465 199.613 108.078 199.613 107.457C199.613 106.95 200.007 106.569 200.728 106.449L201.755 106.276V106.189C201.755 105.835 201.488 105.609 201.101 105.609C200.774 105.609 200.521 105.762 200.341 106.009L199.72 105.535C200.02 105.121 200.514 104.868 201.128 104.868C202.102 104.868 202.603 105.448 202.603 106.189V108.364H201.755V108.038C201.542 108.298 201.141 108.465 200.748 108.465ZM200.454 107.417C200.454 107.644 200.634 107.791 200.921 107.791C201.308 107.791 201.589 107.61 201.755 107.344V106.87L200.955 107.003C200.601 107.063 200.454 107.21 200.454 107.417ZM205.799 104.414C205.499 104.414 205.245 104.161 205.245 103.86C205.245 103.56 205.499 103.306 205.799 103.306C206.099 103.306 206.346 103.56 206.346 103.86C206.346 104.161 206.099 104.414 205.799 104.414ZM205.372 108.364V105.001H206.219V108.364H205.372ZM207.236 108.364V105.001H208.083V105.255C208.31 105.035 208.597 104.868 209.011 104.868C209.438 104.868 209.811 105.055 210.031 105.415C210.272 105.121 210.592 104.868 211.159 104.868C211.853 104.868 212.4 105.348 212.4 106.296V108.364H211.546V106.329C211.546 105.922 211.326 105.669 210.946 105.669C210.579 105.669 210.378 105.922 210.245 106.149C210.252 106.196 210.252 106.243 210.252 106.296V108.364H209.398V106.329C209.398 105.922 209.177 105.669 208.797 105.669C208.41 105.669 208.21 105.956 208.083 106.169V108.364H207.236ZM213.368 110.006V105.001H214.215V105.275C214.475 105.015 214.802 104.868 215.263 104.868C216.33 104.868 216.971 105.702 216.971 106.683C216.971 107.664 216.33 108.498 215.263 108.498C214.802 108.498 214.475 108.351 214.215 108.091V110.006H213.368ZM215.143 105.669C214.749 105.669 214.429 105.842 214.215 106.156V107.21C214.442 107.53 214.756 107.697 215.143 107.697C215.716 107.697 216.09 107.27 216.09 106.683C216.09 106.096 215.716 105.669 215.143 105.669ZM218.616 108.465C217.942 108.465 217.482 108.078 217.482 107.457C217.482 106.95 217.875 106.569 218.596 106.449L219.624 106.276V106.189C219.624 105.835 219.357 105.609 218.97 105.609C218.643 105.609 218.389 105.762 218.209 106.009L217.588 105.535C217.889 105.121 218.382 104.868 218.996 104.868C219.971 104.868 220.471 105.448 220.471 106.189V108.364H219.624V108.038C219.41 108.298 219.01 108.465 218.616 108.465ZM218.322 107.417C218.322 107.644 218.503 107.791 218.79 107.791C219.177 107.791 219.457 107.61 219.624 107.344V106.87L218.823 107.003C218.469 107.063 218.322 107.21 218.322 107.417ZM223.056 107.697C223.39 107.697 223.657 107.544 223.817 107.31L224.478 107.817C224.164 108.231 223.67 108.498 223.056 108.498C221.895 108.498 221.201 107.664 221.201 106.683C221.201 105.702 221.895 104.868 223.056 104.868C223.67 104.868 224.164 105.135 224.478 105.549L223.817 106.056C223.657 105.822 223.39 105.669 223.043 105.669C222.489 105.669 222.082 106.096 222.082 106.683C222.082 107.277 222.489 107.697 223.056 107.697ZM225.356 107.137V105.762H224.729V105.001H225.356V104.161H226.211V105.001H227.238V105.762H226.211V107.137C226.211 107.51 226.411 107.657 226.744 107.657C226.978 107.657 227.131 107.63 227.245 107.584V108.324C227.078 108.398 226.878 108.431 226.598 108.431C225.757 108.431 225.356 107.957 225.356 107.137Z"
-              fill="white"
-            />
+              fill="#fff"
+              d="M167.958 108.91v-4.671h1.181l1.142 1.962 1.141-1.962h1.181v4.671h-.948v-3.35l-1.041 1.748h-.667l-1.041-1.748v3.35h-.948zm7.391-3.497c1.094 0 1.842.808 1.842 1.815 0 1.008-.748 1.815-1.842 1.815-1.095 0-1.842-.807-1.842-1.815 0-1.007.747-1.815 1.842-1.815zm.013 2.83c.541 0 .948-.434.948-1.015 0-.587-.407-1.014-.948-1.014-.56 0-.974.427-.974 1.014 0 .588.414 1.015.974 1.015zm2.602.667v-3.363h.847v.267c.234-.227.547-.401.994-.401.728 0 1.308.501 1.308 1.495v2.002h-.854v-1.969c0-.447-.254-.727-.667-.727-.427 0-.654.287-.781.501v2.195h-.847zm5.91 1.641v-5.004h.847v.273c.261-.26.588-.407 1.048-.407 1.068 0 1.708.834 1.708 1.815s-.64 1.815-1.708 1.815c-.46 0-.787-.146-1.048-.407v1.915h-.847zm1.775-4.337c-.394 0-.714.174-.928.487v1.055c.227.32.541.487.928.487.574 0 .948-.427.948-1.015 0-.587-.374-1.014-.948-1.014zm2.604 2.696v-5.005h.848v5.005h-.848zm2.811.1c-.674 0-1.134-.387-1.134-1.008 0-.507.394-.887 1.114-1.007l1.028-.174v-.086c0-.354-.267-.581-.654-.581a.915.915 0 00-.761.4l-.62-.473c.3-.414.794-.668 1.408-.668.974 0 1.474.581 1.474 1.322v2.175h-.847v-.327c-.214.26-.614.427-1.008.427zm-.293-1.048c0 .227.18.374.467.374.387 0 .667-.18.834-.447v-.474l-.801.134c-.353.06-.5.207-.5.413zm3.119.948v-3.363h.847v.267c.234-.227.547-.401.995-.401.727 0 1.307.501 1.307 1.495v2.002h-.854v-1.969c0-.447-.253-.727-.667-.727-.427 0-.654.287-.781.501v2.195h-.847zm6.838-3.897l-.801-1.108h.921l.687 1.108h-.807zm.02 3.997c-.674 0-1.135-.387-1.135-1.008 0-.507.394-.887 1.115-1.007l1.027-.174v-.086c0-.354-.266-.581-.653-.581a.915.915 0 00-.761.4l-.621-.473c.301-.414.794-.668 1.408-.668.974 0 1.475.581 1.475 1.322v2.175h-.848v-.327c-.213.26-.613.427-1.007.427zm-.294-1.048c0 .227.18.374.467.374a.94.94 0 00.834-.447v-.474l-.8.134c-.354.06-.501.207-.501.413zm5.345-3.002a.562.562 0 01-.554-.554c0-.301.254-.554.554-.554a.555.555 0 010 1.108zm-.427 3.95v-3.363h.847v3.363h-.847zm1.864 0v-3.363h.847v.253c.227-.22.514-.387.928-.387.427 0 .8.187 1.021.548.24-.294.56-.548 1.127-.548.694 0 1.241.481 1.241 1.428v2.069h-.854v-2.035c0-.407-.22-.661-.6-.661-.367 0-.567.254-.701.481.007.046.007.093.007.146v2.069h-.854v-2.035c0-.407-.221-.661-.601-.661-.387 0-.587.287-.714.501v2.195h-.847zm6.132 1.641v-5.004h.847v.273c.26-.26.587-.407 1.048-.407 1.067 0 1.708.834 1.708 1.815s-.641 1.815-1.708 1.815c-.461 0-.788-.146-1.048-.407v1.915h-.847zm1.775-4.337c-.394 0-.714.174-.928.487v1.055c.227.32.541.487.928.487.574 0 .947-.427.947-1.015 0-.587-.373-1.014-.947-1.014zm3.473 2.796c-.674 0-1.134-.387-1.134-1.008 0-.507.393-.887 1.114-1.007l1.028-.174v-.086c0-.354-.267-.581-.654-.581a.915.915 0 00-.761.4l-.621-.473c.301-.414.795-.668 1.408-.668.975 0 1.475.581 1.475 1.322v2.175h-.847v-.327c-.214.26-.614.427-1.008.427zm-.293-1.048c0 .227.18.374.467.374.387 0 .667-.18.834-.447v-.474l-.801.134c-.354.06-.5.207-.5.413zm4.733.281a.9.9 0 00.761-.387l.661.507c-.314.413-.808.68-1.422.68-1.161 0-1.855-.834-1.855-1.815s.694-1.815 1.855-1.815c.614 0 1.108.267 1.422.681l-.661.507a.907.907 0 00-.774-.387c-.554 0-.961.427-.961 1.014 0 .594.407 1.015.974 1.015zm2.301-.561v-1.374h-.628v-.761h.628v-.841h.854v.841h1.027v.761h-1.027v1.374c0 .374.2.521.533.521.234 0 .388-.027.501-.074v.741c-.167.073-.367.107-.647.107-.841 0-1.241-.474-1.241-1.295z"
+            ></path>
             <path
-              d="M352.003 103.894C352.64 103.346 353.605 103.933 353.412 104.751L353.157 105.832C353.07 106.198 353.229 106.577 353.55 106.773L354.5 107.35C355.218 107.786 354.958 108.886 354.12 108.955L353.013 109.046C352.638 109.077 352.326 109.345 352.24 109.711L351.984 110.793C351.791 111.61 350.665 111.703 350.34 110.928L349.912 109.903C349.767 109.556 349.415 109.342 349.04 109.373L347.933 109.464C347.096 109.533 346.659 108.49 347.296 107.943L348.139 107.218C348.424 106.973 348.518 106.572 348.373 106.226L347.944 105.201C347.62 104.426 348.477 103.688 349.195 104.125L350.144 104.702C350.465 104.897 350.876 104.864 351.16 104.619L352.003 103.894Z"
               fill="#FECD8C"
-            />
-            <g clipPath="url(#clip1_523_1843)">
+              d="M352.003 104.439c.637-.548 1.602.04 1.409.857l-.255 1.082a.866.866 0 00.393.94l.95.577c.718.437.458 1.537-.38 1.606l-1.107.091a.866.866 0 00-.773.665l-.256 1.081c-.193.818-1.319.91-1.644.135l-.428-1.025a.868.868 0 00-.872-.529l-1.107.091c-.837.069-1.274-.974-.637-1.522l.843-.725a.866.866 0 00.234-.992l-.429-1.025c-.324-.775.533-1.512 1.251-1.076l.949.578a.867.867 0 001.016-.084l.843-.725z"
+            ></path>
+            <g clipPath="url(#clip1_2639_10667)">
               <rect
-                x="151.065"
-                y="128.579"
                 width="213.056"
                 height="158.72"
-                rx="4.76636"
+                x="151.065"
+                y="129.125"
                 fill="#F4F5FD"
-              />
-              <rect
-                width="74.3551"
-                height="35.7477"
-                transform="translate(162.981 232.486)"
+                rx="4.766"
+              ></rect>
+              <path
                 fill="#F4F5FD"
-              />
+                d="M0 0H74.355V35.748H0z"
+                transform="translate(162.981 233.031)"
+              ></path>
               <rect
+                width="74.244"
+                height="35.637"
                 x="163.037"
-                y="232.541"
-                width="74.2441"
-                height="35.6367"
-                rx="1.05447"
+                y="233.087"
                 fill="#FCFCFC"
                 stroke="#F0F0FE"
-                strokeWidth="0.110997"
-              />
+                strokeWidth="0.111"
+                rx="1.054"
+              ></rect>
               <rect
+                width="48.603"
+                height="3.283"
                 x="170.236"
-                y="254.008"
-                width="48.6029"
-                height="3.28295"
-                rx="1.64147"
+                y="254.553"
                 fill="#C3C3FB"
-              />
+                rx="1.641"
+              ></rect>
               <rect
+                width="22.851"
+                height="3.283"
                 x="170.236"
-                y="249.63"
-                width="22.8506"
-                height="3.28295"
-                rx="1.64147"
+                y="250.176"
                 fill="#F4F5FD"
-              />
+                rx="1.641"
+              ></rect>
               <rect
+                width="6.166"
+                height="3.283"
                 x="226.093"
-                y="240.511"
-                width="6.16604"
-                height="3.28295"
-                rx="1.64147"
+                y="241.056"
                 fill="#7CD4A5"
-              />
+                rx="1.641"
+              ></rect>
               <rect
+                width="37.359"
+                height="3.283"
                 x="170.236"
-                y="259.114"
-                width="37.3589"
-                height="3.28295"
-                rx="1.64147"
+                y="259.66"
                 fill="#F4F5FD"
-              />
+                rx="1.641"
+              ></rect>
               <rect
+                width="20.248"
+                height="6.266"
                 x="170.769"
-                y="237.185"
-                width="20.2476"
-                height="6.2655"
-                rx="3.13275"
+                y="237.731"
                 fill="#E4FCEF"
-              />
-              <rect
-                width="74.8318"
-                height="35.7477"
-                transform="translate(244.009 141.449)"
+                rx="3.133"
+              ></rect>
+              <path
                 fill="#F4F5FD"
-              />
+                d="M0 0H74.832V35.748H0z"
+                transform="translate(244.009 141.994)"
+              ></path>
               <rect
+                width="74.721"
+                height="35.637"
                 x="244.065"
-                y="141.504"
-                width="74.7208"
-                height="35.6367"
-                rx="1.05447"
+                y="142.05"
                 fill="#FCFCFC"
                 stroke="#F0F0FE"
-                strokeWidth="0.110997"
-              />
+                strokeWidth="0.111"
+                rx="1.054"
+              ></rect>
               <rect
+                width="14.107"
+                height="3.133"
                 x="251.847"
-                y="163.378"
-                width="14.1075"
-                height="3.13275"
-                rx="1.56637"
+                y="163.923"
                 fill="#C3C3FB"
-              />
+                rx="1.566"
+              ></rect>
               <rect
-                x="251.635"
-                y="153.841"
-                width="31.4579"
-                height="3.81308"
-                rx="1.90654"
+                width="31.458"
+                height="3.813"
+                x="251.636"
+                y="154.387"
                 fill="#91B2EE"
-              />
+                rx="1.907"
+              ></rect>
               <rect
+                width="6.206"
+                height="3.283"
                 x="307.525"
-                y="149.474"
-                width="6.20556"
-                height="3.28295"
-                rx="1.64147"
+                y="150.019"
                 fill="#7CD4A5"
-              />
+                rx="1.641"
+              ></rect>
               <rect
+                width="37.598"
+                height="3.283"
                 x="251.31"
-                y="168.077"
-                width="37.5984"
-                height="3.28295"
-                rx="1.64147"
+                y="168.622"
                 fill="#F4F5FD"
-              />
-              <rect
-                width="74.8318"
-                height="35.7477"
-                transform="translate(160.598 141.449)"
+                rx="1.641"
+              ></rect>
+              <path
                 fill="#F4F5FD"
-              />
+                d="M0 0H74.832V35.748H0z"
+                transform="translate(160.598 141.994)"
+              ></path>
               <rect
+                width="74.721"
+                height="35.637"
                 x="160.654"
-                y="141.504"
-                width="74.7208"
-                height="35.6367"
-                rx="1.05447"
-                fill="white"
+                y="142.05"
+                fill="#fff"
                 stroke="#F0F0FE"
-                strokeWidth="0.110997"
-              />
+                strokeWidth="0.111"
+                rx="1.054"
+              ></rect>
               <rect
+                width="14.107"
+                height="3.133"
                 x="168.436"
-                y="163.378"
-                width="14.1075"
-                height="3.13275"
-                rx="1.56637"
+                y="163.923"
                 fill="#C3C3FB"
-              />
+                rx="1.566"
+              ></rect>
               <rect
+                width="31.458"
+                height="3.813"
                 x="168.224"
-                y="153.841"
-                width="31.4579"
-                height="3.81308"
-                rx="1.90654"
+                y="154.387"
                 fill="#91B2EE"
-              />
+                rx="1.907"
+              ></rect>
               <rect
+                width="6.206"
+                height="3.283"
                 x="224.114"
-                y="149.474"
-                width="6.20556"
-                height="3.28295"
-                rx="1.64147"
+                y="150.019"
                 fill="#7CD4A5"
-              />
+                rx="1.641"
+              ></rect>
               <rect
+                width="37.598"
+                height="3.283"
                 x="167.899"
-                y="168.077"
-                width="37.5984"
-                height="3.28295"
-                rx="1.64147"
+                y="168.622"
                 fill="#F4F5FD"
-              />
-              <rect
-                width="74.8318"
-                height="35.271"
-                transform="translate(244.009 187.206)"
+                rx="1.641"
+              ></rect>
+              <path
                 fill="#F4F5FD"
-              />
+                d="M0 0H74.832V35.271H0z"
+                transform="translate(244.009 187.751)"
+              ></path>
               <rect
-                x="244.065"
-                y="187.261"
-                width="74.7208"
+                width="74.721"
                 height="35.16"
-                rx="1.05447"
+                x="244.065"
+                y="187.807"
                 fill="#FCFCFC"
                 stroke="#F0F0FE"
-                strokeWidth="0.110997"
-              />
+                strokeWidth="0.111"
+                rx="1.054"
+              ></rect>
               <rect
+                width="25.08"
+                height="3.091"
                 x="251.847"
-                y="208.842"
-                width="25.0799"
-                height="3.09098"
-                rx="1.54549"
+                y="209.388"
                 fill="#C3C3FB"
-              />
+                rx="1.545"
+              ></rect>
               <rect
+                width="6.206"
+                height="3.239"
                 x="307.525"
-                y="195.124"
-                width="6.20556"
-                height="3.23918"
-                rx="1.61959"
+                y="195.669"
                 fill="#7CD4A5"
-              />
+                rx="1.62"
+              ></rect>
               <rect
+                width="37.598"
+                height="3.239"
                 x="251.31"
-                y="213.479"
-                width="37.5984"
-                height="3.23918"
-                rx="1.61959"
+                y="214.024"
                 fill="#F4F5FD"
-              />
+                rx="1.62"
+              ></rect>
               <rect
+                width="20.377"
+                height="6.182"
                 x="251.847"
-                y="194.933"
-                width="20.3774"
-                height="6.18196"
-                rx="3.09098"
+                y="195.479"
                 fill="#A5A5F8"
-              />
-              <rect
-                width="74.8318"
-                height="35.271"
-                transform="translate(160.598 187.206)"
+                rx="3.091"
+              ></rect>
+              <path
                 fill="#F4F5FD"
-              />
+                d="M0 0H74.832V35.271H0z"
+                transform="translate(160.598 187.751)"
+              ></path>
               <rect
-                x="160.654"
-                y="187.261"
-                width="74.7208"
+                width="74.721"
                 height="35.16"
-                rx="1.05447"
+                x="160.654"
+                y="187.807"
                 fill="#FCFCFC"
                 stroke="#F0F0FE"
-                strokeWidth="0.110997"
-              />
+                strokeWidth="0.111"
+                rx="1.054"
+              ></rect>
               <rect
+                width="25.08"
+                height="3.091"
                 x="168.436"
-                y="208.842"
-                width="25.0799"
-                height="3.09098"
-                rx="1.54549"
+                y="209.388"
                 fill="#C3C3FB"
-              />
+                rx="1.545"
+              ></rect>
               <rect
+                width="6.206"
+                height="3.239"
                 x="224.114"
-                y="195.124"
-                width="6.20556"
-                height="3.23918"
-                rx="1.61959"
+                y="195.669"
                 fill="#7CD4A5"
-              />
+                rx="1.62"
+              ></rect>
               <rect
+                width="37.598"
+                height="3.239"
                 x="167.899"
-                y="213.479"
-                width="37.5984"
-                height="3.23918"
-                rx="1.61959"
+                y="214.024"
                 fill="#F4F5FD"
-              />
+                rx="1.62"
+              ></rect>
               <rect
+                width="20.377"
+                height="6.182"
                 x="168.436"
-                y="194.933"
-                width="20.3774"
-                height="6.18196"
-                rx="3.09098"
+                y="195.479"
                 fill="#A5A5F8"
-              />
-              <rect
-                width="74.8318"
-                height="35.7477"
-                transform="translate(244.009 232.486)"
+                rx="3.091"
+              ></rect>
+              <path
                 fill="#F4F5FD"
-              />
+                d="M0 0H74.832V35.748H0z"
+                transform="translate(244.009 233.031)"
+              ></path>
               <rect
+                width="74.721"
+                height="35.637"
                 x="244.065"
-                y="232.541"
-                width="74.7208"
-                height="35.6367"
-                rx="1.05447"
+                y="233.087"
                 fill="#FCFCFC"
                 stroke="#F0F0FE"
-                strokeWidth="0.110997"
-              />
+                strokeWidth="0.111"
+                rx="1.054"
+              ></rect>
               <rect
+                width="48.914"
+                height="3.283"
                 x="251.31"
-                y="254.008"
-                width="48.9144"
-                height="3.28295"
-                rx="1.64147"
+                y="254.553"
                 fill="#C3C3FB"
-              />
+                rx="1.641"
+              ></rect>
               <rect
+                width="22.997"
+                height="3.283"
                 x="251.31"
-                y="249.63"
-                width="22.9971"
-                height="3.28295"
-                rx="1.64147"
+                y="250.176"
                 fill="#F4F5FD"
-              />
+                rx="1.641"
+              ></rect>
               <rect
+                width="6.206"
+                height="3.283"
                 x="307.525"
-                y="240.511"
-                width="6.20556"
-                height="3.28295"
-                rx="1.64147"
+                y="241.056"
                 fill="#7CD4A5"
-              />
+                rx="1.641"
+              ></rect>
               <rect
+                width="37.598"
+                height="3.283"
                 x="251.31"
-                y="259.114"
-                width="37.5984"
-                height="3.28295"
-                rx="1.64147"
+                y="259.66"
                 fill="#F4F5FD"
-              />
+                rx="1.641"
+              ></rect>
               <rect
+                width="20.377"
+                height="4.699"
                 x="251.847"
-                y="240.318"
-                width="20.3774"
-                height="4.69912"
-                rx="2.34956"
+                y="240.863"
                 fill="#FFF5DF"
-              />
+                rx="2.35"
+              ></rect>
             </g>
             <circle
               cx="153.925"
-              cy="81.3925"
-              r="2.85981"
+              cy="81.938"
+              r="2.86"
               fill="#FF4443"
               stroke="#DF3A3B"
-              strokeWidth="0.476636"
-            />
+              strokeWidth="0.477"
+            ></circle>
             <circle
               cx="163.458"
-              cy="81.3925"
-              r="2.85981"
+              cy="81.938"
+              r="2.86"
               fill="#FFBF00"
               stroke="#E9A113"
-              strokeWidth="0.476636"
-            />
+              strokeWidth="0.477"
+            ></circle>
             <circle
               cx="172.991"
-              cy="81.3925"
-              r="2.85981"
+              cy="81.938"
+              r="2.86"
               fill="#00D544"
               stroke="#12B62F"
-              strokeWidth="0.476636"
-            />
+              strokeWidth="0.477"
+            ></circle>
           </g>
         </g>
-        <g filter="url(#filter4_d_523_1843)">
+        <g filter="url(#filter4_d_2639_10667)">
           <rect
-            x="86"
-            y="220.813"
             width="119.159"
-            height="98.1869"
-            rx="4.76636"
+            height="98.187"
+            x="86"
+            y="221.359"
             fill="#FBFEFF"
-          />
+            rx="4.766"
+          ></rect>
           <path
-            d="M96.22 236.346V231.675H97.7615C98.7891 231.675 99.4163 232.202 99.4163 233.069C99.4163 233.93 98.7891 234.457 97.7615 234.457H97.1676V236.346H96.22ZM97.8015 232.462H97.1676V233.67H97.8015C98.2019 233.67 98.4421 233.436 98.4421 233.056C98.4421 232.702 98.2019 232.462 97.8015 232.462ZM100.514 232.395C100.213 232.395 99.9598 232.142 99.9598 231.842C99.9598 231.541 100.213 231.288 100.514 231.288C100.814 231.288 101.061 231.541 101.061 231.842C101.061 232.142 100.814 232.395 100.514 232.395ZM100.087 236.346V232.983H100.934V236.346H100.087ZM101.95 236.346V231.341H102.798V236.346H101.95ZM105.416 232.849C106.51 232.849 107.257 233.657 107.257 234.664C107.257 235.672 106.51 236.479 105.416 236.479C104.321 236.479 103.574 235.672 103.574 234.664C103.574 233.657 104.321 232.849 105.416 232.849ZM105.429 235.679C105.969 235.679 106.376 235.245 106.376 234.664C106.376 234.077 105.969 233.65 105.429 233.65C104.868 233.65 104.455 234.077 104.455 234.664C104.455 235.251 104.868 235.679 105.429 235.679ZM108.205 235.118V233.743H107.577V232.983H108.205V232.142H109.059V232.983H110.086V233.743H109.059V235.118C109.059 235.492 109.259 235.638 109.593 235.638C109.826 235.638 109.98 235.612 110.093 235.565V236.306C109.926 236.379 109.726 236.413 109.446 236.413C108.605 236.413 108.205 235.939 108.205 235.118ZM111.793 236.446C111.119 236.446 110.659 236.059 110.659 235.438C110.659 234.931 111.052 234.551 111.773 234.431L112.801 234.257V234.17C112.801 233.817 112.534 233.59 112.147 233.59C111.82 233.59 111.566 233.743 111.386 233.99L110.765 233.516C111.066 233.103 111.559 232.849 112.173 232.849C113.147 232.849 113.648 233.43 113.648 234.17V236.346H112.801V236.019C112.587 236.279 112.187 236.446 111.793 236.446ZM111.499 235.398C111.499 235.625 111.679 235.772 111.966 235.772C112.353 235.772 112.634 235.592 112.801 235.325V234.851L112 234.985C111.646 235.045 111.499 235.191 111.499 235.398ZM114.285 236.933C114.285 236.599 114.452 236.332 114.752 236.112C114.618 235.979 114.545 235.799 114.545 235.625C114.545 235.358 114.658 235.145 114.912 234.958C114.618 234.738 114.458 234.404 114.458 234.03C114.458 233.376 114.965 232.849 115.806 232.849C116.066 232.849 116.293 232.896 116.487 232.983H117.715V233.703H117.121C117.154 233.81 117.167 233.917 117.167 234.03C117.167 234.691 116.674 235.225 115.806 235.225C115.693 235.225 115.586 235.218 115.486 235.198C115.412 235.265 115.372 235.338 115.372 235.412C115.372 235.545 115.446 235.612 115.599 235.612H116.447C117.294 235.612 117.755 236.066 117.755 236.693C117.755 237.44 117.041 238.014 115.993 238.014C114.919 238.014 114.285 237.64 114.285 236.933ZM115.82 234.584C116.173 234.584 116.4 234.364 116.4 234.03C116.4 233.697 116.173 233.483 115.82 233.483C115.453 233.483 115.232 233.703 115.232 234.03C115.232 234.364 115.453 234.584 115.82 234.584ZM115.086 236.813C115.086 237.133 115.392 237.333 115.986 237.333C116.6 237.333 116.914 237.107 116.914 236.773C116.914 236.519 116.76 236.339 116.353 236.339H115.312C115.186 236.459 115.086 236.606 115.086 236.813ZM121.273 235.799C120.959 236.219 120.439 236.479 119.805 236.479C118.61 236.479 117.936 235.645 117.936 234.664C117.936 233.67 118.563 232.849 119.664 232.849C120.599 232.849 121.213 233.483 121.213 234.364C121.213 234.551 121.186 234.724 121.159 234.838H118.804C118.884 235.465 119.271 235.719 119.798 235.719C120.165 235.719 120.485 235.558 120.665 235.318L121.273 235.799ZM119.644 233.543C119.211 233.543 118.924 233.783 118.83 234.224H120.378C120.365 233.883 120.118 233.543 119.644 233.543ZM123.599 234.664C123.599 233.683 124.246 232.849 125.307 232.849C125.761 232.849 126.088 232.989 126.348 233.25V231.341H127.202V236.346H126.348V236.079C126.088 236.339 125.761 236.479 125.307 236.479C124.246 236.479 123.599 235.645 123.599 234.664ZM124.487 234.664C124.487 235.251 124.854 235.679 125.427 235.679C125.808 235.679 126.121 235.518 126.348 235.211V234.117C126.121 233.81 125.808 233.65 125.427 233.65C124.854 233.65 124.487 234.077 124.487 234.664ZM131.315 235.799C131.001 236.219 130.48 236.479 129.847 236.479C128.652 236.479 127.978 235.645 127.978 234.664C127.978 233.67 128.605 232.849 129.706 232.849C130.641 232.849 131.255 233.483 131.255 234.364C131.255 234.551 131.228 234.724 131.201 234.838H128.846C128.926 235.465 129.313 235.719 129.84 235.719C130.207 235.719 130.527 235.558 130.707 235.318L131.315 235.799ZM129.686 233.543C129.253 233.543 128.966 233.783 128.872 234.224H130.42C130.407 233.883 130.16 233.543 129.686 233.543ZM131.743 235.859L132.304 235.352C132.511 235.612 132.758 235.799 133.078 235.799C133.352 235.799 133.492 235.638 133.492 235.438C133.492 234.851 131.884 235.071 131.884 233.89C131.884 233.296 132.384 232.849 133.085 232.849C133.598 232.849 134.066 233.096 134.306 233.423L133.745 233.917C133.572 233.703 133.352 233.53 133.091 233.53C132.824 233.53 132.698 233.677 132.698 233.85C132.698 234.424 134.306 234.224 134.306 235.385C134.292 236.092 133.725 236.479 133.091 236.479C132.491 236.479 132.064 236.239 131.743 235.859ZM137.833 236.446C137.159 236.446 136.698 236.059 136.698 235.438C136.698 234.931 137.092 234.551 137.813 234.431L138.84 234.257V234.17C138.84 233.817 138.574 233.59 138.186 233.59C137.86 233.59 137.606 233.743 137.426 233.99L136.805 233.516C137.105 233.103 137.599 232.849 138.213 232.849C139.187 232.849 139.688 233.43 139.688 234.17V236.346H138.84V236.019C138.627 236.279 138.227 236.446 137.833 236.446ZM137.539 235.398C137.539 235.625 137.719 235.772 138.006 235.772C138.393 235.772 138.674 235.592 138.84 235.325V234.851L138.04 234.985C137.686 235.045 137.539 235.191 137.539 235.398ZM142.273 235.679C142.607 235.679 142.874 235.525 143.034 235.291L143.695 235.799C143.381 236.212 142.887 236.479 142.273 236.479C141.112 236.479 140.418 235.645 140.418 234.664C140.418 233.683 141.112 232.849 142.273 232.849C142.887 232.849 143.381 233.116 143.695 233.53L143.034 234.037C142.874 233.803 142.607 233.65 142.26 233.65C141.706 233.65 141.299 234.077 141.299 234.664C141.299 235.258 141.706 235.679 142.273 235.679ZM144.573 235.118V233.743H143.946V232.983H144.573V232.142H145.427V232.983H146.455V233.743H145.427V235.118C145.427 235.492 145.628 235.638 145.961 235.638C146.195 235.638 146.348 235.612 146.462 235.565V236.306C146.295 236.379 146.095 236.413 145.814 236.413C144.974 236.413 144.573 235.939 144.573 235.118ZM147.641 232.395C147.341 232.395 147.087 232.142 147.087 231.842C147.087 231.541 147.341 231.288 147.641 231.288C147.941 231.288 148.188 231.541 148.188 231.842C148.188 232.142 147.941 232.395 147.641 232.395ZM147.214 236.346V232.983H148.061V236.346H147.214ZM150.679 232.849C151.774 232.849 152.521 233.657 152.521 234.664C152.521 235.672 151.774 236.479 150.679 236.479C149.585 236.479 148.837 235.672 148.837 234.664C148.837 233.657 149.585 232.849 150.679 232.849ZM150.692 235.679C151.233 235.679 151.64 235.245 151.64 234.664C151.64 234.077 151.233 233.65 150.692 233.65C150.132 233.65 149.718 234.077 149.718 234.664C149.718 235.251 150.132 235.679 150.692 235.679ZM153.294 236.346V232.983H154.141V233.25C154.375 233.023 154.688 232.849 155.136 232.849C155.863 232.849 156.443 233.35 156.443 234.344V236.346H155.589V234.377C155.589 233.93 155.336 233.65 154.922 233.65C154.495 233.65 154.268 233.937 154.141 234.15V236.346H153.294ZM157.112 235.859L157.673 235.352C157.88 235.612 158.126 235.799 158.447 235.799C158.72 235.799 158.86 235.638 158.86 235.438C158.86 234.851 157.252 235.071 157.252 233.89C157.252 233.296 157.753 232.849 158.453 232.849C158.967 232.849 159.434 233.096 159.675 233.423L159.114 233.917C158.941 233.703 158.72 233.53 158.46 233.53C158.193 233.53 158.066 233.677 158.066 233.85C158.066 234.424 159.675 234.224 159.675 235.385C159.661 236.092 159.094 236.479 158.46 236.479C157.86 236.479 157.432 236.239 157.112 235.859Z"
             fill="#20209A"
-          />
-          <rect
-            opacity="0.06"
-            x="95.5327"
-            y="244.645"
-            width="100.093"
-            height="0.476636"
+            d="M96.22 236.891v-4.671h1.541c1.028 0 1.655.527 1.655 1.395 0 .861-.627 1.388-1.655 1.388h-.593v1.888h-.948zm1.582-3.883h-.635v1.207h.635c.4 0 .64-.233.64-.613 0-.354-.24-.594-.64-.594zm2.712-.067a.561.561 0 01-.554-.554c0-.3.253-.554.554-.554.3 0 .547.254.547.554 0 .3-.247.554-.547.554zm-.427 3.95v-3.363h.847v3.363h-.847zm1.863 0v-5.004h.848v5.004h-.848zm3.466-3.496c1.094 0 1.841.807 1.841 1.815 0 1.007-.747 1.815-1.841 1.815-1.095 0-1.842-.808-1.842-1.815 0-1.008.747-1.815 1.842-1.815zm.013 2.829c.54 0 .947-.434.947-1.014 0-.588-.407-1.015-.947-1.015-.561 0-.974.427-.974 1.015 0 .587.413 1.014.974 1.014zm2.776-.561v-1.374h-.628v-.761h.628v-.841h.854v.841h1.027v.761h-1.027v1.374c0 .374.2.521.534.521.233 0 .387-.027.5-.073v.74c-.167.074-.367.107-.647.107-.841 0-1.241-.474-1.241-1.295zm3.588 1.328c-.674 0-1.135-.387-1.135-1.007 0-.507.394-.888 1.115-1.008l1.027-.173v-.087c0-.354-.266-.581-.653-.581a.913.913 0 00-.761.401l-.621-.474c.301-.414.794-.667 1.408-.667.974 0 1.475.58 1.475 1.321v2.175h-.848v-.327c-.213.261-.613.427-1.007.427zm-.294-1.047c0 .227.18.373.467.373a.94.94 0 00.834-.447v-.473l-.8.133c-.354.06-.501.207-.501.414zm2.786 1.534c0-.333.167-.6.467-.82a.7.7 0 01-.207-.487c0-.267.113-.481.367-.668a1.134 1.134 0 01-.454-.927c0-.654.507-1.181 1.348-1.181.26 0 .487.046.681.133h1.228v.721h-.594c.033.107.046.213.046.327 0 .66-.493 1.194-1.361 1.194a1.64 1.64 0 01-.32-.026c-.074.066-.114.14-.114.213 0 .134.074.2.227.2h.848c.847 0 1.308.454 1.308 1.081 0 .748-.714 1.321-1.762 1.321-1.074 0-1.708-.373-1.708-1.081zm1.534-2.348c.354 0 .581-.221.581-.554 0-.334-.227-.547-.581-.547-.367 0-.587.22-.587.547 0 .333.22.554.587.554zm-.734 2.228c0 .321.307.521.901.521.614 0 .928-.227.928-.561 0-.253-.154-.433-.561-.433h-1.041c-.126.12-.227.267-.227.473zm6.188-1.014c-.314.42-.835.681-1.468.681-1.195 0-1.869-.834-1.869-1.815 0-.995.627-1.815 1.728-1.815.935 0 1.549.634 1.549 1.514 0 .187-.027.361-.054.474h-2.355c.08.627.467.881.994.881.367 0 .687-.16.867-.4l.608.48zm-1.629-2.255c-.433 0-.72.24-.814.68h1.548c-.013-.34-.26-.68-.734-.68zm3.955 1.121c0-.981.647-1.815 1.708-1.815.454 0 .781.14 1.041.4v-1.908h.854v5.004h-.854v-.267c-.26.261-.587.401-1.041.401-1.061 0-1.708-.834-1.708-1.815zm.887 0c0 .587.367 1.014.941 1.014a1.1 1.1 0 00.921-.467v-1.094a1.1 1.1 0 00-.921-.468c-.574 0-.941.427-.941 1.015zm6.829 1.134c-.314.42-.835.681-1.469.681-1.194 0-1.868-.834-1.868-1.815 0-.995.627-1.815 1.728-1.815.935 0 1.548.634 1.548 1.514 0 .187-.026.361-.053.474h-2.355c.08.627.467.881.994.881.367 0 .687-.16.867-.4l.608.48zm-1.629-2.255c-.433 0-.72.24-.814.68h1.548c-.013-.34-.26-.68-.734-.68zm2.057 2.315l.561-.507c.207.26.454.447.774.447.274 0 .414-.16.414-.36 0-.587-1.608-.367-1.608-1.548 0-.594.5-1.041 1.201-1.041.513 0 .981.247 1.221.574l-.561.493c-.173-.213-.393-.387-.654-.387-.267 0-.393.147-.393.321 0 .573 1.608.373 1.608 1.534-.014.708-.581 1.095-1.215 1.095-.6 0-1.027-.241-1.348-.621zm6.09.587c-.674 0-1.135-.387-1.135-1.007 0-.507.394-.888 1.115-1.008l1.027-.173v-.087c0-.354-.267-.581-.654-.581a.911.911 0 00-.76.401l-.621-.474c.3-.414.794-.667 1.408-.667.974 0 1.475.58 1.475 1.321v2.175h-.848v-.327c-.213.261-.613.427-1.007.427zm-.294-1.047c0 .227.18.373.467.373a.94.94 0 00.834-.447v-.473l-.8.133c-.354.06-.501.207-.501.414zm4.734.28a.9.9 0 00.761-.387l.66.507c-.313.414-.807.681-1.421.681-1.161 0-1.855-.834-1.855-1.815s.694-1.815 1.855-1.815c.614 0 1.108.267 1.421.68l-.66.507a.907.907 0 00-.774-.387c-.554 0-.961.427-.961 1.015 0 .594.407 1.014.974 1.014zm2.3-.561v-1.374h-.627v-.761h.627v-.841h.854v.841h1.028v.761h-1.028v1.374c0 .374.201.521.534.521.234 0 .387-.027.501-.073v.74c-.167.074-.367.107-.648.107-.84 0-1.241-.474-1.241-1.295zm3.068-2.722a.562.562 0 01-.554-.554c0-.3.254-.554.554-.554.3 0 .547.254.547.554 0 .3-.247.554-.547.554zm-.427 3.95v-3.363h.847v3.363h-.847zm3.465-3.496c1.094 0 1.842.807 1.842 1.815 0 1.007-.748 1.815-1.842 1.815s-1.842-.808-1.842-1.815c0-1.008.748-1.815 1.842-1.815zm.013 2.829c.541 0 .948-.434.948-1.014 0-.588-.407-1.015-.948-1.015-.56 0-.974.427-.974 1.015 0 .587.414 1.014.974 1.014zm2.602.667v-3.363h.847v.267c.234-.227.547-.4.995-.4.727 0 1.307.5 1.307 1.494v2.002h-.854v-1.968c0-.447-.253-.728-.667-.728-.427 0-.654.287-.781.501v2.195h-.847zm3.818-.487l.561-.507c.206.26.453.447.774.447.273 0 .413-.16.413-.36 0-.587-1.608-.367-1.608-1.548 0-.594.501-1.041 1.201-1.041.514 0 .981.247 1.222.574l-.561.493c-.174-.213-.394-.387-.654-.387-.267 0-.394.147-.394.321 0 .573 1.609.373 1.609 1.534-.014.708-.581 1.095-1.215 1.095a1.67 1.67 0 01-1.348-.621z"
+          ></path>
+          <path
             fill="#060640"
-          />
+            d="M95.533 245.19H195.626V245.667H95.533z"
+            opacity="0.06"
+          ></path>
           <rect
-            x="95.5327"
-            y="252.271"
             width="100.093"
             height="26.215"
-            rx="4.76636"
+            x="95.533"
+            y="252.816"
             fill="#F4F5FD"
-          />
+            rx="4.766"
+          ></rect>
           <path
-            d="M103.798 271.99C104.336 271.99 104.789 271.751 105.07 271.379V270.421H103.96V270.274H105.232V271.451C104.922 271.87 104.417 272.142 103.798 272.142C102.739 272.142 102.02 271.332 102.02 270.378C102.02 269.425 102.72 268.615 103.75 268.615C104.341 268.615 104.832 268.896 105.137 269.311L104.999 269.416C104.727 269.025 104.279 268.767 103.75 268.767C102.84 268.767 102.191 269.501 102.191 270.378C102.191 271.256 102.859 271.99 103.798 271.99ZM105.825 268.71H106.001L106.845 271.894L107.884 268.71H108.123L109.162 271.894L110.01 268.71H110.182L109.281 272.047H109.042L108.003 268.891L106.964 272.047H106.726L105.825 268.71ZM110.959 272.047V268.71H111.121V270.274H113.575V268.71H113.738V272.047H113.575V270.421H111.121V272.047H110.959Z"
-            fill="black"
-          />
+            fill="#000"
+            d="M103.798 272.535c.538 0 .991-.238 1.272-.61v-.958h-1.11v-.148h1.272v1.177c-.31.42-.815.692-1.434.692-1.059 0-1.778-.811-1.778-1.764s.7-1.764 1.73-1.764c.591 0 1.082.282 1.387.696l-.138.105a1.504 1.504 0 00-1.249-.648c-.911 0-1.559.734-1.559 1.611s.668 1.611 1.607 1.611zm2.027-3.279h.176l.844 3.184 1.039-3.184h.238l1.039 3.184.849-3.184h.171l-.9 3.336h-.239l-1.039-3.155-1.039 3.155h-.238l-.901-3.336zm5.134 3.336v-3.336h.162v1.563h2.454v-1.563h.162v3.336h-.162v-1.625h-2.454v1.625h-.162z"
+          ></path>
           <path
-            d="M105.893 263.973C105.893 264.964 105.085 265.62 103.994 265.62C103.033 265.62 102.408 265.216 101.981 264.484L102.713 264.034C103.025 264.621 103.422 264.872 103.986 264.872C104.589 264.872 105.039 264.522 105.039 263.934C105.039 263.378 104.627 263.012 103.986 263.012H103.094V262.264H103.895C104.436 262.264 104.795 261.952 104.795 261.479C104.795 260.998 104.436 260.724 103.948 260.724C103.483 260.724 103.155 260.96 102.911 261.387L102.225 260.968C102.614 260.342 103.186 259.976 104.002 259.976C104.955 259.976 105.656 260.533 105.656 261.395C105.656 261.898 105.428 262.333 104.993 262.592C105.573 262.859 105.893 263.37 105.893 263.973ZM107.642 265.467H106.681L109.442 260.884H106.567V260.129H110.334V260.884L107.642 265.467Z"
             fill="#4380F5"
-          />
+            d="M105.893 264.518c0 .991-.809 1.647-1.899 1.647-.961 0-1.586-.404-2.013-1.136l.732-.45c.312.587.709.839 1.273.839.603 0 1.053-.351 1.053-.938 0-.557-.412-.923-1.053-.923h-.892v-.747h.801c.541 0 .9-.313.9-.786 0-.48-.359-.755-.847-.755-.465 0-.793.237-1.037.664l-.686-.42c.389-.625.961-.991 1.777-.991.953 0 1.654.557 1.654 1.418 0 .504-.228.938-.663 1.198.58.267.9.778.9 1.38zm1.749 1.495h-.961l2.761-4.584h-2.876v-.755h3.768v.755l-2.692 4.584z"
+          ></path>
           <path
-            d="M151.299 270.622C151.299 270.622 162.671 258.257 170.364 261.327C174.156 262.84 173.953 267.875 177.991 268.477C183.109 269.239 188.477 260.374 188.477 260.374"
             stroke="#4380F5"
-            strokeWidth="0.476636"
-          />
+            strokeWidth="0.477"
+            d="M151.299 271.167s11.372-12.365 19.065-9.294c3.792 1.513 3.589 6.548 7.627 7.149 5.118.762 10.486-8.103 10.486-8.103"
+          ></path>
           <rect
-            x="95.5327"
-            y="283.252"
             width="100.093"
             height="26.215"
-            rx="4.76636"
+            x="95.533"
+            y="283.798"
             fill="#F4F5FD"
-          />
+            rx="4.766"
+          ></rect>
           <path
-            d="M103.283 302.976C103.655 302.976 103.96 302.799 104.15 302.528L104.279 302.628C104.06 302.928 103.712 303.123 103.278 303.123C102.52 303.123 101.996 302.528 101.996 301.827C101.996 301.126 102.52 300.53 103.278 300.53C103.707 300.53 104.06 300.731 104.279 301.026L104.15 301.126C103.96 300.855 103.65 300.678 103.283 300.678C102.625 300.678 102.158 301.203 102.158 301.827C102.158 302.451 102.625 302.976 103.283 302.976ZM105.912 300.53C106.68 300.53 107.195 301.15 107.195 301.827C107.195 302.504 106.68 303.123 105.912 303.123C105.15 303.123 104.635 302.504 104.635 301.827C104.635 301.15 105.15 300.53 105.912 300.53ZM105.917 302.976C106.556 302.976 107.023 302.423 107.023 301.827C107.023 301.226 106.556 300.678 105.917 300.678C105.259 300.678 104.797 301.226 104.797 301.827C104.797 302.427 105.259 302.976 105.917 302.976ZM107.85 303.028V302.88L108.965 301.674C109.513 301.083 109.713 300.888 109.713 300.44C109.713 299.997 109.38 299.749 108.951 299.749C108.555 299.749 108.283 299.901 108.069 300.264L107.926 300.178C108.178 299.792 108.507 299.596 108.951 299.596C109.475 299.596 109.885 299.944 109.885 300.449C109.885 300.902 109.599 301.226 109.103 301.76L108.064 302.88H109.985V303.028H107.85Z"
-            fill="black"
-          />
+            fill="#000"
+            d="M103.283 303.521c.372 0 .677-.176.867-.448l.129.1c-.219.3-.567.496-1.001.496-.758 0-1.282-.596-1.282-1.297 0-.7.524-1.296 1.282-1.296.429 0 .782.2 1.001.496l-.129.1c-.19-.272-.5-.448-.867-.448-.658 0-1.125.524-1.125 1.148 0 .625.467 1.149 1.125 1.149zm2.629-2.445c.768 0 1.283.62 1.283 1.296 0 .677-.515 1.297-1.283 1.297-.762 0-1.277-.62-1.277-1.297 0-.676.515-1.296 1.277-1.296zm.005 2.445c.639 0 1.106-.553 1.106-1.149 0-.6-.467-1.148-1.106-1.148-.658 0-1.12.548-1.12 1.148 0 .601.462 1.149 1.12 1.149zm1.933.053v-.148l1.115-1.206c.548-.591.748-.787.748-1.235 0-.443-.333-.691-.762-.691-.396 0-.668.153-.882.515l-.143-.086c.252-.386.581-.581 1.025-.581.524 0 .934.348.934.853 0 .453-.286.777-.782 1.311l-1.039 1.12h1.921v.148h-2.135z"
+          ></path>
           <path
-            d="M103.46 296.441V291.957L102.187 292.666L101.76 292.071L103.475 291.103H104.291V296.441H103.46ZM106.05 296.54C105.73 296.54 105.479 296.288 105.479 295.976C105.479 295.671 105.73 295.411 106.05 295.411C106.363 295.411 106.615 295.671 106.615 295.976C106.615 296.288 106.363 296.54 106.05 296.54ZM109.326 290.958C110.172 290.958 110.714 291.339 111.072 291.85L110.416 292.369C110.119 291.949 109.783 291.72 109.318 291.72C108.441 291.72 107.983 292.414 107.938 293.619C108.296 293.268 108.769 293.078 109.333 293.078C110.363 293.078 111.042 293.833 111.042 294.786C111.042 295.77 110.34 296.601 109.158 296.601C107.846 296.601 107.068 295.655 107.068 293.84C107.068 292.14 107.755 290.958 109.326 290.958ZM109.196 293.825C108.7 293.825 108.258 294.031 107.961 294.451C108.083 295.457 108.533 295.839 109.143 295.839C109.791 295.839 110.18 295.396 110.18 294.817C110.18 294.252 109.768 293.825 109.196 293.825ZM112.061 293.985L112.214 291.11H115.264V291.865H113.014L112.938 293.238H113.548C114.883 293.238 115.485 293.901 115.485 294.885C115.485 295.938 114.669 296.601 113.586 296.601C112.641 296.601 112 296.205 111.573 295.465L112.305 295.015C112.626 295.602 113.03 295.854 113.586 295.854C114.189 295.854 114.631 295.503 114.631 294.916C114.631 294.351 114.227 293.985 113.51 293.985H112.061ZM116.71 296.449V291.11H117.816L119.295 293.612L120.79 291.11H121.896V296.449H121.019V292.315L119.623 294.618H118.983L117.58 292.3V296.449H116.71Z"
             fill="#4380F5"
-          />
+            d="M103.46 296.986v-4.484l-1.273.709-.428-.594 1.716-.969h.816v5.338h-.831zm2.59.1a.565.565 0 01-.572-.565.57.57 0 011.137 0 .564.564 0 01-.565.565zm3.276-5.583c.846 0 1.388.382 1.746.892l-.656.519c-.297-.419-.633-.648-1.098-.648-.877 0-1.335.694-1.38 1.899.358-.351.831-.542 1.395-.542 1.03 0 1.709.755 1.709 1.709 0 .983-.702 1.815-1.884 1.815-1.312 0-2.09-.946-2.09-2.761 0-1.701.687-2.883 2.258-2.883zm-.13 2.868c-.496 0-.938.206-1.235.625.122 1.007.571 1.388 1.182 1.388.648 0 1.037-.442 1.037-1.022 0-.564-.412-.991-.984-.991zm2.865.16l.153-2.875h3.05v.755h-2.25l-.076 1.372h.61c1.335 0 1.937.664 1.937 1.648 0 1.052-.816 1.716-1.899 1.716-.945 0-1.586-.397-2.013-1.137l.732-.45c.32.588.725.839 1.281.839.603 0 1.045-.351 1.045-.938 0-.564-.404-.93-1.121-.93h-1.449zm4.649 2.463v-5.338h1.106l1.479 2.501 1.495-2.501h1.106v5.338h-.877v-4.133l-1.396 2.303h-.64l-1.403-2.319v4.149h-.87z"
+          ></path>
           <path
-            d="M149.869 299.984C149.869 299.984 156.595 289.104 162.977 289.975C169.213 290.826 166.702 302.955 172.986 302.606C178.45 302.302 176.814 291.877 182.28 292.12C184.943 292.238 188.477 294.979 188.477 294.979"
             stroke="#4380F5"
-            strokeWidth="0.476636"
-          />
-          <g opacity="0.2">
-            <circle cx="194.911" cy="232.491" r="0.714953" fill="#060640" />
-            <circle cx="194.911" cy="235.35" r="0.714953" fill="#060640" />
+            strokeWidth="0.477"
+            d="M149.869 300.53s6.726-10.88 13.108-10.01c6.236.851 3.725 12.981 10.009 12.631 5.464-.304 3.828-10.728 9.294-10.486 2.663.118 6.197 2.86 6.197 2.86"
+          ></path>
+          <g fill="#060640" opacity="0.2">
+            <circle cx="194.911" cy="233.036" r="0.715"></circle>
+            <circle cx="194.911" cy="235.896" r="0.715"></circle>
           </g>
         </g>
-        <g filter="url(#filter5_d_523_1843)">
+        <g filter="url(#filter5_d_2639_10667)">
           <rect
-            x="338.533"
-            y="156"
             width="96"
             height="122"
-            rx="4.76636"
+            x="338.533"
+            y="156.545"
             fill="#FBFEFF"
-          />
+            rx="4.766"
+          ></rect>
           <path
-            d="M348.753 171.533V166.862H350.294C351.322 166.862 351.949 167.389 351.949 168.256C351.949 169.117 351.322 169.644 350.294 169.644H349.7V171.533H348.753ZM350.334 167.649H349.7V168.857H350.334C350.735 168.857 350.975 168.623 350.975 168.243C350.975 167.889 350.735 167.649 350.334 167.649ZM353.437 171.633C352.763 171.633 352.302 171.246 352.302 170.625C352.302 170.118 352.696 169.738 353.417 169.618L354.444 169.444V169.357C354.444 169.004 354.177 168.777 353.79 168.777C353.463 168.777 353.21 168.93 353.029 169.177L352.409 168.703C352.709 168.29 353.203 168.036 353.817 168.036C354.791 168.036 355.292 168.617 355.292 169.357V171.533H354.444V171.206C354.231 171.466 353.83 171.633 353.437 171.633ZM353.143 170.585C353.143 170.812 353.323 170.959 353.61 170.959C353.997 170.959 354.277 170.779 354.444 170.512V170.038L353.643 170.171C353.29 170.231 353.143 170.378 353.143 170.585ZM356.262 171.533V168.17H357.109V168.436C357.343 168.21 357.657 168.036 358.104 168.036C358.831 168.036 359.412 168.537 359.412 169.531V171.533H358.558V169.564C358.558 169.117 358.304 168.837 357.89 168.837C357.463 168.837 357.236 169.124 357.109 169.337V171.533H356.262ZM360.801 167.582C360.501 167.582 360.247 167.329 360.247 167.029C360.247 166.728 360.501 166.475 360.801 166.475C361.101 166.475 361.348 166.728 361.348 167.029C361.348 167.329 361.101 167.582 360.801 167.582ZM360.374 171.533V168.17H361.221V171.533H360.374ZM365.334 170.986C365.02 171.406 364.5 171.666 363.866 171.666C362.671 171.666 361.997 170.832 361.997 169.851C361.997 168.857 362.625 168.036 363.726 168.036C364.66 168.036 365.274 168.67 365.274 169.551C365.274 169.738 365.247 169.911 365.22 170.025H362.865C362.945 170.652 363.332 170.905 363.859 170.905C364.226 170.905 364.546 170.745 364.727 170.505L365.334 170.986ZM363.706 168.73C363.272 168.73 362.985 168.97 362.892 169.411H364.44C364.426 169.07 364.179 168.73 363.706 168.73ZM366.102 171.533V168.17H366.949V168.503C367.17 168.276 367.457 168.103 367.837 168.103C367.95 168.103 368.05 168.123 368.131 168.15V168.984C368.024 168.957 367.91 168.937 367.757 168.937C367.343 168.937 367.076 169.164 366.949 169.377V171.533H366.102ZM370.371 169.851C370.371 168.87 371.018 168.036 372.079 168.036C372.533 168.036 372.86 168.176 373.12 168.436V166.528H373.975V171.533H373.12V171.266C372.86 171.526 372.533 171.666 372.079 171.666C371.018 171.666 370.371 170.832 370.371 169.851ZM371.259 169.851C371.259 170.438 371.626 170.865 372.2 170.865C372.58 170.865 372.894 170.705 373.12 170.398V169.304C372.894 168.997 372.58 168.837 372.2 168.837C371.626 168.837 371.259 169.264 371.259 169.851ZM375.443 168.783H374.656L375.256 166.862H376.217L375.443 168.783ZM377.522 171.633C376.848 171.633 376.387 171.246 376.387 170.625C376.387 170.118 376.781 169.738 377.502 169.618L378.529 169.444V169.357C378.529 169.004 378.262 168.777 377.875 168.777C377.548 168.777 377.295 168.93 377.114 169.177L376.494 168.703C376.794 168.29 377.288 168.036 377.902 168.036C378.876 168.036 379.377 168.617 379.377 169.357V171.533H378.529V171.206C378.316 171.466 377.915 171.633 377.522 171.633ZM377.228 170.585C377.228 170.812 377.408 170.959 377.695 170.959C378.082 170.959 378.362 170.779 378.529 170.512V170.038L377.728 170.171C377.375 170.231 377.228 170.378 377.228 170.585ZM381.962 170.865C382.296 170.865 382.562 170.712 382.723 170.478L383.383 170.986C383.07 171.399 382.576 171.666 381.962 171.666C380.801 171.666 380.107 170.832 380.107 169.851C380.107 168.87 380.801 168.036 381.962 168.036C382.576 168.036 383.07 168.303 383.383 168.717L382.723 169.224C382.562 168.99 382.296 168.837 381.949 168.837C381.395 168.837 380.988 169.264 380.988 169.851C380.988 170.445 381.395 170.865 381.962 170.865ZM384.262 170.305V168.93H383.635V168.17H384.262V167.329H385.116V168.17H386.144V168.93H385.116V170.305C385.116 170.679 385.316 170.825 385.65 170.825C385.883 170.825 386.037 170.799 386.15 170.752V171.493C385.984 171.566 385.783 171.599 385.503 171.599C384.662 171.599 384.262 171.126 384.262 170.305ZM387.33 167.582C387.029 167.582 386.776 167.329 386.776 167.029C386.776 166.728 387.029 166.475 387.33 166.475C387.63 166.475 387.877 166.728 387.877 167.029C387.877 167.329 387.63 167.582 387.33 167.582ZM386.903 171.533V168.17H387.75V171.533H386.903ZM390.368 168.036C391.462 168.036 392.21 168.844 392.21 169.851C392.21 170.859 391.462 171.666 390.368 171.666C389.273 171.666 388.526 170.859 388.526 169.851C388.526 168.844 389.273 168.036 390.368 168.036ZM390.381 170.865C390.922 170.865 391.329 170.432 391.329 169.851C391.329 169.264 390.922 168.837 390.381 168.837C389.821 168.837 389.407 169.264 389.407 169.851C389.407 170.438 389.821 170.865 390.381 170.865ZM392.983 171.533V168.17H393.83V168.436C394.064 168.21 394.377 168.036 394.824 168.036C395.552 168.036 396.132 168.537 396.132 169.531V171.533H395.278V169.564C395.278 169.117 395.024 168.837 394.611 168.837C394.184 168.837 393.957 169.124 393.83 169.337V171.533H392.983ZM396.801 171.046L397.361 170.538C397.568 170.799 397.815 170.986 398.135 170.986C398.409 170.986 398.549 170.825 398.549 170.625C398.549 170.038 396.941 170.258 396.941 169.077C396.941 168.483 397.441 168.036 398.142 168.036C398.656 168.036 399.123 168.283 399.363 168.61L398.803 169.104C398.629 168.89 398.409 168.717 398.149 168.717C397.882 168.717 397.755 168.864 397.755 169.037C397.755 169.611 399.363 169.411 399.363 170.572C399.35 171.279 398.783 171.666 398.149 171.666C397.548 171.666 397.121 171.426 396.801 171.046Z"
             fill="#6A6AF4"
-          />
+            d="M348.683 172.078v-4.2h1.386c.924 0 1.488.474 1.488 1.254 0 .774-.564 1.248-1.488 1.248h-.534v1.698h-.852zm1.422-3.492h-.57v1.086h.57c.36 0 .576-.21.576-.552 0-.318-.216-.534-.576-.534zm2.79 3.582c-.606 0-1.02-.348-1.02-.906 0-.456.354-.798 1.002-.906l.924-.156v-.078c0-.318-.24-.522-.588-.522a.82.82 0 00-.684.36l-.558-.426c.27-.372.714-.6 1.266-.6.876 0 1.326.522 1.326 1.188v1.956h-.762v-.294c-.192.234-.552.384-.906.384zm-.264-.942c0 .204.162.336.42.336.348 0 .6-.162.75-.402v-.426l-.72.12c-.318.054-.45.186-.45.372zm2.805.852v-3.024h.762v.24c.21-.204.492-.36.894-.36.654 0 1.176.45 1.176 1.344v1.8h-.768v-1.77c0-.402-.228-.654-.6-.654-.384 0-.588.258-.702.45v1.974h-.762zm4.081-3.552a.505.505 0 01-.498-.498c0-.27.228-.498.498-.498a.5.5 0 01.492.498.5.5 0 01-.492.498zm-.384 3.552v-3.024h.762v3.024h-.762zm4.46-.492c-.282.378-.75.612-1.32.612-1.074 0-1.68-.75-1.68-1.632 0-.894.564-1.632 1.554-1.632.84 0 1.392.57 1.392 1.362 0 .168-.024.324-.048.426h-2.118c.072.564.42.792.894.792.33 0 .618-.144.78-.36l.546.432zm-1.464-2.028c-.39 0-.648.216-.732.612h1.392a.626.626 0 00-.66-.612zm2.154 2.52v-3.024h.762v.3c.198-.204.456-.36.798-.36a.84.84 0 01.264.042v.75a1.313 1.313 0 00-.336-.042.825.825 0 00-.726.396v1.938h-.762zm3.839-1.512c0-.882.582-1.632 1.536-1.632.408 0 .702.126.936.36v-1.716h.768v4.5h-.768v-.24c-.234.234-.528.36-.936.36-.954 0-1.536-.75-1.536-1.632zm.798 0c0 .528.33.912.846.912a.989.989 0 00.828-.42v-.984a.989.989 0 00-.828-.42c-.516 0-.846.384-.846.912zm3.762-.96h-.708l.54-1.728h.864l-.696 1.728zm1.869 2.562c-.606 0-1.02-.348-1.02-.906 0-.456.354-.798 1.002-.906l.924-.156v-.078c0-.318-.24-.522-.588-.522a.82.82 0 00-.684.36l-.558-.426c.27-.372.714-.6 1.266-.6.876 0 1.326.522 1.326 1.188v1.956h-.762v-.294c-.192.234-.552.384-.906.384zm-.264-.942c0 .204.162.336.42.336.348 0 .6-.162.75-.402v-.426l-.72.12c-.318.054-.45.186-.45.372zm4.257.252c.3 0 .54-.138.684-.348l.594.456c-.282.372-.726.612-1.278.612-1.044 0-1.668-.75-1.668-1.632 0-.882.624-1.632 1.668-1.632.552 0 .996.24 1.278.612l-.594.456a.815.815 0 00-.696-.348c-.498 0-.864.384-.864.912 0 .534.366.912.876.912zm2.068-.504v-1.236h-.564v-.684h.564v-.756h.768v.756h.924v.684h-.924v1.236c0 .336.18.468.48.468.21 0 .348-.024.45-.066v.666c-.15.066-.33.096-.582.096-.756 0-1.116-.426-1.116-1.164zm2.758-2.448a.505.505 0 01-.498-.498c0-.27.228-.498.498-.498a.5.5 0 01.492.498.5.5 0 01-.492.498zm-.384 3.552v-3.024h.762v3.024h-.762zm3.116-3.144c.984 0 1.656.726 1.656 1.632 0 .906-.672 1.632-1.656 1.632-.984 0-1.656-.726-1.656-1.632 0-.906.672-1.632 1.656-1.632zm.012 2.544c.486 0 .852-.39.852-.912 0-.528-.366-.912-.852-.912-.504 0-.876.384-.876.912s.372.912.876.912zm2.339.6v-3.024h.762v.24c.21-.204.492-.36.894-.36.654 0 1.176.45 1.176 1.344v1.8h-.768v-1.77c0-.402-.228-.654-.6-.654-.384 0-.588.258-.702.45v1.974h-.762zm3.433-.438l.504-.456c.186.234.408.402.696.402.246 0 .372-.144.372-.324 0-.528-1.446-.33-1.446-1.392 0-.534.45-.936 1.08-.936.462 0 .882.222 1.098.516l-.504.444c-.156-.192-.354-.348-.588-.348-.24 0-.354.132-.354.288 0 .516 1.446.336 1.446 1.38-.012.636-.522.984-1.092.984-.54 0-.924-.216-1.212-.558zm5.458-3.066l-.72-.996h.828l.618.996h-.726zm.018 3.594c-.606 0-1.02-.348-1.02-.906 0-.456.354-.798 1.002-.906l.924-.156v-.078c0-.318-.24-.522-.588-.522a.82.82 0 00-.684.36l-.558-.426c.27-.372.714-.6 1.266-.6.876 0 1.326.522 1.326 1.188v1.956h-.762v-.294c-.192.234-.552.384-.906.384zm-.264-.942c0 .204.162.336.42.336.348 0 .6-.162.75-.402v-.426l-.72.12c-.318.054-.45.186-.45.372zm4.806-2.7a.505.505 0 01-.498-.498c0-.27.228-.498.498-.498a.5.5 0 01.492.498.5.5 0 01-.492.498zm-.384 3.552v-3.024h.762v3.024h-.762zm1.675 0v-3.024h.762v.228c.204-.198.462-.348.834-.348.384 0 .72.168.918.492.216-.264.504-.492 1.014-.492.624 0 1.116.432 1.116 1.284v1.86h-.768v-1.83c0-.366-.198-.594-.54-.594-.33 0-.51.228-.63.432a.929.929 0 01.006.132v1.86h-.768v-1.83c0-.366-.198-.594-.54-.594-.348 0-.528.258-.642.45v1.974h-.762zm5.514 1.476v-4.5h.762v.246c.234-.234.528-.366.942-.366.96 0 1.536.75 1.536 1.632 0 .882-.576 1.632-1.536 1.632-.414 0-.708-.132-.942-.366v1.722h-.762zm1.596-3.9a.971.971 0 00-.834.438v.948a.98.98 0 00.834.438c.516 0 .852-.384.852-.912s-.336-.912-.852-.912zm3.123 2.514c-.606 0-1.02-.348-1.02-.906 0-.456.354-.798 1.002-.906l.924-.156v-.078c0-.318-.24-.522-.588-.522a.82.82 0 00-.684.36l-.558-.426c.27-.372.714-.6 1.266-.6.876 0 1.326.522 1.326 1.188v1.956h-.762v-.294c-.192.234-.552.384-.906.384zm-.264-.942c0 .204.162.336.42.336.348 0 .6-.162.75-.402v-.426l-.72.12c-.318.054-.45.186-.45.372zm4.257.252c.3 0 .54-.138.684-.348l.594.456c-.282.372-.726.612-1.278.612-1.044 0-1.668-.75-1.668-1.632 0-.882.624-1.632 1.668-1.632.552 0 .996.24 1.278.612l-.594.456a.815.815 0 00-.696-.348c-.498 0-.864.384-.864.912 0 .534.366.912.876.912zm2.068-.504v-1.236h-.564v-.684h.564v-.756h.768v.756h.924v.684h-.924v1.236c0 .336.18.468.48.468.21 0 .348-.024.45-.066v.666c-.15.066-.33.096-.582.096-.756 0-1.116-.426-1.116-1.164z"
+          ></path>
           <rect
-            x="370.122"
-            y="230.252"
-            width="47.6636"
-            height="2.85981"
-            rx="1.42991"
+            width="47.664"
+            height="2.86"
+            x="370.121"
+            y="230.798"
             fill="#F4F4F4"
-          />
+            rx="1.43"
+          ></rect>
           <rect
-            x="370.122"
-            y="236.925"
-            width="28.5981"
-            height="2.85981"
-            rx="1.42991"
+            width="28.598"
+            height="2.86"
+            x="370.121"
+            y="237.471"
             fill="#F4F4F4"
-          />
+            rx="1.43"
+          ></rect>
           <rect
+            width="47.664"
+            height="2.86"
             x="370.514"
-            y="209.196"
-            width="47.6636"
-            height="2.85981"
-            rx="1.42991"
+            y="209.742"
             fill="#F4F4F4"
-          />
+            rx="1.43"
+          ></rect>
           <rect
+            width="28.598"
+            height="2.86"
             x="370.514"
-            y="215.869"
-            width="28.5981"
-            height="2.85981"
-            rx="1.42991"
+            y="216.415"
             fill="#F4F4F4"
-          />
+            rx="1.43"
+          ></rect>
           <rect
-            x="367.122"
-            y="190.252"
-            width="47.6636"
-            height="2.85981"
-            rx="1.42991"
+            width="47.664"
+            height="2.86"
+            x="367.121"
+            y="190.798"
             fill="#F4F4F4"
-          />
+            rx="1.43"
+          ></rect>
           <rect
-            x="367.122"
-            y="196.925"
-            width="28.5981"
-            height="2.85981"
-            rx="1.42991"
+            width="28.598"
+            height="2.86"
+            x="367.121"
+            y="197.471"
             fill="#F4F4F4"
-          />
-          <g opacity="0.2">
-            <circle cx="423.612" cy="167.678" r="0.714953" fill="#060640" />
-            <circle cx="423.612" cy="170.537" r="0.714953" fill="#060640" />
-          </g>
+            rx="1.43"
+          ></rect>
           <rect
-            x="349.122"
-            y="188.252"
             width="14"
             height="13"
-            rx="5"
+            x="349.121"
+            y="188.798"
             fill="#F4F4F4"
-          />
+            rx="5"
+          ></rect>
           <rect
-            x="349.122"
-            y="207.252"
             width="14"
             height="13"
-            rx="5"
+            x="349.121"
+            y="207.798"
             fill="#F4F4F4"
-          />
+            rx="5"
+          ></rect>
           <rect
-            x="349.122"
-            y="228.252"
             width="14"
             height="13"
-            rx="5"
+            x="349.121"
+            y="228.798"
             fill="#F4F4F4"
-          />
+            rx="5"
+          ></rect>
         </g>
       </g>
-      <g filter="url(#filter6_d_523_1843)">
+      <g filter="url(#filter6_d_2639_10667)">
         <rect
-          x="100"
-          y="172"
           width="29"
           height="29"
-          rx="5.88406"
+          x="100"
+          y="172.545"
           fill="#7CD4A5"
-        />
+          rx="5.884"
+        ></rect>
       </g>
-      <rect x="103" y="176" width="23" height="22" rx="3.36232" fill="white" />
+      <rect
+        width="23"
+        height="22"
+        x="103"
+        y="176.545"
+        fill="#fff"
+        rx="3.362"
+      ></rect>
       <path
-        d="M114.429 179.249C114.429 179.216 114.422 179.183 114.409 179.152C114.396 179.121 114.377 179.093 114.352 179.069C114.328 179.046 114.299 179.028 114.268 179.016C114.236 179.004 114.203 178.999 114.169 179C112.547 179.068 110.991 179.661 109.736 180.691C108.481 181.721 107.595 183.131 107.212 184.709C106.828 186.287 106.968 187.947 107.61 189.438C108.252 190.93 109.362 192.171 110.772 192.977C110.801 192.993 110.833 193.004 110.866 193.008C110.9 193.012 110.934 193.009 110.966 192.999C110.998 192.99 111.028 192.974 111.054 192.952C111.08 192.931 111.101 192.904 111.117 192.875L112.436 190.322C112.465 190.266 112.471 190.201 112.454 190.14C112.437 190.08 112.398 190.028 112.344 189.995C111.597 189.541 111.015 188.861 110.68 188.054C110.346 187.247 110.277 186.354 110.483 185.505C110.689 184.656 111.16 183.895 111.828 183.331C112.496 182.768 113.325 182.432 114.197 182.371C114.26 182.367 114.319 182.339 114.362 182.293C114.405 182.246 114.429 182.186 114.429 182.122V179.249Z"
         fill="#91B1EE"
-      />
+        d="M114.429 179.795a.253.253 0 00-.077-.18.24.24 0 00-.084-.053.24.24 0 00-.099-.016 7.474 7.474 0 00-6.957 5.709 7.485 7.485 0 003.56 8.267.258.258 0 00.194.023.267.267 0 00.088-.047.264.264 0 00.063-.078l1.319-2.552a.25.25 0 00-.092-.328 4.113 4.113 0 01-1.861-4.49 4.108 4.108 0 011.345-2.173 4.108 4.108 0 012.369-.96.25.25 0 00.232-.249v-2.873z"
+      ></path>
       <path
-        d="M111.273 192.954C111.257 192.984 111.248 193.017 111.246 193.051C111.243 193.085 111.248 193.119 111.258 193.151C111.269 193.183 111.286 193.212 111.309 193.238C111.331 193.263 111.358 193.283 111.388 193.297C112.736 193.933 114.24 194.144 115.707 193.903C115.74 193.897 115.772 193.885 115.8 193.867C115.828 193.849 115.852 193.825 115.871 193.797C115.89 193.77 115.903 193.738 115.91 193.705C115.917 193.672 115.917 193.638 115.91 193.604L115.337 190.772C115.324 190.71 115.289 190.655 115.238 190.618C115.186 190.581 115.124 190.565 115.061 190.574C114.327 190.674 113.579 190.569 112.899 190.271C112.841 190.245 112.777 190.243 112.718 190.265C112.659 190.286 112.61 190.329 112.581 190.386L111.273 192.954Z"
         fill="#F9E2AF"
-      />
+        d="M111.273 193.5a.235.235 0 00-.027.097.24.24 0 00.012.099.26.26 0 00.05.087c.023.025.05.045.08.06a7.322 7.322 0 004.319.605.245.245 0 00.203-.198.28.28 0 000-.1l-.573-2.832a.25.25 0 00-.276-.199 4.03 4.03 0 01-2.162-.303.246.246 0 00-.318.115l-1.308 2.569z"
+      ></path>
       <path
-        d="M116.004 193.519C116.011 193.552 116.024 193.583 116.044 193.61C116.063 193.638 116.087 193.661 116.116 193.679C116.144 193.697 116.176 193.709 116.21 193.714C116.243 193.719 116.277 193.718 116.31 193.71C118.111 193.264 119.683 192.172 120.72 190.645C121.757 189.117 122.186 187.263 121.925 185.44C121.92 185.406 121.909 185.375 121.891 185.346C121.874 185.317 121.851 185.293 121.823 185.273C121.796 185.254 121.765 185.24 121.732 185.232C121.699 185.225 121.665 185.224 121.632 185.231L118.799 185.75C118.736 185.762 118.681 185.796 118.643 185.847C118.605 185.897 118.589 185.96 118.596 186.022C118.707 186.99 118.467 187.966 117.918 188.774C117.37 189.582 116.549 190.169 115.602 190.431C115.541 190.448 115.489 190.487 115.456 190.54C115.423 190.594 115.412 190.658 115.425 190.72L116.004 193.519Z"
         fill="#B68BE2"
-      />
+        d="M116.004 194.064a.244.244 0 00.112.16c.029.018.06.03.094.035a.241.241 0 00.1-.004 7.503 7.503 0 004.41-3.065 7.396 7.396 0 001.205-5.205.237.237 0 00-.034-.093.226.226 0 00-.068-.073.235.235 0 00-.091-.041.259.259 0 00-.1-.002l-2.833.52a.253.253 0 00-.156.096.251.251 0 00-.047.176 4.068 4.068 0 01-.678 2.751 4.12 4.12 0 01-2.315 1.657.248.248 0 00-.178.289l.579 2.799z"
+      ></path>
       <path
-        d="M121.584 185.123C121.617 185.117 121.649 185.104 121.677 185.086C121.704 185.067 121.728 185.043 121.747 185.015C121.765 184.987 121.778 184.955 121.784 184.922C121.79 184.889 121.789 184.855 121.781 184.822C121.417 183.218 120.54 181.78 119.283 180.728C118.027 179.676 116.462 179.069 114.829 179C114.796 178.999 114.762 179.004 114.731 179.016C114.7 179.028 114.671 179.046 114.647 179.07C114.623 179.093 114.604 179.121 114.59 179.152C114.577 179.183 114.571 179.216 114.571 179.25V182.128C114.571 182.192 114.594 182.253 114.637 182.299C114.68 182.345 114.739 182.373 114.802 182.378C115.66 182.438 116.478 182.768 117.139 183.322C117.801 183.875 118.272 184.625 118.487 185.463C118.502 185.525 118.54 185.578 118.593 185.612C118.646 185.646 118.71 185.658 118.772 185.647L121.584 185.123Z"
         fill="#7CD4A5"
-      />
-      <g filter="url(#filter7_d_523_1843)">
-        <g clipPath="url(#clip2_523_1843)">
+        d="M121.584 185.669a.253.253 0 00.163-.109.235.235 0 00.036-.093.24.24 0 00-.002-.1 7.51 7.51 0 00-2.498-4.094 7.417 7.417 0 00-4.454-1.727.255.255 0 00-.239.151.256.256 0 00-.02.098v2.879a.25.25 0 00.232.249c.858.06 1.676.39 2.337.944a4.125 4.125 0 011.347 2.142.251.251 0 00.107.148.245.245 0 00.179.035l2.812-.523z"
+      ></path>
+      <g filter="url(#filter7_d_2639_10667)">
+        <g clipPath="url(#clip2_2639_10667)">
           <path
-            d="M346 260.839C346 258.719 347.719 257 349.839 257H426.195C428.315 257 430.033 258.719 430.033 260.839V266.213C430.033 268.334 428.315 270.052 426.195 270.052H349.839C347.719 270.052 346 268.334 346 266.213V260.839Z"
             fill="#6A6AF4"
-          />
-          <path
-            fillRule="evenodd"
-            clipRule="evenodd"
-            d="M357.517 261.127L358.716 262.326V265.687C358.716 265.819 358.609 265.925 358.478 265.925H354.636C354.505 265.925 354.399 265.819 354.397 265.687V261.365C354.397 261.233 354.504 261.127 354.636 261.127H357.517ZM356.797 262.566H356.317V263.286H355.597V263.766H356.317V264.486H356.797V263.766H357.517V263.286H356.797V262.566Z"
-            fill="#FDFDFD"
-          />
+            d="M346 261.384a3.84 3.84 0 013.839-3.839h76.356a3.838 3.838 0 013.838 3.839v5.375a3.838 3.838 0 01-3.838 3.839h-76.356a3.84 3.84 0 01-3.839-3.839v-5.375z"
+          ></path>
+          <g clipPath="url(#clip3_2639_10667)">
+            <path
+              fill="#FDFDFD"
+              fillRule="evenodd"
+              d="M357.517 261.672l1.199 1.2v3.361a.238.238 0 01-.238.238h-3.842a.24.24 0 01-.238-.238v-4.323c0-.131.106-.238.238-.238h2.881zm-.72 1.44h-.48v.72h-.72v.48h.72v.719h.48v-.719h.72v-.48h-.72v-.72z"
+              clipRule="evenodd"
+            ></path>
+          </g>
           <path
-            d="M363.267 265.006C363.636 265.006 363.926 264.826 364.111 264.563L364.626 264.96C364.332 265.36 363.853 265.618 363.267 265.618C362.249 265.618 361.554 264.835 361.554 263.914C361.554 262.992 362.249 262.209 363.267 262.209C363.853 262.209 364.332 262.472 364.626 262.863L364.111 263.264C363.926 263.002 363.636 262.822 363.267 262.822C362.659 262.822 362.226 263.296 362.226 263.914C362.226 264.531 362.659 265.006 363.267 265.006ZM365.116 265.526V263.204H365.701V263.435C365.853 263.278 366.051 263.158 366.314 263.158C366.392 263.158 366.461 263.172 366.516 263.191V263.766C366.443 263.748 366.364 263.734 366.258 263.734C365.973 263.734 365.788 263.891 365.701 264.038V265.526H365.116ZM368.238 262.836H367.676L368.155 262.071H368.791L368.238 262.836ZM369.026 265.148C368.809 265.439 368.45 265.618 368.012 265.618C367.188 265.618 366.723 265.042 366.723 264.365C366.723 263.679 367.156 263.112 367.916 263.112C368.561 263.112 368.984 263.55 368.984 264.158C368.984 264.287 368.966 264.407 368.948 264.485H367.321C367.377 264.918 367.644 265.093 368.008 265.093C368.261 265.093 368.482 264.983 368.607 264.817L369.026 265.148ZM367.902 263.591C367.602 263.591 367.404 263.757 367.34 264.061H368.409C368.399 263.826 368.229 263.591 367.902 263.591ZM371.676 265.148C371.459 265.439 371.1 265.618 370.662 265.618C369.838 265.618 369.372 265.042 369.372 264.365C369.372 263.679 369.805 263.112 370.565 263.112C371.21 263.112 371.634 263.55 371.634 264.158C371.634 264.287 371.616 264.407 371.597 264.485H369.971C370.026 264.918 370.294 265.093 370.658 265.093C370.911 265.093 371.132 264.983 371.256 264.817L371.676 265.148ZM370.552 263.591C370.252 263.591 370.054 263.757 369.99 264.061H371.058C371.049 263.826 370.879 263.591 370.552 263.591ZM372.206 265.526V263.204H372.791V263.435C372.943 263.278 373.141 263.158 373.404 263.158C373.482 263.158 373.551 263.172 373.606 263.191V263.766C373.533 263.748 373.454 263.734 373.348 263.734C373.063 263.734 372.878 263.891 372.791 264.038V265.526H372.206ZM375.319 265.526V263.204H375.904V263.379C376.061 263.227 376.259 263.112 376.544 263.112C376.839 263.112 377.097 263.241 377.249 263.49C377.415 263.287 377.636 263.112 378.028 263.112C378.507 263.112 378.885 263.444 378.885 264.098V265.526H378.295V264.121C378.295 263.84 378.143 263.665 377.88 263.665C377.627 263.665 377.489 263.84 377.397 263.997C377.401 264.029 377.401 264.061 377.401 264.098V265.526H376.811V264.121C376.811 263.84 376.659 263.665 376.397 263.665C376.13 263.665 375.992 263.863 375.904 264.011V265.526H375.319ZM380.658 263.112C381.413 263.112 381.929 263.67 381.929 264.365C381.929 265.061 381.413 265.618 380.658 265.618C379.902 265.618 379.386 265.061 379.386 264.365C379.386 263.67 379.902 263.112 380.658 263.112ZM380.667 265.065C381.04 265.065 381.321 264.766 381.321 264.365C381.321 263.96 381.04 263.665 380.667 263.665C380.28 263.665 379.994 263.96 379.994 264.365C379.994 264.771 380.28 265.065 380.667 265.065ZM382.463 265.526V263.204H383.048V263.389C383.209 263.232 383.426 263.112 383.734 263.112C384.236 263.112 384.637 263.458 384.637 264.144V265.526H384.048V264.167C384.048 263.859 383.873 263.665 383.587 263.665C383.292 263.665 383.135 263.863 383.048 264.011V265.526H382.463ZM386.543 266.659V263.204H387.128V263.393C387.308 263.214 387.534 263.112 387.852 263.112C388.589 263.112 389.031 263.688 389.031 264.365C389.031 265.042 388.589 265.618 387.852 265.618C387.534 265.618 387.308 265.517 387.128 265.337V266.659H386.543ZM387.769 263.665C387.497 263.665 387.276 263.785 387.128 264.001V264.729C387.285 264.95 387.501 265.065 387.769 265.065C388.165 265.065 388.423 264.771 388.423 264.365C388.423 263.96 388.165 263.665 387.769 263.665ZM389.566 265.526V262.071H390.151V265.526H389.566ZM391.507 265.595C391.042 265.595 390.724 265.328 390.724 264.9C390.724 264.55 390.996 264.287 391.493 264.204L392.203 264.084V264.024C392.203 263.78 392.018 263.624 391.751 263.624C391.526 263.624 391.351 263.73 391.226 263.9L390.798 263.573C391.005 263.287 391.346 263.112 391.77 263.112C392.442 263.112 392.788 263.513 392.788 264.024V265.526H392.203V265.3C392.055 265.48 391.779 265.595 391.507 265.595ZM391.304 264.872C391.304 265.029 391.429 265.13 391.627 265.13C391.894 265.13 392.088 265.006 392.203 264.821V264.494L391.65 264.586C391.406 264.628 391.304 264.729 391.304 264.872ZM393.458 265.526V263.204H394.043V263.389C394.204 263.232 394.421 263.112 394.729 263.112C395.231 263.112 395.632 263.458 395.632 264.144V265.526H395.042V264.167C395.042 263.859 394.867 263.665 394.582 263.665C394.287 263.665 394.13 263.863 394.043 264.011V265.526H393.458ZM397.372 264.365C397.372 263.688 397.819 263.112 398.552 263.112C398.865 263.112 399.091 263.209 399.27 263.389V262.071H399.86V265.526H399.27V265.342C399.091 265.522 398.865 265.618 398.552 265.618C397.819 265.618 397.372 265.042 397.372 264.365ZM397.985 264.365C397.985 264.771 398.238 265.065 398.634 265.065C398.897 265.065 399.114 264.955 399.27 264.743V263.987C399.114 263.776 398.897 263.665 398.634 263.665C398.238 263.665 397.985 263.96 397.985 264.365ZM400.874 263.628H400.33L400.745 262.301H401.408L400.874 263.628ZM402.309 265.595C401.843 265.595 401.525 265.328 401.525 264.9C401.525 264.55 401.797 264.287 402.295 264.204L403.004 264.084V264.024C403.004 263.78 402.82 263.624 402.553 263.624C402.327 263.624 402.152 263.73 402.028 263.9L401.599 263.573C401.806 263.287 402.147 263.112 402.571 263.112C403.244 263.112 403.589 263.513 403.589 264.024V265.526H403.004V265.3C402.857 265.48 402.58 265.595 402.309 265.595ZM402.106 264.872C402.106 265.029 402.23 265.13 402.428 265.13C402.696 265.13 402.889 265.006 403.004 264.821V264.494L402.451 264.586C402.207 264.628 402.106 264.729 402.106 264.872ZM405.374 265.065C405.604 265.065 405.789 264.96 405.899 264.798L406.355 265.148C406.139 265.434 405.798 265.618 405.374 265.618C404.572 265.618 404.093 265.042 404.093 264.365C404.093 263.688 404.572 263.112 405.374 263.112C405.798 263.112 406.139 263.296 406.355 263.582L405.899 263.932C405.789 263.771 405.604 263.665 405.365 263.665C404.982 263.665 404.701 263.96 404.701 264.365C404.701 264.775 404.982 265.065 405.374 265.065ZM407.266 263.628H406.723L407.137 262.301H407.801L407.266 263.628ZM408.701 265.595C408.236 265.595 407.918 265.328 407.918 264.9C407.918 264.55 408.19 264.287 408.687 264.204L409.397 264.084V264.024C409.397 263.78 409.213 263.624 408.945 263.624C408.72 263.624 408.545 263.73 408.42 263.9L407.992 263.573C408.199 263.287 408.54 263.112 408.964 263.112C409.636 263.112 409.982 263.513 409.982 264.024V265.526H409.397V265.3C409.249 265.48 408.973 265.595 408.701 265.595ZM408.499 264.872C408.499 265.029 408.623 265.13 408.821 265.13C409.088 265.13 409.282 265.006 409.397 264.821V264.494L408.844 264.586C408.6 264.628 408.499 264.729 408.499 264.872ZM411.767 265.065C411.997 265.065 412.181 264.96 412.292 264.798L412.748 265.148C412.531 265.434 412.19 265.618 411.767 265.618C410.965 265.618 410.486 265.042 410.486 264.365C410.486 263.688 410.965 263.112 411.767 263.112C412.19 263.112 412.531 263.296 412.748 263.582L412.292 263.932C412.181 263.771 411.997 263.665 411.757 263.665C411.375 263.665 411.094 263.96 411.094 264.365C411.094 264.775 411.375 265.065 411.767 265.065ZM413.355 264.678V263.73H412.921V263.204H413.355V262.624H413.944V263.204H414.654V263.73H413.944V264.678C413.944 264.936 414.082 265.038 414.313 265.038C414.474 265.038 414.58 265.019 414.658 264.987V265.498C414.543 265.549 414.405 265.572 414.211 265.572C413.631 265.572 413.355 265.245 413.355 264.678ZM415.472 262.799C415.265 262.799 415.09 262.624 415.09 262.417C415.09 262.209 415.265 262.034 415.472 262.034C415.68 262.034 415.85 262.209 415.85 262.417C415.85 262.624 415.68 262.799 415.472 262.799ZM415.178 265.526V263.204H415.763V265.526H415.178ZM417.57 263.112C418.325 263.112 418.841 263.67 418.841 264.365C418.841 265.061 418.325 265.618 417.57 265.618C416.814 265.618 416.298 265.061 416.298 264.365C416.298 263.67 416.814 263.112 417.57 263.112ZM417.579 265.065C417.952 265.065 418.233 264.766 418.233 264.365C418.233 263.96 417.952 263.665 417.579 263.665C417.192 263.665 416.906 263.96 416.906 264.365C416.906 264.771 417.192 265.065 417.579 265.065ZM419.375 265.526V263.204H419.96V263.389C420.121 263.232 420.338 263.112 420.646 263.112C421.148 263.112 421.549 263.458 421.549 264.144V265.526H420.96V264.167C420.96 263.859 420.784 263.665 420.499 263.665C420.204 263.665 420.047 263.863 419.96 264.011V265.526H419.375Z"
-            fill="white"
-          />
+            fill="#fff"
+            d="M363.267 265.551c.369 0 .659-.18.843-.442l.516.396c-.294.401-.774.659-1.359.659-1.018 0-1.713-.783-1.713-1.705 0-.921.695-1.704 1.713-1.704.585 0 1.065.262 1.359.654l-.516.401a1.007 1.007 0 00-.843-.443c-.608 0-1.041.475-1.041 1.092 0 .618.433 1.092 1.041 1.092zm1.849.521v-2.322h.585v.23a.836.836 0 01.612-.276c.079 0 .148.014.203.032v.576a.986.986 0 00-.258-.032.632.632 0 00-.557.304v1.488h-.585zm3.122-2.691h-.562l.479-.764h.636l-.553.764zm.788 2.313c-.217.29-.576.47-1.014.47-.824 0-1.29-.576-1.29-1.253 0-.687.433-1.253 1.194-1.253.644 0 1.068.437 1.068 1.045 0 .129-.018.249-.037.327h-1.626c.056.434.323.609.687.609a.747.747 0 00.599-.277l.419.332zm-1.124-1.557c-.3 0-.498.166-.562.47h1.068a.48.48 0 00-.506-.47zm3.773 1.557c-.216.29-.575.47-1.013.47-.825 0-1.29-.576-1.29-1.253 0-.687.433-1.253 1.193-1.253.645 0 1.069.437 1.069 1.045 0 .129-.018.249-.037.327h-1.626c.055.434.322.609.686.609a.744.744 0 00.599-.277l.419.332zm-1.124-1.557c-.299 0-.497.166-.562.47h1.069a.48.48 0 00-.507-.47zm1.655 1.935v-2.322h.585v.23a.836.836 0 01.612-.276c.079 0 .148.014.203.032v.576a.986.986 0 00-.258-.032.632.632 0 00-.557.304v1.488h-.585zm3.113 0v-2.322h.585v.175a.876.876 0 01.64-.267c.295 0 .553.129.705.377.166-.202.387-.377.779-.377.479 0 .856.331.856.986v1.428h-.589v-1.405c0-.281-.152-.456-.415-.456-.253 0-.391.175-.484.331.005.032.005.065.005.102v1.428h-.59v-1.405c0-.281-.152-.456-.414-.456-.267 0-.406.198-.493.345v1.516h-.585zm5.339-2.414c.755 0 1.271.557 1.271 1.253 0 .695-.516 1.253-1.271 1.253-.756 0-1.272-.558-1.272-1.253 0-.696.516-1.253 1.272-1.253zm.009 1.953c.373 0 .654-.299.654-.7 0-.406-.281-.7-.654-.7-.387 0-.673.294-.673.7 0 .405.286.7.673.7zm1.796.461v-2.322h.585v.184a.941.941 0 01.686-.276c.502 0 .903.345.903 1.032v1.382h-.59v-1.359c0-.309-.175-.502-.46-.502-.295 0-.452.198-.539.345v1.516h-.585zm4.08 1.133v-3.455h.585v.189c.18-.18.406-.281.723-.281.737 0 1.18.576 1.18 1.253 0 .677-.443 1.253-1.18 1.253-.317 0-.543-.102-.723-.281v1.322h-.585zm1.225-2.994a.745.745 0 00-.64.336v.728a.752.752 0 00.64.336c.397 0 .655-.295.655-.7 0-.406-.258-.7-.655-.7zm1.798 1.861v-3.455h.585v3.455h-.585zm1.941.069c-.465 0-.783-.267-.783-.696 0-.35.272-.613.769-.696l.71-.119v-.06c0-.244-.185-.401-.452-.401a.63.63 0 00-.525.276l-.428-.327c.207-.285.548-.46.972-.46.672 0 1.018.4 1.018.912v1.502h-.585v-.226c-.148.18-.424.295-.696.295zm-.203-.724c0 .157.125.258.323.258.267 0 .46-.124.576-.308v-.327l-.553.092c-.244.041-.346.143-.346.285zm2.154.655v-2.322h.585v.184a.94.94 0 01.686-.276c.502 0 .903.345.903 1.032v1.382h-.59v-1.359c0-.309-.175-.502-.46-.502-.295 0-.452.198-.539.345v1.516h-.585zm3.914-1.161c0-.677.447-1.253 1.179-1.253.314 0 .539.096.719.276v-1.317h.59v3.455h-.59v-.185c-.18.18-.405.277-.719.277-.732 0-1.179-.576-1.179-1.253zm.613 0c0 .405.253.7.649.7a.76.76 0 00.636-.323v-.755a.76.76 0 00-.636-.322c-.396 0-.649.294-.649.7zm2.888-.737h-.543l.415-1.327h.663l-.535 1.327zm1.435 1.967c-.465 0-.783-.267-.783-.696 0-.35.272-.613.77-.696l.709-.119v-.06c0-.244-.184-.401-.451-.401a.633.633 0 00-.526.276l-.428-.327c.207-.285.548-.46.972-.46.673 0 1.018.4 1.018.912v1.502h-.585v-.226c-.147.18-.424.295-.696.295zm-.202-.724c0 .157.124.258.322.258a.65.65 0 00.576-.308v-.327l-.553.092c-.244.041-.345.143-.345.285zm3.268.194c.23 0 .414-.106.525-.267l.456.35a1.2 1.2 0 01-.981.47c-.802 0-1.281-.576-1.281-1.253 0-.677.479-1.253 1.281-1.253.424 0 .765.184.981.47l-.456.35a.624.624 0 00-.534-.267c-.383 0-.664.294-.664.7 0 .41.281.7.673.7zm1.892-1.437h-.543l.414-1.327h.664l-.535 1.327zm1.435 1.967c-.465 0-.783-.267-.783-.696 0-.35.272-.613.769-.696l.71-.119v-.06c0-.244-.185-.401-.452-.401a.63.63 0 00-.525.276l-.428-.327c.207-.285.548-.46.972-.46.672 0 1.018.4 1.018.912v1.502h-.585v-.226c-.148.18-.424.295-.696.295zm-.203-.724c0 .157.125.258.323.258a.65.65 0 00.576-.308v-.327l-.553.092c-.244.041-.346.143-.346.285zm3.269.194c.23 0 .414-.106.525-.267l.456.35c-.217.285-.558.47-.981.47-.802 0-1.281-.576-1.281-1.253 0-.677.479-1.253 1.281-1.253a1.2 1.2 0 01.981.47l-.456.35a.625.625 0 00-.535-.267c-.382 0-.663.294-.663.7 0 .41.281.7.673.7zm1.587-.387v-.949h-.433v-.525h.433v-.581h.59v.581h.709v.525h-.709v.949c0 .258.138.359.369.359a.912.912 0 00.345-.05v.511a1.08 1.08 0 01-.447.074c-.58 0-.857-.327-.857-.894zm2.118-1.88a.387.387 0 01-.382-.382c0-.207.175-.382.382-.382.208 0 .378.175.378.382 0 .207-.17.382-.378.382zm-.295 2.728v-2.322h.585v2.322h-.585zm2.393-2.414c.755 0 1.271.557 1.271 1.253 0 .695-.516 1.253-1.271 1.253-.756 0-1.272-.558-1.272-1.253 0-.696.516-1.253 1.272-1.253zm.009 1.953c.373 0 .654-.299.654-.7 0-.406-.281-.7-.654-.7-.387 0-.673.294-.673.7 0 .405.286.7.673.7zm1.796.461v-2.322h.585v.184a.941.941 0 01.686-.276c.502 0 .903.345.903 1.032v1.382h-.59v-1.359c0-.309-.175-.502-.46-.502-.295 0-.452.198-.539.345v1.516h-.585z"
+          ></path>
         </g>
       </g>
       <defs>
         <filter
-          id="filter0_d_523_1843"
+          id="filter0_d_2639_10667"
+          width="62.623"
+          height="62.623"
           x="403.188"
-          y="69.5507"
-          width="62.6232"
-          height="62.6232"
-          filterUnits="userSpaceOnUse"
+          y="70.096"
           colorInterpolationFilters="sRGB"
+          filterUnits="userSpaceOnUse"
         >
-          <feFlood floodOpacity="0" result="BackgroundImageFix" />
+          <feFlood floodOpacity="0" result="BackgroundImageFix"></feFlood>
           <feColorMatrix
             in="SourceAlpha"
-            type="matrix"
-            values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"
             result="hardAlpha"
-          />
-          <feOffset dy="3.36232" />
-          <feGaussianBlur stdDeviation="8.4058" />
-          <feColorMatrix
-            type="matrix"
-            values="0 0 0 0 0.429448 0 0 0 0 0.311235 0 0 0 0 0.332927 0 0 0 0.26 0"
-          />
+            values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"
+          ></feColorMatrix>
+          <feOffset dy="3.362"></feOffset>
+          <feGaussianBlur stdDeviation="8.406"></feGaussianBlur>
+          <feColorMatrix values="0 0 0 0 0.429448 0 0 0 0 0.311235 0 0 0 0 0.332927 0 0 0 0.26 0"></feColorMatrix>
           <feBlend
-            mode="normal"
             in2="BackgroundImageFix"
-            result="effect1_dropShadow_523_1843"
-          />
+            result="effect1_dropShadow_2639_10667"
+          ></feBlend>
           <feBlend
-            mode="normal"
             in="SourceGraphic"
-            in2="effect1_dropShadow_523_1843"
+            in2="effect1_dropShadow_2639_10667"
             result="shape"
-          />
+          ></feBlend>
         </filter>
         <filter
-          id="filter1_f_523_1843"
-          x="0.482201"
-          y="0.339806"
+          id="filter1_f_2639_10667"
           width="495.036"
           height="421.204"
-          filterUnits="userSpaceOnUse"
+          x="0.482"
+          y="0.885"
           colorInterpolationFilters="sRGB"
+          filterUnits="userSpaceOnUse"
         >
-          <feFlood floodOpacity="0" result="BackgroundImageFix" />
+          <feFlood floodOpacity="0" result="BackgroundImageFix"></feFlood>
           <feBlend
-            mode="normal"
             in="SourceGraphic"
             in2="BackgroundImageFix"
             result="shape"
-          />
+          ></feBlend>
           <feGaussianBlur
-            stdDeviation="30.2589"
-            result="effect1_foregroundBlur_523_1843"
-          />
+            result="effect1_foregroundBlur_2639_10667"
+            stdDeviation="30.259"
+          ></feGaussianBlur>
         </filter>
         <filter
-          id="filter2_d_523_1843"
-          x="66"
-          y="53"
+          id="filter2_d_2639_10667"
           width="388.533"
           height="290"
-          filterUnits="userSpaceOnUse"
+          x="66"
+          y="53.545"
           colorInterpolationFilters="sRGB"
+          filterUnits="userSpaceOnUse"
         >
-          <feFlood floodOpacity="0" result="BackgroundImageFix" />
+          <feFlood floodOpacity="0" result="BackgroundImageFix"></feFlood>
           <feColorMatrix
             in="SourceAlpha"
-            type="matrix"
-            values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"
             result="hardAlpha"
-          />
-          <feOffset dy="4" />
-          <feGaussianBlur stdDeviation="10" />
-          <feComposite in2="hardAlpha" operator="out" />
-          <feColorMatrix
-            type="matrix"
-            values="0 0 0 0 0.930353 0 0 0 0 0.930353 0 0 0 0 0.978465 0 0 0 1 0"
-          />
+            values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"
+          ></feColorMatrix>
+          <feOffset dy="4"></feOffset>
+          <feGaussianBlur stdDeviation="10"></feGaussianBlur>
+          <feComposite in2="hardAlpha" operator="out"></feComposite>
+          <feColorMatrix values="0 0 0 0 0.930353 0 0 0 0 0.930353 0 0 0 0 0.978465 0 0 0 1 0"></feColorMatrix>
           <feBlend
-            mode="normal"
             in2="BackgroundImageFix"
-            result="effect1_dropShadow_523_1843"
-          />
+            result="effect1_dropShadow_2639_10667"
+          ></feBlend>
           <feBlend
-            mode="normal"
             in="SourceGraphic"
-            in2="effect1_dropShadow_523_1843"
+            in2="effect1_dropShadow_2639_10667"
             result="shape"
-          />
+          ></feBlend>
         </filter>
         <filter
-          id="filter3_d_523_1843"
-          x="127.234"
-          y="56.6075"
+          id="filter3_d_2639_10667"
           width="263.598"
           height="261.598"
-          filterUnits="userSpaceOnUse"
+          x="127.234"
+          y="57.153"
           colorInterpolationFilters="sRGB"
+          filterUnits="userSpaceOnUse"
         >
-          <feFlood floodOpacity="0" result="BackgroundImageFix" />
+          <feFlood floodOpacity="0" result="BackgroundImageFix"></feFlood>
           <feColorMatrix
             in="SourceAlpha"
-            type="matrix"
-            values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"
             result="hardAlpha"
-          />
-          <feOffset dy="1.90654" />
-          <feGaussianBlur stdDeviation="7.14953" />
-          <feComposite in2="hardAlpha" operator="out" />
-          <feColorMatrix
-            type="matrix"
-            values="0 0 0 0 0.0235294 0 0 0 0 0.0235294 0 0 0 0 0.25098 0 0 0 0.03 0"
-          />
+            values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"
+          ></feColorMatrix>
+          <feOffset dy="1.907"></feOffset>
+          <feGaussianBlur stdDeviation="7.15"></feGaussianBlur>
+          <feComposite in2="hardAlpha" operator="out"></feComposite>
+          <feColorMatrix values="0 0 0 0 0.0235294 0 0 0 0 0.0235294 0 0 0 0 0.25098 0 0 0 0.03 0"></feColorMatrix>
           <feBlend
-            mode="normal"
             in2="BackgroundImageFix"
-            result="effect1_dropShadow_523_1843"
-          />
+            result="effect1_dropShadow_2639_10667"
+          ></feBlend>
           <feBlend
-            mode="normal"
             in="SourceGraphic"
-            in2="effect1_dropShadow_523_1843"
+            in2="effect1_dropShadow_2639_10667"
             result="shape"
-          />
+          ></feBlend>
         </filter>
         <filter
-          id="filter4_d_523_1843"
-          x="36"
-          y="175.579"
+          id="filter4_d_2639_10667"
           width="219.159"
           height="198.187"
-          filterUnits="userSpaceOnUse"
+          x="36"
+          y="176.125"
           colorInterpolationFilters="sRGB"
+          filterUnits="userSpaceOnUse"
         >
-          <feFlood floodOpacity="0" result="BackgroundImageFix" />
+          <feFlood floodOpacity="0" result="BackgroundImageFix"></feFlood>
           <feColorMatrix
             in="SourceAlpha"
-            type="matrix"
-            values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"
             result="hardAlpha"
-          />
-          <feOffset dy="4.76636" />
-          <feGaussianBlur stdDeviation="25" />
-          <feComposite in2="hardAlpha" operator="out" />
-          <feColorMatrix
-            type="matrix"
-            values="0 0 0 0 0.551433 0 0 0 0 0.551433 0 0 0 0 0.635327 0 0 0 0.2 0"
-          />
+            values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"
+          ></feColorMatrix>
+          <feOffset dy="4.766"></feOffset>
+          <feGaussianBlur stdDeviation="25"></feGaussianBlur>
+          <feComposite in2="hardAlpha" operator="out"></feComposite>
+          <feColorMatrix values="0 0 0 0 0.551433 0 0 0 0 0.551433 0 0 0 0 0.635327 0 0 0 0.2 0"></feColorMatrix>
           <feBlend
-            mode="normal"
             in2="BackgroundImageFix"
-            result="effect1_dropShadow_523_1843"
-          />
+            result="effect1_dropShadow_2639_10667"
+          ></feBlend>
           <feBlend
-            mode="normal"
             in="SourceGraphic"
-            in2="effect1_dropShadow_523_1843"
+            in2="effect1_dropShadow_2639_10667"
             result="shape"
-          />
+          ></feBlend>
         </filter>
         <filter
-          id="filter5_d_523_1843"
-          x="324.234"
-          y="146.467"
+          id="filter5_d_2639_10667"
           width="124.598"
           height="150.598"
-          filterUnits="userSpaceOnUse"
+          x="324.234"
+          y="147.013"
           colorInterpolationFilters="sRGB"
+          filterUnits="userSpaceOnUse"
         >
-          <feFlood floodOpacity="0" result="BackgroundImageFix" />
+          <feFlood floodOpacity="0" result="BackgroundImageFix"></feFlood>
           <feColorMatrix
             in="SourceAlpha"
-            type="matrix"
-            values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"
             result="hardAlpha"
-          />
-          <feOffset dy="4.76636" />
-          <feGaussianBlur stdDeviation="7.14953" />
-          <feComposite in2="hardAlpha" operator="out" />
-          <feColorMatrix
-            type="matrix"
-            values="0 0 0 0 0.450557 0 0 0 0 0.450557 0 0 0 0 0.799656 0 0 0 0.2 0"
-          />
+            values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"
+          ></feColorMatrix>
+          <feOffset dy="4.766"></feOffset>
+          <feGaussianBlur stdDeviation="7.15"></feGaussianBlur>
+          <feComposite in2="hardAlpha" operator="out"></feComposite>
+          <feColorMatrix values="0 0 0 0 0.450557 0 0 0 0 0.450557 0 0 0 0 0.799656 0 0 0 0.2 0"></feColorMatrix>
           <feBlend
-            mode="normal"
             in2="BackgroundImageFix"
-            result="effect1_dropShadow_523_1843"
-          />
+            result="effect1_dropShadow_2639_10667"
+          ></feBlend>
           <feBlend
-            mode="normal"
             in="SourceGraphic"
-            in2="effect1_dropShadow_523_1843"
+            in2="effect1_dropShadow_2639_10667"
             result="shape"
-          />
+          ></feBlend>
         </filter>
         <filter
-          id="filter6_d_523_1843"
-          x="83.1884"
-          y="158.551"
-          width="62.6232"
-          height="62.6232"
-          filterUnits="userSpaceOnUse"
+          id="filter6_d_2639_10667"
+          width="62.623"
+          height="62.623"
+          x="83.188"
+          y="159.096"
           colorInterpolationFilters="sRGB"
+          filterUnits="userSpaceOnUse"
         >
-          <feFlood floodOpacity="0" result="BackgroundImageFix" />
+          <feFlood floodOpacity="0" result="BackgroundImageFix"></feFlood>
           <feColorMatrix
             in="SourceAlpha"
-            type="matrix"
-            values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"
             result="hardAlpha"
-          />
-          <feOffset dy="3.36232" />
-          <feGaussianBlur stdDeviation="8.4058" />
-          <feColorMatrix
-            type="matrix"
-            values="0 0 0 0 0.820014 0 0 0 0 0.820014 0 0 0 0 0.959084 0 0 0 1 0"
-          />
+            values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"
+          ></feColorMatrix>
+          <feOffset dy="3.362"></feOffset>
+          <feGaussianBlur stdDeviation="8.406"></feGaussianBlur>
+          <feColorMatrix values="0 0 0 0 0.820014 0 0 0 0 0.820014 0 0 0 0 0.959084 0 0 0 1 0"></feColorMatrix>
           <feBlend
-            mode="normal"
             in2="BackgroundImageFix"
-            result="effect1_dropShadow_523_1843"
-          />
+            result="effect1_dropShadow_2639_10667"
+          ></feBlend>
           <feBlend
-            mode="normal"
             in="SourceGraphic"
-            in2="effect1_dropShadow_523_1843"
+            in2="effect1_dropShadow_2639_10667"
             result="shape"
-          />
+          ></feBlend>
         </filter>
         <filter
-          id="filter7_d_523_1843"
+          id="filter7_d_2639_10667"
+          width="99.389"
+          height="28.408"
           x="338.322"
-          y="250.858"
-          width="99.3891"
-          height="28.4079"
-          filterUnits="userSpaceOnUse"
+          y="251.403"
           colorInterpolationFilters="sRGB"
+          filterUnits="userSpaceOnUse"
         >
-          <feFlood floodOpacity="0" result="BackgroundImageFix" />
+          <feFlood floodOpacity="0" result="BackgroundImageFix"></feFlood>
           <feColorMatrix
             in="SourceAlpha"
-            type="matrix"
-            values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"
             result="hardAlpha"
-          />
-          <feOffset dy="1.53556" />
-          <feGaussianBlur stdDeviation="3.8389" />
-          <feComposite in2="hardAlpha" operator="out" />
-          <feColorMatrix
-            type="matrix"
-            values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.25 0"
-          />
+            values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"
+          ></feColorMatrix>
+          <feOffset dy="1.536"></feOffset>
+          <feGaussianBlur stdDeviation="3.839"></feGaussianBlur>
+          <feComposite in2="hardAlpha" operator="out"></feComposite>
+          <feColorMatrix values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.25 0"></feColorMatrix>
           <feBlend
-            mode="normal"
             in2="BackgroundImageFix"
-            result="effect1_dropShadow_523_1843"
-          />
+            result="effect1_dropShadow_2639_10667"
+          ></feBlend>
           <feBlend
-            mode="normal"
             in="SourceGraphic"
-            in2="effect1_dropShadow_523_1843"
+            in2="effect1_dropShadow_2639_10667"
             result="shape"
-          />
+          ></feBlend>
         </filter>
-        <clipPath id="clip0_523_1843">
+        <clipPath id="clip0_2639_10667">
           <rect
-            x="141.533"
-            y="69"
             width="235"
             height="233"
-            rx="7.62617"
-            fill="white"
-          />
+            x="141.533"
+            y="69.546"
+            fill="#fff"
+            rx="7.626"
+          ></rect>
         </clipPath>
-        <clipPath id="clip1_523_1843">
+        <clipPath id="clip1_2639_10667">
           <rect
-            x="151.065"
-            y="128.579"
             width="213.056"
             height="158.72"
-            rx="4.76636"
-            fill="white"
-          />
+            x="151.065"
+            y="129.125"
+            fill="#fff"
+            rx="4.766"
+          ></rect>
+        </clipPath>
+        <clipPath id="clip2_2639_10667">
+          <path
+            fill="#fff"
+            d="M346 261.384a3.84 3.84 0 013.839-3.839h76.356a3.838 3.838 0 013.838 3.839v5.375a3.838 3.838 0 01-3.838 3.839h-76.356a3.84 3.84 0 01-3.839-3.839v-5.375z"
+          ></path>
         </clipPath>
-        <clipPath id="clip2_523_1843">
+        <clipPath id="clip3_2639_10667">
           <path
-            d="M346 260.839C346 258.719 347.719 257 349.839 257H426.195C428.315 257 430.033 258.719 430.033 260.839V266.213C430.033 268.334 428.315 270.052 426.195 270.052H349.839C347.719 270.052 346 268.334 346 266.213V260.839Z"
-            fill="white"
-          />
+            fill="#fff"
+            d="M0 0H5.758V5.758H0z"
+            transform="translate(353.678 261.192)"
+          ></path>
         </clipPath>
       </defs>
     </svg>

From c21aa9462bcc8509033c4583b2684f9235f30bac Mon Sep 17 00:00:00 2001
From: Marc Rutkowski <marc@attractive-media.fr>
Date: Tue, 17 Sep 2024 18:03:41 +0200
Subject: [PATCH 02/91] =?UTF-8?q?Ajoute=20le=20composant=20de=20recherche/?=
 =?UTF-8?q?s=C3=A9lection=20d'une=20collectivit=C3=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/Landing/SelectCollectivite.tsx | 42 +++++++++++++++++++
 .../Landing/useFilteredCollectivites.ts       | 31 ++++++++++++++
 2 files changed, 73 insertions(+)
 create mode 100644 packages/panier/components/Landing/SelectCollectivite.tsx
 create mode 100644 packages/panier/components/Landing/useFilteredCollectivites.ts

diff --git a/packages/panier/components/Landing/SelectCollectivite.tsx b/packages/panier/components/Landing/SelectCollectivite.tsx
new file mode 100644
index 0000000000..8b820441a9
--- /dev/null
+++ b/packages/panier/components/Landing/SelectCollectivite.tsx
@@ -0,0 +1,42 @@
+'use client';
+
+import {useState} from 'react';
+import {Select} from '@tet/ui';
+import {useFilteredCollectivites} from '@components/Landing/useFilteredCollectivites';
+
+/**
+ *  Permet de rechercher et sélectionner une collectivité
+ */
+const SelectCollectivite = ({
+  collectiviteId,
+  onSelectCollectivite,
+}: {
+  collectiviteId: number | null;
+  onSelectCollectivite: (id: number | null) => void;
+}) => {
+  const [search, setSearch] = useState('');
+  const {data: collectivites, isLoading} = useFilteredCollectivites(search);
+
+  return (
+    <Select
+      placeholder="Rechercher une collectivité"
+      debounce={500}
+      options={
+        collectivites?.map(c => ({
+          value: c.collectivite_id!,
+          label: `${c.nom!} (${c.departement_code})`,
+        })) || []
+      }
+      values={collectiviteId ? collectiviteId : undefined}
+      isSearcheable
+      onSearch={setSearch}
+      isLoading={isLoading}
+      onChange={value => {
+        const id = collectiviteId === value ? null : (value as number);
+        onSelectCollectivite(id);
+      }}
+    />
+  );
+};
+
+export default SelectCollectivite;
diff --git a/packages/panier/components/Landing/useFilteredCollectivites.ts b/packages/panier/components/Landing/useFilteredCollectivites.ts
new file mode 100644
index 0000000000..831f6f7d33
--- /dev/null
+++ b/packages/panier/components/Landing/useFilteredCollectivites.ts
@@ -0,0 +1,31 @@
+import {makeSearchString} from '@tet/api';
+import {supabase} from 'src/clientAPI';
+import useSWR from 'swr';
+
+/** Donne la liste des collectivités dont le nom inclus la chaîne recherchée */
+export const useFilteredCollectivites = (search: string, limit = 10) => {
+  const key = `site_labellisation-filtered-${search}`;
+  return useSWR(key, async () => {
+    const query = supabase
+      .from('site_labellisation')
+      .select('collectivite_id, nom, departement_code, engagee')
+      .order('nom')
+      .limit(limit);
+
+    const processedSearch = makeSearchString(search, 'nom');
+    if (processedSearch) {
+      query.or(processedSearch);
+    }
+
+    const {error, data} = await query;
+
+    if (error) {
+      throw new Error(key);
+    }
+    if (!data || !data.length) {
+      return null;
+    }
+
+    return data || [];
+  });
+};

From f22e09a10d43fa2b6f6f51e49b9561fd6543776f Mon Sep 17 00:00:00 2001
From: Marc Rutkowski <marc@attractive-media.fr>
Date: Tue, 17 Sep 2024 18:05:45 +0200
Subject: [PATCH 03/91] =?UTF-8?q?Extrait=20et=20met=20=C3=A0=20jour=20le?=
 =?UTF-8?q?=20contenu=20de=20la=20section=20"comment=20=C3=A7a=20marche"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/Landing/CommentCaMarche.tsx    | 37 +++++++++++++++++++
 packages/panier/components/Landing/index.tsx  | 17 +--------
 2 files changed, 39 insertions(+), 15 deletions(-)
 create mode 100644 packages/panier/components/Landing/CommentCaMarche.tsx

diff --git a/packages/panier/components/Landing/CommentCaMarche.tsx b/packages/panier/components/Landing/CommentCaMarche.tsx
new file mode 100644
index 0000000000..17ab6ee466
--- /dev/null
+++ b/packages/panier/components/Landing/CommentCaMarche.tsx
@@ -0,0 +1,37 @@
+export const CommentCaMarche = () => (
+  <>
+    <h3>Comment ça marche ? </h3>
+    <ul className="list-decimal list-outside text-lg text-primary-10 font-bold pl-5">
+      <li>Explorez les actions disponibles</li>
+      <p className="font-normal">
+        Parcourez la liste d&apos;actions pour découvrir celles qui
+        correspondent le mieux aux besoins de votre territoire.
+      </p>
+      <li>Accédez aux détails de chaque action</li>
+      <p className="font-normal">
+        Cliquez sur une action pour obtenir toutes les informations nécessaires
+        à sa mise en œuvre : étapes, coût, temps, financement, et autres
+        ressources utiles.
+      </p>
+      <li>Sélectionnez les actions pertinentes</li>
+      <p className="font-normal">
+        Ajoutez les actions les plus adaptées à votre panier, triez celles déjà
+        faites ou en cours et retrouvez les toutes au sein de votre plan
+        d&apos;action.
+      </p>
+      <li>Validez votre panier et créez votre plan d&apos;action</li>
+      <p className="font-normal">
+        Confirmez votre sélection, créez un compte, et accédez à votre plan
+        d&apos;action pilotable directement sur la plateforme Territoires en
+        Transitions.
+      </p>
+      <li>Pilotez et suivez votre plan</li>
+      <p className="font-normal">
+        Utilisez la plateforme comme espace de travail collaboratif pour gérer
+        votre plan d&apos;action en y ajoutant des indicateurs de suivi. Suivez
+        la progression de vos actions grâce au tableau de bord et invitez vos
+        collègues pour travailler sur une plateforme unique.
+      </p>
+    </ul>
+  </>
+);
diff --git a/packages/panier/components/Landing/index.tsx b/packages/panier/components/Landing/index.tsx
index 3b80ea728b..8cfdc1fcd6 100644
--- a/packages/panier/components/Landing/index.tsx
+++ b/packages/panier/components/Landing/index.tsx
@@ -3,6 +3,7 @@ import DashboardPicto from '@tet/panier/components/Picto/DashboardPicto';
 import Section from '@tet/panier/components/Section';
 import CestParti from './CestParti';
 import ReprendrePanier from './ReprendrePanier';
+import {CommentCaMarche} from './CommentCaMarche';
 
 const Landing = () => {
   return (
@@ -45,21 +46,7 @@ const Landing = () => {
           <DashboardPicto />
         </div>
         <div className="lg:w-1/2">
-          <h3>Comment ça marche ? </h3>
-          <ul className="list-decimal list-outside text-lg text-primary-10 font-bold pl-5">
-            <li className="mb-6">
-              Ajoutez à votre panier les actions impactantes et pertinentes pour
-              votre collectivité.
-            </li>
-            <li className="mb-6">
-              Retrouvez vos fiches actions directement sur votre compte
-              Territoires en Transitions.
-            </li>
-            <li className="mb-6">
-              A vous de jouer ! Vous pouvez modifiez les actions à volonté et
-              vous en servir comme base de travail et outil de dialogue.
-            </li>
-          </ul>
+          <CommentCaMarche />
         </div>
       </Section>
     </>

From bab368848217fe377bf59076f5a7df8f7a38d52c Mon Sep 17 00:00:00 2001
From: Marc Rutkowski <marc@attractive-media.fr>
Date: Tue, 17 Sep 2024 18:08:07 +0200
Subject: [PATCH 04/91] =?UTF-8?q?Ajoute=20la=20section=20"Vous=20=C3=AAtes?=
 =?UTF-8?q?=20une=20collectivit=C3=A9=20d=C3=A9j=C3=A0=20engag=C3=A9e..."?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/panier/components/Landing/index.tsx | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/packages/panier/components/Landing/index.tsx b/packages/panier/components/Landing/index.tsx
index 8cfdc1fcd6..f0e2a924b7 100644
--- a/packages/panier/components/Landing/index.tsx
+++ b/packages/panier/components/Landing/index.tsx
@@ -49,6 +49,21 @@ const Landing = () => {
           <CommentCaMarche />
         </div>
       </Section>
+      <Section
+        className="flex-col gap-y-4 gap-x-12 items-center text-center max-md:pt-12 md:py-24"
+        containerClassName="bg-white"
+      >
+        <CollectiviteEngageePicto />
+        <h3 className="mb-0">
+          Vous êtes une collectivité déjà engagée dans le programme Territoires
+          Engagés Transition Écologique ?
+        </h3>
+        <p className="font-bold text-primary-10">
+          Le panier d&apos;actions basé principalement sur les actions des
+          référentiels est conçu en priorité pour faciliter le passage à
+          l&apos;action aux collectivités qui ne sont pas encore engagées !{' '}
+        </p>
+      </Section>
     </>
   );
 };

From ecc0b78d8e4c2404ff889096bc5d8e182edc91e9 Mon Sep 17 00:00:00 2001
From: Marc Rutkowski <marc@attractive-media.fr>
Date: Tue, 17 Sep 2024 18:08:58 +0200
Subject: [PATCH 05/91] =?UTF-8?q?Ajoute=20le=20s=C3=A9lecteur=20de=20colle?=
 =?UTF-8?q?ctivit=C3=A9=20sur=20la=20landing=20page=20g=C3=A9n=C3=A9rique?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/src/panier_action_impact/panierAPI.ts |  6 +-
 .../panier/components/Landing/CestParti.tsx   | 59 +++++++++++++++----
 packages/panier/components/Landing/index.tsx  | 25 +++-----
 .../components/Landing/useCollectiviteInfo.ts | 25 ++++++++
 4 files changed, 83 insertions(+), 32 deletions(-)
 create mode 100644 packages/panier/components/Landing/useCollectiviteInfo.ts

diff --git a/packages/api/src/panier_action_impact/panierAPI.ts b/packages/api/src/panier_action_impact/panierAPI.ts
index 2895617e7d..80651d2c43 100644
--- a/packages/api/src/panier_action_impact/panierAPI.ts
+++ b/packages/api/src/panier_action_impact/panierAPI.ts
@@ -34,9 +34,9 @@ export class PanierAPI {
     this.supabase = supabase;
   }
 
-  async panierFromLanding(collectivite_id?: number): Promise<PanierBase> {
-    const { data, error } =
-      collectivite_id === undefined
+  async panierFromLanding(collectivite_id: number | null): Promise<PanierBase> {
+    const {data, error} =
+      collectivite_id === null
         ? await this.supabase.rpc('panier_from_landing')
         : await this.supabase.rpc('panier_from_landing', { collectivite_id });
 
diff --git a/packages/panier/components/Landing/CestParti.tsx b/packages/panier/components/Landing/CestParti.tsx
index 6fd1deb655..92c129ec43 100644
--- a/packages/panier/components/Landing/CestParti.tsx
+++ b/packages/panier/components/Landing/CestParti.tsx
@@ -1,9 +1,11 @@
 'use client';
 
-
-import { panierAPI } from '@tet/panier/src/clientAPI';
-import { Button, useEventTracker } from '@tet/ui';
-import { useParams, usePathname, useRouter } from 'next/navigation';
+import {useState} from 'react';
+import {panierAPI} from '@tet/panier/src/clientAPI';
+import {useParams, usePathname, useRouter} from 'next/navigation';
+import {useEventTracker, Button, Icon} from '@tet/ui';
+import SelectCollectivite from './SelectCollectivite';
+import {useCollectiviteInfo} from './useCollectiviteInfo';
 
 const CestParti = () => {
   const params = useParams();
@@ -11,25 +13,56 @@ const CestParti = () => {
   const router = useRouter();
   const pathnameArray = pathname.split('/');
   const id = params['id'];
-  const collectivite_id =
-    pathnameArray[2] === 'collectivite' && id
-      ? parseInt(id as string)
-      : undefined;
+  const collectiviteIdFromUrl = pathnameArray[2] === 'collectivite' && id;
+  const [collectiviteId, setCollectiviteId] = useState(
+    collectiviteIdFromUrl ? parseInt(id as string) : null,
+  );
+  const {data: collectiviteInfo} = useCollectiviteInfo(collectiviteId);
 
   const tracker = useEventTracker(
-    collectivite_id ? 'panier/landing/collectivite' : 'panier/landing',
+    collectiviteId ? 'panier/landing/collectivite' : 'panier/landing',
   );
 
   const onClick = async () => {
-    const base = await panierAPI.panierFromLanding(collectivite_id);
-    collectivite_id
-      ? tracker('cta_panier_click', {collectivite_preset: collectivite_id})
+    const base = await panierAPI.panierFromLanding(collectiviteId);
+    collectiviteId
+      ? tracker('cta_panier_click', {collectivite_preset: collectiviteId})
       : // @ts-expect-error
         tracker('cta_panier_click');
     router.push(`/panier/${base.id}`);
   };
 
-  return <Button onClick={onClick}>C&apos;est parti !</Button>;
+  return (
+    <div className="flex flex-row gap-4 w-full">
+      {!collectiviteIdFromUrl && (
+        <div className="w-full">
+          <SelectCollectivite
+            collectiviteId={collectiviteId}
+            onSelectCollectivite={setCollectiviteId}
+          />
+          {collectiviteInfo?.engagee && (
+            <div className="flex flex-row mt-4 gap-2">
+              <Icon icon="alert-fill text-warning-1" />
+              <p className="text-xs">
+                <span className="text-warning-1">
+                  Vous êtes membre d&apos;une collectivité déjà engagée dans le
+                  programme Territoire Engagé Transition Écologique ?
+                </span>
+                <br />
+                Le panier d&apos;actions basé principalement sur les actions des
+                référentiels est conçu en priorité pour faciliter le passage à
+                l&apos;action aux collectivités qui ne sont pas encore engagées
+                !
+              </p>
+            </div>
+          )}
+        </div>
+      )}
+      <Button className="min-w-max h-12" onClick={onClick}>
+        C&apos;est parti !
+      </Button>
+    </div>
+  );
 };
 
 export default CestParti;
diff --git a/packages/panier/components/Landing/index.tsx b/packages/panier/components/Landing/index.tsx
index f0e2a924b7..1c162204c7 100644
--- a/packages/panier/components/Landing/index.tsx
+++ b/packages/panier/components/Landing/index.tsx
@@ -1,5 +1,6 @@
 import BigBasketPicto from '@tet/panier/components/Picto/BigBasketPicto';
 import DashboardPicto from '@tet/panier/components/Picto/DashboardPicto';
+import CollectiviteEngageePicto from '@tet/panier/components/Picto/CollectiviteEngageePicto';
 import Section from '@tet/panier/components/Section';
 import CestParti from './CestParti';
 import ReprendrePanier from './ReprendrePanier';
@@ -14,23 +15,14 @@ const Landing = () => {
       >
         <div className="lg:w-2/3">
           <h1>
-            Identifiez des actions à impact pour votre collectivité <br />
-            en <span className="text-primary">quelques clics.</span>
+            Faites vivre la transition écologique sur votre territoire.{' '}
+            <span className="text-primary">la transition écologique</span>
           </h1>
-          <ul className="list-disc list-outside text-base text-primary-9 font-bold pl-4 mb-8">
-            <li className="mb-4">
-              Vous avez besoin d&apos;aide pour identifier des actions concrètes
-              adaptées à votre territoire ?
-            </li>
-            <li className="mb-4">
-              Vous souhaitez accélérer votre démarche de transition écologique
-              pour votre commune ou votre intercommunalité ?
-            </li>
-            <li className="mb-4">
-              Vous cherchez à prioriser quelques actions clés à valider avec vos
-              élus ?
-            </li>
-          </ul>
+          <p>
+            Avec le panier d’action à impact, constituez une base d’actions
+            adaptés aux compétences de votre collectivité et retrouvez là au
+            sein d’un plan d’action pilotable.
+          </p>
           <div className="flex gap-x-8 gap-y-4 flex-wrap">
             <CestParti />
             <ReprendrePanier />
@@ -49,6 +41,7 @@ const Landing = () => {
           <CommentCaMarche />
         </div>
       </Section>
+
       <Section
         className="flex-col gap-y-4 gap-x-12 items-center text-center max-md:pt-12 md:py-24"
         containerClassName="bg-white"
diff --git a/packages/panier/components/Landing/useCollectiviteInfo.ts b/packages/panier/components/Landing/useCollectiviteInfo.ts
new file mode 100644
index 0000000000..4785afe708
--- /dev/null
+++ b/packages/panier/components/Landing/useCollectiviteInfo.ts
@@ -0,0 +1,25 @@
+import {makeSearchString} from '@tet/api';
+import {supabase} from 'src/clientAPI';
+import useSWR from 'swr';
+
+/** Donne des infos sur une collectivité */
+export const useCollectiviteInfo = (collectiviteId: number | null) => {
+  const key = `collectivite-info-${collectiviteId}`;
+  return useSWR(key, async () => {
+    if (!collectiviteId) return null;
+
+    const {error, data} = await supabase
+      .from('site_labellisation')
+      .select('collectivite_id, nom, engagee')
+      .eq('collectivite_id', collectiviteId);
+
+    if (error) {
+      throw new Error(key);
+    }
+    if (!data || !data.length) {
+      return null;
+    }
+
+    return data[0];
+  });
+};

From 626878a1762d8a1279bd2ec1c6af27607757363f Mon Sep 17 00:00:00 2001
From: Marc Rutkowski <marc@attractive-media.fr>
Date: Tue, 17 Sep 2024 18:15:30 +0200
Subject: [PATCH 06/91] =?UTF-8?q?D=C3=A9sactive=20le=20bouton=20"C'est=20p?=
 =?UTF-8?q?arti"=20si=20il=20n'y=20a=20pas=20de=20collectivit=C3=A9=20de?=
 =?UTF-8?q?=20s=C3=A9lectionn=C3=A9e?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/panier/components/Landing/CestParti.tsx | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/panier/components/Landing/CestParti.tsx b/packages/panier/components/Landing/CestParti.tsx
index 92c129ec43..ba9adee0c7 100644
--- a/packages/panier/components/Landing/CestParti.tsx
+++ b/packages/panier/components/Landing/CestParti.tsx
@@ -58,7 +58,11 @@ const CestParti = () => {
           )}
         </div>
       )}
-      <Button className="min-w-max h-12" onClick={onClick}>
+      <Button
+        className="min-w-max h-12"
+        disabled={!collectiviteId}
+        onClick={onClick}
+      >
         C&apos;est parti !
       </Button>
     </div>

From 05ff64ad51bc93db1bca6b091ac923c2f23802b9 Mon Sep 17 00:00:00 2001
From: Marc Rutkowski <marc@attractive-media.fr>
Date: Wed, 18 Sep 2024 11:14:35 +0200
Subject: [PATCH 07/91] =?UTF-8?q?Ajoute=20l'encadr=C3=A9=20invitant=20au?=
 =?UTF-8?q?=20partage=20du=20lien=20vers=20le=20panier?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PanierRealtime/PartagerLeLien.tsx         | 72 +++++++++++++++++++
 .../components/PanierRealtime/index.tsx       |  3 +
 packages/panier/components/Picto/Membres.tsx  | 41 +++++++++++
 3 files changed, 116 insertions(+)
 create mode 100644 packages/panier/components/PanierRealtime/PartagerLeLien.tsx
 create mode 100644 packages/panier/components/Picto/Membres.tsx

diff --git a/packages/panier/components/PanierRealtime/PartagerLeLien.tsx b/packages/panier/components/PanierRealtime/PartagerLeLien.tsx
new file mode 100644
index 0000000000..f7e7e97242
--- /dev/null
+++ b/packages/panier/components/PanierRealtime/PartagerLeLien.tsx
@@ -0,0 +1,72 @@
+'use client';
+import {useEffect, useState} from 'react';
+import {Card, Button, Icon, useCopyToClipboard} from '@tet/ui';
+import Membres from '@components/Picto/Membres';
+
+/**
+ * Affiche l'encadré invitant au partage du lien vers le panier
+ */
+export const PartagerLeLien = () => {
+  const [opened, setOpened] = useState(true);
+  const [copied, setCopied] = useState(false);
+  const [timeoutId, setTimeoutId] = useState<number | null>(null);
+
+  const {copy} = useCopyToClipboard();
+
+  // TODO: remplacer ça par le composant Toast de l'app et du site
+  // (à mutualiser dans le package ui)
+  useEffect(() => {
+    if (copied) {
+      if (timeoutId) {
+        window.clearTimeout(timeoutId);
+      }
+      const id = window.setTimeout(() => setCopied(false), 2000);
+      setTimeoutId(id);
+    }
+    return () => {
+      if (timeoutId) {
+        window.clearTimeout(timeoutId);
+        setTimeoutId(null);
+      }
+    };
+    // eslint-disable-next-line
+  }, [copied]);
+
+  return opened ? (
+    <Card className="fixed bottom-4 left-4 shadow-md w-96 z-10">
+      <div
+        onClick={() => setOpened(false)}
+        className="ml-auto cursor-pointer h-fit w-fit"
+      >
+        <Icon icon="close-line" className="" />
+      </div>
+      <Membres className="-mt-12" />
+      <h4 className="mb-0">Inviter des membres de votre collectivité</h4>
+      <p className="font-normal text-sm mb-0">
+        Vous pouvez partager ce lien aux autres services de votre collectivité
+        afin de travailler de façon synchronisée ! La coopération entre les
+        services de la collectivité favorise la mise en place d’une politique
+        locale de transition écologique transversale et impactante.
+      </p>
+      {copied && (
+        <p className="text-success text-sm mb-0">
+          Le lien a été copié dans le presse-papier
+        </p>
+      )}
+      <Button
+        size="xs"
+        icon="file-copy-line"
+        onClick={() => {
+          copy(document.location.href);
+          setCopied(true);
+        }}
+      >
+        Copier le lien du panier
+      </Button>
+    </Card>
+  ) : (
+    <div className="fixed bottom-4 left-4">
+      <Button icon="share-line" size="sm" onClick={() => setOpened(true)} />
+    </div>
+  );
+};
diff --git a/packages/panier/components/PanierRealtime/index.tsx b/packages/panier/components/PanierRealtime/index.tsx
index ab062732b2..a52a2f6d89 100644
--- a/packages/panier/components/PanierRealtime/index.tsx
+++ b/packages/panier/components/PanierRealtime/index.tsx
@@ -17,6 +17,7 @@ import {
   usePanierContext,
   useUserContext,
 } from '@tet/panier/providers';
+import {PartagerLeLien} from './PartagerLeLien';
 
 type PanierRealtimeProps = {
   panier: Panier;
@@ -134,6 +135,8 @@ const PanierRealtime = ({
         budgets={budgets}
         onToggleSelected={handleToggleSelected}
       />
+
+      <PartagerLeLien />
     </div>
   );
 };
diff --git a/packages/panier/components/Picto/Membres.tsx b/packages/panier/components/Picto/Membres.tsx
new file mode 100644
index 0000000000..aec7206f46
--- /dev/null
+++ b/packages/panier/components/Picto/Membres.tsx
@@ -0,0 +1,41 @@
+import React from 'react';
+
+const Membres = ({className}: {className?: string}) => (
+  <svg
+    xmlns="http://www.w3.org/2000/svg"
+    width="82"
+    height="82"
+    fill="none"
+    viewBox="0 0 82 82"
+    className={className}
+  >
+    <g clipPath="url(#clip0_2661_8281)">
+      <g clipPath="url(#clip1_2661_8281)">
+        <path
+          fill="#404092"
+          fillRule="evenodd"
+          d="M50.898 34.682v.092-.092zm-21.845.092zm-4.245 13.184l-.034.004.034-.004zm31.481 7.331c.068.055.136.11.202.166l-.018-.016-.184-.15zm12.977 5.01v.41h-9.677l-.098-.269a11.073 11.073 0 00-1.056-2.142l-.095-.15 1.992-7.762 4.3 1.027a6.551 6.551 0 015.044 6.391V60.3h-.41zM60.56 46.72v2.012l4.457 1.065a8.205 8.205 0 016.32 8.008v3.737a.831.831 0 01-.83.83H60.015l.06.463c.06.474.092.956.092 1.445v4.374h7.857a.831.831 0 010 1.662h-56.1a.831.831 0 010-1.662h7.857v-4.38c0-.486.031-.967.092-1.44l.06-.461H9.442a.831.831 0 01-.831-.831v-3.737a8.206 8.206 0 016.32-8.008l4.457-1.065V46.72l-.201-.12a7.355 7.355 0 01-3.626-6.333v-5.492c0-4.054 3.299-7.352 7.353-7.352h.858c2.164 0 4.112.94 5.46 2.434l.483.536.213-.69c1.325-4.29 5.329-7.415 10.046-7.415 4.718 0 8.721 3.125 10.046 7.415l.213.69.484-.536a7.334 7.334 0 015.46-2.434h.858c4.053 0 7.352 3.298 7.352 7.352v5.492a7.355 7.355 0 01-3.626 6.334l-.201.119zM50.487 34.774v.733l.415-.005a9.78 9.78 0 005.25-1.6.83.83 0 01.91 0 9.782 9.782 0 005.249 1.6l.415.005v-.733a5.696 5.696 0 00-5.69-5.69h-.859a5.696 5.696 0 00-5.69 5.69zm.406 2.39l-.406.005v3.097a5.696 5.696 0 005.69 5.69h.858a5.696 5.696 0 005.69-5.69v-3.097l-.405-.004a11.43 11.43 0 01-5.512-1.472l-.202-.114-.2.114a11.433 11.433 0 01-5.513 1.472zm2.234 16.757l.747.294-.985-3.839-4.313 1.034c-.332.08-.654.185-.966.313l-1.175.483 5.18 1.237a11.3 11.3 0 011.512.478zm-.467-5.2v-1.998l-.202-.119a7.407 7.407 0 01-2.502-2.428l-.376-.595-.332.62a10.592 10.592 0 01-3.892 4.08l-.2.119v2.782l.626-.387a8.214 8.214 0 012.407-1.002l4.471-1.071zM32.9 35.209h-1.774v4.045c0 4.88 3.97 8.85 8.85 8.85 4.88 0 8.849-3.97 8.849-8.85v-4.045h-1.042a5.674 5.674 0 01-4.725-2.524l-.523-.783-.346.256a15.574 15.574 0 01-9.29 3.05zm14.883-1.663h1.042V32.8c0-4.88-3.97-8.85-8.85-8.85-4.88 0-8.85 3.97-8.85 8.85v.745H32.9c4.243 0 8.209-1.894 10.876-5.194a.831.831 0 011.293 1.045c-.329.406-.677.793-1.04 1.162l-.234.238.645.963a4.015 4.015 0 003.343 1.786zm-17.08 10.656l-.333-.62-.376.595a7.412 7.412 0 01-2.502 2.428l-.202.12v1.998l4.471 1.071c.86.207 1.675.548 2.418 1.008l.626.389v-2.784l-.2-.12a10.592 10.592 0 01-3.902-4.085zm-2.376 9.238l5.178-1.24-1.18-.482a6.561 6.561 0 00-.952-.307l-4.312-1.034-.984 3.832.747-.294c.485-.19.986-.35 1.503-.475zm-5.412-24.355a5.696 5.696 0 00-5.69 5.69v.733l.415-.005a9.78 9.78 0 005.25-1.6.83.83 0 01.91 0 9.782 9.782 0 005.248 1.6l.415.005v-.733a5.696 5.696 0 00-5.69-5.69h-.858zm-5.284 8.08l-.407.005v3.097a5.696 5.696 0 005.69 5.69h.859a5.696 5.696 0 005.69-5.69v-3.097l-.406-.004a11.43 11.43 0 01-5.512-1.472l-.201-.114-.202.114a11.433 11.433 0 01-5.511 1.472zM10.274 60.71H20.36l.098-.27a11.08 11.08 0 011.057-2.145l.095-.15-1.99-7.76-4.3 1.028a6.55 6.55 0 00-5.045 6.391v2.906zm11.264-13.223l-.486-.093v1.888l1.85 7.215.505-.459c.163-.15.335-.294.513-.437l.106-.085 1.602-6.244v-1.876l-.486.092c-.445.084-.902.13-1.369.13h-.858c-.47 0-.93-.046-1.377-.131zm-.094 16.787v4.379h16.54L25.69 56.358l-.282.201a9.45 9.45 0 00-3.963 7.715zm6.387-8.96l-.621.214 11.21 11.21-3.386-13.197-6.32 1.515a9.61 9.61 0 00-.883.258zm8.636-6.136v3.26l3.119 12.153h.794l3.114-12.14v-3.277l-.527.157a10.48 10.48 0 01-2.992.435c-1.036 0-2.036-.151-2.981-.432l-.527-.156zM51.23 55.06l-6.302-1.505L41.54 66.76 52.758 55.54l-.62-.214a9.564 9.564 0 00-.909-.267zm-9.232 13.593h16.509V64.28a9.448 9.448 0 00-3.947-7.704l-.283-.202-12.279 12.279zm15.05-12.151l1.852-7.22v-1.887l-.487.092a7.35 7.35 0 01-1.376.131h-.859c-.467 0-.924-.045-1.368-.13l-.486-.091v1.876l1.603 6.25.106.085c.177.143.348.286.51.435l.505.459z"
+          clipRule="evenodd"
+        ></path>
+        <path
+          fill="#F4C447"
+          d="M39.975 7.175c-.685 0-1.24.556-1.24 1.241v5.314a1.241 1.241 0 102.481 0V8.416c0-.685-.555-1.241-1.24-1.241zM40.852 17.169a1.25 1.25 0 00-.877-.364c-.328 0-.647.133-.877.364-.231.23-.364.55-.364.877 0 .327.133.647.364.878.23.23.55.363.877.363.326 0 .647-.133.877-.363.231-.232.364-.551.364-.878 0-.328-.133-.646-.364-.877zM31.722 17.45l-4.6-4.598a1.241 1.241 0 00-1.754 1.756l4.599 4.598a1.237 1.237 0 001.755 0 1.242 1.242 0 000-1.756zM54.768 12.66a1.242 1.242 0 00-1.755 0l-4.879 4.878a1.241 1.241 0 101.755 1.756l4.88-4.88a1.241 1.241 0 000-1.755z"
+        ></path>
+      </g>
+    </g>
+    <defs>
+      <clipPath id="clip0_2661_8281">
+        <path fill="#fff" d="M0 0H82V82H0z"></path>
+      </clipPath>
+      <clipPath id="clip1_2661_8281">
+        <path
+          fill="#fff"
+          d="M0 0H63.55V63.55H0z"
+          transform="translate(8.2 7.175)"
+        ></path>
+      </clipPath>
+    </defs>
+  </svg>
+);
+
+export default Membres;

From 45da3196ed96674c4f2056510ec071dfbc9b9872 Mon Sep 17 00:00:00 2001
From: Marc Rutkowski <marc@attractive-media.fr>
Date: Wed, 18 Sep 2024 12:23:10 +0200
Subject: [PATCH 08/91] =?UTF-8?q?Ajoute=20un=20CTA=20"Voir=20le=20d=C3=A9t?=
 =?UTF-8?q?ail=20de=20la=20fiche"=20dans=20la=20preview=20des=20fiches?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ActionImpact/CarteActionImpact.tsx           | 16 +++++++++-------
 .../panier/components/ActionImpact/index.tsx     |  1 -
 .../panier/components/PanierActions/index.tsx    |  5 +++--
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/packages/panier/components/ActionImpact/CarteActionImpact.tsx b/packages/panier/components/ActionImpact/CarteActionImpact.tsx
index b9add07a9b..c6f796ebe9 100644
--- a/packages/panier/components/ActionImpact/CarteActionImpact.tsx
+++ b/packages/panier/components/ActionImpact/CarteActionImpact.tsx
@@ -1,6 +1,6 @@
 import classNames from 'classnames';
 import {CarteActionImpactProps} from './types';
-import {Badge, Button, Card} from '@tet/ui';
+import {Badge, Button, Card, Icon} from '@tet/ui';
 import NiveauBudget from './NiveauBudget';
 
 /**
@@ -21,9 +21,7 @@ export const CarteActionImpact = ({
 
   return (
     <Card
-      className={classNames('box-content px-4 py-4 h-28', {
-        '!cursor-default': panier && !isSelected,
-      })}
+      className={classNames('box-content px-4 py-4 h-28 cursor-default')}
       isSelected={isSelected}
       footer={
         <div className="relative z-0">
@@ -37,13 +35,13 @@ export const CarteActionImpact = ({
           </div>
 
           {/* Boutons d'action, visibles au hover de la carte */}
-          <div className="opacity-0 group-hover:opacity-100 transition-opacity duration-500 w-full absolute z-10 bottom-0 right-0 bg-white flex justify-end gap-2">
+          <div className="opacity-0 group-hover:opacity-100 transition-opacity duration-500 w-full absolute z-10 bottom-0 right-0 bg-white flex flex-col items-end gap-2">
             {panier ? (
               <Button size="xs" onClick={() => handleToggleSelect(false)}>
                 Retirer du panier
               </Button>
             ) : (
-              <>
+              <div className="flex flex-row gap-2 h-10">
                 <Button
                   variant="outlined"
                   size="xs"
@@ -68,8 +66,12 @@ export const CarteActionImpact = ({
                 <Button size="xs" onClick={() => handleToggleSelect(true)}>
                   Ajouter au panier
                 </Button>
-              </>
+              </div>
             )}
+            <span className="text-xs font-medium -mb-1">
+              <Icon icon="eye-line" size="xs" className="mr-1" />
+              Voir le détail de la fiche
+            </span>
           </div>
         </div>
       }
diff --git a/packages/panier/components/ActionImpact/index.tsx b/packages/panier/components/ActionImpact/index.tsx
index 4e744d718d..745d99d01f 100644
--- a/packages/panier/components/ActionImpact/index.tsx
+++ b/packages/panier/components/ActionImpact/index.tsx
@@ -17,7 +17,6 @@ export const ActionImpact = ({
   useEffect(() => setIsActionSelected(panier), [panier]);
 
   const handleToggleSelect = (value: boolean) => {
-    setIsActionSelected(value);
     onToggleSelected(value);
   };
 
diff --git a/packages/panier/components/PanierActions/index.tsx b/packages/panier/components/PanierActions/index.tsx
index 2078408948..04f38694d3 100644
--- a/packages/panier/components/PanierActions/index.tsx
+++ b/packages/panier/components/PanierActions/index.tsx
@@ -1,5 +1,5 @@
 /* eslint-disable react/no-unescaped-entities */
-import {CarteActionImpact} from '@tet/panier/components/ActionImpact/CarteActionImpact';
+import {ActionImpact} from '@tet/panier/components/ActionImpact';
 import BasketPicto from '@tet/panier/components/Picto/BasketPicto';
 import EmptyBasketPicto from '@tet/panier/components/Picto/EmptyBasketPicto';
 import ValiderPanierButton from '@tet/panier/components/ValidationPanier/ValiderPanierButton';
@@ -51,8 +51,9 @@ const PanierActions = ({
 
             <div className="grid md:max-lg:grid-cols-2 gap-4">
               {actionsListe.map(action => (
-                <CarteActionImpact
+                <ActionImpact
                   key={action.id}
+                  description={action.description}
                   titre={action.titre}
                   thematiques={action.thematiques}
                   budget={budgets.find(

From 6a66a4b934f033c1b1dcb6ac91a8a13433e06e3f Mon Sep 17 00:00:00 2001
From: Marc Rutkowski <marc@attractive-media.fr>
Date: Wed, 18 Sep 2024 18:27:59 +0200
Subject: [PATCH 09/91] =?UTF-8?q?Charge=20l'id=20de=20la=20fiche=20action?=
 =?UTF-8?q?=20=C3=A0=20impact=20associ=C3=A9e=20=C3=A0=20une=20FA=20cr?=
 =?UTF-8?q?=C3=A9=C3=A9e=20depuis=20le=20panier?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PlansActions/FicheAction/data/types.ts    |  2 +-
 .../data/useFicheActionImpactId.ts            | 19 +++++++++++++++++++
 .../PlanAction/data/useAxeFiches.ts           |  8 +++++++-
 3 files changed, 27 insertions(+), 2 deletions(-)
 create mode 100644 app.territoiresentransitions.react/src/app/pages/collectivite/PlansActions/FicheAction/data/useFicheActionImpactId.ts

diff --git a/app.territoiresentransitions.react/src/app/pages/collectivite/PlansActions/FicheAction/data/types.ts b/app.territoiresentransitions.react/src/app/pages/collectivite/PlansActions/FicheAction/data/types.ts
index 867860faec..129955ecd9 100644
--- a/app.territoiresentransitions.react/src/app/pages/collectivite/PlansActions/FicheAction/data/types.ts
+++ b/app.territoiresentransitions.react/src/app/pages/collectivite/PlansActions/FicheAction/data/types.ts
@@ -57,4 +57,4 @@ export type Financeur = Omit<
 //   pilotes: Personne[] | null;
 // };
 
-export type FicheResume = FicheResumeZod;
+export type FicheResume = FicheResumeZod & {actionImpactId?: number};
diff --git a/app.territoiresentransitions.react/src/app/pages/collectivite/PlansActions/FicheAction/data/useFicheActionImpactId.ts b/app.territoiresentransitions.react/src/app/pages/collectivite/PlansActions/FicheAction/data/useFicheActionImpactId.ts
new file mode 100644
index 0000000000..9929b2e925
--- /dev/null
+++ b/app.territoiresentransitions.react/src/app/pages/collectivite/PlansActions/FicheAction/data/useFicheActionImpactId.ts
@@ -0,0 +1,19 @@
+import {supabaseClient} from 'core-logic/api/supabase';
+import {useQuery} from 'react-query';
+
+export const useFicheActionImpactId = (ficheId: number | null) =>
+  useQuery(['action_impact_fiche_action', ficheId], async () => {
+    if (!ficheId) return;
+    const {data, error} = await fetchActionImpactId([ficheId]);
+    if (error) {
+      throw new Error(error.message);
+    }
+
+    return data?.[0]?.action_impact_id;
+  });
+
+export const fetchActionImpactId = (ficheIds: (number | null)[]) =>
+  supabaseClient
+    .from('action_impact_fiche_action')
+    .select()
+    .in('fiche_id', ficheIds);
diff --git a/app.territoiresentransitions.react/src/app/pages/collectivite/PlansActions/PlanAction/data/useAxeFiches.ts b/app.territoiresentransitions.react/src/app/pages/collectivite/PlansActions/PlanAction/data/useAxeFiches.ts
index 0485c9bbcd..7f19876f2a 100644
--- a/app.territoiresentransitions.react/src/app/pages/collectivite/PlansActions/PlanAction/data/useAxeFiches.ts
+++ b/app.territoiresentransitions.react/src/app/pages/collectivite/PlansActions/PlanAction/data/useAxeFiches.ts
@@ -2,6 +2,7 @@ import {supabaseClient} from 'core-logic/api/supabase';
 import {useQuery} from 'react-query';
 import {FicheResume} from '../../FicheAction/data/types';
 import {sortFichesResume} from '../../FicheAction/data/utils';
+import {fetchActionImpactId} from '../../FicheAction/data/useFicheActionImpactId';
 
 type Args = {
   ficheIds: number[];
@@ -15,6 +16,11 @@ export const useAxeFiches = ({ficheIds, axeId}: Args) => {
       .select()
       .in('id', ficheIds);
 
-    return sortFichesResume(data as FicheResume[]);
+     const {data: actionsImpact} = await fetchActionImpactId(ficheIds);
+
+     return sortFichesResume(data as FicheResume[]).map(fiche => {
+       const actionImpact = actionsImpact?.find(f => f.fiche_id === fiche.id);
+       return {...fiche, actionImpactId: actionImpact?.action_impact_id};
+     });
   });
 };

From 805c2d4dc7b20f09c8c5fdcc735f2fbe99c9b539 Mon Sep 17 00:00:00 2001
From: Marc Rutkowski <marc@attractive-media.fr>
Date: Wed, 18 Sep 2024 18:29:01 +0200
Subject: [PATCH 10/91] =?UTF-8?q?Indique=20sur=20une=20fiche=20action=20si?=
 =?UTF-8?q?=20elle=20est=20issue=20d'une=20action=20=C3=A0=20impact?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FicheAction/Carte/FicheActionCard.tsx     | 14 ++++++++-
 .../PlansActions/FicheAction/FicheAction.tsx  |  4 +++
 .../FicheAction/FicheActionImpact.tsx         | 31 +++++++++++++++++++
 3 files changed, 48 insertions(+), 1 deletion(-)
 create mode 100644 app.territoiresentransitions.react/src/app/pages/collectivite/PlansActions/FicheAction/FicheActionImpact.tsx

diff --git a/app.territoiresentransitions.react/src/app/pages/collectivite/PlansActions/FicheAction/Carte/FicheActionCard.tsx b/app.territoiresentransitions.react/src/app/pages/collectivite/PlansActions/FicheAction/Carte/FicheActionCard.tsx
index 6ec556f4b9..318d6e6aed 100644
--- a/app.territoiresentransitions.react/src/app/pages/collectivite/PlansActions/FicheAction/Carte/FicheActionCard.tsx
+++ b/app.territoiresentransitions.react/src/app/pages/collectivite/PlansActions/FicheAction/Carte/FicheActionCard.tsx
@@ -124,7 +124,9 @@ const FicheActionCard = ({
         external={openInNewTab}
         header={
           // Badges priorité et statut de la fiche
-          (ficheAction.niveau_priorite || ficheAction.statut) && (
+          (ficheAction.niveau_priorite ||
+            ficheAction.statut ||
+            ficheAction.actionImpactId) && (
             <div className="flex items-center gap-3">
               {ficheAction.niveau_priorite && (
                 <BadgePriorite
@@ -135,6 +137,16 @@ const FicheActionCard = ({
               {ficheAction.statut && (
                 <BadgeStatut statut={ficheAction.statut} size="sm" />
               )}
+              {ficheAction.actionImpactId && (
+                <Tooltip label="Action issue du panier d'action">
+                  <Button
+                    variant="outlined"
+                    size="xs"
+                    className="bg-primary-2 text-center border-none !p-1"
+                    icon="shopping-basket-2-line"
+                  />
+                </Tooltip>
+              )}
             </div>
           )
         }
diff --git a/app.territoiresentransitions.react/src/app/pages/collectivite/PlansActions/FicheAction/FicheAction.tsx b/app.territoiresentransitions.react/src/app/pages/collectivite/PlansActions/FicheAction/FicheAction.tsx
index b3e71615d7..84332f7274 100644
--- a/app.territoiresentransitions.react/src/app/pages/collectivite/PlansActions/FicheAction/FicheAction.tsx
+++ b/app.territoiresentransitions.react/src/app/pages/collectivite/PlansActions/FicheAction/FicheAction.tsx
@@ -10,6 +10,7 @@ import FicheActionPlanning from './FicheActionPlanning/FicheActionPlanning';
 import FicheActionActeurs from './FicheActionActeurs/FicheActionActeurs';
 import FicheActionRestreint from './FicheActionRestreint/FicheActionRestreint';
 import FicheActionOnglets from './FicheActionOnglets';
+import FicheActionImpact from './FicheActionImpact';
 
 type FicheActionProps = {
   isReadonly: boolean;
@@ -67,6 +68,9 @@ const FicheAction = ({isReadonly}: FicheActionProps) => {
                   }
                 />
 
+                {/** Fiche action issue du panier d’action */}
+                <FicheActionImpact fiche={fiche} />
+
                 {/* Date de dernière modification */}
                 {fiche.modified_at && (
                   <div className="bg-white border border-grey-3 rounded-lg py-2 px-3.5 text-sm text-primary-10 font-medium italic flex flex-col items-start max-md:items-center gap-1">
diff --git a/app.territoiresentransitions.react/src/app/pages/collectivite/PlansActions/FicheAction/FicheActionImpact.tsx b/app.territoiresentransitions.react/src/app/pages/collectivite/PlansActions/FicheAction/FicheActionImpact.tsx
new file mode 100644
index 0000000000..30356a8d80
--- /dev/null
+++ b/app.territoiresentransitions.react/src/app/pages/collectivite/PlansActions/FicheAction/FicheActionImpact.tsx
@@ -0,0 +1,31 @@
+import classNames from 'classnames';
+import {Icon, Notification} from '@tet/ui';
+import {FicheAction} from './data/types';
+import {useFicheActionImpactId} from './data/useFicheActionImpactId';
+
+type FicheActionImpactProps = {
+  fiche: FicheAction;
+};
+
+/** Indique sur une fiche action si elle est issue d'une action à impact */
+const FicheActionImpact = ({fiche}: FicheActionImpactProps) => {
+  const {data: actionImpactId} = useFicheActionImpactId(fiche.id);
+
+  return actionImpactId ? (
+    <div
+      className={classNames(
+        'relative bg-white border border-grey-3 rounded-lg py-2 px-2.5 h-14 text-sm text-primary-10 font-medium italic flex gap-2 items-center max-md:justify-center cursor-pointer hover:bg-primary-2 transition-colors'
+      )}
+    >
+      <Notification
+        icon="shopping-basket-line"
+        size="xs"
+        classname="h-6 w-8 justify-center"
+      />
+      <span className="mt-1">Fiche action issue du panier d’action</span>
+      <Icon className="!absolute right-4 text-primary-10" icon="eye-line" />
+    </div>
+  ) : null;
+};
+
+export default FicheActionImpact;

From 475d40c9f747c5d81f56ab8497001230b0d890ca Mon Sep 17 00:00:00 2001
From: Marc Rutkowski <marc@attractive-media.fr>
Date: Wed, 18 Sep 2024 18:31:16 +0200
Subject: [PATCH 11/91] =?UTF-8?q?D=C3=A9place=20une=20partie=20du=20code?=
 =?UTF-8?q?=20du=20panier=20dans=20le=20package=20ui=20pour=20pouvoir=20le?=
 =?UTF-8?q?=20r=C3=A9utiliser=20dans=20l'app?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ActionImpact/LienExterneModale.tsx        |  24 --
 .../ActionImpact/ModaleActionImpact.tsx       | 195 ++--------------
 .../InfoActionImpact/InfoActionImpact.tsx     | 221 ++++++++++++++++++
 .../src/components/InfoActionImpact/index.ts  |   1 +
 packages/ui/src/index.ts                      |   1 +
 5 files changed, 242 insertions(+), 200 deletions(-)
 delete mode 100644 packages/panier/components/ActionImpact/LienExterneModale.tsx
 create mode 100644 packages/ui/src/components/InfoActionImpact/InfoActionImpact.tsx
 create mode 100644 packages/ui/src/components/InfoActionImpact/index.ts

diff --git a/packages/panier/components/ActionImpact/LienExterneModale.tsx b/packages/panier/components/ActionImpact/LienExterneModale.tsx
deleted file mode 100644
index 0ad0e9d352..0000000000
--- a/packages/panier/components/ActionImpact/LienExterneModale.tsx
+++ /dev/null
@@ -1,24 +0,0 @@
-import {Icon} from '@tet/ui';
-
-type LienExterneModaleProps = {
-  url: string;
-  label: string;
-};
-
-const LienExterneModale = ({url, label}: LienExterneModaleProps) => {
-  return (
-    <div className="flex items-start gap-2">
-      <Icon icon="external-link-line" size="lg" className="text-primary-4" />
-      <a
-        href={url}
-        className="text-primary-10 text-sm leading-6 font-bold hover:text-primary-8 bg-none active:!bg-transparent after:hidden underline underline-offset-4"
-        target="_blank"
-        rel="noreferrer noopener"
-      >
-        {label}
-      </a>
-    </div>
-  );
-};
-
-export default LienExterneModale;
diff --git a/packages/panier/components/ActionImpact/ModaleActionImpact.tsx b/packages/panier/components/ActionImpact/ModaleActionImpact.tsx
index 2a3a3710c8..4cf3bcdab6 100644
--- a/packages/panier/components/ActionImpact/ModaleActionImpact.tsx
+++ b/packages/panier/components/ActionImpact/ModaleActionImpact.tsx
@@ -1,39 +1,28 @@
-/* eslint-disable react/no-unescaped-entities */
 import classNames from 'classnames';
 import {ModaleActionImpactProps} from './types';
 import {
-  Badge,
   Button,
-  Divider,
-  InfoTooltip,
   Modal,
   ModalFooter,
   ModalFooterSection,
+  InfoActionImpact,
 } from '@tet/ui';
-import LienExterneModale from './LienExterneModale';
 import Markdown from '@tet/panier/components/Markdown';
 
-const URL_AIDES_TERRITOIRES = 'https://aides-territoires.beta.gouv.fr';
-
 /**
  * Modale action à impact du panier d'actions
  */
+export const ModaleActionImpact = (props: ModaleActionImpactProps) => {
+  const {
+    children,
+    titre,
+    description,
+    statut,
+    panier,
+    onToggleSelected,
+    onUpdateStatus,
+  } = props;
 
-export const ModaleActionImpact = ({
-  children,
-  titre,
-  thematiques,
-  budget,
-  description,
-  miseEnOeuvre,
-  ressources,
-  rex,
-  subventions,
-  statut,
-  panier,
-  onToggleSelected,
-  onUpdateStatus,
-}: ModaleActionImpactProps) => {
   return (
     <Modal
       size="lg"
@@ -41,161 +30,15 @@ export const ModaleActionImpact = ({
       textAlign="left"
       render={() => {
         return (
-          <div>
-            {/* Badges thématiques */}
-            {!!thematiques.length && (
-              <div className="flex gap-4 flex-wrap mb-6">
-                {thematiques.map(theme => (
-                  <Badge
-                    key={theme.id}
-                    title={theme.nom}
-                    size="sm"
-                    state="standard"
-                  />
-                ))}
-              </div>
-            )}
-
-            {/* Description */}
-            <Markdown
-              content={description}
-              className="paragraphe-18 mb-8 [&_ul]:list-disc [&_ul]:pl-8"
-            />
-
-            {/* Temps de mise en oeuvre */}
-            <p className="text-base text-primary-10 font-bold mb-8">
-              Temps de mise en oeuvre :{' '}
-              <span className="text-primary-8">
-                {miseEnOeuvre?.nom.toLowerCase() ?? 'non estimé'}
-              </span>
-              <InfoTooltip
-                activatedBy="click"
-                iconClassName="ml-2"
-                label={
-                  <div className="w-52 !font-normal flex flex-col gap-3 p-1">
-                    <div>
-                      Temps estimatif correspondant au déploiement de l’action
-                      une fois celle-ci validée, de son démarrage à ses
-                      premières réalisations.
-                    </div>
-                    <div>
-                      Cette temporalité peut varier en fonction des
-                      priorisations, des moyens et des ressources disponibles.
-                    </div>
-                    <Button
-                      variant="underlined"
-                      size="xs"
-                      className="!text-info-1 !border-info-1"
-                      href="https://aide.territoiresentransitions.fr/fr/article/en-savoir-plus-sur-les-criteres-du-panier-dactions-a-impact-b37tky/#1-temps-de-mise-en-oeuvre"
-                      external
-                    >
-                      En savoir plus
-                    </Button>
-                  </div>
-                }
-              />
-            </p>
-
-            {/* Estimation budgétaire */}
-            <p className="text-base text-primary-10 font-bold mb-8">
-              Estimation budgétaire :{' '}
-              <span className="text-primary-8">
-                {budget?.nom.toLowerCase() ?? 'non estimé'}
-              </span>
-              <InfoTooltip
-                activatedBy="click"
-                iconClassName="ml-2"
-                label={
-                  <div className="w-52 !font-normal flex flex-col gap-3 p-1">
-                    <div>
-                      Estimation budgétaire HT (investissement et
-                      fonctionnement, hors subvention).
-                    </div>
-                    <div>
-                      Une évaluation précise du budget sera à réaliser lors du
-                      dimensionnement exacte de l’action.
-                    </div>
-                    <Button
-                      variant="underlined"
-                      size="xs"
-                      className="!text-info-1 !border-info-1"
-                      href="https://aide.territoiresentransitions.fr/fr/article/en-savoir-plus-sur-les-criteres-du-panier-dactions-a-impact-b37tky/#1-estimation-des-ordres-de-grandeur-budgetaires"
-                      external
-                    >
-                      En savoir plus
-                    </Button>
-                  </div>
-                }
+          <InfoActionImpact
+            action={{...props}}
+            descriptionMarkdown={
+              <Markdown
+                content={description}
+                className="paragraphe-18 mb-8 [&_ul]:list-disc [&_ul]:pl-8"
               />
-            </p>
-
-            {/* Ressources externes */}
-            {!!ressources && ressources.length > 0 && (
-              <div className="flex gap-x-8 gap-y-3 flex-wrap pb-8">
-                {ressources.map(r => (
-                  <LienExterneModale key={r.label} {...r} />
-                ))}
-              </div>
-            )}
-
-            <Divider className="mt-4" />
-
-            {/* REX */}
-            <div className="mt-2">
-              <h6 className="text-primary-10 text-base font-bold">
-                D’autres collectivités l’ont fait :
-              </h6>
-              <div className="flex gap-x-8 gap-y-3 flex-wrap pb-8">
-                {!rex || rex.length === 0 ? (
-                  <span className="text-sm text-grey-7">
-                    Exemples d'autres collectivités à venir
-                  </span>
-                ) : (
-                  rex.map(r => <LienExterneModale key={r.label} {...r} />)
-                )}
-              </div>
-            </div>
-
-            {/* Subventions mobilisables */}
-            <div className="mt-2">
-              <h6 className="text-primary-10 text-base font-bold">
-                Subventions mobilisables :{' '}
-                <InfoTooltip
-                  activatedBy="click"
-                  iconClassName="ml-1"
-                  label={
-                    <div className="w-52 !font-normal flex flex-col gap-3 p-1">
-                      <div>
-                        De nombreux programmes d’aides nationaux et locaux
-                        peuvent vous permettre de financer ou d’accompagner vos
-                        projets.
-                      </div>
-                      <div>
-                        Les liens directs vers les programmes concernés seront
-                        prochainement disponibles sur la plateforme.
-                      </div>
-                    </div>
-                  }
-                />
-              </h6>
-              <div className="flex gap-x-8 gap-y-3 flex-wrap">
-                <LienExterneModale
-                  label="Aides territoires"
-                  url={URL_AIDES_TERRITOIRES}
-                />
-                {!!subventions &&
-                  subventions.length > 0 &&
-                  subventions.map(
-                    s =>
-                      s.url &&
-                      s.url !== URL_AIDES_TERRITOIRES &&
-                      s.url !== `${URL_AIDES_TERRITOIRES}/` && (
-                        <LienExterneModale key={s.label} {...s} />
-                      ),
-                  )}
-              </div>
-            </div>
-          </div>
+            }
+          />
         );
       }}
       renderFooter={({close}) => (
diff --git a/packages/ui/src/components/InfoActionImpact/InfoActionImpact.tsx b/packages/ui/src/components/InfoActionImpact/InfoActionImpact.tsx
new file mode 100644
index 0000000000..73bb1dd4a5
--- /dev/null
+++ b/packages/ui/src/components/InfoActionImpact/InfoActionImpact.tsx
@@ -0,0 +1,221 @@
+import {
+  ActionImpactFourchetteBudgetaire,
+  ActionImpactTempsMiseEnOeuvre,
+  ActionImpactThematique,
+} from '@tet/api';
+
+import {Badge} from 'design-system/Badge';
+import {Button} from 'design-system/Button';
+import {Divider} from 'design-system/Divider';
+import {InfoTooltip} from 'design-system/Tooltip';
+import {ReactNode} from 'react';
+
+const URL_AIDES_TERRITOIRES = 'https://aides-territoires.beta.gouv.fr';
+
+type LinkType = {
+  url: string;
+  label: string;
+};
+
+export type ActionImpactDetail = {
+  /** Titre de l'action à impact */
+  titre: string;
+  /** Thématiques de l'action à impact */
+  thematiques: ActionImpactThematique[];
+  /** Budget de la mise en place de l'action : petit, moyen ou élevé */
+  budget?: ActionImpactFourchetteBudgetaire;
+  /** Description de l'action à impact */
+  description: string;
+  /** Temps de mise en oeuvre */
+  miseEnOeuvre?: ActionImpactTempsMiseEnOeuvre;
+  /** Lien vers les ressources externes */
+  ressources?: LinkType[] | null;
+  /** Lien vers les retours d'expérience */
+  rex?: LinkType[] | null;
+  /** Lien vers les subventions mobilisables */
+  subventions?: LinkType[] | null;
+  /** Statut de l'action */
+  statut?: 'non_pertinent' | 'en_cours' | 'realise' | null;
+};
+
+type InfoActionImpactProps = {
+  /** Détail de l'action */
+  action: ActionImpactDetail;
+  /** Description de l'action à impact rendu depuis le contenu Markdown */
+  descriptionMarkdown: React.JSX.Element;
+  /** Styles additionnels */
+  className?: string;
+};
+
+/**
+ * Affiche les informations détaillées d'une action à impact
+ */
+export const InfoActionImpact = ({
+  action,
+  descriptionMarkdown,
+  className,
+}: InfoActionImpactProps) => {
+  const {thematiques, budget, miseEnOeuvre, ressources, rex, subventions} =
+    action;
+
+  return (
+    <div className={className}>
+      {/* Badges thématiques */}
+      {!!thematiques.length && (
+        <div className="flex gap-4 flex-wrap mb-6">
+          {thematiques.map(theme => (
+            <Badge
+              key={theme.id}
+              title={theme.nom}
+              size="sm"
+              state="standard"
+            />
+          ))}
+        </div>
+      )}
+
+      {/* Description */}
+      {descriptionMarkdown}
+
+      {/* Temps de mise en oeuvre */}
+      <p className="text-base text-primary-10 font-bold mb-8">
+        Temps de mise en oeuvre :{' '}
+        <span className="text-primary-8">
+          {miseEnOeuvre?.nom.toLowerCase() ?? 'non estimé'}
+        </span>
+        <InfoTooltip
+          activatedBy="click"
+          iconClassName="ml-2"
+          label={
+            <div className="w-52 !font-normal flex flex-col gap-3 p-1">
+              <div>
+                Temps estimatif correspondant au déploiement de l’action une
+                fois celle-ci validée, de son démarrage à ses premières
+                réalisations.
+              </div>
+              <div>
+                Cette temporalité peut varier en fonction des priorisations, des
+                moyens et des ressources disponibles.
+              </div>
+              <Button
+                variant="underlined"
+                size="xs"
+                className="!text-info-1 !border-info-1"
+                href="https://aide.territoiresentransitions.fr/fr/article/en-savoir-plus-sur-les-criteres-du-panier-dactions-a-impact-b37tky/#1-temps-de-mise-en-oeuvre"
+                external
+              >
+                En savoir plus
+              </Button>
+            </div>
+          }
+        />
+      </p>
+
+      {/* Estimation budgétaire */}
+      <p className="text-base text-primary-10 font-bold mb-8">
+        Estimation budgétaire :{' '}
+        <span className="text-primary-8">
+          {budget?.nom.toLowerCase() ?? 'non estimé'}
+        </span>
+        <InfoTooltip
+          activatedBy="click"
+          iconClassName="ml-2"
+          label={
+            <div className="w-52 !font-normal flex flex-col gap-3 p-1">
+              <div>
+                Estimation budgétaire HT (investissement et fonctionnement, hors
+                subvention).
+              </div>
+              <div>
+                Une évaluation précise du budget sera à réaliser lors du
+                dimensionnement exacte de l’action.
+              </div>
+              <Button
+                variant="underlined"
+                size="xs"
+                className="!text-info-1 !border-info-1"
+                href="https://aide.territoiresentransitions.fr/fr/article/en-savoir-plus-sur-les-criteres-du-panier-dactions-a-impact-b37tky/#1-estimation-des-ordres-de-grandeur-budgetaires"
+                external
+              >
+                En savoir plus
+              </Button>
+            </div>
+          }
+        />
+      </p>
+
+      {/* Ressources externes */}
+      {!!ressources && ressources.length > 0 && (
+        <div className="flex gap-x-8 gap-y-3 flex-wrap pb-8">
+          {ressources.map((r, i) => (
+            <Button key={i} href={r.url} variant="underlined" external>
+              {r.label}
+            </Button>
+          ))}
+        </div>
+      )}
+
+      <Divider className="mt-4" />
+
+      {/* REX */}
+      <div className="mt-2">
+        <h6 className="text-primary-10 text-base font-bold">
+          D’autres collectivités l’ont fait :
+        </h6>
+        <div className="flex gap-x-8 gap-y-3 flex-wrap pb-8">
+          {!rex || rex.length === 0 ? (
+            <span className="text-sm text-grey-7">
+              Exemples d'autres collectivités à venir
+            </span>
+          ) : (
+            rex.map((r, i) => (
+              <Button key={i} href={r.url} variant="underlined" external>
+                {r.label}
+              </Button>
+            ))
+          )}
+        </div>
+      </div>
+
+      {/* Subventions mobilisables */}
+      <div className="mt-2">
+        <h6 className="text-primary-10 text-base font-bold">
+          Subventions mobilisables :{' '}
+          <InfoTooltip
+            activatedBy="click"
+            iconClassName="ml-1"
+            label={
+              <div className="w-52 !font-normal flex flex-col gap-3 p-1">
+                <div>
+                  De nombreux programmes d’aides nationaux et locaux peuvent
+                  vous permettre de financer ou d’accompagner vos projets.
+                </div>
+                <div>
+                  Les liens directs vers les programmes concernés seront
+                  prochainement disponibles sur la plateforme.
+                </div>
+              </div>
+            }
+          />
+        </h6>
+        <div className="flex gap-x-8 gap-y-3 flex-wrap">
+          <Button href={URL_AIDES_TERRITOIRES} variant="underlined" external>
+            Aides territoires
+          </Button>
+          {!!subventions &&
+            subventions.length > 0 &&
+            subventions.map(
+              (s, i) =>
+                s.url &&
+                s.url !== URL_AIDES_TERRITOIRES &&
+                s.url !== `${URL_AIDES_TERRITOIRES}/` && (
+                  <Button key={i} href={s.url} variant="underlined" external>
+                    {s.url}
+                  </Button>
+                )
+            )}
+        </div>
+      </div>
+    </div>
+  );
+};
diff --git a/packages/ui/src/components/InfoActionImpact/index.ts b/packages/ui/src/components/InfoActionImpact/index.ts
new file mode 100644
index 0000000000..381ba1fde0
--- /dev/null
+++ b/packages/ui/src/components/InfoActionImpact/index.ts
@@ -0,0 +1 @@
+export * from './InfoActionImpact';
diff --git a/packages/ui/src/index.ts b/packages/ui/src/index.ts
index 00e9e2dbcc..4e5f1a6016 100644
--- a/packages/ui/src/index.ts
+++ b/packages/ui/src/index.ts
@@ -11,6 +11,7 @@ export * from './hooks/useCopyToClipboard';
 // dossier composants
 export * from './components/layout';
 export * from './components/tracking';
+export * from './components/InfoActionImpact';
 
 // dossier design-system
 export * from './design-system/Accordion';

From 2f16fca65ad4208ede53cf9532df0f8910eb7112 Mon Sep 17 00:00:00 2001
From: Marc Rutkowski <marc@attractive-media.fr>
Date: Thu, 19 Sep 2024 18:00:09 +0200
Subject: [PATCH 12/91] =?UTF-8?q?Affiche=20dans=20l'app=20le=20descriptif?=
 =?UTF-8?q?=20d'une=20action=20=C3=A0=20impact=20(du=20panier=20d'actions)?=
 =?UTF-8?q?=20li=C3=A9e=20=C3=A0=20une=20fiche=20action?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FicheAction/FicheActionImpact.tsx         | 29 ++++++------
 .../FicheActionImpact/ModaleActionImpact.tsx  | 44 +++++++++++++++++++
 .../FicheActionImpact/useActionImpact.ts      | 23 ++++++++++
 .../src/ui/Markdown/index.tsx                 | 15 +++++++
 .../InfoActionImpact/InfoActionImpact.tsx     |  3 +-
 5 files changed, 99 insertions(+), 15 deletions(-)
 create mode 100644 app.territoiresentransitions.react/src/app/pages/collectivite/PlansActions/FicheAction/FicheActionImpact/ModaleActionImpact.tsx
 create mode 100644 app.territoiresentransitions.react/src/app/pages/collectivite/PlansActions/FicheAction/FicheActionImpact/useActionImpact.ts
 create mode 100644 app.territoiresentransitions.react/src/ui/Markdown/index.tsx

diff --git a/app.territoiresentransitions.react/src/app/pages/collectivite/PlansActions/FicheAction/FicheActionImpact.tsx b/app.territoiresentransitions.react/src/app/pages/collectivite/PlansActions/FicheAction/FicheActionImpact.tsx
index 30356a8d80..7ab6b4cc0c 100644
--- a/app.territoiresentransitions.react/src/app/pages/collectivite/PlansActions/FicheAction/FicheActionImpact.tsx
+++ b/app.territoiresentransitions.react/src/app/pages/collectivite/PlansActions/FicheAction/FicheActionImpact.tsx
@@ -2,6 +2,7 @@ import classNames from 'classnames';
 import {Icon, Notification} from '@tet/ui';
 import {FicheAction} from './data/types';
 import {useFicheActionImpactId} from './data/useFicheActionImpactId';
+import {ModaleActionImpact} from 'app/pages/collectivite/PlansActions/FicheAction/FicheActionImpact/ModaleActionImpact';
 
 type FicheActionImpactProps = {
   fiche: FicheAction;
@@ -12,19 +13,21 @@ const FicheActionImpact = ({fiche}: FicheActionImpactProps) => {
   const {data: actionImpactId} = useFicheActionImpactId(fiche.id);
 
   return actionImpactId ? (
-    <div
-      className={classNames(
-        'relative bg-white border border-grey-3 rounded-lg py-2 px-2.5 h-14 text-sm text-primary-10 font-medium italic flex gap-2 items-center max-md:justify-center cursor-pointer hover:bg-primary-2 transition-colors'
-      )}
-    >
-      <Notification
-        icon="shopping-basket-line"
-        size="xs"
-        classname="h-6 w-8 justify-center"
-      />
-      <span className="mt-1">Fiche action issue du panier d’action</span>
-      <Icon className="!absolute right-4 text-primary-10" icon="eye-line" />
-    </div>
+    <ModaleActionImpact actionImpactId={actionImpactId}>
+      <div
+        className={classNames(
+          'relative bg-white border border-grey-3 rounded-lg py-2 px-2.5 h-14 text-sm text-primary-10 font-medium italic flex gap-2 items-center max-md:justify-center cursor-pointer hover:bg-primary-2 transition-colors'
+        )}
+      >
+        <Notification
+          icon="shopping-basket-line"
+          size="xs"
+          classname="h-6 w-8 justify-center"
+        />
+        <span className="mt-1">Fiche action issue du panier d’action</span>
+        <Icon className="!absolute right-4 text-primary-10" icon="eye-line" />
+      </div>
+    </ModaleActionImpact>
   ) : null;
 };
 
diff --git a/app.territoiresentransitions.react/src/app/pages/collectivite/PlansActions/FicheAction/FicheActionImpact/ModaleActionImpact.tsx b/app.territoiresentransitions.react/src/app/pages/collectivite/PlansActions/FicheAction/FicheActionImpact/ModaleActionImpact.tsx
new file mode 100644
index 0000000000..29c9ef41f7
--- /dev/null
+++ b/app.territoiresentransitions.react/src/app/pages/collectivite/PlansActions/FicheAction/FicheActionImpact/ModaleActionImpact.tsx
@@ -0,0 +1,44 @@
+import {Modal, InfoActionImpact} from '@tet/ui';
+import {useActionImpact} from './useActionImpact';
+import Markdown from 'ui/Markdown';
+
+type ModaleActionImpactProps = {
+  actionImpactId: number;
+  children: React.JSX.Element;
+};
+
+/**
+ * Affiche le descriptif d'une action à impact (du panier d'actions)
+ */
+export const ModaleActionImpact = (props: ModaleActionImpactProps) => {
+  const {actionImpactId, children} = props;
+  const {data: action} = useActionImpact(actionImpactId);
+
+  if (!action) {
+    return null;
+  }
+
+  const {titre, description} = action;
+  return (
+    <Modal
+      size="lg"
+      title={titre}
+      textAlign="left"
+      render={() => {
+        return (
+          <InfoActionImpact
+            action={action}
+            descriptionMarkdown={
+              <Markdown
+                content={description}
+                className="paragraphe-18 mb-8 [&_ul]:list-disc [&_ul]:pl-8"
+              />
+            }
+          />
+        );
+      }}
+    >
+      {children}
+    </Modal>
+  );
+};
diff --git a/app.territoiresentransitions.react/src/app/pages/collectivite/PlansActions/FicheAction/FicheActionImpact/useActionImpact.ts b/app.territoiresentransitions.react/src/app/pages/collectivite/PlansActions/FicheAction/FicheActionImpact/useActionImpact.ts
new file mode 100644
index 0000000000..54ff1ecf9b
--- /dev/null
+++ b/app.territoiresentransitions.react/src/app/pages/collectivite/PlansActions/FicheAction/FicheActionImpact/useActionImpact.ts
@@ -0,0 +1,23 @@
+import {useQuery} from 'react-query';
+import {supabaseClient} from 'core-logic/api/supabase';
+import {ActionImpact, ActionImpactThematique} from '@tet/api';
+
+type ActionImpactDetail = ActionImpact & {
+  thematiques: ActionImpactThematique[];
+};
+
+/**
+ * Charge le détail d'une action à impact
+ */
+export const useActionImpact = (actionImpactId: number) =>
+  useQuery(['action_impact', actionImpactId], async () => {
+    const {data, error} = await supabaseClient
+      .from('action_impact')
+      .select()
+      .eq('id', actionImpactId)
+      .returns<ActionImpactDetail[]>();
+
+    if (error) throw new Error(error.message);
+
+    return data?.[0];
+  });
diff --git a/app.territoiresentransitions.react/src/ui/Markdown/index.tsx b/app.territoiresentransitions.react/src/ui/Markdown/index.tsx
new file mode 100644
index 0000000000..2a8da5a58b
--- /dev/null
+++ b/app.territoiresentransitions.react/src/ui/Markdown/index.tsx
@@ -0,0 +1,15 @@
+import MarkdownBase from 'react-markdown';
+import remarkGfm from 'remark-gfm';
+
+type MarkdownProps = {
+  content: string;
+  className?: string;
+};
+
+const Markdown = ({content, className}: MarkdownProps) => (
+  <MarkdownBase remarkPlugins={[remarkGfm]} className={className}>
+    {content}
+  </MarkdownBase>
+);
+
+export default Markdown;
diff --git a/packages/ui/src/components/InfoActionImpact/InfoActionImpact.tsx b/packages/ui/src/components/InfoActionImpact/InfoActionImpact.tsx
index 73bb1dd4a5..2631184add 100644
--- a/packages/ui/src/components/InfoActionImpact/InfoActionImpact.tsx
+++ b/packages/ui/src/components/InfoActionImpact/InfoActionImpact.tsx
@@ -8,7 +8,6 @@ import {Badge} from 'design-system/Badge';
 import {Button} from 'design-system/Button';
 import {Divider} from 'design-system/Divider';
 import {InfoTooltip} from 'design-system/Tooltip';
-import {ReactNode} from 'react';
 
 const URL_AIDES_TERRITOIRES = 'https://aides-territoires.beta.gouv.fr';
 
@@ -61,7 +60,7 @@ export const InfoActionImpact = ({
   return (
     <div className={className}>
       {/* Badges thématiques */}
-      {!!thematiques.length && (
+      {!!thematiques?.length && (
         <div className="flex gap-4 flex-wrap mb-6">
           {thematiques.map(theme => (
             <Badge

From 3a1378d2a3494ae48eac4668dfc445f93f70f45c Mon Sep 17 00:00:00 2001
From: Marc Rutkowski <marc@attractive-media.fr>
Date: Thu, 19 Sep 2024 18:13:15 +0200
Subject: [PATCH 13/91] =?UTF-8?q?Retire=20de=20la=20s=C3=A9lection=20les?=
 =?UTF-8?q?=20actions=20d=C3=A9j=C3=A0=20ajout=C3=A9es=20au=20panier?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/panier/components/ListeActions/index.tsx | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/panier/components/ListeActions/index.tsx b/packages/panier/components/ListeActions/index.tsx
index af03b91cd6..4468a9b141 100644
--- a/packages/panier/components/ListeActions/index.tsx
+++ b/packages/panier/components/ListeActions/index.tsx
@@ -71,8 +71,9 @@ const ListeActions = ({
       {...tabsList.map(tab => {
         const actionsFiltrees = actionsListe.filter(
           a =>
-            (!a.statut && a.statut === tab.status) ||
-            (a.statut && a.statut.categorie_id === tab.status),
+            ((!a.statut && a.statut === tab.status) ||
+              (a.statut && a.statut.categorie_id === tab.status)) &&
+            (tab.status || !a.isinpanier),
         );
 
         return (

From 446674e469877ef64af9cf9e7207035aeaf52430 Mon Sep 17 00:00:00 2001
From: Marc Rutkowski <marc@attractive-media.fr>
Date: Thu, 19 Sep 2024 18:17:21 +0200
Subject: [PATCH 14/91] =?UTF-8?q?Change=20le=20libell=C3=A9=20du=20bouton?=
 =?UTF-8?q?=20de=20validation=20du=20panier?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../panier/components/ValidationPanier/ValiderPanierButton.tsx  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/panier/components/ValidationPanier/ValiderPanierButton.tsx b/packages/panier/components/ValidationPanier/ValiderPanierButton.tsx
index 3caa39b367..dd938691f7 100644
--- a/packages/panier/components/ValidationPanier/ValiderPanierButton.tsx
+++ b/packages/panier/components/ValidationPanier/ValiderPanierButton.tsx
@@ -31,7 +31,7 @@ const ValiderPanierButton = () => {
           });
         }}
       >
-        Valider la création
+        Créer un plan d’action
       </Button>
       <Modal
         size="lg"

From 74cb74d0b75548d5ad9e3c36d6ba017bd42855c6 Mon Sep 17 00:00:00 2001
From: Marc Rutkowski <marc@attractive-media.fr>
Date: Thu, 19 Sep 2024 18:27:43 +0200
Subject: [PATCH 15/91] =?UTF-8?q?Change=20les=20styles=20de=20l'encadr?=
 =?UTF-8?q?=C3=A9=20"Inviter=20des=20membres"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/PanierRealtime/PartagerLeLien.tsx    | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/packages/panier/components/PanierRealtime/PartagerLeLien.tsx b/packages/panier/components/PanierRealtime/PartagerLeLien.tsx
index f7e7e97242..40999d0966 100644
--- a/packages/panier/components/PanierRealtime/PartagerLeLien.tsx
+++ b/packages/panier/components/PanierRealtime/PartagerLeLien.tsx
@@ -33,7 +33,7 @@ export const PartagerLeLien = () => {
   }, [copied]);
 
   return opened ? (
-    <Card className="fixed bottom-4 left-4 shadow-md w-96 z-10">
+    <Card className="fixed bottom-0 rounded-b-none -mb-1 left-4 shadow-md w-96 z-10">
       <div
         onClick={() => setOpened(false)}
         className="ml-auto cursor-pointer h-fit w-fit"
@@ -65,8 +65,15 @@ export const PartagerLeLien = () => {
       </Button>
     </Card>
   ) : (
-    <div className="fixed bottom-4 left-4">
-      <Button icon="share-line" size="sm" onClick={() => setOpened(true)} />
+    <div className="fixed bottom-0 left-4">
+      <Button
+        className="rounded-b-none -mb-1"
+        icon="user-add-line"
+        size="sm"
+        onClick={() => setOpened(true)}
+      >
+        Inviter des membres
+      </Button>
     </div>
   );
 };

From 74d7b57d005a2b629272e958c217886ca695a311 Mon Sep 17 00:00:00 2001
From: Marc Rutkowski <marc@attractive-media.fr>
Date: Thu, 19 Sep 2024 19:11:27 +0200
Subject: [PATCH 16/91] Ajoute le bouton "Initier votre plan d'action"

---
 .../.env.sample                               |  3 +-
 .../ParcoursCreationPlan/Selection.tsx        | 61 ++++++++++++-------
 .../ParcoursCreationPlan/document-add.svg     |  9 +++
 .../document-download.svg                     | 20 ++++++
 .../ParcoursCreationPlan/shopping-basket.svg  | 15 +++++
 .../src/app/paths.ts                          |  7 +++
 .../src/environmentVariables.ts               |  1 +
 7 files changed, 93 insertions(+), 23 deletions(-)
 create mode 100644 app.territoiresentransitions.react/src/app/pages/collectivite/PlansActions/ParcoursCreationPlan/document-add.svg
 create mode 100644 app.territoiresentransitions.react/src/app/pages/collectivite/PlansActions/ParcoursCreationPlan/document-download.svg
 create mode 100644 app.territoiresentransitions.react/src/app/pages/collectivite/PlansActions/ParcoursCreationPlan/shopping-basket.svg

diff --git a/app.territoiresentransitions.react/.env.sample b/app.territoiresentransitions.react/.env.sample
index 2a0858d066..5802113fe9 100644
--- a/app.territoiresentransitions.react/.env.sample
+++ b/app.territoiresentransitions.react/.env.sample
@@ -4,4 +4,5 @@ NX_PUBLIC_CRISP_WEBSITE_ID="// Crisp integration (warning: use different ID by d
 NX_PUBLIC_SENTRY_DSN=""
 NX_PUBLIC_POSTHOG_KEY=
 NX_PUBLIC_POSTHOG_HOST=
-NX_PUBLIC_BACKEND_URL=
+NX_PUBLIC_BACKEND_URL=http://localhost:8080
+NX_PUBLIC_PANIER_URL=http://localhost:3002
diff --git a/app.territoiresentransitions.react/src/app/pages/collectivite/PlansActions/ParcoursCreationPlan/Selection.tsx b/app.territoiresentransitions.react/src/app/pages/collectivite/PlansActions/ParcoursCreationPlan/Selection.tsx
index fad253ad11..5b2a24bd11 100644
--- a/app.territoiresentransitions.react/src/app/pages/collectivite/PlansActions/ParcoursCreationPlan/Selection.tsx
+++ b/app.territoiresentransitions.react/src/app/pages/collectivite/PlansActions/ParcoursCreationPlan/Selection.tsx
@@ -1,4 +1,5 @@
 import {
+  makeCollectivitePanierUrl,
   makeCollectivitePlansActionsCreerUrl,
   makeCollectivitePlansActionsImporterUrl,
 } from 'app/paths';
@@ -6,6 +7,10 @@ import classNames from 'classnames';
 import {useCollectiviteId} from 'core-logic/hooks/params';
 import {useFonctionTracker} from 'core-logic/hooks/useFonctionTracker';
 import {Link, useHistory} from 'react-router-dom';
+import {ReactComponent as DocumentAddPicto} from './document-add.svg';
+import {ReactComponent as DocumentDownloadPicto} from './document-download.svg';
+import {ReactComponent as ShoppingBasket} from './shopping-basket.svg';
+import {Button} from '@tet/ui';
 
 const Selection = () => {
   const collectivite_id = useCollectiviteId();
@@ -14,41 +19,51 @@ const Selection = () => {
   const tracker = useFonctionTracker();
 
   return (
-    <div className="max-w-3xl mx-auto flex flex-col grow py-12">
+    <div className="max-w-5xl mx-auto flex flex-col grow py-12">
       <div className="w-full mx-auto">
         <div className="flex flex-col mt-2 mb-10 py-14 px-24 text-center bg-primary-0">
-          <h3 className="mb-4">Ajouter un plan d’action</h3>
+          <h3 className="mb-4">Créer un plan d’action</h3>
           <p className="text-lg text-grey-6">Vous souhaitez</p>
           <div className="flex justify-between gap-6 mt-4">
+            <SelectFlowButton
+              isPrimary
+              dataTest="CreerPlan"
+              title="Créer un plan d’action"
+              subTitle="directement sur la plateforme"
+              icon={<DocumentAddPicto />}
+              url={makeCollectivitePlansActionsCreerUrl({
+                collectiviteId: collectivite_id!,
+              })}
+            />
             <SelectFlowButton
               dataTest="ImporterPlan"
               title="Importer un plan d’action"
               subTitle="à partir d’un modèle"
-              iconClass="fr-icon-file-add-line"
+              icon={<DocumentDownloadPicto />}
               url={makeCollectivitePlansActionsImporterUrl({
                 collectiviteId: collectivite_id!,
               })}
             />
             <SelectFlowButton
-              isPrimary
-              dataTest="CreerPlan"
-              title="Créer un plan d’action"
-              subTitle="suivez le guide, pas à pas"
-              iconClass="fr-icon-draft-line"
-              url={makeCollectivitePlansActionsCreerUrl({
+              dataTest="InitierPlan"
+              title="Initier votre plan d’action"
+              subTitle="grâce au Panier d'Actions à Impact"
+              icon={<ShoppingBasket className="my-3" />}
+              url={makeCollectivitePanierUrl({
                 collectiviteId: collectivite_id!,
               })}
             />
           </div>
-          <button
-            className="fr-btn fr-btn--tertiary mt-10 ml-auto"
+          <Button
+            className="mt-4 self-center"
+            variant="outlined"
             onClick={() => {
               history.goBack();
               tracker({fonction: 'annulation', action: 'clic'});
             }}
           >
             Annuler
-          </button>
+          </Button>
         </div>
       </div>
     </div>
@@ -60,7 +75,7 @@ export default Selection;
 type SelectFlowButtonProps = {
   dataTest?: string;
   url: string;
-  iconClass: string;
+  icon: React.JSX.Element;
   title: string;
   subTitle: string;
   isPrimary?: boolean;
@@ -69,7 +84,7 @@ type SelectFlowButtonProps = {
 const SelectFlowButton = ({
   dataTest,
   url,
-  iconClass,
+  icon,
   title,
   subTitle,
   isPrimary = false,
@@ -80,14 +95,12 @@ const SelectFlowButton = ({
       {'!bg-primary hover:!bg-primary-6': isPrimary}
     )}
   >
-    <Link
+    <a
       data-test={dataTest}
-      className="flex flex-col w-full p-6 text-center !bg-none"
-      to={url}
+      className="flex flex-col w-full py-6 items-center text-center text-sm !bg-none"
+      href={url}
     >
-      <div
-        className={`${iconClass} flex !w-20 !h-20 mx-auto mt-3 mb-6 before:!h-16 before:!w-16 before:!m-auto text-primary-4`}
-      />
+      {icon}
       <div
         className={classNames('m-1 font-bold text-primary-8', {
           '!text-primary-0': isPrimary,
@@ -95,9 +108,13 @@ const SelectFlowButton = ({
       >
         {title}
       </div>
-      <div className={classNames('text-grey-7', {'!text-grey-1': isPrimary})}>
+      <div
+        className={classNames('text-grey-7 text-xs', {
+          '!text-grey-1': isPrimary,
+        })}
+      >
         {subTitle}
       </div>
-    </Link>
+    </a>
   </div>
 );
diff --git a/app.territoiresentransitions.react/src/app/pages/collectivite/PlansActions/ParcoursCreationPlan/document-add.svg b/app.territoiresentransitions.react/src/app/pages/collectivite/PlansActions/ParcoursCreationPlan/document-add.svg
new file mode 100644
index 0000000000..b470987862
--- /dev/null
+++ b/app.territoiresentransitions.react/src/app/pages/collectivite/PlansActions/ParcoursCreationPlan/document-add.svg
@@ -0,0 +1,9 @@
+<svg width="81" height="80" viewBox="0 0 81 80" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M77.1366 56C76.5852 56 76.1366 55.5514 76.1366 55C76.1366 54.4486 76.5852 54 77.1366 54C77.688 54 78.1366 54.4486 78.1366 55C78.1366 55.5514 77.688 56 77.1366 56Z" fill="#E1E1FD"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M5.1366 60C4.5852 60 4.1366 59.5514 4.1366 59C4.1366 58.4486 4.5852 58 5.1366 58C5.688 58 6.1366 58.4486 6.1366 59C6.1366 59.5514 5.688 60 5.1366 60Z" fill="#E1E1FD"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M75.1366 22C74.5852 22 74.1366 21.5514 74.1366 21C74.1366 20.4486 74.5852 20 75.1366 20C75.688 20 76.1366 20.4486 76.1366 21C76.1366 21.5514 75.688 22 75.1366 22Z" fill="#E1E1FD"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M3.1366 26C2.5852 26 2.1366 25.5514 2.1366 25C2.1366 24.4486 2.5852 24 3.1366 24C3.688 24 4.1366 24.4486 4.1366 25C4.1366 25.5514 3.688 26 3.1366 26Z" fill="#E1E1FD"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M17.1366 8C16.5852 8 16.1366 7.5514 16.1366 7C16.1366 6.44855 16.5852 6 17.1366 6C17.688 6 18.1366 6.44855 18.1366 7C18.1366 7.5514 17.688 8 17.1366 8Z" fill="#E1E1FD"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M55.1366 48C62.3163 48 68.1366 53.8203 68.1366 61C68.1366 68.1797 62.3163 74 55.1366 74C47.9569 74 42.1366 68.1797 42.1366 61C42.1366 53.8203 47.9569 48 55.1366 48ZM55.1366 50C49.0615 50 44.1366 54.9249 44.1366 61C44.1366 67.0751 49.0615 72 55.1366 72C61.2117 72 66.1366 67.0751 66.1366 61C66.1366 54.9249 61.2117 50 55.1366 50ZM55.1366 54C55.6494 54 56.0721 54.386 56.1299 54.8834L56.1366 55V60H61.1366C61.6889 60 62.1366 60.4477 62.1366 61C62.1366 61.5128 61.7506 61.9355 61.2532 61.9933L61.1366 62H56.1366V67C56.1366 67.5523 55.6889 68 55.1366 68C54.6238 68 54.2011 67.614 54.1433 67.1166L54.1366 67V62H49.1366C48.5843 62 48.1366 61.5523 48.1366 61C48.1366 60.4872 48.5226 60.0645 49.02 60.0067L49.1366 60H54.1366V55C54.1366 54.4477 54.5843 54 55.1366 54ZM43.1366 30C43.6889 30 44.1366 30.4477 44.1366 31C44.1366 31.5128 43.7506 31.9355 43.2532 31.9933L43.1366 32H23.1366C22.5843 32 22.1366 31.5523 22.1366 31C22.1366 30.4872 22.5226 30.0645 23.02 30.0067L23.1366 30H43.1366ZM49.1366 24C49.6889 24 50.1366 24.4477 50.1366 25C50.1366 25.5128 49.7506 25.9355 49.2532 25.9933L49.1366 26H23.1366C22.5843 26 22.1366 25.5523 22.1366 25C22.1366 24.4872 22.5226 24.0645 23.02 24.0067L23.1366 24H49.1366ZM39.1366 18C39.6889 18 40.1366 18.4477 40.1366 19C40.1366 19.5128 39.7506 19.9355 39.2532 19.9933L39.1366 20H23.1366C22.5843 20 22.1366 19.5523 22.1366 19C22.1366 18.4872 22.5226 18.0645 23.02 18.0067L23.1366 18H39.1366Z" fill="#E1E1FD"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M55.1366 12C55.6494 12 56.0721 12.386 56.1299 12.8834L56.1366 13V45C56.1366 45.5523 55.6889 46 55.1366 46C54.6238 46 54.2011 45.614 54.1433 45.1166L54.1366 45V14H18.1366V66H39.1366C39.6494 66 40.0721 66.386 40.1299 66.8834L40.1366 67C40.1366 67.5128 39.7506 67.9355 39.2532 67.9933L39.1366 68H17.1366C16.6238 68 16.2011 67.614 16.1433 67.1166L16.1366 67V13C16.1366 12.4872 16.5226 12.0645 17.02 12.0067L17.1366 12H55.1366ZM33.1366 60C33.6889 60 34.1366 60.4477 34.1366 61C34.1366 61.5128 33.7506 61.9355 33.2532 61.9933L33.1366 62H23.1366C22.5843 62 22.1366 61.5523 22.1366 61C22.1366 60.4872 22.5226 60.0645 23.02 60.0067L23.1366 60H33.1366ZM37.1366 54C37.6889 54 38.1366 54.4477 38.1366 55C38.1366 55.5128 37.7506 55.9355 37.2532 55.9933L37.1366 56H23.1366C22.5843 56 22.1366 55.5523 22.1366 55C22.1366 54.4872 22.5226 54.0645 23.02 54.0067L23.1366 54H37.1366ZM41.1366 48C41.6889 48 42.1366 48.4477 42.1366 49C42.1366 49.5128 41.7506 49.9355 41.2532 49.9933L41.1366 50H23.1366C22.5843 50 22.1366 49.5523 22.1366 49C22.1366 48.4872 22.5226 48.0645 23.02 48.0067L23.1366 48H41.1366ZM45.1366 42C45.6889 42 46.1366 42.4477 46.1366 43C46.1366 43.5128 45.7506 43.9355 45.2532 43.9933L45.1366 44H23.1366C22.5843 44 22.1366 43.5523 22.1366 43C22.1366 42.4872 22.5226 42.0645 23.02 42.0067L23.1366 42H45.1366ZM49.1366 36C49.6889 36 50.1366 36.4477 50.1366 37C50.1366 37.5128 49.7506 37.9355 49.2532 37.9933L49.1366 38H23.1366C22.5843 38 22.1366 37.5523 22.1366 37C22.1366 36.4872 22.5226 36.0645 23.02 36.0067L23.1366 36H49.1366ZM59.1366 12C59.6494 12 60.0721 12.386 60.1299 12.8834L60.1366 13V45C60.1366 45.5523 59.6889 46 59.1366 46C58.6238 46 58.2011 45.614 58.1433 45.1166L58.1366 45V13C58.1366 12.4477 58.5843 12 59.1366 12Z" fill="#C3C3FB"/>
+</svg>
diff --git a/app.territoiresentransitions.react/src/app/pages/collectivite/PlansActions/ParcoursCreationPlan/document-download.svg b/app.territoiresentransitions.react/src/app/pages/collectivite/PlansActions/ParcoursCreationPlan/document-download.svg
new file mode 100644
index 0000000000..5c5c6755ff
--- /dev/null
+++ b/app.territoiresentransitions.react/src/app/pages/collectivite/PlansActions/ParcoursCreationPlan/document-download.svg
@@ -0,0 +1,20 @@
+<svg width="81" height="80" viewBox="0 0 81 80" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M5.28784 60C4.73644 60 4.28784 59.5514 4.28784 59C4.28784 58.4486 4.73644 58 5.28784 58C5.83924 58 6.28784 58.4486 6.28784 59C6.28784 59.5514 5.83924 60 5.28784 60Z" fill="#E1E1FD"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M16.2878 6C15.7364 6 15.2878 5.5514 15.2878 5C15.2878 4.44855 15.7364 4 16.2878 4C16.8392 4 17.2878 4.44855 17.2878 5C17.2878 5.5514 16.8392 6 16.2878 6Z" fill="#E1E1FD"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M3.28784 26C2.73644 26 2.28784 25.5514 2.28784 25C2.28784 24.4486 2.73644 24 3.28784 24C3.83924 24 4.28784 24.4486 4.28784 25C4.28784 25.5514 3.83924 26 3.28784 26Z" fill="#E1E1FD"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M77.2878 56C76.7364 56 76.2878 55.5514 76.2878 55C76.2878 54.4486 76.7364 54 77.2878 54C77.8392 54 78.2878 54.4486 78.2878 55C78.2878 55.5514 77.8392 56 77.2878 56Z" fill="#E1E1FD"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M75.2878 22C74.7364 22 74.2878 21.5514 74.2878 21C74.2878 20.4486 74.7364 20 75.2878 20C75.8392 20 76.2878 20.4486 76.2878 21C76.2878 21.5514 75.8392 22 75.2878 22Z" fill="#E1E1FD"/>
+<path d="M40.2878 19C40.2878 18.4477 39.8401 18 39.2878 18H23.2878L23.1712 18.0067C22.6739 18.0645 22.2878 18.4872 22.2878 19C22.2878 19.5523 22.7356 20 23.2878 20H39.2878L39.4045 19.9933C39.9018 19.9355 40.2878 19.5128 40.2878 19Z" fill="#E1E1FD"/>
+<path d="M51.2878 66L51.1712 66.0067C50.6739 66.0645 50.2878 66.4872 50.2878 67C50.2878 67.5523 50.7356 68 51.2878 68H59.2878L59.4045 67.9933C59.9018 67.9355 60.2878 67.5128 60.2878 67C60.2878 66.4477 59.8401 66 59.2878 66H51.2878Z" fill="#E1E1FD"/>
+<path d="M55.2878 54C55.8007 54 56.2234 54.386 56.2811 54.8834L56.2878 55V60.5858L58.5807 58.2929C58.9713 57.9024 59.6044 57.9024 59.9949 58.2929C60.3554 58.6534 60.3832 59.2206 60.0781 59.6129L59.9949 59.7071L55.9949 63.7071C55.8985 63.8036 55.7872 63.8762 55.6685 63.925C55.5662 63.9672 55.4553 63.9928 55.3393 63.9987L55.3168 63.9996C55.3072 63.9999 55.2975 64 55.2878 64C55.2709 64 55.254 63.9996 55.2373 63.9987C55.12 63.9929 55.0081 63.9669 54.9049 63.924C54.8239 63.8905 54.7465 63.846 54.6749 63.7903C54.6423 63.7649 54.6108 63.7371 54.5807 63.7071L50.5807 59.7071C50.1902 59.3166 50.1902 58.6834 50.5807 58.2929C50.9412 57.9324 51.5084 57.9047 51.9007 58.2097L51.9949 58.2929L54.2878 60.5858V55C54.2878 54.4477 54.7356 54 55.2878 54Z" fill="#E1E1FD"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M55.2878 48C48.1081 48 42.2878 53.8203 42.2878 61C42.2878 68.1797 48.1081 74 55.2878 74C62.4675 74 68.2878 68.1797 68.2878 61C68.2878 53.8203 62.4675 48 55.2878 48ZM55.2878 50C61.363 50 66.2878 54.9249 66.2878 61C66.2878 67.0751 61.363 72 55.2878 72C49.2127 72 44.2878 67.0751 44.2878 61C44.2878 54.9249 49.2127 50 55.2878 50Z" fill="#E1E1FD"/>
+<path d="M49.2878 24C49.8401 24 50.2878 24.4477 50.2878 25C50.2878 25.5128 49.9018 25.9355 49.4045 25.9933L49.2878 26H23.2878C22.7356 26 22.2878 25.5523 22.2878 25C22.2878 24.4872 22.6739 24.0645 23.1712 24.0067L23.2878 24H49.2878Z" fill="#E1E1FD"/>
+<path d="M44.2878 31C44.2878 30.4477 43.8401 30 43.2878 30H23.2878L23.1712 30.0067C22.6739 30.0645 22.2878 30.4872 22.2878 31C22.2878 31.5523 22.7356 32 23.2878 32H43.2878L43.4045 31.9933C43.9018 31.9355 44.2878 31.5128 44.2878 31Z" fill="#E1E1FD"/>
+<path d="M55.2878 12C55.8007 12 56.2233 12.386 56.2811 12.8834L56.2878 13V45C56.2878 45.5523 55.8401 46 55.2878 46C54.775 46 54.3523 45.614 54.2946 45.1166L54.2878 45V14H18.2878V66H39.2878C39.8007 66 40.2233 66.386 40.2811 66.8834L40.2878 67C40.2878 67.5128 39.9018 67.9355 39.4045 67.9933L39.2878 68H17.2878C16.775 68 16.3523 67.614 16.2946 67.1166L16.2878 67V13C16.2878 12.4872 16.6739 12.0645 17.1712 12.0067L17.2878 12H55.2878Z" fill="#C3C3FB"/>
+<path d="M49.2878 36C49.8401 36 50.2878 36.4477 50.2878 37C50.2878 37.5128 49.9018 37.9355 49.4045 37.9933L49.2878 38H23.2878C22.7356 38 22.2878 37.5523 22.2878 37C22.2878 36.4872 22.6739 36.0645 23.1712 36.0067L23.2878 36H49.2878Z" fill="#C3C3FB"/>
+<path d="M42.2878 49C42.2878 48.4477 41.8401 48 41.2878 48H23.2878L23.1712 48.0067C22.6739 48.0645 22.2878 48.4872 22.2878 49C22.2878 49.5523 22.7356 50 23.2878 50H41.2878L41.4045 49.9933C41.9018 49.9355 42.2878 49.5128 42.2878 49Z" fill="#C3C3FB"/>
+<path d="M59.2878 12C59.8007 12 60.2234 12.386 60.2811 12.8834L60.2878 13V45C60.2878 45.5523 59.8401 46 59.2878 46C58.775 46 58.3523 45.614 58.2946 45.1166L58.2878 45V13C58.2878 12.4477 58.7356 12 59.2878 12Z" fill="#C3C3FB"/>
+<path d="M46.2878 43C46.2878 42.4477 45.8401 42 45.2878 42H23.2878L23.1712 42.0067C22.6739 42.0645 22.2878 42.4872 22.2878 43C22.2878 43.5523 22.7356 44 23.2878 44H45.2878L45.4045 43.9933C45.9018 43.9355 46.2878 43.5128 46.2878 43Z" fill="#C3C3FB"/>
+<path d="M33.2878 60C33.8401 60 34.2878 60.4477 34.2878 61C34.2878 61.5128 33.9018 61.9355 33.4045 61.9933L33.2878 62H23.2878C22.7356 62 22.2878 61.5523 22.2878 61C22.2878 60.4872 22.6739 60.0645 23.1712 60.0067L23.2878 60H33.2878Z" fill="#C3C3FB"/>
+<path d="M38.2878 55C38.2878 54.4477 37.8401 54 37.2878 54H23.2878L23.1712 54.0067C22.6739 54.0645 22.2878 54.4872 22.2878 55C22.2878 55.5523 22.7356 56 23.2878 56H37.2878L37.4045 55.9933C37.9018 55.9355 38.2878 55.5128 38.2878 55Z" fill="#C3C3FB"/>
+</svg>
diff --git a/app.territoiresentransitions.react/src/app/pages/collectivite/PlansActions/ParcoursCreationPlan/shopping-basket.svg b/app.territoiresentransitions.react/src/app/pages/collectivite/PlansActions/ParcoursCreationPlan/shopping-basket.svg
new file mode 100644
index 0000000000..88870e7ec3
--- /dev/null
+++ b/app.territoiresentransitions.react/src/app/pages/collectivite/PlansActions/ParcoursCreationPlan/shopping-basket.svg
@@ -0,0 +1,15 @@
+<svg width="62" height="54" viewBox="0 0 62 54" fill="none" xmlns="http://www.w3.org/2000/svg">
+<mask id="mask0_4799_53761" style="mask-type:luminance" maskUnits="userSpaceOnUse" x="0" y="-4" width="62" height="62">
+<path d="M0.530396 -3.33326H61.8636V57.9999H0.530396V-3.33326Z" fill="white"/>
+</mask>
+<g mask="url(#mask0_4799_53761)">
+<path d="M31.1971 24.9375C31.8583 24.9375 32.395 25.4742 32.395 26.1354C32.395 26.7966 31.8583 27.3333 31.1971 27.3333C30.5358 27.3333 29.9991 26.7966 29.9991 26.1354C29.9991 25.4742 30.5358 24.9375 31.1971 24.9375Z" fill="#C3C3FB"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M4.68843 27.2902C4.89786 27.3192 5.10959 27.3333 5.32193 27.3333H26.4052C27.0668 27.3333 27.6031 26.797 27.6031 26.1354C27.6031 25.4738 27.0668 24.9375 26.4052 24.9375H5.32193C5.21499 24.9375 5.11223 24.9303 5.0143 24.9166L5.0039 24.9152C3.8323 24.7622 2.9261 23.7572 2.9261 22.5417C2.9261 21.2183 3.99858 20.1458 5.32193 20.1458H57.0718C58.3952 20.1458 59.4676 21.2183 59.4676 22.5417C59.4676 23.7572 58.5615 24.7622 57.3898 24.9152L57.3794 24.9166C57.2815 24.9303 57.1788 24.9375 57.0718 24.9375H35.9885C35.3269 24.9375 34.7906 25.4738 34.7906 26.1354C34.7906 26.797 35.3269 27.3333 35.9885 27.3333H57.0718C57.2842 27.3333 57.4959 27.3192 57.7054 27.2902C60.0531 26.9809 61.8635 24.9731 61.8635 22.5417C61.8635 19.8951 59.7183 17.75 57.0718 17.75H5.32193C2.6754 17.75 0.530273 19.8951 0.530273 22.5417C0.530273 24.9732 2.34068 26.981 4.68843 27.2902Z" fill="#C3C3FB"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M3.32238 26.1354C3.32238 25.4738 3.8587 24.9375 4.52029 24.9375C4.68215 24.9375 4.84233 24.9482 5.00197 24.9699C6.52589 25.1752 7.77403 26.3389 8.05629 27.8876L12.1315 50.308C12.2352 50.8774 12.7318 51.2916 13.3106 51.2916H49.0826C49.6613 51.2916 50.158 50.8774 50.2616 50.308L54.3368 27.8882C54.6191 26.339 55.868 25.1747 57.3922 24.9697C57.5516 24.9481 57.7117 24.9375 57.873 24.9375C58.5346 24.9375 59.0709 25.4738 59.0709 26.1354C59.0709 26.797 58.5346 27.3333 57.873 27.3333C57.817 27.3333 57.7644 27.337 57.7137 27.3439L57.7114 27.3442C57.2043 27.4124 56.788 27.801 56.6939 28.317L52.6188 50.7368C52.3077 52.4459 50.8182 53.6874 49.0826 53.6874H13.3106C11.5748 53.6874 10.0855 52.4461 9.77442 50.7371L5.69929 28.3172C5.60503 27.8013 5.18882 27.4124 4.68173 27.3442L4.67966 27.3439C4.62857 27.337 4.57611 27.3333 4.52029 27.3333C3.8587 27.3333 3.32238 26.797 3.32238 26.1354Z" fill="#C3C3FB"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M50.0819 19.9169C50.617 19.5279 50.7355 18.7788 50.3465 18.2436L39.0905 2.75783C38.1089 1.07501 35.9554 0.483239 34.2439 1.43105L34.2426 1.43176C32.5075 2.3954 31.8831 4.58417 32.8475 6.31928C32.8748 6.36842 32.9055 6.41557 32.9394 6.46039L42.9408 19.671C43.3402 20.1985 44.0915 20.3023 44.619 19.903C45.1464 19.5037 45.2503 18.7523 44.851 18.2249L34.9092 5.09305C34.6351 4.525 34.8491 3.83592 35.4052 3.52661C35.9889 3.20382 36.7173 3.41618 37.0347 3.98913C37.0584 4.03196 37.0848 4.0733 37.1136 4.11291L48.4086 19.6522C48.7976 20.1874 49.5467 20.3059 50.0819 19.9169Z" fill="#C3C3FB"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M12.3118 19.9169C12.847 20.3059 13.5961 20.1874 13.9851 19.6523L25.2802 4.11291C25.3087 4.07379 25.3347 4.03298 25.3582 3.99071C25.6784 3.41492 26.406 3.20441 26.9887 3.52666C27.5447 3.83605 27.7586 4.5251 27.4845 5.09301L17.5427 18.2249C17.1434 18.7523 17.2472 19.5037 17.7747 19.903C18.3022 20.3023 19.0535 20.1985 19.4529 19.671L29.4542 6.46039C29.4882 6.4156 29.5189 6.36847 29.5462 6.31936C30.5108 4.58414 29.8861 2.39539 28.1512 1.43179L28.1499 1.43102C26.4369 0.482493 24.2868 1.0764 23.3038 2.75719L12.0471 18.2436C11.6582 18.7788 11.7766 19.5279 12.3118 19.9169Z" fill="#C3C3FB"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M27.6032 44.1041C27.6032 46.0894 29.2116 47.6979 31.1969 47.6979C33.1822 47.6979 34.7907 46.0894 34.7907 44.1041V34.5208C34.7907 33.5288 34.3867 32.6288 33.7378 31.9799C33.089 31.331 32.189 30.9271 31.1969 30.9271C29.2116 30.9271 27.6032 32.5355 27.6032 34.5208V44.1041ZM31.1969 45.302C30.5348 45.302 29.999 44.7662 29.999 44.1041V34.5208C29.999 33.8587 30.5348 33.3229 31.1969 33.3229C31.5274 33.3229 31.8253 33.4556 32.0437 33.674C32.2621 33.8924 32.3948 34.1904 32.3948 34.5208V44.1041C32.3948 44.7662 31.859 45.302 31.1969 45.302Z" fill="#E1E1FD"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M39.5823 44.1041C39.5823 46.0894 41.1907 47.6979 43.176 47.6979C45.1613 47.6979 46.7698 46.0894 46.7698 44.1041V34.5208C46.7698 33.5288 46.3658 32.6288 45.7169 31.9799C45.0681 31.331 44.1681 30.9271 43.176 30.9271C41.1907 30.9271 39.5823 32.5355 39.5823 34.5208V44.1041ZM43.176 45.302C42.5139 45.302 41.9781 44.7662 41.9781 44.1041V34.5208C41.9781 33.8587 42.5139 33.3229 43.176 33.3229C43.5065 33.3229 43.8044 33.4556 44.0228 33.674C44.2412 33.8924 44.3739 34.1904 44.3739 34.5208V44.1041C44.3739 44.7662 43.8381 45.302 43.176 45.302Z" fill="#E1E1FD"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M15.624 44.1041C15.624 46.0894 17.2325 47.6979 19.2178 47.6979C21.203 47.6979 22.8115 46.0894 22.8115 44.1041V34.5208C22.8115 33.5288 22.4075 32.6288 21.7587 31.9799C21.1098 31.331 20.2098 30.9271 19.2178 30.9271C17.2325 30.9271 15.624 32.5355 15.624 34.5208V44.1041ZM19.2178 45.302C18.5557 45.302 18.0199 44.7662 18.0199 44.1041V34.5208C18.0199 33.8587 18.5557 33.3229 19.2178 33.3229C19.5482 33.3229 19.8461 33.4556 20.0646 33.674C20.283 33.8924 20.4157 34.1904 20.4157 34.5208V44.1041C20.4157 44.7662 19.8799 45.302 19.2178 45.302Z" fill="#E1E1FD"/>
+</g>
+</svg>
diff --git a/app.territoiresentransitions.react/src/app/paths.ts b/app.territoiresentransitions.react/src/app/paths.ts
index 23a47367bd..c877c74b8e 100644
--- a/app.territoiresentransitions.react/src/app/paths.ts
+++ b/app.territoiresentransitions.react/src/app/paths.ts
@@ -1,5 +1,6 @@
 import {Referentiel} from 'types/litterals';
 import {getAuthPaths} from '@tet/api';
+import {ENV} from '../environmentVariables';
 
 const authPaths = getAuthPaths(
   document.location.hostname,
@@ -508,6 +509,12 @@ export const makeCollectiviteJournalUrl = ({
     collectiviteId.toString()
   );
 
+export const makeCollectivitePanierUrl = ({
+  collectiviteId,
+}: {
+  collectiviteId: number;
+}) => `${ENV.panier_url}/landing/collectivite/${collectiviteId}`;
+
 export const makeInvitationLandingPath = (
   invitationId: string,
   email: string
diff --git a/app.territoiresentransitions.react/src/environmentVariables.ts b/app.territoiresentransitions.react/src/environmentVariables.ts
index 90b5664fd5..df65a3cec3 100644
--- a/app.territoiresentransitions.react/src/environmentVariables.ts
+++ b/app.territoiresentransitions.react/src/environmentVariables.ts
@@ -4,6 +4,7 @@ export const ENV = {
   supabase_anon_key: process.env.NX_PUBLIC_SUPABASE_KEY,
   supabase_url: process.env.NX_PUBLIC_SUPABASE_URL,
   sentry_dsn: process.env.NX_PUBLIC_SENTRY_DSN,
+  panier_url: process.env.REACT_APP_PANIER_URL,
   posthog: {
     host: process.env.NX_PUBLIC_POSTHOG_HOST,
     key: process.env.NX_PUBLIC_POSTHOG_KEY,

From fc2ed6de65b4d4d9ae0dbf7ba6867867c07c92f3 Mon Sep 17 00:00:00 2001
From: Marc Rutkowski <marc@attractive-media.fr>
Date: Mon, 23 Sep 2024 11:14:30 +0200
Subject: [PATCH 17/91] =?UTF-8?q?Am=C3=A9liore=20l'affichage=20de=20la=20d?=
 =?UTF-8?q?escription=20de=20l'action=20=C3=A0=20impact=20li=C3=A9e=20?=
 =?UTF-8?q?=C3=A0=20une=20fiche=20action?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FicheAction/FicheActionImpact/useActionImpact.ts  | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/app.territoiresentransitions.react/src/app/pages/collectivite/PlansActions/FicheAction/FicheActionImpact/useActionImpact.ts b/app.territoiresentransitions.react/src/app/pages/collectivite/PlansActions/FicheAction/FicheActionImpact/useActionImpact.ts
index 54ff1ecf9b..db70d06039 100644
--- a/app.territoiresentransitions.react/src/app/pages/collectivite/PlansActions/FicheAction/FicheActionImpact/useActionImpact.ts
+++ b/app.territoiresentransitions.react/src/app/pages/collectivite/PlansActions/FicheAction/FicheActionImpact/useActionImpact.ts
@@ -13,7 +13,16 @@ export const useActionImpact = (actionImpactId: number) =>
   useQuery(['action_impact', actionImpactId], async () => {
     const {data, error} = await supabaseClient
       .from('action_impact')
-      .select()
+      .select(
+        `titre, 
+        thematiques:action_impact_thematique(...thematique(id,nom)),
+        budget:action_impact_fourchette_budgetaire(*),
+        miseEnOeuvre:action_impact_temps_de_mise_en_oeuvre(*),
+        ressources:ressources_externes,
+        rex,
+        subventions:subventions_mobilisables
+      `
+      )
       .eq('id', actionImpactId)
       .returns<ActionImpactDetail[]>();
 

From 15849e61f7bf80c52ad293317a3dd65850c7836a Mon Sep 17 00:00:00 2001
From: Marc Rutkowski <marc@attractive-media.fr>
Date: Wed, 25 Sep 2024 13:55:13 +0200
Subject: [PATCH 18/91] =?UTF-8?q?Ajoute=20dans=20la=20m=C3=A9thode=20de=20?=
 =?UTF-8?q?fetch=20des=20actions=20=C3=A0=20impact=20le=20filtrage=20sur?=
 =?UTF-8?q?=20les=20comp=C3=A9tences=20de=20la=20collectivit=C3=A9=20assoc?=
 =?UTF-8?q?i=C3=A9e=20au=20panier?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/src/panier_action_impact/panierAPI.ts | 49 +++++++++++++++++--
 1 file changed, 46 insertions(+), 3 deletions(-)

diff --git a/packages/api/src/panier_action_impact/panierAPI.ts b/packages/api/src/panier_action_impact/panierAPI.ts
index 80651d2c43..5671449d1d 100644
--- a/packages/api/src/panier_action_impact/panierAPI.ts
+++ b/packages/api/src/panier_action_impact/panierAPI.ts
@@ -109,7 +109,9 @@ export class PanierAPI {
     panier_id: string,
     thematique_ids: number[],
     niveau_budget_ids: number[],
-    niveau_temps_ids: number[]
+    niveau_temps_ids: number[],
+    /** indique que les actions à impact ne sont pas filtrées sur les compétences de la collectivité */
+    sansFiltreCompetences: boolean
   ): Promise<Panier | null> {
     const builder = this.supabase
       .from('panier')
@@ -155,9 +157,50 @@ export class PanierAPI {
       );
     }
 
-    const { data, error } = await builder.single<Panier>();
+    if (!sansFiltreCompetences) {
+      // @ts-expect-error Le client Supabase ne permet pas de filtrer à ce niveau
+      builder.url.searchParams.append(
+        'action_impact_state.matches_competences',
+        'is.true'
+      );
+    }
+
+    const {data, error} = await builder.single<Panier>();
     if (error) throw error;
-    return data;
+    return sansFiltreCompetences ? data : this.filterActionsCommune(data);
+  }
+
+  async fetchCollectiviteTypes(collectivite_id: number) {
+    const {data, error} = await this.supabase
+      .from('collectivite_identite')
+      .select('type')
+      .eq('id', collectivite_id);
+    if (error) throw error;
+    const collectivite = data?.[0];
+    return collectivite?.type || null;
+  }
+
+  // filtre a posteriori les actions pour les communes
+  async filterActionsCommune(panier: Panier) {
+    const collectiviteId = panier.collectivite_id || panier.collectivite_preset;
+    if (!collectiviteId) return panier;
+
+    // type et compétences de la collectivité
+    const collectiviteTypes = await this.fetchCollectiviteTypes(collectiviteId);
+
+    // pour les communes : filtre sur les flags “independamment_competences” et/ou “competences_communales”
+    if (collectiviteTypes?.includes('commune')) {
+      return {
+        ...panier,
+        states: panier.states.filter(
+          state =>
+            state.action.independamment_competences ||
+            state.action.competences_communales
+        ),
+      };
+    }
+
+    return panier;
   }
 
   /**

From 0ec3fbb23a149afb9b6a890353df681bf160efb8 Mon Sep 17 00:00:00 2001
From: Marc Rutkowski <marc@attractive-media.fr>
Date: Wed, 25 Sep 2024 13:55:26 +0200
Subject: [PATCH 19/91] =?UTF-8?q?Supprime=20une=20ligne=20dupliqu=C3=A9e?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/api/src/panier_action_impact/index.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/api/src/panier_action_impact/index.ts b/packages/api/src/panier_action_impact/index.ts
index 9ea8c9d167..0512d8b22d 100644
--- a/packages/api/src/panier_action_impact/index.ts
+++ b/packages/api/src/panier_action_impact/index.ts
@@ -1,4 +1,3 @@
 export * from "./actionImpactAPI";
 export * from "./panierAPI";
-export * from "./types";
-export * from "./types";
+export * from './types';

From 4adfc0ffdae91c261ea1bc20ef342a7a9251f879 Mon Sep 17 00:00:00 2001
From: Marc Rutkowski <marc@attractive-media.fr>
Date: Wed, 25 Sep 2024 13:56:57 +0200
Subject: [PATCH 20/91] =?UTF-8?q?Permet=20d'avoir=20un=20filtre=20par=20ch?=
 =?UTF-8?q?eckbox=20dans=20les=20options=20de=20filtrage=20des=20actions?=
 =?UTF-8?q?=20=C3=A0=20impact?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FiltresActions/BadgesFilters.tsx          | 115 +++++++++++++-----
 1 file changed, 83 insertions(+), 32 deletions(-)

diff --git a/packages/panier/components/FiltresActions/BadgesFilters.tsx b/packages/panier/components/FiltresActions/BadgesFilters.tsx
index a39569753c..1fc2b678ed 100644
--- a/packages/panier/components/FiltresActions/BadgesFilters.tsx
+++ b/packages/panier/components/FiltresActions/BadgesFilters.tsx
@@ -2,9 +2,10 @@ import classNames from 'classnames';
 import { useEffect, useState } from 'react';
 
 import {
-  Badge,
   ButtonMenu,
+  Checkbox,
   Field,
+  Icon,
   OptionValue,
   SelectMultiple,
   SelectMultipleOnChangeArgs,
@@ -12,7 +13,8 @@ import {
   getFlatOptions,
 } from '@tet/ui';
 
-type FilterType = {
+type FilterSelect = {
+  type?: never;
   /** Titre affiché dans <Field /> */
   title: string;
   /** Tag optionnel, affiché dans les badges */
@@ -27,6 +29,22 @@ type FilterType = {
   onChange: (args: SelectMultipleOnChangeArgs) => void;
 };
 
+type FilterCheckbox = {
+  type: 'checkbox';
+  /** Titre affiché dans <Field /> */
+  title: string;
+  /** Tag optionnel, affiché dans les badges */
+  tag?: string;
+  /** Valeur de la checkbox */
+  value?: boolean;
+  /** Contenu de l'infobulle */
+  tooltip?: string;
+  /** Détecte le changement de valeur de la checkbox */
+  onChange: (value: boolean) => void;
+};
+
+type FilterType = FilterSelect | FilterCheckbox;
+
 type BadgeType = {
   filter: FilterType;
   value: OptionValue;
@@ -51,17 +69,28 @@ export const BadgesFilters = ({
   const handleCloseBadge = (badge: BadgeType) => {
     const selectedValue = badge.value;
 
-    const values: OptionValue[] | undefined = badge.filter.values?.filter(
-      (v) => v !== badge.value
-    );
+    if (badge.filter.type === 'checkbox') {
+      badge.filter.onChange(badge.filter.value ?? false);
+    } else {
+      const values: OptionValue[] | undefined = badge.filter.values?.filter(
+        v => v !== badge.value,
+      );
 
-    badge.filter.onChange({ selectedValue, values });
+      badge.filter.onChange({selectedValue, values});
+    }
   };
 
   /** Supprime tous les filtres sélectionnés */
   const handleClearFilters = () => {
-    badgesList?.forEach((badge) => {
-      badge.filter.onChange({ selectedValue: badge.value, values: undefined });
+    badgesList?.forEach(badge => {
+      if (badge.filter.type === 'checkbox') {
+        badge.filter.onChange(false);
+      } else {
+        badge.filter.onChange({
+          selectedValue: badge.value,
+          values: undefined,
+        });
+      }
     });
   };
 
@@ -69,20 +98,25 @@ export const BadgesFilters = ({
   useEffect(() => {
     const newList: BadgeType[] = [];
 
-    filters.forEach((filter) => {
-      if (filter.values !== undefined) {
-        const options = getFlatOptions(filter.options);
-
-        filter.values.forEach((value) => {
-          const option = options.find((opt) => opt.value === value);
-
-          option &&
-            newList.push({
-              filter,
-              value: option.value,
-              label: option.label,
-            });
-        });
+    filters.forEach(filter => {
+      if (filter.type === 'checkbox') {
+        if (filter.value)
+          newList.push({filter, value: 'true', label: filter.title});
+      } else {
+        if (filter.values !== undefined) {
+          const options = getFlatOptions(filter.options);
+
+          filter.values.forEach(value => {
+            const option = options.find(opt => opt.value === value);
+
+            option &&
+              newList.push({
+                filter,
+                value: option.value,
+                label: option.label,
+              });
+          });
+        }
       }
     });
 
@@ -141,16 +175,33 @@ export const BadgesFilters = ({
         }
       >
         <div className="flex flex-col gap-4 w-72 p-4">
-          {filters.map((filter) => (
-            <Field key={filter.title} title={filter.title}>
-              <SelectMultiple
-                options={filter.options}
-                values={filter.values}
-                onChange={filter.onChange}
-                small
-              />
-            </Field>
-          ))}
+          {filters.map(filter =>
+            filter.type === 'checkbox' ? (
+              <div className="flex flex-row" key={filter.title}>
+                <Checkbox
+                  label={filter.title}
+                  checked={filter.value}
+                  onChange={evt => filter.onChange(evt.currentTarget.checked)}
+                />
+                {!!filter.tooltip && (
+                  <Icon
+                    icon="information-line"
+                    className="cursor-pointer"
+                    title={filter.tooltip}
+                  />
+                )}
+              </div>
+            ) : (
+              <Field key={filter.title} title={filter.title}>
+                <SelectMultiple
+                  options={filter.options}
+                  values={filter.values}
+                  onChange={filter.onChange}
+                  small
+                />
+              </Field>
+            ),
+          )}
         </div>
       </ButtonMenu>
     </div>

From 663809f1321094216d96bb0438a4d1f2f603c38f Mon Sep 17 00:00:00 2001
From: Marc Rutkowski <marc@attractive-media.fr>
Date: Wed, 25 Sep 2024 13:57:23 +0200
Subject: [PATCH 21/91] =?UTF-8?q?Ajoute=20l'option=20de=20filtrage=20"?=
 =?UTF-8?q?=C3=89largir=20au-del=C3=A0=20des=20comp=C3=A9tences=20territor?=
 =?UTF-8?q?iales"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/FiltresActions/index.tsx       | 30 +++++++++++++++++--
 1 file changed, 27 insertions(+), 3 deletions(-)

diff --git a/packages/panier/components/FiltresActions/index.tsx b/packages/panier/components/FiltresActions/index.tsx
index d7b2a2053a..f5345dc811 100644
--- a/packages/panier/components/FiltresActions/index.tsx
+++ b/packages/panier/components/FiltresActions/index.tsx
@@ -19,12 +19,14 @@ type FiltresActionsProps = {
   budgets: ActionImpactFourchetteBudgetaire[];
   temps: ActionImpactTempsMiseEnOeuvre[];
   thematiques: ActionImpactThematique[];
+  sansFiltreCompetences: boolean;
 };
 
 const FiltresActions = ({
   budgets,
   temps,
   thematiques,
+  sansFiltreCompetences,
 }: FiltresActionsProps) => {
   const router = useRouter();
   const pathname = usePathname();
@@ -39,6 +41,9 @@ const FiltresActions = ({
     OptionValue[] | undefined
   >();
   const [tempsValues, setTempsValues] = useState<OptionValue[] | undefined>();
+  const [sansFiltreCompetencesValue, setSansFiltreCompetencesValue] = useState(
+    sansFiltreCompetences,
+  );
 
   useEffect(() => {
     // Permet de conserver les filtres lors d'un changement d'onglet
@@ -54,12 +59,13 @@ const FiltresActions = ({
     const tempsParams = searchParams
       .get('m')
       ?.split(',')
-      .map((val) => parseInt(val));
-    // const competencesParams = searchParams.get('c');
+      .map(val => parseInt(val));
+    const competencesParams = searchParams.get('c');
 
     if (thematiquesParams) setThematiquesValues(thematiquesParams);
     if (budgetsParams) setBudgetsValues(budgetsParams);
     if (tempsParams) setTempsValues(tempsParams);
+    setSansFiltreCompetencesValue(competencesParams === 'true');
 
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
@@ -77,6 +83,9 @@ const FiltresActions = ({
     if (!!tempsValues && tempsValues?.length > 0) {
       paramsArray.push(`m=${tempsValues.join(',')}`);
     }
+    if (sansFiltreCompetencesValue) {
+      paramsArray.push('c=true');
+    }
 
     const href =
       paramsArray.length > 0
@@ -90,13 +99,19 @@ const FiltresActions = ({
         thematique_ids: thematiquesValues,
         niveau_budget_ids: budgetsValues,
         niveau_temps_ids: tempsValues,
+        match_competences: sansFiltreCompetencesValue,
       });
       router.push(href, { scroll: false });
     };
 
     trackThenNavigate();
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [thematiquesValues?.length, budgetsValues?.length, tempsValues?.length]);
+  }, [
+    thematiquesValues?.length,
+    budgetsValues?.length,
+    tempsValues?.length,
+    sansFiltreCompetencesValue,
+  ]);
 
   return (
     <BadgesFilters
@@ -127,6 +142,15 @@ const FiltresActions = ({
             setTempsValues((args as SelectMultipleOnChangeArgs).values),
           multiple: true,
         },
+        {
+          type: 'checkbox',
+          title: 'Élargir au-delà des compétences territoriales',
+          tooltip:
+            'Certaines actions ne sont pas directement rattachées à un domaine de compétence administrative. Néanmoins, votre collectivité peut s’en emparer en fonction de ses moyens afin de mener sa politique locale de transition (par exemple : coopérer avec les autres échelons territoriaux compétents, modifier et adapter le contenu de l’action en accord avec ses compétences et les spécificités de votre territoire, etc…)',
+          value: sansFiltreCompetencesValue,
+          onChange: () =>
+            setSansFiltreCompetencesValue(!sansFiltreCompetencesValue),
+        },
       ]}
       className="my-4"
       btnMenuClassName="-mt-14"

From 95f89962a5f35ba129f7c6a9f2a93d3bd7aa8446 Mon Sep 17 00:00:00 2001
From: Marc Rutkowski <marc@attractive-media.fr>
Date: Wed, 25 Sep 2024 14:01:07 +0200
Subject: [PATCH 22/91] =?UTF-8?q?Passe=20l'option=20de=20filtrage=20"?=
 =?UTF-8?q?=C3=89largir=20au-del=C3=A0=20des=20comp=C3=A9tences=20territor?=
 =?UTF-8?q?iales"=20aux=20diff=C3=A9rents=20composants?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/panier/app/panier/[id]/PagePanier.tsx      |  5 +++--
 packages/panier/app/panier/[id]/page.tsx            | 11 +++++++----
 packages/panier/app/panier/[id]/utils.ts            |  7 +++++--
 packages/panier/components/ListeActions/index.tsx   |  6 +++++-
 packages/panier/components/PanierRealtime/index.tsx |  4 +++-
 5 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/packages/panier/app/panier/[id]/PagePanier.tsx b/packages/panier/app/panier/[id]/PagePanier.tsx
index 4dac797cf2..5b0db2dc76 100644
--- a/packages/panier/app/panier/[id]/PagePanier.tsx
+++ b/packages/panier/app/panier/[id]/PagePanier.tsx
@@ -15,9 +15,10 @@ type PagePanierProps = {
   budgets: ActionImpactFourchetteBudgetaire[];
   temps: ActionImpactTempsMiseEnOeuvre[];
   thematiques: ActionImpactThematique[];
+  sansFiltreCompetences: boolean;
 };
 
-const PagePanier = ({panier, budgets, temps, thematiques}: PagePanierProps) => {
+const PagePanier = (props: PagePanierProps) => {
   return (
     <>
       <ControlledAlert
@@ -26,7 +27,7 @@ const PagePanier = ({panier, budgets, temps, thematiques}: PagePanierProps) => {
       />
 
       <Section>
-        <PanierRealtime {...{panier, budgets, temps, thematiques}} />
+        <PanierRealtime {...props} />
       </Section>
     </>
   );
diff --git a/packages/panier/app/panier/[id]/page.tsx b/packages/panier/app/panier/[id]/page.tsx
index 1b8f2e0bd7..9dfe5d11d6 100644
--- a/packages/panier/app/panier/[id]/page.tsx
+++ b/packages/panier/app/panier/[id]/page.tsx
@@ -12,7 +12,7 @@ import { TrackPageView } from '@tet/ui';
  *  - t pour les ids des thématiques ex : 1 ou 1,2
  *  - b pour les ids des fourchettes budgétaires ex : 1 ou 1,2
  *  - m pour les ids de temps de mise en oeuvre ex : 1 ou 1,2
- *  - c pour utiliser les competences ex : true ou false (true par défaut)
+ *  - c pour ne pas restreindre aux compétences territoriales ex : true ou false (false par défaut)
  *
  *  Ainsi que le contrôle de la modale de "Création de plan d’action”
  *  - Si le paramètre `modale` est égal à `creation` la modale est initialement ouverte
@@ -28,13 +28,14 @@ async function Page({
   const thematique_ids = extractIdsFromParam(searchParams['t'] as string);
   const budget_ids = extractIdsFromParam(searchParams['b'] as string);
   const temps_ids = extractIdsFromParam(searchParams['m'] as string);
-  // const match_competences = searchParams['c'] !== 'false';
+  const sansFiltreCompetences = searchParams['c'] === 'true';
 
   const panier = await fetchPanier(
     panierId,
     thematique_ids,
     budget_ids,
-    temps_ids
+    temps_ids,
+    sansFiltreCompetences,
   );
 
   if (!panier) return notFound();
@@ -52,7 +53,9 @@ async function Page({
           panier_id: panier.id,
         }}
       />
-      <PagePanier {...{ panier, budgets, temps, thematiques }} />
+      <PagePanier
+        {...{panier, budgets, temps, thematiques, sansFiltreCompetences}}
+      />
     </>
   );
 }
diff --git a/packages/panier/app/panier/[id]/utils.ts b/packages/panier/app/panier/[id]/utils.ts
index 973b7ac054..204f2890d7 100644
--- a/packages/panier/app/panier/[id]/utils.ts
+++ b/packages/panier/app/panier/[id]/utils.ts
@@ -22,7 +22,8 @@ export const fetchPanier = async (
   panierId: string,
   thematique_ids: number[],
   budget_ids: number[],
-  temps_ids: number[]
+  temps_ids: number[],
+  sansFiltreCompetences: boolean,
 ): Promise<Panier | null> => {
   const supabase = createClient(cookies());
   const api = new PanierAPI(supabase);
@@ -31,7 +32,8 @@ export const fetchPanier = async (
     panierId,
     thematique_ids,
     budget_ids,
-    temps_ids
+    temps_ids,
+    sansFiltreCompetences,
   );
 
   return panier;
@@ -63,3 +65,4 @@ export const fetchNiveaux = async (
   const response = await fetch(`${apiUrl}/rest/v1/${table}`, getInit);
   return await response.json();
 };
+
diff --git a/packages/panier/components/ListeActions/index.tsx b/packages/panier/components/ListeActions/index.tsx
index 4468a9b141..3b045c846d 100644
--- a/packages/panier/components/ListeActions/index.tsx
+++ b/packages/panier/components/ListeActions/index.tsx
@@ -31,6 +31,7 @@ type ListeActionsProps = {
   budgets: ActionImpactFourchetteBudgetaire[];
   temps: ActionImpactTempsMiseEnOeuvre[];
   thematiques: ActionImpactThematique[];
+  sansFiltreCompetences: boolean;
   onToggleSelected: (actionId: number, selected: boolean) => void;
   onUpdateStatus: (actionId: number, statusId: string | null) => void;
   onChangeTab: (tab: PanierOngletName) => void;
@@ -41,6 +42,7 @@ const ListeActions = ({
   budgets,
   temps,
   thematiques,
+  sansFiltreCompetences,
   onToggleSelected,
   onUpdateStatus,
   onChangeTab,
@@ -78,7 +80,9 @@ const ListeActions = ({
 
         return (
           <Tab key={tab.label} label={getTabLabel(tab, actionsFiltrees.length)}>
-            <FiltresActions {...{budgets, temps, thematiques}} />
+            <FiltresActions
+              {...{budgets, temps, thematiques, sansFiltreCompetences}}
+            />
 
             {!tab.status &&
             !actionsFiltrees.length &&
diff --git a/packages/panier/components/PanierRealtime/index.tsx b/packages/panier/components/PanierRealtime/index.tsx
index a52a2f6d89..9d16ac09ba 100644
--- a/packages/panier/components/PanierRealtime/index.tsx
+++ b/packages/panier/components/PanierRealtime/index.tsx
@@ -24,6 +24,7 @@ type PanierRealtimeProps = {
   budgets: ActionImpactFourchetteBudgetaire[];
   temps: ActionImpactTempsMiseEnOeuvre[];
   thematiques: ActionImpactThematique[];
+  sansFiltreCompetences: boolean;
 };
 
 /**
@@ -40,6 +41,7 @@ const PanierRealtime = ({
   budgets,
   temps,
   thematiques,
+  sansFiltreCompetences,
 }: PanierRealtimeProps) => {
   const [currentTab, setCurrentTab] = useState<PanierOngletName>('selection');
 
@@ -126,7 +128,7 @@ const PanierRealtime = ({
           onToggleSelected={handleToggleSelected}
           onUpdateStatus={handleUpdateStatus}
           onChangeTab={handleChangeTab}
-          {...{ budgets, temps, thematiques }}
+          {...{budgets, temps, thematiques, sansFiltreCompetences}}
         />
       </div>
 

From f50f4ec590346f2db154677977d7a1a8862188cf Mon Sep 17 00:00:00 2001
From: Marc Rutkowski <marc@attractive-media.fr>
Date: Wed, 25 Sep 2024 13:57:43 +0200
Subject: [PATCH 23/91] =?UTF-8?q?Supprime=20un=20fichier=20inutilis=C3=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ListeActions/FiltresActions.tsx           | 165 ------------------
 1 file changed, 165 deletions(-)
 delete mode 100644 packages/panier/components/ListeActions/FiltresActions.tsx

diff --git a/packages/panier/components/ListeActions/FiltresActions.tsx b/packages/panier/components/ListeActions/FiltresActions.tsx
deleted file mode 100644
index 64f7610335..0000000000
--- a/packages/panier/components/ListeActions/FiltresActions.tsx
+++ /dev/null
@@ -1,165 +0,0 @@
-'use client';
-
-import {useEffect, useState} from 'react';
-import {usePathname, useRouter, useSearchParams} from 'next/navigation';
-import {
-  ActionImpactFourchetteBudgetaire,
-  ActionImpactTempsMiseEnOeuvre,
-  ActionImpactThematique,
-} from '@tet/api';
-import {
-  Button,
-  Field,
-  OptionValue,
-  SelectMultiple,
-  useEventTracker,
-} from '@tet/ui';
-import {usePanierContext} from '@tet/panier/providers';
-
-type FiltresActionsProps = {
-  budgets: ActionImpactFourchetteBudgetaire[];
-  temps: ActionImpactTempsMiseEnOeuvre[];
-  thematiques: ActionImpactThematique[];
-};
-
-const FiltresActions = ({budgets, temps, thematiques}: FiltresActionsProps) => {
-  const router = useRouter();
-  const pathname = usePathname();
-  const searchParams = useSearchParams();
-  const tracker = useEventTracker('panier/panier');
-  const {panier} = usePanierContext();
-
-  const [thematiquesValues, setThematiquesValues] = useState<
-    OptionValue[] | undefined
-  >();
-  const [budgetsValues, setBudgetsValues] = useState<
-    OptionValue[] | undefined
-  >();
-  const [tempsValues, setTempsValues] = useState<OptionValue[] | undefined>();
-  // const [competencesValue, setCompetencesValue] = useState(false);
-
-  useEffect(() => {
-    // Permet de conserver les filtres lors d'un changement d'onglet
-    // ou au refresh de la page
-    const thematiquesParams = searchParams
-      .get('t')
-      ?.split(',')
-      .map(val => parseInt(val));
-    const budgetsParams = searchParams
-      .get('b')
-      ?.split(',')
-      .map(val => parseInt(val));
-    const tempsParams = searchParams
-      .get('m')
-      ?.split(',')
-      .map(val => parseInt(val));
-    // const competencesParams = searchParams.get('c');
-
-    if (!!thematiquesParams) setThematiquesValues(thematiquesParams);
-    if (!!budgetsParams) setBudgetsValues(budgetsParams);
-    if (!!tempsParams) setTempsValues(tempsParams);
-    // if (!!competencesParams)
-    //   setCompetencesValue(competencesParams === 'true' ? true : false);
-
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []);
-
-  useEffect(() => {
-    // Mise à jour de l'url (et du panier) lorsqu'un filtre est modifié
-    let paramsArray = [];
-
-    if (!!thematiquesValues && thematiquesValues?.length > 0) {
-      paramsArray.push(`t=${thematiquesValues.join(',')}`);
-    }
-    if (!!budgetsValues && budgetsValues?.length > 0) {
-      paramsArray.push(`b=${budgetsValues.join(',')}`);
-    }
-    if (!!tempsValues && tempsValues?.length > 0) {
-      paramsArray.push(`m=${tempsValues.join(',')}`);
-    }
-    // if (competencesValue) paramsArray.push('c=true');
-
-    const href =
-      paramsArray.length > 0
-        ? `${pathname}?${paramsArray.join('&')}`
-        : pathname;
-
-    const trackThenNavigate = async () => {
-      await tracker('filtre', {
-        collectivite_preset: panier?.collectivite_preset ?? null,
-        panier_id: panier?.id ?? '',
-        thematique_ids: thematiquesValues,
-        niveau_budget_ids: budgetsValues,
-        niveau_temps_ids: tempsValues,
-      });
-      router.push(href, {scroll: false});
-    };
-
-    trackThenNavigate();
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [thematiquesValues?.length, budgetsValues?.length, tempsValues?.length]);
-
-  const handleClearFilters = () => {
-    setThematiquesValues(undefined);
-    setBudgetsValues(undefined);
-    setTempsValues(undefined);
-  };
-
-  return (
-    <div className="mb-8 relative z-10 bg-white p-6 rounded-lg border-[0.5px] border-primary-3">
-      <div className="grid sm:grid-cols-2 xl:grid-cols-3 gap-4">
-        <Field title="Thématiques" small>
-          <SelectMultiple
-            options={thematiques.map(t => ({value: t.id, label: t.nom}))}
-            values={thematiquesValues}
-            onChange={({values}) => {
-              setThematiquesValues(values);
-            }}
-            small
-          />
-        </Field>
-        <Field title="Ordre de grandeur budgétaire" small>
-          <SelectMultiple
-            options={budgets.map(b => ({value: b.niveau, label: b.nom}))}
-            values={budgetsValues}
-            onChange={({values}) => {
-              setBudgetsValues(values);
-            }}
-            small
-          />
-        </Field>
-        <Field title="Temps de mise en oeuvre" small>
-          <SelectMultiple
-            options={temps.map(t => ({value: t.niveau, label: t.nom}))}
-            values={tempsValues}
-            onChange={({values}) => {
-              setTempsValues(values);
-            }}
-            small
-          />
-        </Field>
-        <div className="flex justify-end max-xl:items-end xl:col-span-3 mt-4">
-          <Button
-            variant="grey"
-            size="xs"
-            icon="delete-bin-6-line"
-            onClick={handleClearFilters}
-          >
-            Supprimer tous les filtres
-          </Button>
-        </div>
-      </div>
-
-      {/* <div className="mt-8">
-        <Checkbox
-          label="Élargir au delà de mes compétences"
-          message="Certaines actions ne sont pas directement rattachées à un domaine de compétence territoriale. Néanmoins, votre collectivité peut s’en emparer afin d’enrichir sa politique locale de transition."
-          checked={competencesValue}
-          onChange={() => setCompetencesValue(prevState => !prevState)}
-        />
-      </div> */}
-    </div>
-  );
-};
-
-export default FiltresActions;

From b136b46ce5db2f4fbf9ea97ab2d4c7d612fc35ec Mon Sep 17 00:00:00 2001
From: Marc Rutkowski <marc@attractive-media.fr>
Date: Wed, 25 Sep 2024 15:44:11 +0200
Subject: [PATCH 24/91] =?UTF-8?q?Supprime=20un=20import=20inutilis=C3=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PlansActions/ParcoursCreationPlan/Selection.tsx             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app.territoiresentransitions.react/src/app/pages/collectivite/PlansActions/ParcoursCreationPlan/Selection.tsx b/app.territoiresentransitions.react/src/app/pages/collectivite/PlansActions/ParcoursCreationPlan/Selection.tsx
index 5b2a24bd11..9c1ebce29c 100644
--- a/app.territoiresentransitions.react/src/app/pages/collectivite/PlansActions/ParcoursCreationPlan/Selection.tsx
+++ b/app.territoiresentransitions.react/src/app/pages/collectivite/PlansActions/ParcoursCreationPlan/Selection.tsx
@@ -6,7 +6,7 @@ import {
 import classNames from 'classnames';
 import {useCollectiviteId} from 'core-logic/hooks/params';
 import {useFonctionTracker} from 'core-logic/hooks/useFonctionTracker';
-import {Link, useHistory} from 'react-router-dom';
+import {useHistory} from 'react-router-dom';
 import {ReactComponent as DocumentAddPicto} from './document-add.svg';
 import {ReactComponent as DocumentDownloadPicto} from './document-download.svg';
 import {ReactComponent as ShoppingBasket} from './shopping-basket.svg';

From b02aaf26607e317dc5d48ef35710e4cac6d56561 Mon Sep 17 00:00:00 2001
From: Marc Rutkowski <marc@attractive-media.fr>
Date: Wed, 25 Sep 2024 16:09:57 +0200
Subject: [PATCH 25/91] Affiche les contenus markdown dans la description d'une
 fiche action

---
 .../FicheActionDescription.tsx                    | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/app.territoiresentransitions.react/src/app/pages/collectivite/PlansActions/FicheAction/FicheActionDescription/FicheActionDescription.tsx b/app.territoiresentransitions.react/src/app/pages/collectivite/PlansActions/FicheAction/FicheActionDescription/FicheActionDescription.tsx
index 7f2bc436ce..8852a558f0 100644
--- a/app.territoiresentransitions.react/src/app/pages/collectivite/PlansActions/FicheAction/FicheActionDescription/FicheActionDescription.tsx
+++ b/app.territoiresentransitions.react/src/app/pages/collectivite/PlansActions/FicheAction/FicheActionDescription/FicheActionDescription.tsx
@@ -4,6 +4,7 @@ import {Badge, Button} from '@tet/ui';
 import {FicheAction} from '../data/types';
 import MenuDescription from './MenuDescription';
 import {getTruncatedText} from '../utils';
+import Markdown from 'ui/Markdown';
 
 type FicheActionDescriptionProps = {
   isReadonly: boolean;
@@ -87,9 +88,17 @@ const FicheActionDescription = ({
           Description de l'action :
         </h6>
         <p className="text-base text-grey-1 whitespace-pre-wrap mb-0">
-          {(isFullDescription || !isDescriptionTruncated
-            ? description
-            : truncatedDescription) || 'Non renseigné'}
+          {description ? (
+            <Markdown
+              className="[&_ul]:list-disc [&_ul]:pl-8 [&_p]:mb-0"
+              content={(isFullDescription || !isDescriptionTruncated
+                ? description
+                : truncatedDescription
+              ).replaceAll('\\n', '\n')}
+            />
+          ) : (
+            'Non renseigné'
+          )}
         </p>
         {isDescriptionTruncated && (
           <Button

From 035300166a4cbce06e08e088f8935985a83b2e98 Mon Sep 17 00:00:00 2001
From: Marc Rutkowski <marc@attractive-media.fr>
Date: Thu, 26 Sep 2024 11:29:39 +0200
Subject: [PATCH 26/91] =?UTF-8?q?Supprime=20du=20code=20inutilis=C3=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../panier_action_impact/actionImpactAPI.ts   | 25 -------------------
 .../api/src/panier_action_impact/index.ts     |  3 +--
 .../components/ActionImpactDetails/index.tsx  | 23 -----------------
 packages/panier/src/clientAPI.ts              | 10 +++-----
 4 files changed, 4 insertions(+), 57 deletions(-)
 delete mode 100644 packages/api/src/panier_action_impact/actionImpactAPI.ts
 delete mode 100644 packages/panier/components/ActionImpactDetails/index.tsx

diff --git a/packages/api/src/panier_action_impact/actionImpactAPI.ts b/packages/api/src/panier_action_impact/actionImpactAPI.ts
deleted file mode 100644
index cec041bb35..0000000000
--- a/packages/api/src/panier_action_impact/actionImpactAPI.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-
-import { SupabaseClient } from "@supabase/supabase-js";
-import { Database } from '../database.types';
-import { ActionImpactDetails } from './types';
-
-export const actionDetailsSelect = "*, categoriesFNV:categorie_fnv(*), thematiques:thematique(*)";
-
-export class ActionImpactAPI {
-  protected supabase: SupabaseClient<Database>;
-
-  constructor(supabase: SupabaseClient<Database>) {
-    this.supabase = supabase;
-  }
-
-  async fetchActionImpactDetails(
-    id: number,
-  ): Promise<ActionImpactDetails | null> {
-    const { data, error } = await this.supabase.from("action_impact")
-      .select(actionDetailsSelect)
-      .eq("id", id)
-      .single<ActionImpactDetails>();
-    if (error) throw error;
-    return data;
-  }
-}
diff --git a/packages/api/src/panier_action_impact/index.ts b/packages/api/src/panier_action_impact/index.ts
index 0512d8b22d..12edc4a5bb 100644
--- a/packages/api/src/panier_action_impact/index.ts
+++ b/packages/api/src/panier_action_impact/index.ts
@@ -1,3 +1,2 @@
-export * from "./actionImpactAPI";
-export * from "./panierAPI";
+export * from './panierAPI';
 export * from './types';
diff --git a/packages/panier/components/ActionImpactDetails/index.tsx b/packages/panier/components/ActionImpactDetails/index.tsx
deleted file mode 100644
index 8874361d47..0000000000
--- a/packages/panier/components/ActionImpactDetails/index.tsx
+++ /dev/null
@@ -1,23 +0,0 @@
-'use client';
-
-import useSWR from 'swr';
-import type {ActionImpactDetails} from '@tet/api';
-import {actionImpactAPI} from '@tet/panier/src/clientAPI';
-
-
-export default function ActionImpactDetails({id}: { id: number }) {
-  const {data, error} =
-    useSWR<ActionImpactDetails | null>(
-      ['ActionImpactDetails', id],
-      () => actionImpactAPI.fetchActionImpactDetails(id));
-
-  if (!data) {
-    return <div>Loading...</div>;
-  }
-
-  return <div>
-    <h1>{data.titre}</h1>
-    <p>{data.description}</p>
-    <pre>{JSON.stringify(data, null, 2)}</pre>
-  </div>;
-}
diff --git a/packages/panier/src/clientAPI.ts b/packages/panier/src/clientAPI.ts
index 4bf4c7bcb8..ec8b54479d 100644
--- a/packages/panier/src/clientAPI.ts
+++ b/packages/panier/src/clientAPI.ts
@@ -1,10 +1,6 @@
-import {ActionImpactAPI, PanierAPI} from '@tet/api';
-import {createClient} from '@tet/panier/src/supabase/client';
+import {PanierAPI} from '@tet/api';
+import { createClient } from './supabase/client';
 
-export const supabase = createClient()
+export const supabase = createClient();
 
-// @ts-ignore
-export const actionImpactAPI = new ActionImpactAPI(supabase);
-
-// @ts-ignore
 export const panierAPI = new PanierAPI(supabase);

From 330f45d5fe418e3689a08e942cc3a92c86d41314 Mon Sep 17 00:00:00 2001
From: Marc Rutkowski <marc@attractive-media.fr>
Date: Thu, 26 Sep 2024 15:44:29 +0200
Subject: [PATCH 27/91] =?UTF-8?q?Corrige=20le=20filtrage=20par=20comp?=
 =?UTF-8?q?=C3=A9tences?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/src/panier_action_impact/panierAPI.ts | 35 +------------------
 1 file changed, 1 insertion(+), 34 deletions(-)

diff --git a/packages/api/src/panier_action_impact/panierAPI.ts b/packages/api/src/panier_action_impact/panierAPI.ts
index 5671449d1d..432a9c1825 100644
--- a/packages/api/src/panier_action_impact/panierAPI.ts
+++ b/packages/api/src/panier_action_impact/panierAPI.ts
@@ -167,40 +167,7 @@ export class PanierAPI {
 
     const {data, error} = await builder.single<Panier>();
     if (error) throw error;
-    return sansFiltreCompetences ? data : this.filterActionsCommune(data);
-  }
-
-  async fetchCollectiviteTypes(collectivite_id: number) {
-    const {data, error} = await this.supabase
-      .from('collectivite_identite')
-      .select('type')
-      .eq('id', collectivite_id);
-    if (error) throw error;
-    const collectivite = data?.[0];
-    return collectivite?.type || null;
-  }
-
-  // filtre a posteriori les actions pour les communes
-  async filterActionsCommune(panier: Panier) {
-    const collectiviteId = panier.collectivite_id || panier.collectivite_preset;
-    if (!collectiviteId) return panier;
-
-    // type et compétences de la collectivité
-    const collectiviteTypes = await this.fetchCollectiviteTypes(collectiviteId);
-
-    // pour les communes : filtre sur les flags “independamment_competences” et/ou “competences_communales”
-    if (collectiviteTypes?.includes('commune')) {
-      return {
-        ...panier,
-        states: panier.states.filter(
-          state =>
-            state.action.independamment_competences ||
-            state.action.competences_communales
-        ),
-      };
-    }
-
-    return panier;
+    return data;
   }
 
   /**

From 7497f57cb943a0a52d7cb3d9b7b9ee3324e9c413 Mon Sep 17 00:00:00 2001
From: Marc Rutkowski <marc@attractive-media.fr>
Date: Thu, 26 Sep 2024 15:50:43 +0200
Subject: [PATCH 28/91] =?UTF-8?q?Ajoute=20l'affichage=20des=20actions=20de?=
 =?UTF-8?q?s=20r=C3=A9f=C3=A9rentiels=20li=C3=A9es=20=C3=A0=20une=20action?=
 =?UTF-8?q?=20=C3=A0=20impact?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/src/panier_action_impact/panierAPI.ts |  3 +-
 .../api/src/panier_action_impact/types.ts     | 13 ++++-
 .../ActionImpact/ModaleActionImpact.tsx       | 50 +++++++++++++++----
 .../panier/components/ActionImpact/types.ts   |  3 ++
 .../ListeActions/ListeActionsFiltrees.tsx     |  1 +
 5 files changed, 59 insertions(+), 11 deletions(-)

diff --git a/packages/api/src/panier_action_impact/panierAPI.ts b/packages/api/src/panier_action_impact/panierAPI.ts
index 432a9c1825..92a840779b 100644
--- a/packages/api/src/panier_action_impact/panierAPI.ts
+++ b/packages/api/src/panier_action_impact/panierAPI.ts
@@ -13,7 +13,8 @@ export const panierSelect =
   '*,' +
   'thematiques:thematique(*),' +
   'fourchette_budgetaire:action_impact_fourchette_budgetaire(*),' +
-  'temps_de_mise_en_oeuvre:action_impact_temps_de_mise_en_oeuvre(*)' +
+  'temps_de_mise_en_oeuvre:action_impact_temps_de_mise_en_oeuvre(*),' +
+  'actions_liees:action_definition(identifiant,referentiel,nom)' +
   ')' +
   ')';
 
diff --git a/packages/api/src/panier_action_impact/types.ts b/packages/api/src/panier_action_impact/types.ts
index e0ca83d802..4f792173f1 100644
--- a/packages/api/src/panier_action_impact/types.ts
+++ b/packages/api/src/panier_action_impact/types.ts
@@ -35,7 +35,9 @@ export type ActionImpact = Omit<
 /* Le resumé d'une action à impact, utilisé pour les cartes  */
 export type ActionImpactSnippet =
   // todo: Omit<ActionImpact, 'description' | 'ressources_externes'>
-  ActionImpact & {thematiques: ActionImpactThematique[]};
+  ActionImpact & {
+    thematiques: ActionImpactThematique[];
+  };
 
 /* Une action à impact avec des informations complémentaires, utilisé par la modale */
 export type ActionImpactDetails = ActionImpact & {
@@ -45,13 +47,22 @@ export type ActionImpactDetails = ActionImpact & {
 export type ActionImpactStatut =
   Database['public']['Tables']['action_impact_statut']['Row'];
 
+export type ActionReferentiel = {
+  identifiant: string;
+  referentiel: string;
+  nom: string;
+};
+
 export type ActionImpactState = {
   action: ActionImpact;
   isinpanier: boolean;
   statut: ActionImpactStatut | null;
   thematiques: ActionImpactThematique[];
+  actions_liees: ActionReferentiel[] | null;
+  matches_competences: boolean;
 };
 
+
 export type PanierBase = Database['public']['Tables']['panier']['Row'];
 
 export type Panier =
diff --git a/packages/panier/components/ActionImpact/ModaleActionImpact.tsx b/packages/panier/components/ActionImpact/ModaleActionImpact.tsx
index 4cf3bcdab6..e917ece3d9 100644
--- a/packages/panier/components/ActionImpact/ModaleActionImpact.tsx
+++ b/packages/panier/components/ActionImpact/ModaleActionImpact.tsx
@@ -6,15 +6,22 @@ import {
   ModalFooter,
   ModalFooterSection,
   InfoActionImpact,
+  Card,
 } from '@tet/ui';
 import Markdown from '@tet/panier/components/Markdown';
 
+const referentielToName: Record<string, string> = {
+  cae: 'Climat Air Énergie',
+  eci: 'Économie Circulaire',
+};
+
 /**
  * Modale action à impact du panier d'actions
  */
 export const ModaleActionImpact = (props: ModaleActionImpactProps) => {
   const {
     children,
+    actionsLiees,
     titre,
     description,
     statut,
@@ -30,15 +37,40 @@ export const ModaleActionImpact = (props: ModaleActionImpactProps) => {
       textAlign="left"
       render={() => {
         return (
-          <InfoActionImpact
-            action={{...props}}
-            descriptionMarkdown={
-              <Markdown
-                content={description}
-                className="paragraphe-18 mb-8 [&_ul]:list-disc [&_ul]:pl-8"
-              />
-            }
-          />
+          <>
+            <InfoActionImpact
+              action={{...props}}
+              descriptionMarkdown={
+                <Markdown
+                  content={description}
+                  className="paragraphe-18 mb-8 [&_ul]:list-disc [&_ul]:pl-8"
+                />
+              }
+            />
+            {!!actionsLiees?.length && (
+              <div className="mt-4">
+                <h6 className="text-primary-10 text-base font-bold">
+                  Actions des référentiels liés :
+                </h6>
+                <div className={'grid lg:grid-cols-2 xl:grid-cols-3 gap-3'}>
+                  {actionsLiees.map(({identifiant, nom, referentiel}) => (
+                    <Card
+                      key={identifiant}
+                      className="h-full px-4 py-[1.125rem] !gap-3 text-grey-8 !shadow-none"
+                    >
+                      <span className="text-grey-8 text-sm font-medium">
+                        Référentiel {referentielToName[referentiel]}
+                      </span>
+
+                      <span className="text-base font-bold text-primary-9">
+                        {identifiant} {nom}
+                      </span>
+                    </Card>
+                  ))}
+                </div>
+              </div>
+            )}
+          </>
         );
       }}
       renderFooter={({close}) => (
diff --git a/packages/panier/components/ActionImpact/types.ts b/packages/panier/components/ActionImpact/types.ts
index 8c1eddc874..a3a67dea9f 100644
--- a/packages/panier/components/ActionImpact/types.ts
+++ b/packages/panier/components/ActionImpact/types.ts
@@ -2,6 +2,7 @@ import {
   ActionImpactFourchetteBudgetaire,
   ActionImpactTempsMiseEnOeuvre,
   ActionImpactThematique,
+  ActionReferentiel,
 } from '@tet/api';
 
 type LinkType = {
@@ -28,6 +29,8 @@ export type ActionImpactProps = {
   subventions?: LinkType[] | null;
   /** Statut de l'action */
   statut?: 'non_pertinent' | 'en_cours' | 'realise' | null;
+  /** Actions des référentiels liées */
+  actionsLiees?: ActionReferentiel[] | null;
   /** Indique si l'action est mise dans le panier */
   panier: boolean;
   /** Initialisation de l'état sélectionné de la carte */
diff --git a/packages/panier/components/ListeActions/ListeActionsFiltrees.tsx b/packages/panier/components/ListeActions/ListeActionsFiltrees.tsx
index 5bf04bccda..15602cf73a 100644
--- a/packages/panier/components/ListeActions/ListeActionsFiltrees.tsx
+++ b/packages/panier/components/ListeActions/ListeActionsFiltrees.tsx
@@ -25,6 +25,7 @@ const ListeActionsFiltrees = ({
       {actionsListe.map(action => (
         <ActionImpact
           key={action.action.id}
+          actionsLiees={action.actions_liees}
           titre={action.action.titre}
           thematiques={action.thematiques}
           budget={budgets.find(

From 9fb55e40bdb3aa22971e7f3e5d6fe6a01eabd688 Mon Sep 17 00:00:00 2001
From: Marc Rutkowski <marc@attractive-media.fr>
Date: Fri, 27 Sep 2024 09:12:56 +0200
Subject: [PATCH 29/91] =?UTF-8?q?G=C3=A8re=20un=20=C3=A9tat=20`disabled`?=
 =?UTF-8?q?=20sur=20le=20bouton=20"Cr=C3=A9er=20un=20plan=20d=E2=80=99acti?=
 =?UTF-8?q?on"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/ValidationPanier/ValiderPanierButton.tsx      | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/panier/components/ValidationPanier/ValiderPanierButton.tsx b/packages/panier/components/ValidationPanier/ValiderPanierButton.tsx
index dd938691f7..0274676242 100644
--- a/packages/panier/components/ValidationPanier/ValiderPanierButton.tsx
+++ b/packages/panier/components/ValidationPanier/ValiderPanierButton.tsx
@@ -1,8 +1,8 @@
 'use client';
 
-import {Button, Modal, useEventTracker} from '@tet/ui';
 import {useState} from 'react';
 import {useSearchParams} from 'next/navigation';
+import {Button, Modal, useEventTracker} from '@tet/ui';
 import ValiderPanierModale from './ValiderPanierModale';
 import {usePanierContext} from '@tet/panier/providers';
 
@@ -12,7 +12,7 @@ import {usePanierContext} from '@tet/panier/providers';
  * Contrôle la modale de "Création de plan d’action”
  * Si le paramètre `modale` est égal à `creation` la modale est initialement ouverte
  */
-const ValiderPanierButton = () => {
+const ValiderPanierButton = ({disabled}: {disabled?: boolean}) => {
   const searchParams = useSearchParams();
   const initiallyOpen = searchParams.get('modale') === 'creation';
   const [createModalOpen, setCreateModalOpen] = useState(initiallyOpen);
@@ -23,6 +23,7 @@ const ValiderPanierButton = () => {
     <>
       <Button
         className="w-full justify-center mt-auto"
+        disabled={disabled}
         onClick={() => {
           setCreateModalOpen(true);
           tracker('cta_valider_creation_panier_click', {

From f61f18a39a294dc54feeda4fa27073f245c2600c Mon Sep 17 00:00:00 2001
From: Marc Rutkowski <marc@attractive-media.fr>
Date: Fri, 27 Sep 2024 09:14:17 +0200
Subject: [PATCH 30/91] =?UTF-8?q?Affiche=20le=20bouton=20"Retirer=20des=20?=
 =?UTF-8?q?actions=20r=C3=A9alis=C3=A9es/en=20cours"=20sur=20les=20cartes?=
 =?UTF-8?q?=20plac=C3=A9es=20dans=20une=20de=20ces=20deux=20sous-s=C3=A9le?=
 =?UTF-8?q?ctions?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ActionImpact/CarteActionImpact.tsx        | 49 ++++++++++---------
 1 file changed, 26 insertions(+), 23 deletions(-)

diff --git a/packages/panier/components/ActionImpact/CarteActionImpact.tsx b/packages/panier/components/ActionImpact/CarteActionImpact.tsx
index c6f796ebe9..e775b03d75 100644
--- a/packages/panier/components/ActionImpact/CarteActionImpact.tsx
+++ b/packages/panier/components/ActionImpact/CarteActionImpact.tsx
@@ -42,30 +42,33 @@ export const CarteActionImpact = ({
               </Button>
             ) : (
               <div className="flex flex-row gap-2 h-10">
-                <Button
-                  variant="outlined"
-                  size="xs"
-                  className={classNames({
-                    '!bg-primary-2': statut === 'en_cours',
-                  })}
-                  onClick={() => onUpdateStatus?.('en_cours')}
-                >
-                  En cours
-                </Button>
-                <Button
-                  variant="outlined"
-                  size="xs"
-                  className={classNames({
-                    '!bg-primary-2': statut === 'realise',
-                  })}
-                  onClick={() => onUpdateStatus?.('realise')}
-                >
-                  Réalisée
-                </Button>
+                {statut === 'en_cours' || statut === 'realise' ? (
+                  <Button size="xs" onClick={() => onUpdateStatus?.(statut)}>
+                    Retirer des actions{' '}
+                    {statut === 'realise' ? 'réalisées' : 'en cours'}
+                  </Button>
+                ) : (
+                  <>
+                    <Button
+                      variant="outlined"
+                      size="xs"
+                      onClick={() => onUpdateStatus?.('en_cours')}
+                    >
+                      En cours
+                    </Button>
+                    <Button
+                      variant="outlined"
+                      size="xs"
+                      onClick={() => onUpdateStatus?.('realise')}
+                    >
+                      Réalisée
+                    </Button>
 
-                <Button size="xs" onClick={() => handleToggleSelect(true)}>
-                  Ajouter au panier
-                </Button>
+                    <Button size="xs" onClick={() => handleToggleSelect(true)}>
+                      Ajouter au panier
+                    </Button>
+                  </>
+                )}
               </div>
             )}
             <span className="text-xs font-medium -mb-1">

From dec45d89a0506e07dd47ce776879a0d23d1ec4f2 Mon Sep 17 00:00:00 2001
From: Marc Rutkowski <marc@attractive-media.fr>
Date: Fri, 27 Sep 2024 09:15:38 +0200
Subject: [PATCH 31/91] =?UTF-8?q?Affiche=20un=20message=20=C3=A0=20propos?=
 =?UTF-8?q?=20de=20l'ajout=20des=20actions=20plac=C3=A9es=20"r=C3=A9alis?=
 =?UTF-8?q?=C3=A9es"=20et=20"en=20cours"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../panier/components/ListeActions/index.tsx  | 65 +++++++++++++++++--
 1 file changed, 58 insertions(+), 7 deletions(-)

diff --git a/packages/panier/components/ListeActions/index.tsx b/packages/panier/components/ListeActions/index.tsx
index 3b045c846d..ae76ad5d7d 100644
--- a/packages/panier/components/ListeActions/index.tsx
+++ b/packages/panier/components/ListeActions/index.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable react/no-unescaped-entities */
 import {useSearchParams} from 'next/navigation';
 import {
   ActionImpactFourchetteBudgetaire,
@@ -5,7 +6,14 @@ import {
   ActionImpactTempsMiseEnOeuvre,
   ActionImpactThematique,
 } from '@tet/api';
-import {PanierOngletName, Tab, Tabs} from '@tet/ui';
+import {
+  Alert,
+  Button,
+  PanierOngletName,
+  SITE_BASE_URL,
+  Tab,
+  Tabs,
+} from '@tet/ui';
 import ListeActionsFiltrees from './ListeActionsFiltrees';
 import ListeVide from './ListeVide';
 import FiltresActions from '@tet/panier/components/FiltresActions';
@@ -92,12 +100,55 @@ const ListeActions = ({
               !actionsFiltrees.length ? (
               <ListeVide />
             ) : (
-              <ListeActionsFiltrees
-                actionsListe={actionsFiltrees}
-                onUpdateStatus={onUpdateStatus}
-                onToggleSelected={onToggleSelected}
-                {...{budgets, temps}}
-              />
+              <>
+                {(tab.status === 'en_cours' || tab.status === 'realise') && (
+                  <Alert
+                    className="mb-6"
+                    title="Souhaitez-vous ajouter ces actions à votre panier ?"
+                    footer={
+                      tab.status === 'realise' ? (
+                        <div className="inline">
+                          Valorisez ces actions "réalisées" sur l'&nbsp;
+                          <Button
+                            className="inline-flex mr-1"
+                            variant="underlined"
+                            href={`${SITE_BASE_URL}/outil-numerique`}
+                            external
+                          >
+                            outil numérique
+                          </Button>
+                          aux côtés des actions en cours et à venir pour
+                          constituer et piloter un plan d'action sur l'outil
+                          numérique. Il vous suffit de cocher la case "Ajouter
+                          les actions classées comme “réalisées” au niveau du
+                          panier à droite.
+                        </div>
+                      ) : (
+                        <div className="inline">
+                          Pour retrouver ces actions "en cours" sur l'&nbsp;
+                          <Button
+                            className="inline-flex mr-1"
+                            variant="underlined"
+                            href={`${SITE_BASE_URL}/outil-numerique`}
+                            external
+                          >
+                            outil numérique
+                          </Button>
+                          et les piloter, il vous suffit de cocher la case
+                          "Ajouter les actions classées comme “en cours” au
+                          niveau du panier à droite.
+                        </div>
+                      )
+                    }
+                  />
+                )}
+                <ListeActionsFiltrees
+                  actionsListe={actionsFiltrees}
+                  onUpdateStatus={onUpdateStatus}
+                  onToggleSelected={onToggleSelected}
+                  {...{budgets, temps}}
+                />
+              </>
             )}
           </Tab>
         );

From 8a2c06b733f81815fce9763ed5a3cac1acf80629 Mon Sep 17 00:00:00 2001
From: Marc Rutkowski <marc@attractive-media.fr>
Date: Fri, 27 Sep 2024 09:23:05 +0200
Subject: [PATCH 32/91] =?UTF-8?q?Ajoute=20les=20cases=20=C3=A0=20cocher=20?=
 =?UTF-8?q?(et=20le=20gestionnaire=20d'=C3=A9tat=20associ=C3=A9)=20permett?=
 =?UTF-8?q?ant=20d'ajouter/enlever=20la=20s=C3=A9lection=20d'actions=20"r?=
 =?UTF-8?q?=C3=A9alis=C3=A9es"=20ou=20"en=20cours"=20du=20panier?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AjouterActionsRealiseesOuEnCours.tsx      | 48 +++++++++++
 .../panier/components/PanierActions/index.tsx | 36 ++++++--
 ...eAjouterActionsRealiseesOuEnCoursState.tsx | 85 +++++++++++++++++++
 3 files changed, 161 insertions(+), 8 deletions(-)
 create mode 100644 packages/panier/components/PanierActions/AjouterActionsRealiseesOuEnCours.tsx
 create mode 100644 packages/panier/components/PanierActions/useAjouterActionsRealiseesOuEnCoursState.tsx

diff --git a/packages/panier/components/PanierActions/AjouterActionsRealiseesOuEnCours.tsx b/packages/panier/components/PanierActions/AjouterActionsRealiseesOuEnCours.tsx
new file mode 100644
index 0000000000..791aa756be
--- /dev/null
+++ b/packages/panier/components/PanierActions/AjouterActionsRealiseesOuEnCours.tsx
@@ -0,0 +1,48 @@
+import {ActionImpactState} from '@tet/api';
+import {Checkbox} from '@tet/ui';
+import classNames from 'classnames';
+import {AjouterActionsRealiseesOuEnCoursState} from './useAjouterActionsRealiseesOuEnCoursState';
+
+/**
+ * Affiche les cases à cocher permettant d'ajouter/enlever la sélection
+ * d'actions "réalisées" ou "en cours" du panier
+ */
+export const AjouterActionsRealiseesOuEnCours = ({
+  className,
+  state,
+}: {
+  className?: string;
+  state: AjouterActionsRealiseesOuEnCoursState;
+}) => {
+  const {
+    nbEnCours,
+    nbEnCoursInPanier,
+    nbRealisees,
+    nbRealiseesInPanier,
+    ajoutEnCours,
+    toggleAjoutEnCours,
+    ajoutRealisees,
+    toggleAjoutRealisees,
+  } = state;
+
+  return nbEnCours + nbRealisees === 0 ? null : (
+    <div
+      className={classNames('flex flex-col items-center gap-2 mb-8', className)}
+    >
+      {!!nbEnCours && (
+        <Checkbox
+          label={`Ajouter les actions classées “en cours” (${nbEnCoursInPanier}/${nbEnCours})`}
+          checked={ajoutEnCours}
+          onChange={toggleAjoutEnCours}
+        />
+      )}
+      {!!nbRealisees && (
+        <Checkbox
+          label={`Ajouter les actions classées “réalisées” (${nbRealiseesInPanier}/${nbRealisees})`}
+          checked={ajoutRealisees}
+          onChange={toggleAjoutRealisees}
+        />
+      )}
+    </div>
+  );
+};
diff --git a/packages/panier/components/PanierActions/index.tsx b/packages/panier/components/PanierActions/index.tsx
index 04f38694d3..a7b73b32cb 100644
--- a/packages/panier/components/PanierActions/index.tsx
+++ b/packages/panier/components/PanierActions/index.tsx
@@ -5,7 +5,8 @@ import EmptyBasketPicto from '@tet/panier/components/Picto/EmptyBasketPicto';
 import ValiderPanierButton from '@tet/panier/components/ValidationPanier/ValiderPanierButton';
 import {ActionImpactFourchetteBudgetaire, ActionImpactSnippet} from '@tet/api';
 import {Alert} from '@tet/ui';
-import React from 'react';
+import {AjouterActionsRealiseesOuEnCours} from './AjouterActionsRealiseesOuEnCours';
+import {useAjouterActionsRealiseesOuEnCoursState} from './useAjouterActionsRealiseesOuEnCoursState';
 
 type PanierActionsProps = {
   actionsListe: ActionImpactSnippet[];
@@ -18,20 +19,34 @@ const PanierActions = ({
   budgets,
   onToggleSelected,
 }: PanierActionsProps) => {
+  const ajouterActionsRealiseesOuEnCours =
+    useAjouterActionsRealiseesOuEnCoursState();
+  const {nbEnCours, nbRealisees} = ajouterActionsRealiseesOuEnCours;
+
   return (
     <div className="lg:h-screen lg:w-2/5 xl:w-1/3 bg-white border-[0.5px] border-primary-3 sticky top-0">
       {actionsListe.length === 0 ? (
-        <div className="h-full relative">
+        <div className="h-full flex flex-col items-center">
           <Alert
             title="Comment ajouter des actions ?"
             description={`Pour ajouter des actions à votre panier, veuillez cliquer sur le bouton "Ajouter" qui s'affiche au survol de chacune des vignettes d'action.`}
-            className="lg:absolute"
           />
-          <div className="h-full flex flex-col items-center justify-center max-lg:py-4">
-            <EmptyBasketPicto />
-            <span className="text-primary-8 text-lg font-bold text-center">
-              Votre panier d'actions est vide !
-            </span>
+          <div className="w-full relative p-4">
+            <AjouterActionsRealiseesOuEnCours
+              className="mt-4"
+              state={ajouterActionsRealiseesOuEnCours}
+            />
+            {nbEnCours + nbRealisees > 0 && (
+              <ValiderPanierButton disabled={true} />
+            )}
+          </div>
+          <div className="flex items-center h-full">
+            <div className="flex flex-col items-center max-lg:py-4">
+              <EmptyBasketPicto />
+              <span className="text-primary-8 text-lg font-bold text-center">
+                Votre panier d'actions est vide !
+              </span>
+            </div>
           </div>
         </div>
       ) : (
@@ -45,6 +60,11 @@ const PanierActions = ({
                 {actionsListe.length} action{actionsListe.length > 1 ? 's' : ''}{' '}
                 dans mon panier
               </div>
+              <AjouterActionsRealiseesOuEnCours
+                className="justify-self-start mt-4"
+                state={ajouterActionsRealiseesOuEnCours}
+              />
+
               <ValiderPanierButton />
               <div className="h-12 bg-gradient-to-b from-white via-white" />
             </div>
diff --git a/packages/panier/components/PanierActions/useAjouterActionsRealiseesOuEnCoursState.tsx b/packages/panier/components/PanierActions/useAjouterActionsRealiseesOuEnCoursState.tsx
new file mode 100644
index 0000000000..f2aa79e610
--- /dev/null
+++ b/packages/panier/components/PanierActions/useAjouterActionsRealiseesOuEnCoursState.tsx
@@ -0,0 +1,85 @@
+import {Panier} from '@tet/api';
+import {useState, useEffect} from 'react';
+import {panierAPI} from 'src/clientAPI';
+import {usePanierContext} from '../../providers';
+
+/**
+ * Fourni les décomptes d'actions réalisées/en cours totaux et ajouter dans le panier
+ * ainsi que des fonctions pour ajouter/enlever une de ces sous-sélections du panier.
+ */
+export const useAjouterActionsRealiseesOuEnCoursState = () => {
+  const {panier} = usePanierContext();
+
+  const {
+    count: nbEnCours,
+    countInPanier: nbEnCoursInPanier,
+    ajout: ajoutEnCours,
+    toggleAjout: toggleAjoutEnCours,
+  } = useToggleAjoutActions(panier, 'en_cours');
+  const {
+    count: nbRealisees,
+    countInPanier: nbRealiseesInPanier,
+    ajout: ajoutRealisees,
+    toggleAjout: toggleAjoutRealisees,
+  } = useToggleAjoutActions(panier, 'realise');
+
+  return {
+    nbEnCours,
+    nbEnCoursInPanier,
+    ajoutEnCours,
+    toggleAjoutEnCours,
+    nbRealisees,
+    nbRealiseesInPanier,
+    ajoutRealisees,
+    toggleAjoutRealisees,
+  };
+};
+export type AjouterActionsRealiseesOuEnCoursState = ReturnType<
+  typeof useAjouterActionsRealiseesOuEnCoursState
+>;
+
+// enlève/ajoute un sous-ensemble d'actions dans le panier
+const useToggleAjoutActions = (
+  panier: Panier | null,
+  subset: 'en_cours' | 'realise',
+) => {
+  const [ajout, setAjout] = useState(false);
+
+  const panierId = panier?.id;
+
+  // le sous-ensemble
+  const actions = panier?.states.filter(
+    state => state.statut?.categorie_id === subset,
+  );
+
+  // nombre d'items total et dans le panier
+  const count = actions?.length ?? 0;
+  const countInPanier =
+    actions?.filter(action => action.isinpanier).length ?? 0;
+
+  // ajoute/enlève les actions du panier
+  const toggleAjout = () => {
+    if (!actions?.length || !panierId) return;
+    if (ajout) {
+      actions.forEach(state =>
+        panierAPI.removeActionFromPanier(state.action.id, panierId),
+      );
+    } else {
+      actions.forEach(state =>
+        panierAPI.addActionToPanier(state.action.id, panierId),
+      );
+    }
+    setAjout(!ajout);
+  };
+
+  // synchronise l'état si il n'y a plus d'actions dans le panier
+  useEffect(() => {
+    if (!countInPanier && ajout) {
+      setAjout(false);
+    } else if (countInPanier && !ajout) {
+      setAjout(true);
+    }
+  }, [countInPanier, ajout]);
+
+  return {ajout, toggleAjout, count, countInPanier};
+};

From c2bbd8e77f22bb5b29ae3976493fb9b0d83c5fdc Mon Sep 17 00:00:00 2001
From: Marc Rutkowski <marc@attractive-media.fr>
Date: Fri, 27 Sep 2024 09:41:04 +0200
Subject: [PATCH 33/91] =?UTF-8?q?Ajoute=20une=20fonction=20permettant=20d'?=
 =?UTF-8?q?obtenir=20l'id=20du=20panier=20d'une=20collectivit=C3=A9=20et?=
 =?UTF-8?q?=20le=20nombre=20d'actions=20de=20celui-ci?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/src/panier_action_impact/panierAPI.ts   | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/packages/api/src/panier_action_impact/panierAPI.ts b/packages/api/src/panier_action_impact/panierAPI.ts
index 92a840779b..8029658079 100644
--- a/packages/api/src/panier_action_impact/panierAPI.ts
+++ b/packages/api/src/panier_action_impact/panierAPI.ts
@@ -171,6 +171,23 @@ export class PanierAPI {
     return data;
   }
 
+  /**
+   * Renvoi l'id du panier d'une collectivité et le nombre d'actions de celui-ci
+   */
+  async getCollectivitePanierInfo(collectivite_id: number) {
+    const {data, error} = await this.supabase
+      .from('panier')
+      .select('id,actions:action_impact_state(isinpanier)')
+      .or(
+        `collectivite_id.eq.${collectivite_id},collectivite_preset.eq.${collectivite_id}`
+      )
+      .is('action_impact_state.isinpanier', true);
+    if (error) throw error;
+    return data?.[0]
+      ? {panierId: data[0].id, count: data[0].actions?.length ?? 0}
+      : null;
+  }
+
   /**
    * Crée un plan d'action pour la collectivité à partir d'un panier
    *

From 19371ef6842d4337a58761e73e5c763eae4aa7a1 Mon Sep 17 00:00:00 2001
From: Marc Rutkowski <marc@attractive-media.fr>
Date: Mon, 30 Sep 2024 16:26:28 +0200
Subject: [PATCH 34/91] Ajoute le lien vers le panier dans l'app

---
 .../app/Layout/Header/AccesPanierAction.tsx   | 45 +++++++++++++++++++
 .../src/app/Layout/Header/AccesRapide.tsx     |  6 +++
 2 files changed, 51 insertions(+)
 create mode 100644 app.territoiresentransitions.react/src/app/Layout/Header/AccesPanierAction.tsx

diff --git a/app.territoiresentransitions.react/src/app/Layout/Header/AccesPanierAction.tsx b/app.territoiresentransitions.react/src/app/Layout/Header/AccesPanierAction.tsx
new file mode 100644
index 0000000000..44c92752aa
--- /dev/null
+++ b/app.territoiresentransitions.react/src/app/Layout/Header/AccesPanierAction.tsx
@@ -0,0 +1,45 @@
+import {useQuery} from 'react-query';
+import {PanierAPI} from '@tet/api';
+import {Button} from '@tet/ui';
+import {supabaseClient} from 'core-logic/api/supabase';
+import {useCollectiviteId} from 'core-logic/hooks/params';
+import {ENV} from 'environmentVariables';
+import classNames from 'classnames';
+
+const panierAPI = new PanierAPI(supabaseClient);
+
+/**
+ * Affiche un bouton d'accès au panier d'actions
+ */
+export const AccesPanierAction = () => {
+  const collectiviteId = useCollectiviteId();
+  const {data} = useNbActionsDansPanier(collectiviteId);
+  const {panierId, count} = data || {};
+
+  return (
+    panierId && (
+      <Button
+        variant="white"
+        className={classNames('text-primary-9', {'mr-2': !!count})}
+        size="sm"
+        icon="shopping-basket-2-line"
+        notification={count ? {number: count, variant: 'info'} : undefined}
+        onClick={() => {
+          window.open(`${ENV.panier_url}/panier/${panierId}`, '_blank');
+        }}
+      >
+        Panier d'action
+      </Button>
+    )
+  );
+};
+
+/**
+ * Charge le nombre d'actions présentes dans le panier d'une collectivité
+ */
+export const useNbActionsDansPanier = (collectiviteId: number | null) => {
+  return useQuery(['nb_actions_dans_panier', collectiviteId], async () => {
+    if (!collectiviteId) return;
+    return panierAPI.getCollectivitePanierInfo(collectiviteId);
+  });
+};
diff --git a/app.territoiresentransitions.react/src/app/Layout/Header/AccesRapide.tsx b/app.territoiresentransitions.react/src/app/Layout/Header/AccesRapide.tsx
index aba22b7bf0..6fcb6dfe64 100644
--- a/app.territoiresentransitions.react/src/app/Layout/Header/AccesRapide.tsx
+++ b/app.territoiresentransitions.react/src/app/Layout/Header/AccesRapide.tsx
@@ -2,6 +2,7 @@ import {signInPath, signUpPath} from 'app/paths';
 import {useFonctionTracker} from 'core-logic/hooks/useFonctionTracker';
 import MenuUtilisateur from './MenuUtilisateur';
 import {HeaderPropsWithModalState} from './types';
+import {AccesPanierAction} from './AccesPanierAction';
 
 /** liens en "accès rapide" */
 export const AccesRapide = (props: HeaderPropsWithModalState) => {
@@ -10,6 +11,11 @@ export const AccesRapide = (props: HeaderPropsWithModalState) => {
 
   return (
     <ul className="fr-btns-group">
+      {isConnected && user && (
+        <li>
+          <AccesPanierAction />
+        </li>
+      )}
       <li onClick={() => setModalOpened(false)}>
         <Aide />
       </li>

From c39d8fbef7d9afe6fda420dfdeefbdbd654e40ee Mon Sep 17 00:00:00 2001
From: Marc Rutkowski <marc@attractive-media.fr>
Date: Mon, 30 Sep 2024 16:58:11 +0200
Subject: [PATCH 35/91] =?UTF-8?q?Utilise=20les=20composants=20Button=20du?=
 =?UTF-8?q?=20DS=20dans=20l'en-t=C3=AAte=20de=20l'app?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(TODO: utiliser HeaderTeT quand le MenuPrincipal sera intégré dedans)
---
 .../src/app/Layout/Header/AccesRapide.tsx     | 28 +++++++++----
 .../src/app/Layout/Header/MenuUtilisateur.tsx | 42 +++++++++++--------
 2 files changed, 43 insertions(+), 27 deletions(-)

diff --git a/app.territoiresentransitions.react/src/app/Layout/Header/AccesRapide.tsx b/app.territoiresentransitions.react/src/app/Layout/Header/AccesRapide.tsx
index 6fcb6dfe64..b7c6f83697 100644
--- a/app.territoiresentransitions.react/src/app/Layout/Header/AccesRapide.tsx
+++ b/app.territoiresentransitions.react/src/app/Layout/Header/AccesRapide.tsx
@@ -3,6 +3,7 @@ import {useFonctionTracker} from 'core-logic/hooks/useFonctionTracker';
 import MenuUtilisateur from './MenuUtilisateur';
 import {HeaderPropsWithModalState} from './types';
 import {AccesPanierAction} from './AccesPanierAction';
+import {Button} from '@tet/ui';
 
 /** liens en "accès rapide" */
 export const AccesRapide = (props: HeaderPropsWithModalState) => {
@@ -26,24 +27,30 @@ export const AccesRapide = (props: HeaderPropsWithModalState) => {
       ) : (
         <>
           <li>
-            <a
+            <Button
               data-test="signup"
+              className="text-primary-9"
+              variant="white"
+              size="sm"
+              icon="add-circle-line"
               href={signUpPath}
-              className="fr-btn fr-icon-add-circle-line"
               onClick={() => setModalOpened(false)}
             >
               Créer un compte
-            </a>
+            </Button>
           </li>
           <li>
-            <a
+            <Button
               data-test="signin"
+              className="text-primary-9"
+              variant="white"
+              size="sm"
+              icon="user-line"
               href={signInPath}
-              className="fr-btn fr-icon-account-line"
               onClick={() => setModalOpened(false)}
             >
               Se connecter
-            </a>
+            </Button>
           </li>
         </>
       )}
@@ -66,12 +73,15 @@ const Aide = () => {
   };
 
   return (
-    <button
+    <Button
       data-test="help"
-      className="fr-btn fr-fi-question-line"
+      className="text-primary-9"
+      variant="white"
+      size="sm"
+      icon="question-line"
       onClick={onClick}
     >
       Aide
-    </button>
+    </Button>
   );
 };
diff --git a/app.territoiresentransitions.react/src/app/Layout/Header/MenuUtilisateur.tsx b/app.territoiresentransitions.react/src/app/Layout/Header/MenuUtilisateur.tsx
index 9e118ec2a2..8d1a9eaf47 100644
--- a/app.territoiresentransitions.react/src/app/Layout/Header/MenuUtilisateur.tsx
+++ b/app.territoiresentransitions.react/src/app/Layout/Header/MenuUtilisateur.tsx
@@ -7,6 +7,7 @@ import {TAuthContext, UserData} from 'core-logic/api/auth/AuthProvider';
 import DropdownFloater from 'ui/shared/floating-ui/DropdownFloater';
 import {HeaderPropsWithModalState} from './types';
 import './MenuUtilisateur.css';
+import {Button} from '@tet/ui';
 
 /**
  * Affiche le menu associé à l'utilisateur courant
@@ -23,7 +24,7 @@ const MenuUtilisateur = (props: HeaderPropsWithModalState) => {
   return (
     <DropdownFloater
       placement="bottom"
-      offsetValue={-12}
+      offsetValue={0}
       zIndex={2000}
       render={({close}) => (
         <div
@@ -66,23 +67,28 @@ const MenuUtilisateurBtn = forwardRef(
     },
     ref?: Ref<HTMLDivElement>
   ) => (
-    <div ref={ref} {...props}>
-      <button
-        data-test="connectedMenu"
-        className={`user-menu fr-btn fr-icon-${
-          user.isSupport ? 'customer-service' : 'account'
-        }-${isUserPath ? 'fill' : 'line'}`}
-        style={{maxWidth: '15rem'}}
-        aria-expanded={isOpen}
-      >
-        <span className="line-clamp-1">{user.prenom}</span>
-        <i
-          className={classNames('fr-fi-arrow-down-s-line ml-2 transition-all', {
-            'rotate-180': isOpen,
-          })}
-        />
-      </button>
-    </div>
+    <Button
+      ref={ref}
+      {...props}
+      data-test="connectedMenu"
+      variant="white"
+      size="sm"
+      className={classNames('user-menu text-primary-9 pr-2', {
+        'rounded-b-none': isOpen,
+      })}
+      icon={`${user.isSupport ? 'customer-service' : 'account-circle'}-${
+        isUserPath ? 'fill' : 'line'
+      }`}
+      style={{maxWidth: '15rem'}}
+      aria-expanded={isOpen}
+    >
+      <span className="line-clamp-1">{user.prenom}</span>
+      <i
+        className={classNames('fr-fi-arrow-down-s-line ml-2 transition-all', {
+          'rotate-180': isOpen,
+        })}
+      />
+    </Button>
   )
 );
 

From 02edd7834bffe43906dba1150e2649c51cd85a23 Mon Sep 17 00:00:00 2001
From: Marc Rutkowski <marc@attractive-media.fr>
Date: Mon, 30 Sep 2024 19:05:12 +0200
Subject: [PATCH 36/91] =?UTF-8?q?D=C3=A9termine=20si=20une=20action=20?=
 =?UTF-8?q?=C3=A0=20impact=20est=20d=C3=A9j=C3=A0=20import=C3=A9e=20dans?=
 =?UTF-8?q?=20un=20PA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/src/panier_action_impact/panierAPI.ts | 34 ++++++++++++++++++-
 .../api/src/panier_action_impact/types.ts     |  1 +
 2 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/packages/api/src/panier_action_impact/panierAPI.ts b/packages/api/src/panier_action_impact/panierAPI.ts
index 8029658079..c50321dd6e 100644
--- a/packages/api/src/panier_action_impact/panierAPI.ts
+++ b/packages/api/src/panier_action_impact/panierAPI.ts
@@ -168,7 +168,7 @@ export class PanierAPI {
 
     const {data, error} = await builder.single<Panier>();
     if (error) throw error;
-    return data;
+    return this.ajouteActionsDejaImportees(data);
   }
 
   /**
@@ -188,6 +188,38 @@ export class PanierAPI {
       : null;
   }
 
+  /**
+   * Ajoute aux items du tableau `states` un nouveau flag `dejaImportee`
+   * si une action à impact est liée à une fiche action de la collectivité.
+   */
+  async ajouteActionsDejaImportees(panier: Panier) {
+    const collectiviteId =
+      panier?.collectivite_id ?? panier?.collectivite_preset;
+    if (!collectiviteId) {
+      return panier;
+    }
+
+    const {data, error} = await this.supabase
+      .from('fiche_action')
+      .select('action_impact_fiche_action!inner(action_impact_id)')
+      .eq('collectivite_id', collectiviteId);
+    if (error) throw error;
+    const actionsDejaImportees = data?.flatMap(row =>
+      row.action_impact_fiche_action.map(action => action.action_impact_id)
+    );
+    if (!actionsDejaImportees?.length) {
+      return panier;
+    }
+
+    return {
+      ...panier,
+      states: panier.states?.map(state => ({
+        ...state,
+        dejaImportee: actionsDejaImportees.includes(state.action.id),
+      })),
+    };
+  }
+
   /**
    * Crée un plan d'action pour la collectivité à partir d'un panier
    *
diff --git a/packages/api/src/panier_action_impact/types.ts b/packages/api/src/panier_action_impact/types.ts
index 4f792173f1..2fd60da433 100644
--- a/packages/api/src/panier_action_impact/types.ts
+++ b/packages/api/src/panier_action_impact/types.ts
@@ -60,6 +60,7 @@ export type ActionImpactState = {
   thematiques: ActionImpactThematique[];
   actions_liees: ActionReferentiel[] | null;
   matches_competences: boolean;
+  dejaImportee?: boolean;
 };
 
 

From 8fe36217dcdbc7d2c819b490fc7095918e542b21 Mon Sep 17 00:00:00 2001
From: Marc Rutkowski <marc@attractive-media.fr>
Date: Mon, 30 Sep 2024 19:07:50 +0200
Subject: [PATCH 37/91] =?UTF-8?q?Ajoute=20l'onglet=20"fiches=20d=C3=A9j?=
 =?UTF-8?q?=C3=A0=20import=C3=A9es"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../panier/components/ListeActions/index.tsx  | 32 +++++++++++++++----
 .../src/components/tracking/trackingPlan.ts   |  6 +++-
 2 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/packages/panier/components/ListeActions/index.tsx b/packages/panier/components/ListeActions/index.tsx
index ae76ad5d7d..9c9a6ecab9 100644
--- a/packages/panier/components/ListeActions/index.tsx
+++ b/packages/panier/components/ListeActions/index.tsx
@@ -71,6 +71,15 @@ const ListeActions = ({
     },
   ];
 
+  const actionsDejaImportees = actionsListe.filter(state => state.dejaImportee);
+  if (actionsDejaImportees.length) {
+    tabsList.push({
+      label: 'Fiches déjà importées',
+      shortName: 'importees',
+      status: 'importees',
+    });
+  }
+
   return (
     <Tabs
       onChange={activeTab => onChangeTab(tabsList[activeTab].shortName)}
@@ -79,12 +88,15 @@ const ListeActions = ({
       tabsListClassName="!justify-start mb-0"
     >
       {...tabsList.map(tab => {
-        const actionsFiltrees = actionsListe.filter(
-          a =>
-            ((!a.statut && a.statut === tab.status) ||
-              (a.statut && a.statut.categorie_id === tab.status)) &&
-            (tab.status || !a.isinpanier),
-        );
+        const actionsFiltrees =
+          tab.shortName === 'importees'
+            ? actionsDejaImportees
+            : actionsListe.filter(
+                a =>
+                  ((!a.statut && a.statut === tab.status) ||
+                    (a.statut && a.statut.categorie_id === tab.status)) &&
+                  (tab.status || !a.isinpanier),
+              );
 
         return (
           <Tab key={tab.label} label={getTabLabel(tab, actionsFiltrees.length)}>
@@ -142,6 +154,14 @@ const ListeActions = ({
                     }
                   />
                 )}
+                {tab.shortName === 'importees' && (
+                  <Alert
+                    className="mb-4"
+                    state="info"
+                    title="Ces fiches action ont déjà été ajoutées à votre plan d’action sur l’outil numérique territoires en transitions, retrouvez les dans votre onglet connecté Plans d’action"
+                  />
+                )}
+
                 <ListeActionsFiltrees
                   actionsListe={actionsFiltrees}
                   onUpdateStatus={onUpdateStatus}
diff --git a/packages/ui/src/components/tracking/trackingPlan.ts b/packages/ui/src/components/tracking/trackingPlan.ts
index 848e836523..1196b5c66d 100644
--- a/packages/ui/src/components/tracking/trackingPlan.ts
+++ b/packages/ui/src/components/tracking/trackingPlan.ts
@@ -28,7 +28,11 @@ export type PageProperties<N extends PageName> =
 /**
  * Liste des onglets de la page panier
  */
-export type PanierOngletName = 'selection' | 'réalisées' | 'en cours';
+export type PanierOngletName =
+  | 'selection'
+  | 'réalisées'
+  | 'en cours'
+  | 'importees';
 
 /** Pour le tracking de page sans données additionnelles */
 type NoProps = {

From b535fe56a5384e075fa3de65955efba721318de0 Mon Sep 17 00:00:00 2001
From: Marc Rutkowski <marc@attractive-media.fr>
Date: Tue, 1 Oct 2024 08:46:08 +0200
Subject: [PATCH 38/91] =?UTF-8?q?Evite=20de=20charger=20en=20double=20les?=
 =?UTF-8?q?=20informations=20des=20actions=20=C3=A0=20impact?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/src/panier_action_impact/panierAPI.ts | 20 ++++++++-----------
 .../api/src/panier_action_impact/types.ts     |  9 ---------
 .../panier/components/PanierActions/index.tsx |  8 ++++----
 .../components/PanierRealtime/index.tsx       |  2 +-
 packages/panier/hooks/useLandingPathname.ts   |  4 ++--
 5 files changed, 15 insertions(+), 28 deletions(-)

diff --git a/packages/api/src/panier_action_impact/panierAPI.ts b/packages/api/src/panier_action_impact/panierAPI.ts
index c50321dd6e..dbd58f284b 100644
--- a/packages/api/src/panier_action_impact/panierAPI.ts
+++ b/packages/api/src/panier_action_impact/panierAPI.ts
@@ -4,19 +4,15 @@ import { MesCollectivite, Panier, PanierBase } from './types';
 
 /**
  * On sélectionne toutes les colonnes du panier : *
- * puis les `action_impact` par la relation `action_impact_panier` que l'on renomme `contenuPanier`
+ * puis les `action_impact` par la relation `action_impact_state` que l'on renomme `states`
  */
-export const panierSelect =
-  '*,' +
-  'contenu:action_impact!action_impact_panier(*,thematiques:thematique(*)),' +
-  'states:action_impact_state(' +
-  '*,' +
-  'thematiques:thematique(*),' +
-  'fourchette_budgetaire:action_impact_fourchette_budgetaire(*),' +
-  'temps_de_mise_en_oeuvre:action_impact_temps_de_mise_en_oeuvre(*),' +
-  'actions_liees:action_definition(identifiant,referentiel,nom)' +
-  ')' +
-  ')';
+export const panierSelect = `*,states:action_impact_state(
+    *,
+    thematiques:thematique(*),
+    fourchette_budgetaire:action_impact_fourchette_budgetaire(*),
+    temps_de_mise_en_oeuvre:action_impact_temps_de_mise_en_oeuvre(*),
+    actions_liees:action_definition(identifiant,referentiel,nom)
+)`;
 
 type RealtimePayload<T> = {
   type: string;
diff --git a/packages/api/src/panier_action_impact/types.ts b/packages/api/src/panier_action_impact/types.ts
index 2fd60da433..5aa56fad8d 100644
--- a/packages/api/src/panier_action_impact/types.ts
+++ b/packages/api/src/panier_action_impact/types.ts
@@ -32,13 +32,6 @@ export type ActionImpact = Omit<
   subventions_mobilisables: Link[];
 };
 
-/* Le resumé d'une action à impact, utilisé pour les cartes  */
-export type ActionImpactSnippet =
-  // todo: Omit<ActionImpact, 'description' | 'ressources_externes'>
-  ActionImpact & {
-    thematiques: ActionImpactThematique[];
-  };
-
 /* Une action à impact avec des informations complémentaires, utilisé par la modale */
 export type ActionImpactDetails = ActionImpact & {
   thematiques: ActionImpactThematique[];
@@ -69,8 +62,6 @@ export type PanierBase = Database['public']['Tables']['panier']['Row'];
 export type Panier =
   /* Le panier en tant que tel */
   PanierBase & {
-    /* Liste des actions ajoutée au panier */
-    contenu: ActionImpactSnippet[];
     /* Liste de toutes les actions avec leurs states. */
     states: ActionImpactState[];
   };
diff --git a/packages/panier/components/PanierActions/index.tsx b/packages/panier/components/PanierActions/index.tsx
index a7b73b32cb..0441f1999a 100644
--- a/packages/panier/components/PanierActions/index.tsx
+++ b/packages/panier/components/PanierActions/index.tsx
@@ -3,13 +3,13 @@ import {ActionImpact} from '@tet/panier/components/ActionImpact';
 import BasketPicto from '@tet/panier/components/Picto/BasketPicto';
 import EmptyBasketPicto from '@tet/panier/components/Picto/EmptyBasketPicto';
 import ValiderPanierButton from '@tet/panier/components/ValidationPanier/ValiderPanierButton';
-import {ActionImpactFourchetteBudgetaire, ActionImpactSnippet} from '@tet/api';
+import {ActionImpactFourchetteBudgetaire, ActionImpactState} from '@tet/api';
 import {Alert} from '@tet/ui';
 import {AjouterActionsRealiseesOuEnCours} from './AjouterActionsRealiseesOuEnCours';
 import {useAjouterActionsRealiseesOuEnCoursState} from './useAjouterActionsRealiseesOuEnCoursState';
 
 type PanierActionsProps = {
-  actionsListe: ActionImpactSnippet[];
+  actionsListe: ActionImpactState[];
   budgets: ActionImpactFourchetteBudgetaire[];
   onToggleSelected: (actionId: number, selected: boolean) => void;
 };
@@ -70,12 +70,12 @@ const PanierActions = ({
             </div>
 
             <div className="grid md:max-lg:grid-cols-2 gap-4">
-              {actionsListe.map(action => (
+              {actionsListe.map(({action, thematiques}) => (
                 <ActionImpact
                   key={action.id}
                   description={action.description}
                   titre={action.titre}
-                  thematiques={action.thematiques}
+                  thematiques={thematiques}
                   budget={budgets.find(
                     b => b.niveau === action.fourchette_budgetaire,
                   )}
diff --git a/packages/panier/components/PanierRealtime/index.tsx b/packages/panier/components/PanierRealtime/index.tsx
index 9d16ac09ba..38f1dc6a10 100644
--- a/packages/panier/components/PanierRealtime/index.tsx
+++ b/packages/panier/components/PanierRealtime/index.tsx
@@ -133,7 +133,7 @@ const PanierRealtime = ({
       </div>
 
       <PanierActions
-        actionsListe={panier.contenu}
+        actionsListe={panier.states.filter(({isinpanier}) => isinpanier)}
         budgets={budgets}
         onToggleSelected={handleToggleSelected}
       />
diff --git a/packages/panier/hooks/useLandingPathname.ts b/packages/panier/hooks/useLandingPathname.ts
index 07fc19a252..0206b9b814 100644
--- a/packages/panier/hooks/useLandingPathname.ts
+++ b/packages/panier/hooks/useLandingPathname.ts
@@ -13,10 +13,10 @@ const useLandingPathname = () => {
       setLandingPathname(pathname);
     } else if (collectiviteId) {
       setLandingPathname(`/landing/collectivite/${collectiviteId}`);
-    } else if (panier?.id && panier.contenu.length > 0) {
+    } else if (panier?.id && panier.states.length > 0) {
       setLandingPathname(`/landing/panier/${panier.id}`);
     }
-  }, [pathname, collectiviteId, panier?.id, panier?.contenu.length]);
+  }, [pathname, collectiviteId, panier?.id, panier?.states.length]);
 
   return landingPathname;
 };

From 3b5ffe57edad41d65ec192461e8bcef20c020dc0 Mon Sep 17 00:00:00 2001
From: Marc Rutkowski <marc@attractive-media.fr>
Date: Tue, 1 Oct 2024 11:23:07 +0200
Subject: [PATCH 39/91] =?UTF-8?q?Corrige=20un=20libell=C3=A9=20et=20change?=
 =?UTF-8?q?=20les=20styles=20des=20titres=20de=20section?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/panier/components/Landing/CommentCaMarche.tsx | 2 +-
 packages/panier/components/Landing/index.tsx           | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/packages/panier/components/Landing/CommentCaMarche.tsx b/packages/panier/components/Landing/CommentCaMarche.tsx
index 17ab6ee466..0927f9a600 100644
--- a/packages/panier/components/Landing/CommentCaMarche.tsx
+++ b/packages/panier/components/Landing/CommentCaMarche.tsx
@@ -1,6 +1,6 @@
 export const CommentCaMarche = () => (
   <>
-    <h3>Comment ça marche ? </h3>
+    <h3 className="text-primary-8">Comment ça marche ? </h3>
     <ul className="list-decimal list-outside text-lg text-primary-10 font-bold pl-5">
       <li>Explorez les actions disponibles</li>
       <p className="font-normal">
diff --git a/packages/panier/components/Landing/index.tsx b/packages/panier/components/Landing/index.tsx
index 1c162204c7..58a24c7e68 100644
--- a/packages/panier/components/Landing/index.tsx
+++ b/packages/panier/components/Landing/index.tsx
@@ -15,8 +15,9 @@ const Landing = () => {
       >
         <div className="lg:w-2/3">
           <h1>
-            Faites vivre la transition écologique sur votre territoire.{' '}
-            <span className="text-primary">la transition écologique</span>
+            Faites vivre{' '}
+            <span className="text-primary">la transition écologique</span> sur
+            votre territoire.
           </h1>
           <p>
             Avec le panier d’action à impact, constituez une base d’actions
@@ -47,7 +48,7 @@ const Landing = () => {
         containerClassName="bg-white"
       >
         <CollectiviteEngageePicto />
-        <h3 className="mb-0">
+        <h3 className="mb-0 max-w-4xl text-primary-8">
           Vous êtes une collectivité déjà engagée dans le programme Territoires
           Engagés Transition Écologique ?
         </h3>

From c906bb50f9cb139fca48f89dfc5f67db63c1a577 Mon Sep 17 00:00:00 2001
From: Marc Rutkowski <marc@attractive-media.fr>
Date: Tue, 1 Oct 2024 11:48:32 +0200
Subject: [PATCH 40/91] =?UTF-8?q?R=C3=A9alise=20le=20filtrage=20sur=20les?=
 =?UTF-8?q?=20comp=C3=A9tences=20a=20posteriori=20pour=20qu'il=20ne=20s'ap?=
 =?UTF-8?q?plique=20qu'=C3=A0=20l'onglet=20S=C3=A9lection?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/src/panier_action_impact/panierAPI.ts | 14 ++-------
 packages/panier/app/panier/[id]/page.tsx      |  1 -
 packages/panier/app/panier/[id]/utils.ts      |  2 --
 .../panier/components/ListeActions/index.tsx  | 29 +++++++++++++++----
 4 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/packages/api/src/panier_action_impact/panierAPI.ts b/packages/api/src/panier_action_impact/panierAPI.ts
index dbd58f284b..efd3b0ef32 100644
--- a/packages/api/src/panier_action_impact/panierAPI.ts
+++ b/packages/api/src/panier_action_impact/panierAPI.ts
@@ -7,7 +7,7 @@ import { MesCollectivite, Panier, PanierBase } from './types';
  * puis les `action_impact` par la relation `action_impact_state` que l'on renomme `states`
  */
 export const panierSelect = `*,states:action_impact_state(
-    *,
+    *, matches_competences,
     thematiques:thematique(*),
     fourchette_budgetaire:action_impact_fourchette_budgetaire(*),
     temps_de_mise_en_oeuvre:action_impact_temps_de_mise_en_oeuvre(*),
@@ -106,9 +106,7 @@ export class PanierAPI {
     panier_id: string,
     thematique_ids: number[],
     niveau_budget_ids: number[],
-    niveau_temps_ids: number[],
-    /** indique que les actions à impact ne sont pas filtrées sur les compétences de la collectivité */
-    sansFiltreCompetences: boolean
+    niveau_temps_ids: number[]
   ): Promise<Panier | null> {
     const builder = this.supabase
       .from('panier')
@@ -154,14 +152,6 @@ export class PanierAPI {
       );
     }
 
-    if (!sansFiltreCompetences) {
-      // @ts-expect-error Le client Supabase ne permet pas de filtrer à ce niveau
-      builder.url.searchParams.append(
-        'action_impact_state.matches_competences',
-        'is.true'
-      );
-    }
-
     const {data, error} = await builder.single<Panier>();
     if (error) throw error;
     return this.ajouteActionsDejaImportees(data);
diff --git a/packages/panier/app/panier/[id]/page.tsx b/packages/panier/app/panier/[id]/page.tsx
index 9dfe5d11d6..05a68e20dc 100644
--- a/packages/panier/app/panier/[id]/page.tsx
+++ b/packages/panier/app/panier/[id]/page.tsx
@@ -35,7 +35,6 @@ async function Page({
     thematique_ids,
     budget_ids,
     temps_ids,
-    sansFiltreCompetences,
   );
 
   if (!panier) return notFound();
diff --git a/packages/panier/app/panier/[id]/utils.ts b/packages/panier/app/panier/[id]/utils.ts
index 204f2890d7..21d552933f 100644
--- a/packages/panier/app/panier/[id]/utils.ts
+++ b/packages/panier/app/panier/[id]/utils.ts
@@ -23,7 +23,6 @@ export const fetchPanier = async (
   thematique_ids: number[],
   budget_ids: number[],
   temps_ids: number[],
-  sansFiltreCompetences: boolean,
 ): Promise<Panier | null> => {
   const supabase = createClient(cookies());
   const api = new PanierAPI(supabase);
@@ -33,7 +32,6 @@ export const fetchPanier = async (
     thematique_ids,
     budget_ids,
     temps_ids,
-    sansFiltreCompetences,
   );
 
   return panier;
diff --git a/packages/panier/components/ListeActions/index.tsx b/packages/panier/components/ListeActions/index.tsx
index 9c9a6ecab9..fb16a1b4f2 100644
--- a/packages/panier/components/ListeActions/index.tsx
+++ b/packages/panier/components/ListeActions/index.tsx
@@ -91,12 +91,9 @@ const ListeActions = ({
         const actionsFiltrees =
           tab.shortName === 'importees'
             ? actionsDejaImportees
-            : actionsListe.filter(
-                a =>
-                  ((!a.statut && a.statut === tab.status) ||
-                    (a.statut && a.statut.categorie_id === tab.status)) &&
-                  (tab.status || !a.isinpanier),
-              );
+            : tab.shortName === 'selection'
+            ? filtreSelection({actionsListe, sansFiltreCompetences})
+            : actionsListe.filter(a => a.statut?.categorie_id === tab.status);
 
         return (
           <Tab key={tab.label} label={getTabLabel(tab, actionsFiltrees.length)}>
@@ -177,4 +174,24 @@ const ListeActions = ({
   );
 };
 
+const filtreSelection = ({
+  actionsListe,
+  sansFiltreCompetences,
+}: {
+  actionsListe: ActionImpactState[];
+  sansFiltreCompetences: boolean;
+}) => {
+  // toutes les actions sauf celles qui ont un statut (en
+  // cours/réalisée), celles qui sont déjà dans le panier ou déjà
+  // importées dans un plan
+  const subset = actionsListe.filter(
+    a => a.statut === null && !a.isinpanier && !a.dejaImportee,
+  );
+
+  return sansFiltreCompetences
+    ? subset
+    : subset.filter(a => a.matches_competences);
+};
+
+
 export default ListeActions;

From a7fe6d315c5163b777d30d410c6877fa58a92736 Mon Sep 17 00:00:00 2001
From: Marc Rutkowski <marc@attractive-media.fr>
Date: Tue, 1 Oct 2024 12:02:09 +0200
Subject: [PATCH 41/91] =?UTF-8?q?Utilise=20la=20nouvelle=20table=20pour=20?=
 =?UTF-8?q?l'affichage=20et=20l'=C3=A9dition=20des=20effets=20attendus=20(?=
 =?UTF-8?q?anciennement=20"r=C3=A9sultats=20attendus")=20plut=C3=B4t=20qu'?=
 =?UTF-8?q?une=20liste=20statique?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Indicateurs/IndicateursHeader.tsx         |  7 +++-
 .../src/types/alias.ts                        |  3 +-
 .../EffetsAttendusDropdown.tsx                | 31 +++++++-------
 .../useEffetsAttendus.ts                      | 14 +++++++
 .../src/ui/dropdownLists/listesStatiques.ts   | 40 -------------------
 5 files changed, 37 insertions(+), 58 deletions(-)
 create mode 100644 app.territoiresentransitions.react/src/ui/dropdownLists/ficheAction/EffetsAttendusDropdown/useEffetsAttendus.ts

diff --git a/app.territoiresentransitions.react/src/app/pages/collectivite/PlansActions/FicheAction/Indicateurs/IndicateursHeader.tsx b/app.territoiresentransitions.react/src/app/pages/collectivite/PlansActions/FicheAction/Indicateurs/IndicateursHeader.tsx
index 192c4cb00a..9279a12036 100644
--- a/app.territoiresentransitions.react/src/app/pages/collectivite/PlansActions/FicheAction/Indicateurs/IndicateursHeader.tsx
+++ b/app.territoiresentransitions.react/src/app/pages/collectivite/PlansActions/FicheAction/Indicateurs/IndicateursHeader.tsx
@@ -91,7 +91,12 @@ const IndicateursHeader = ({
         </span>
         {resultats && resultats.length ? (
           resultats.map(res => (
-            <Badge key={res} title={res} state="standard" uppercase={false} />
+            <Badge
+              key={res.id}
+              title={res.nom}
+              state="standard"
+              uppercase={false}
+            />
           ))
         ) : (
           <span className="text-sm text-grey-7 leading-7">Non renseignés</span>
diff --git a/app.territoiresentransitions.react/src/types/alias.ts b/app.territoiresentransitions.react/src/types/alias.ts
index 1d5c4429d1..61aa6cc6b8 100644
--- a/app.territoiresentransitions.react/src/types/alias.ts
+++ b/app.territoiresentransitions.react/src/types/alias.ts
@@ -66,8 +66,7 @@ export type TFicheActionCibles = Enums<'fiche_action_cibles'>;
 export type TFicheActionNiveauxPriorite =
   Enums<'fiche_action_niveaux_priorite'>;
 export type TFicheActionPiliersECI = Enums<'fiche_action_piliers_eci'>;
-export type TFicheActionResultatsAttendus =
-  Enums<'fiche_action_resultats_attendus'>;
+export type TFicheActionResultatsAttendus = Tables<'effet_attendu'>;
 export type TFicheActionStatuts = Enums<'fiche_action_statuts'>;
 export type TFicheActionEcheances = Enums<'fiche_action_echeances'>;
 
diff --git a/app.territoiresentransitions.react/src/ui/dropdownLists/ficheAction/EffetsAttendusDropdown/EffetsAttendusDropdown.tsx b/app.territoiresentransitions.react/src/ui/dropdownLists/ficheAction/EffetsAttendusDropdown/EffetsAttendusDropdown.tsx
index 8ff11cb363..04b177fda7 100644
--- a/app.territoiresentransitions.react/src/ui/dropdownLists/ficheAction/EffetsAttendusDropdown/EffetsAttendusDropdown.tsx
+++ b/app.territoiresentransitions.react/src/ui/dropdownLists/ficheAction/EffetsAttendusDropdown/EffetsAttendusDropdown.tsx
@@ -1,31 +1,32 @@
 import {SelectFilter, SelectMultipleProps} from '@tet/ui';
 import {TFicheActionResultatsAttendus} from 'types/alias';
-import {ficheActionResultatsAttendusOptions} from '../../listesStatiques';
+import {useEffetsAttendus} from './useEffetsAttendus';
 
 type EffetsAttendusDropdownProps = Omit<
   SelectMultipleProps,
   'values' | 'onChange' | 'options'
 > & {
   values?: TFicheActionResultatsAttendus[];
-  onChange: ({
-    effets,
-    selectedEffet,
-  }: {
-    effets: TFicheActionResultatsAttendus[];
-    selectedEffet: TFicheActionResultatsAttendus;
-  }) => void;
+  onChange: ({effets}: {effets: TFicheActionResultatsAttendus[]}) => void;
 };
 
-const EffetsAttendusDropdown = (props: EffetsAttendusDropdownProps) => {
+const EffetsAttendusDropdown = ({
+  values,
+  onChange,
+}: EffetsAttendusDropdownProps) => {
+  const {data: options} = useEffetsAttendus();
+  if (!options?.length) return;
+
   return (
     <SelectFilter
-      {...props}
+      values={values?.map(v => v.id)}
       isSearcheable
-      options={ficheActionResultatsAttendusOptions}
-      onChange={({values, selectedValue}) =>
-        props.onChange({
-          effets: values as TFicheActionResultatsAttendus[],
-          selectedEffet: selectedValue as TFicheActionResultatsAttendus,
+      options={options.map(({id, nom}) => ({value: id, label: nom}))}
+      onChange={({values}) =>
+        onChange({
+          effets: options.filter(v =>
+            values?.includes(v.id)
+          ) as TFicheActionResultatsAttendus[],
         })
       }
     />
diff --git a/app.territoiresentransitions.react/src/ui/dropdownLists/ficheAction/EffetsAttendusDropdown/useEffetsAttendus.ts b/app.territoiresentransitions.react/src/ui/dropdownLists/ficheAction/EffetsAttendusDropdown/useEffetsAttendus.ts
new file mode 100644
index 0000000000..847a3177e4
--- /dev/null
+++ b/app.territoiresentransitions.react/src/ui/dropdownLists/ficheAction/EffetsAttendusDropdown/useEffetsAttendus.ts
@@ -0,0 +1,14 @@
+import {useQuery} from 'react-query';
+import {supabaseClient} from 'core-logic/api/supabase';
+
+/**
+ * Charge les effets attendus
+ */
+export const useEffetsAttendus = () =>
+  useQuery(['effets_attendus'], async () => {
+    const {data, error} = await supabaseClient.from('effet_attendu').select();
+
+    if (error) throw new Error(error.message);
+
+    return data;
+  });
diff --git a/app.territoiresentransitions.react/src/ui/dropdownLists/listesStatiques.ts b/app.territoiresentransitions.react/src/ui/dropdownLists/listesStatiques.ts
index a103b400c2..0694172a39 100644
--- a/app.territoiresentransitions.react/src/ui/dropdownLists/listesStatiques.ts
+++ b/app.territoiresentransitions.react/src/ui/dropdownLists/listesStatiques.ts
@@ -4,7 +4,6 @@ import {
   TFicheActionCibles,
   TFicheActionEcheances,
   TFicheActionNiveauxPriorite,
-  TFicheActionResultatsAttendus,
 } from 'types/alias';
 
 type Options<T extends string> = {
@@ -13,45 +12,6 @@ type Options<T extends string> = {
   disabled?: boolean;
 }[];
 
-export const ficheActionResultatsAttendusOptions: Options<TFicheActionResultatsAttendus> =
-  [
-    {
-      value: 'Adaptation au changement climatique',
-      label: 'Adaptation au changement climatique',
-    },
-    {
-      value: 'Allongement de la durée d’usage',
-      label: 'Allongement de la durée d’usage',
-    },
-    {
-      value: 'Amélioration de la qualité de vie',
-      label: 'Amélioration de la qualité de vie',
-    },
-    {
-      value: 'Développement des énergies renouvelables',
-      label: 'Développement des énergies renouvelables',
-    },
-    { value: 'Efficacité énergétique', label: 'Efficacité énergétique' },
-    {
-      value: 'Préservation de la biodiversité',
-      label: 'Préservation de la biodiversité',
-    },
-    {
-      value: 'Réduction des consommations énergétiques',
-      label: 'Réduction des consommations énergétiques',
-    },
-    { value: 'Réduction des déchets', label: 'Réduction des déchets' },
-    {
-      value: 'Réduction des polluants atmosphériques',
-      label: 'Réduction des polluants atmosphériques',
-    },
-    {
-      value: 'Réduction des émissions de gaz à effet de serre',
-      label: 'Réduction des émissions de gaz à effet de serre',
-    },
-    { value: 'Sobriété énergétique', label: 'Sobriété énergétique' },
-  ];
-
 export const ficheActionCiblesOptions: Options<TFicheActionCibles> = [
   {
     value: 'Grand public et associations',

From 5c5ac2fbc4f3279acff9130a25d958ab073223d9 Mon Sep 17 00:00:00 2001
From: Marc Rutkowski <marc@attractive-media.fr>
Date: Tue, 1 Oct 2024 14:11:15 +0200
Subject: [PATCH 42/91] =?UTF-8?q?Change=20la=20mani=C3=A8re=20de=20charger?=
 =?UTF-8?q?=20et=20de=20filtrer=20les=20th=C3=A9matiques=20associ=C3=A9es?=
 =?UTF-8?q?=20aux=20actions=20=C3=A0=20impact=20pour=20qu'elles=20soient?=
 =?UTF-8?q?=20tri=C3=A9es?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/api/src/panier_action_impact/panierAPI.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/api/src/panier_action_impact/panierAPI.ts b/packages/api/src/panier_action_impact/panierAPI.ts
index efd3b0ef32..76d90b2d18 100644
--- a/packages/api/src/panier_action_impact/panierAPI.ts
+++ b/packages/api/src/panier_action_impact/panierAPI.ts
@@ -8,7 +8,7 @@ import { MesCollectivite, Panier, PanierBase } from './types';
  */
 export const panierSelect = `*,states:action_impact_state(
     *, matches_competences,
-    thematiques:thematique(*),
+    thematiques:action_impact_thematique(...thematique(id,nom)),
     fourchette_budgetaire:action_impact_fourchette_budgetaire(*),
     temps_de_mise_en_oeuvre:action_impact_temps_de_mise_en_oeuvre(*),
     actions_liees:action_definition(identifiant,referentiel,nom)

From 67b43aa1f327aa76a63b52e8d7f4a4af4b7c1f28 Mon Sep 17 00:00:00 2001
From: Marc Rutkowski <marc@attractive-media.fr>
Date: Tue, 1 Oct 2024 14:59:13 +0200
Subject: [PATCH 43/91] Ajoute le tracking du bouton "copier le lien du panier"

---
 .../components/PanierRealtime/PartagerLeLien.tsx       | 10 ++++++++--
 packages/panier/components/PanierRealtime/index.tsx    |  2 +-
 packages/ui/src/components/tracking/trackingPlan.ts    |  2 ++
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/packages/panier/components/PanierRealtime/PartagerLeLien.tsx b/packages/panier/components/PanierRealtime/PartagerLeLien.tsx
index 40999d0966..1293c0dbd6 100644
--- a/packages/panier/components/PanierRealtime/PartagerLeLien.tsx
+++ b/packages/panier/components/PanierRealtime/PartagerLeLien.tsx
@@ -1,17 +1,19 @@
 'use client';
 import {useEffect, useState} from 'react';
-import {Card, Button, Icon, useCopyToClipboard} from '@tet/ui';
+import {Card, Button, Icon, useCopyToClipboard, useEventTracker} from '@tet/ui';
+import {Panier} from '@tet/api';
 import Membres from '@components/Picto/Membres';
 
 /**
  * Affiche l'encadré invitant au partage du lien vers le panier
  */
-export const PartagerLeLien = () => {
+export const PartagerLeLien = ({panier}: {panier: Panier}) => {
   const [opened, setOpened] = useState(true);
   const [copied, setCopied] = useState(false);
   const [timeoutId, setTimeoutId] = useState<number | null>(null);
 
   const {copy} = useCopyToClipboard();
+  const tracker = useEventTracker('panier/panier');
 
   // TODO: remplacer ça par le composant Toast de l'app et du site
   // (à mutualiser dans le package ui)
@@ -59,6 +61,10 @@ export const PartagerLeLien = () => {
         onClick={() => {
           copy(document.location.href);
           setCopied(true);
+          tracker('copier_panier_URL', {
+            collectivite_preset: panier.collectivite_preset,
+            panier_id: panier.id,
+          });
         }}
       >
         Copier le lien du panier
diff --git a/packages/panier/components/PanierRealtime/index.tsx b/packages/panier/components/PanierRealtime/index.tsx
index 38f1dc6a10..26639ed4eb 100644
--- a/packages/panier/components/PanierRealtime/index.tsx
+++ b/packages/panier/components/PanierRealtime/index.tsx
@@ -138,7 +138,7 @@ const PanierRealtime = ({
         onToggleSelected={handleToggleSelected}
       />
 
-      <PartagerLeLien />
+      <PartagerLeLien panier={panier} />
     </div>
   );
 };
diff --git a/packages/ui/src/components/tracking/trackingPlan.ts b/packages/ui/src/components/tracking/trackingPlan.ts
index 1196b5c66d..cd26f93200 100644
--- a/packages/ui/src/components/tracking/trackingPlan.ts
+++ b/packages/ui/src/components/tracking/trackingPlan.ts
@@ -297,6 +297,8 @@ export interface TrackingPlan extends Record<never, Page> {
         action_id: number;
         category_id: string | null;
       };
+      /** Bouton "copier le lien du panier" */
+      copier_panier_URL: {};
       /* Le bouton "valider la création" affiché dans le panier */
       cta_valider_creation_panier_click: {};
       /* Le bouton "créer le plan d'action" affiché dans la modale */

From c7d61eed346768392ad615d026244d8769647e28 Mon Sep 17 00:00:00 2001
From: Marc Rutkowski <marc@attractive-media.fr>
Date: Tue, 1 Oct 2024 15:21:49 +0200
Subject: [PATCH 44/91] =?UTF-8?q?Corrige=20le=20tracking=20du=20filtre=20s?=
 =?UTF-8?q?ur=20les=20comp=C3=A9tences?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/panier/components/FiltresActions/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/panier/components/FiltresActions/index.tsx b/packages/panier/components/FiltresActions/index.tsx
index f5345dc811..57ef99dca7 100644
--- a/packages/panier/components/FiltresActions/index.tsx
+++ b/packages/panier/components/FiltresActions/index.tsx
@@ -99,7 +99,7 @@ const FiltresActions = ({
         thematique_ids: thematiquesValues,
         niveau_budget_ids: budgetsValues,
         niveau_temps_ids: tempsValues,
-        match_competences: sansFiltreCompetencesValue,
+        match_competences: !sansFiltreCompetencesValue,
       });
       router.push(href, { scroll: false });
     };

From f902e6866e6513460db908df6059d122136f5edb Mon Sep 17 00:00:00 2001
From: Marc Rutkowski <marc@attractive-media.fr>
Date: Tue, 1 Oct 2024 16:06:34 +0200
Subject: [PATCH 45/91] Ajoute le tracking du bouton "action issue du panier"

---
 .../FicheAction/FicheActionImpact.tsx            |  2 +-
 .../FicheActionImpact/ModaleActionImpact.tsx     | 16 +++++++++++++++-
 .../ui/src/components/tracking/trackingPlan.ts   |  1 +
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/app.territoiresentransitions.react/src/app/pages/collectivite/PlansActions/FicheAction/FicheActionImpact.tsx b/app.territoiresentransitions.react/src/app/pages/collectivite/PlansActions/FicheAction/FicheActionImpact.tsx
index 7ab6b4cc0c..b6671d310b 100644
--- a/app.territoiresentransitions.react/src/app/pages/collectivite/PlansActions/FicheAction/FicheActionImpact.tsx
+++ b/app.territoiresentransitions.react/src/app/pages/collectivite/PlansActions/FicheAction/FicheActionImpact.tsx
@@ -2,7 +2,7 @@ import classNames from 'classnames';
 import {Icon, Notification} from '@tet/ui';
 import {FicheAction} from './data/types';
 import {useFicheActionImpactId} from './data/useFicheActionImpactId';
-import {ModaleActionImpact} from 'app/pages/collectivite/PlansActions/FicheAction/FicheActionImpact/ModaleActionImpact';
+import {ModaleActionImpact} from './FicheActionImpact/ModaleActionImpact';
 
 type FicheActionImpactProps = {
   fiche: FicheAction;
diff --git a/app.territoiresentransitions.react/src/app/pages/collectivite/PlansActions/FicheAction/FicheActionImpact/ModaleActionImpact.tsx b/app.territoiresentransitions.react/src/app/pages/collectivite/PlansActions/FicheAction/FicheActionImpact/ModaleActionImpact.tsx
index 29c9ef41f7..82a28ced94 100644
--- a/app.territoiresentransitions.react/src/app/pages/collectivite/PlansActions/FicheAction/FicheActionImpact/ModaleActionImpact.tsx
+++ b/app.territoiresentransitions.react/src/app/pages/collectivite/PlansActions/FicheAction/FicheActionImpact/ModaleActionImpact.tsx
@@ -1,4 +1,6 @@
-import {Modal, InfoActionImpact} from '@tet/ui';
+import {useState} from 'react';
+import {Modal, InfoActionImpact, useEventTracker} from '@tet/ui';
+import {useCollectiviteId} from 'core-logic/hooks/params';
 import {useActionImpact} from './useActionImpact';
 import Markdown from 'ui/Markdown';
 
@@ -13,6 +15,9 @@ type ModaleActionImpactProps = {
 export const ModaleActionImpact = (props: ModaleActionImpactProps) => {
   const {actionImpactId, children} = props;
   const {data: action} = useActionImpact(actionImpactId);
+  const [isOpen, setIsOpen] = useState(false);
+  const trackEvent = useEventTracker('app/fiche-action');
+  const collectivite_id = useCollectiviteId()!;
 
   if (!action) {
     return null;
@@ -24,6 +29,15 @@ export const ModaleActionImpact = (props: ModaleActionImpactProps) => {
       size="lg"
       title={titre}
       textAlign="left"
+      openState={{
+        isOpen,
+        setIsOpen: opened => {
+          if (opened) {
+            trackEvent('cta_fa_fai', {collectivite_id});
+          }
+          setIsOpen(opened);
+        },
+      }}
       render={() => {
         return (
           <InfoActionImpact
diff --git a/packages/ui/src/components/tracking/trackingPlan.ts b/packages/ui/src/components/tracking/trackingPlan.ts
index cd26f93200..21c11e28fd 100644
--- a/packages/ui/src/components/tracking/trackingPlan.ts
+++ b/packages/ui/src/components/tracking/trackingPlan.ts
@@ -190,6 +190,7 @@ export interface TrackingPlan extends Record<never, Page> {
       validation_modale_acteurs_fa: {};
       validation_modale_planning_fa: {};
       cta_indicateur_perso_fa: {};
+      cta_fa_fai: {};
     };
   };
 

From 2e7a83c39182a6c594670697f623c55ca5409b91 Mon Sep 17 00:00:00 2001
From: Marc Rutkowski <marc@attractive-media.fr>
Date: Tue, 1 Oct 2024 16:29:46 +0200
Subject: [PATCH 46/91] =?UTF-8?q?Ajoute=20le=20tracking=20des=20boutons=20?=
 =?UTF-8?q?de=20la=20page=20"cr=C3=A9er=20un=20plan=20d'action"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ParcoursCreationPlan/Selection.tsx        | 71 +++++++++++--------
 .../src/components/tracking/trackingPlan.ts   | 11 +++
 2 files changed, 53 insertions(+), 29 deletions(-)

diff --git a/app.territoiresentransitions.react/src/app/pages/collectivite/PlansActions/ParcoursCreationPlan/Selection.tsx b/app.territoiresentransitions.react/src/app/pages/collectivite/PlansActions/ParcoursCreationPlan/Selection.tsx
index 9c1ebce29c..8c43fb38eb 100644
--- a/app.territoiresentransitions.react/src/app/pages/collectivite/PlansActions/ParcoursCreationPlan/Selection.tsx
+++ b/app.territoiresentransitions.react/src/app/pages/collectivite/PlansActions/ParcoursCreationPlan/Selection.tsx
@@ -10,7 +10,7 @@ import {useHistory} from 'react-router-dom';
 import {ReactComponent as DocumentAddPicto} from './document-add.svg';
 import {ReactComponent as DocumentDownloadPicto} from './document-download.svg';
 import {ReactComponent as ShoppingBasket} from './shopping-basket.svg';
-import {Button} from '@tet/ui';
+import {Button, TrackingPlan, useEventTracker} from '@tet/ui';
 
 const Selection = () => {
   const collectivite_id = useCollectiviteId();
@@ -34,6 +34,7 @@ const Selection = () => {
               url={makeCollectivitePlansActionsCreerUrl({
                 collectiviteId: collectivite_id!,
               })}
+              trackingId="cta_creer"
             />
             <SelectFlowButton
               dataTest="ImporterPlan"
@@ -43,6 +44,7 @@ const Selection = () => {
               url={makeCollectivitePlansActionsImporterUrl({
                 collectiviteId: collectivite_id!,
               })}
+              trackingId="cta_importer"
             />
             <SelectFlowButton
               dataTest="InitierPlan"
@@ -52,6 +54,7 @@ const Selection = () => {
               url={makeCollectivitePanierUrl({
                 collectiviteId: collectivite_id!,
               })}
+              trackingId="cta_commencer_pai"
             />
           </div>
           <Button
@@ -79,6 +82,7 @@ type SelectFlowButtonProps = {
   title: string;
   subTitle: string;
   isPrimary?: boolean;
+  trackingId: keyof TrackingPlan['app/creer-plan']['events'];
 };
 
 const SelectFlowButton = ({
@@ -88,33 +92,42 @@ const SelectFlowButton = ({
   title,
   subTitle,
   isPrimary = false,
-}: SelectFlowButtonProps) => (
-  <div
-    className={classNames(
-      'grow bg-white border border-gray-200 rounded-lg hover:bg-primary-0',
-      {'!bg-primary hover:!bg-primary-6': isPrimary}
-    )}
-  >
-    <a
-      data-test={dataTest}
-      className="flex flex-col w-full py-6 items-center text-center text-sm !bg-none"
-      href={url}
+  trackingId,
+}: SelectFlowButtonProps) => {
+  const trackEvent = useEventTracker('app/creer-plan');
+  const collectivite_id = useCollectiviteId()!;
+
+  return (
+    <div
+      className={classNames(
+        'grow bg-white border border-gray-200 rounded-lg hover:bg-primary-0',
+        {'!bg-primary hover:!bg-primary-6': isPrimary}
+      )}
     >
-      {icon}
-      <div
-        className={classNames('m-1 font-bold text-primary-8', {
-          '!text-primary-0': isPrimary,
-        })}
+      <a
+        data-test={dataTest}
+        className="flex flex-col w-full py-6 items-center text-center text-sm !bg-none"
+        href={url}
+        onClick={() => {
+          trackEvent(trackingId, {collectivite_id});
+        }}
       >
-        {title}
-      </div>
-      <div
-        className={classNames('text-grey-7 text-xs', {
-          '!text-grey-1': isPrimary,
-        })}
-      >
-        {subTitle}
-      </div>
-    </a>
-  </div>
-);
+        {icon}
+        <div
+          className={classNames('m-1 font-bold text-primary-8', {
+            '!text-primary-0': isPrimary,
+          })}
+        >
+          {title}
+        </div>
+        <div
+          className={classNames('text-grey-7 text-xs', {
+            '!text-grey-1': isPrimary,
+          })}
+        >
+          {subTitle}
+        </div>
+      </a>
+    </div>
+  );
+};
diff --git a/packages/ui/src/components/tracking/trackingPlan.ts b/packages/ui/src/components/tracking/trackingPlan.ts
index 21c11e28fd..cb63b888dc 100644
--- a/packages/ui/src/components/tracking/trackingPlan.ts
+++ b/packages/ui/src/components/tracking/trackingPlan.ts
@@ -194,6 +194,17 @@ export interface TrackingPlan extends Record<never, Page> {
     };
   };
 
+  /** Page "créer un plan" */
+  'app/creer-plan': {
+    properties: {collectivite_id: number};
+    onglets: never;
+    events: {
+      cta_creer: {};
+      cta_importer: {};
+      cta_commencer_pai: {};
+    };
+  };
+
   /** Trajectoire SNBC territorialisée */
   'app/trajectoires/snbc': {
     properties: {

From f923a3cdc6584f10f1dfe8faa1055a241f677a74 Mon Sep 17 00:00:00 2001
From: Marc Rutkowski <marc@attractive-media.fr>
Date: Tue, 1 Oct 2024 17:20:31 +0200
Subject: [PATCH 47/91] =?UTF-8?q?Ajoute=20le=20chargement=20de=20la=20typo?=
 =?UTF-8?q?logie=20des=20actions=20=C3=A0=20impact?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/api/src/panier_action_impact/panierAPI.ts | 1 +
 packages/api/src/panier_action_impact/types.ts     | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/packages/api/src/panier_action_impact/panierAPI.ts b/packages/api/src/panier_action_impact/panierAPI.ts
index 76d90b2d18..8294d904f3 100644
--- a/packages/api/src/panier_action_impact/panierAPI.ts
+++ b/packages/api/src/panier_action_impact/panierAPI.ts
@@ -9,6 +9,7 @@ import { MesCollectivite, Panier, PanierBase } from './types';
 export const panierSelect = `*,states:action_impact_state(
     *, matches_competences,
     thematiques:action_impact_thematique(...thematique(id,nom)),
+    typologie:action_impact_typologie(*),
     fourchette_budgetaire:action_impact_fourchette_budgetaire(*),
     temps_de_mise_en_oeuvre:action_impact_temps_de_mise_en_oeuvre(*),
     actions_liees:action_definition(identifiant,referentiel,nom)
diff --git a/packages/api/src/panier_action_impact/types.ts b/packages/api/src/panier_action_impact/types.ts
index 5aa56fad8d..954835ef47 100644
--- a/packages/api/src/panier_action_impact/types.ts
+++ b/packages/api/src/panier_action_impact/types.ts
@@ -8,6 +8,9 @@ export type ActionImpactThematique = Omit<
   'md_id'
 >;
 
+export type ActionImpactTypologie =
+  Database['public']['Tables']['action_impact_typologie']['Row'];
+
 export type Niveau = {niveau: number; nom: string};
 
 export type ActionImpactFourchetteBudgetaire =
@@ -51,6 +54,7 @@ export type ActionImpactState = {
   isinpanier: boolean;
   statut: ActionImpactStatut | null;
   thematiques: ActionImpactThematique[];
+  typologie: ActionImpactTypologie;
   actions_liees: ActionReferentiel[] | null;
   matches_competences: boolean;
   dejaImportee?: boolean;

From 0288b22620a8210f6ff772bd9d725ce56d594d89 Mon Sep 17 00:00:00 2001
From: Marc Rutkowski <marc@attractive-media.fr>
Date: Tue, 1 Oct 2024 17:23:43 +0200
Subject: [PATCH 48/91] =?UTF-8?q?Ajoute=20l'affichage=20de=20la=20typologi?=
 =?UTF-8?q?e=20dans=20le=20d=C3=A9tail=20et=20la=20preview=20d'une=20actio?=
 =?UTF-8?q?n=20=C3=A0=20impact?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/panier/components/ActionImpact/CarteActionImpact.tsx | 4 ++++
 .../panier/components/ActionImpact/ModaleActionImpact.tsx     | 2 ++
 packages/panier/components/ActionImpact/types.ts              | 4 ++++
 .../panier/components/ListeActions/ListeActionsFiltrees.tsx   | 1 +
 packages/panier/components/PanierActions/index.tsx            | 3 ++-
 5 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/packages/panier/components/ActionImpact/CarteActionImpact.tsx b/packages/panier/components/ActionImpact/CarteActionImpact.tsx
index e775b03d75..2e6f0263e1 100644
--- a/packages/panier/components/ActionImpact/CarteActionImpact.tsx
+++ b/packages/panier/components/ActionImpact/CarteActionImpact.tsx
@@ -10,6 +10,7 @@ import NiveauBudget from './NiveauBudget';
 export const CarteActionImpact = ({
   titre,
   thematiques,
+  typologie,
   budget,
   panier,
   isSelected,
@@ -25,6 +26,9 @@ export const CarteActionImpact = ({
       isSelected={isSelected}
       footer={
         <div className="relative z-0">
+          {!!typologie && (
+            <p className="mb-2 text-sm text-grey-7">{typologie.nom}</p>
+          )}
           <div className="flex justify-end items-center gap-2 opacity-100 group-hover:opacity-0 transition-opacity duration-500">
             {/* Badge thématique */}
             {!!thematiques.length && (
diff --git a/packages/panier/components/ActionImpact/ModaleActionImpact.tsx b/packages/panier/components/ActionImpact/ModaleActionImpact.tsx
index e917ece3d9..3914e8ba77 100644
--- a/packages/panier/components/ActionImpact/ModaleActionImpact.tsx
+++ b/packages/panier/components/ActionImpact/ModaleActionImpact.tsx
@@ -23,6 +23,7 @@ export const ModaleActionImpact = (props: ModaleActionImpactProps) => {
     children,
     actionsLiees,
     titre,
+    typologie,
     description,
     statut,
     panier,
@@ -34,6 +35,7 @@ export const ModaleActionImpact = (props: ModaleActionImpactProps) => {
     <Modal
       size="lg"
       title={titre}
+      subTitle={typologie?.nom}
       textAlign="left"
       render={() => {
         return (
diff --git a/packages/panier/components/ActionImpact/types.ts b/packages/panier/components/ActionImpact/types.ts
index a3a67dea9f..9048958813 100644
--- a/packages/panier/components/ActionImpact/types.ts
+++ b/packages/panier/components/ActionImpact/types.ts
@@ -2,6 +2,7 @@ import {
   ActionImpactFourchetteBudgetaire,
   ActionImpactTempsMiseEnOeuvre,
   ActionImpactThematique,
+  ActionImpactTypologie,
   ActionReferentiel,
 } from '@tet/api';
 
@@ -15,6 +16,8 @@ export type ActionImpactProps = {
   titre: string;
   /** Thématiques de l'action à impact */
   thematiques: ActionImpactThematique[];
+  /** Typologie */
+  typologie: ActionImpactTypologie | null;
   /** Budget de la mise en place de l'action : petit, moyen ou élevé */
   budget?: ActionImpactFourchetteBudgetaire;
   /** Description de l'action à impact */
@@ -50,6 +53,7 @@ export type CarteActionImpactProps = Pick<
   ActionImpactProps,
   | 'titre'
   | 'thematiques'
+  | 'typologie'
   | 'budget'
   | 'statut'
   | 'panier'
diff --git a/packages/panier/components/ListeActions/ListeActionsFiltrees.tsx b/packages/panier/components/ListeActions/ListeActionsFiltrees.tsx
index 15602cf73a..5486058229 100644
--- a/packages/panier/components/ListeActions/ListeActionsFiltrees.tsx
+++ b/packages/panier/components/ListeActions/ListeActionsFiltrees.tsx
@@ -28,6 +28,7 @@ const ListeActionsFiltrees = ({
           actionsLiees={action.actions_liees}
           titre={action.action.titre}
           thematiques={action.thematiques}
+          typologie={action.typologie}
           budget={budgets.find(
             b => b.niveau === action.action.fourchette_budgetaire
           )}
diff --git a/packages/panier/components/PanierActions/index.tsx b/packages/panier/components/PanierActions/index.tsx
index 0441f1999a..8334afe417 100644
--- a/packages/panier/components/PanierActions/index.tsx
+++ b/packages/panier/components/PanierActions/index.tsx
@@ -70,10 +70,11 @@ const PanierActions = ({
             </div>
 
             <div className="grid md:max-lg:grid-cols-2 gap-4">
-              {actionsListe.map(({action, thematiques}) => (
+              {actionsListe.map(({action, thematiques, typologie}) => (
                 <ActionImpact
                   key={action.id}
                   description={action.description}
+                  typologie={typologie}
                   titre={action.titre}
                   thematiques={thematiques}
                   budget={budgets.find(

From bec18d8c722f9eba0004284330aeefd66804e0aa Mon Sep 17 00:00:00 2001
From: Marc Rutkowski <marc@attractive-media.fr>
Date: Tue, 1 Oct 2024 18:36:36 +0200
Subject: [PATCH 49/91] =?UTF-8?q?Ajoute=20l'affichage=20de=20la=20typologi?=
 =?UTF-8?q?e=20dans=20le=20d=C3=A9tail=20d'une=20action=20=C3=A0=20impact?=
 =?UTF-8?q?=20(depuis=20une=20fiche=20action)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FicheAction/FicheActionImpact/ModaleActionImpact.tsx  | 3 ++-
 .../FicheAction/FicheActionImpact/useActionImpact.ts      | 8 +++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/app.territoiresentransitions.react/src/app/pages/collectivite/PlansActions/FicheAction/FicheActionImpact/ModaleActionImpact.tsx b/app.territoiresentransitions.react/src/app/pages/collectivite/PlansActions/FicheAction/FicheActionImpact/ModaleActionImpact.tsx
index 82a28ced94..f3a58330b1 100644
--- a/app.territoiresentransitions.react/src/app/pages/collectivite/PlansActions/FicheAction/FicheActionImpact/ModaleActionImpact.tsx
+++ b/app.territoiresentransitions.react/src/app/pages/collectivite/PlansActions/FicheAction/FicheActionImpact/ModaleActionImpact.tsx
@@ -23,11 +23,12 @@ export const ModaleActionImpact = (props: ModaleActionImpactProps) => {
     return null;
   }
 
-  const {titre, description} = action;
+  const {titre, description, typologie} = action;
   return (
     <Modal
       size="lg"
       title={titre}
+      subTitle={typologie?.nom}
       textAlign="left"
       openState={{
         isOpen,
diff --git a/app.territoiresentransitions.react/src/app/pages/collectivite/PlansActions/FicheAction/FicheActionImpact/useActionImpact.ts b/app.territoiresentransitions.react/src/app/pages/collectivite/PlansActions/FicheAction/FicheActionImpact/useActionImpact.ts
index db70d06039..6592f550c7 100644
--- a/app.territoiresentransitions.react/src/app/pages/collectivite/PlansActions/FicheAction/FicheActionImpact/useActionImpact.ts
+++ b/app.territoiresentransitions.react/src/app/pages/collectivite/PlansActions/FicheAction/FicheActionImpact/useActionImpact.ts
@@ -1,9 +1,14 @@
 import {useQuery} from 'react-query';
 import {supabaseClient} from 'core-logic/api/supabase';
-import {ActionImpact, ActionImpactThematique} from '@tet/api';
+import {
+  ActionImpact,
+  ActionImpactThematique,
+  ActionImpactTypologie,
+} from '@tet/api';
 
 type ActionImpactDetail = ActionImpact & {
   thematiques: ActionImpactThematique[];
+  typologie: ActionImpactTypologie | null;
 };
 
 /**
@@ -15,6 +20,7 @@ export const useActionImpact = (actionImpactId: number) =>
       .from('action_impact')
       .select(
         `titre, 
+        typologie:action_impact_typologie(*),
         thematiques:action_impact_thematique(...thematique(id,nom)),
         budget:action_impact_fourchette_budgetaire(*),
         miseEnOeuvre:action_impact_temps_de_mise_en_oeuvre(*),

From 1609c23a076a0150830efd6d1c6d68b96a06d52a Mon Sep 17 00:00:00 2001
From: Marc Rutkowski <marc@attractive-media.fr>
Date: Tue, 1 Oct 2024 18:59:12 +0200
Subject: [PATCH 50/91] =?UTF-8?q?Ajoute=20le=20filtrage=20par=20typologie?=
 =?UTF-8?q?=20des=20actions=20=C3=A0=20impact?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/src/panier_action_impact/panierAPI.ts | 34 +++++++++++++++----
 .../panier/app/panier/[id]/PagePanier.tsx     |  2 ++
 packages/panier/app/panier/[id]/page.tsx      | 18 +++++++---
 packages/panier/app/panier/[id]/utils.ts      | 33 +++++++++++++-----
 .../components/FiltresActions/index.tsx       | 25 +++++++++++++-
 .../panier/components/ListeActions/index.tsx  | 11 +++++-
 .../components/PanierRealtime/index.tsx       |  5 ++-
 7 files changed, 106 insertions(+), 22 deletions(-)

diff --git a/packages/api/src/panier_action_impact/panierAPI.ts b/packages/api/src/panier_action_impact/panierAPI.ts
index 8294d904f3..1814cc33ae 100644
--- a/packages/api/src/panier_action_impact/panierAPI.ts
+++ b/packages/api/src/panier_action_impact/panierAPI.ts
@@ -103,16 +103,23 @@ export class PanierAPI {
     }
   }
 
-  async fetchPanier(
-    panier_id: string,
-    thematique_ids: number[],
-    niveau_budget_ids: number[],
-    niveau_temps_ids: number[]
-  ): Promise<Panier | null> {
+  async fetchPanier({
+    panierId,
+    thematique_ids,
+    typologie_ids,
+    niveau_budget_ids,
+    niveau_temps_ids,
+  }: {
+    panierId: string;
+    thematique_ids: number[];
+    typologie_ids: number[];
+    niveau_budget_ids: number[];
+    niveau_temps_ids: number[];
+  }): Promise<Panier | null> {
     const builder = this.supabase
       .from('panier')
       .select(panierSelect)
-      .eq('id', panier_id);
+      .eq('id', panierId);
 
     if (thematique_ids && thematique_ids.length > 0) {
       // @ts-expect-error Le client Supabase ne permet pas de filtrer à ce niveau
@@ -127,6 +134,19 @@ export class PanierAPI {
       );
     }
 
+    if (typologie_ids && typologie_ids.length > 0) {
+      // @ts-expect-error Le client Supabase ne permet pas de filtrer à ce niveau
+      builder.url.searchParams.append(
+        'action_impact_state.typologie.id',
+        `in.(${typologie_ids.join(',')})`
+      );
+      // @ts-expect-error Le client Supabase ne permet pas de filtrer à ce niveau
+      builder.url.searchParams.append(
+        'action_impact_state.typologie',
+        'not.is.null'
+      );
+    }
+
     if (niveau_budget_ids && niveau_budget_ids.length > 0) {
       // @ts-expect-error Le client Supabase ne permet pas de filtrer à ce niveau
       builder.url.searchParams.append(
diff --git a/packages/panier/app/panier/[id]/PagePanier.tsx b/packages/panier/app/panier/[id]/PagePanier.tsx
index 5b0db2dc76..f76546d4d9 100644
--- a/packages/panier/app/panier/[id]/PagePanier.tsx
+++ b/packages/panier/app/panier/[id]/PagePanier.tsx
@@ -6,6 +6,7 @@ import {
   ActionImpactFourchetteBudgetaire,
   ActionImpactTempsMiseEnOeuvre,
   ActionImpactThematique,
+  ActionImpactTypologie,
   Panier,
 } from '@tet/api';
 import {ControlledAlert} from '@tet/ui';
@@ -15,6 +16,7 @@ type PagePanierProps = {
   budgets: ActionImpactFourchetteBudgetaire[];
   temps: ActionImpactTempsMiseEnOeuvre[];
   thematiques: ActionImpactThematique[];
+  typologies: ActionImpactTypologie[];
   sansFiltreCompetences: boolean;
 };
 
diff --git a/packages/panier/app/panier/[id]/page.tsx b/packages/panier/app/panier/[id]/page.tsx
index 05a68e20dc..b4794c3a28 100644
--- a/packages/panier/app/panier/[id]/page.tsx
+++ b/packages/panier/app/panier/[id]/page.tsx
@@ -1,7 +1,7 @@
 import { extractIdsFromParam } from '@tet/panier/src/utils/extractIdsFromParam';
 import { notFound } from 'next/navigation';
 import PagePanier from './PagePanier';
-import { fetchNiveaux, fetchPanier, fetchThematiques } from './utils';
+import { fetchNiveaux, fetchPanier, fetchThematiques, fetchTypologies } from './utils';
 import { TrackPageView } from '@tet/ui';
 
 /**
@@ -26,22 +26,25 @@ async function Page({
 }) {
   const panierId = params.id;
   const thematique_ids = extractIdsFromParam(searchParams['t'] as string);
+  const typologie_ids = extractIdsFromParam(searchParams['ty'] as string);
   const budget_ids = extractIdsFromParam(searchParams['b'] as string);
   const temps_ids = extractIdsFromParam(searchParams['m'] as string);
   const sansFiltreCompetences = searchParams['c'] === 'true';
 
-  const panier = await fetchPanier(
+  const panier = await fetchPanier({
     panierId,
     thematique_ids,
+    typologie_ids,
     budget_ids,
     temps_ids,
-  );
+  });
 
   if (!panier) return notFound();
 
   const budgets = await fetchNiveaux('action_impact_fourchette_budgetaire');
   const temps = await fetchNiveaux('action_impact_temps_de_mise_en_oeuvre');
   const thematiques = await fetchThematiques();
+  const typologies = await fetchTypologies();
 
   return (
     <>
@@ -53,7 +56,14 @@ async function Page({
         }}
       />
       <PagePanier
-        {...{panier, budgets, temps, thematiques, sansFiltreCompetences}}
+        {...{
+          panier,
+          budgets,
+          temps,
+          thematiques,
+          typologies,
+          sansFiltreCompetences,
+        }}
       />
     </>
   );
diff --git a/packages/panier/app/panier/[id]/utils.ts b/packages/panier/app/panier/[id]/utils.ts
index 21d552933f..98a45fc4a0 100644
--- a/packages/panier/app/panier/[id]/utils.ts
+++ b/packages/panier/app/panier/[id]/utils.ts
@@ -1,6 +1,7 @@
 import {
   ActionImpactCategorie,
   ActionImpactThematique,
+  ActionImpactTypologie,
   Niveau,
   Panier,
   PanierAPI,
@@ -18,21 +19,29 @@ const getInit = {
   },
 };
 
-export const fetchPanier = async (
-  panierId: string,
-  thematique_ids: number[],
-  budget_ids: number[],
-  temps_ids: number[],
-): Promise<Panier | null> => {
+export const fetchPanier = async ({
+  panierId,
+  thematique_ids,
+  typologie_ids,
+  budget_ids,
+  temps_ids,
+}: {
+  panierId: string;
+  thematique_ids: number[];
+  typologie_ids: number[];
+  budget_ids: number[];
+  temps_ids: number[];
+}): Promise<Panier | null> => {
   const supabase = createClient(cookies());
   const api = new PanierAPI(supabase);
 
-  const panier: Panier | null = await api.fetchPanier(
+  const panier: Panier | null = await api.fetchPanier({
     panierId,
     thematique_ids,
+    typologie_ids,
     budget_ids,
     temps_ids,
-  );
+  });
 
   return panier;
 };
@@ -53,6 +62,14 @@ export const fetchThematiques = async (): Promise<ActionImpactThematique[]> => {
   return await response.json();
 };
 
+export const fetchTypologies = async (): Promise<ActionImpactTypologie[]> => {
+  const response = await fetch(
+    `${apiUrl}/rest/v1/action_impact_typologie?select=id,nom`,
+    getInit,
+  );
+  return await response.json();
+};
+
 export const fetchNiveaux = async (
   table:
     | 'action_impact_complexite'
diff --git a/packages/panier/components/FiltresActions/index.tsx b/packages/panier/components/FiltresActions/index.tsx
index 57ef99dca7..4cb28f1f45 100644
--- a/packages/panier/components/FiltresActions/index.tsx
+++ b/packages/panier/components/FiltresActions/index.tsx
@@ -6,6 +6,7 @@ import {
   ActionImpactFourchetteBudgetaire,
   ActionImpactTempsMiseEnOeuvre,
   ActionImpactThematique,
+  ActionImpactTypologie,
 } from '@tet/api';
 import {
   OptionValue,
@@ -19,6 +20,7 @@ type FiltresActionsProps = {
   budgets: ActionImpactFourchetteBudgetaire[];
   temps: ActionImpactTempsMiseEnOeuvre[];
   thematiques: ActionImpactThematique[];
+  typologies: ActionImpactTypologie[];
   sansFiltreCompetences: boolean;
 };
 
@@ -26,6 +28,7 @@ const FiltresActions = ({
   budgets,
   temps,
   thematiques,
+  typologies,
   sansFiltreCompetences,
 }: FiltresActionsProps) => {
   const router = useRouter();
@@ -37,6 +40,9 @@ const FiltresActions = ({
   const [thematiquesValues, setThematiquesValues] = useState<
     OptionValue[] | undefined
   >();
+  const [typologiesValues, setTypologiesValues] = useState<
+    OptionValue[] | undefined
+  >();
   const [budgetsValues, setBudgetsValues] = useState<
     OptionValue[] | undefined
   >();
@@ -51,7 +57,11 @@ const FiltresActions = ({
     const thematiquesParams = searchParams
       .get('t')
       ?.split(',')
-      .map((val) => parseInt(val));
+      .map(val => parseInt(val));
+    const typologiesParams = searchParams
+      .get('ty')
+      ?.split(',')
+      .map(val => parseInt(val));
     const budgetsParams = searchParams
       .get('b')
       ?.split(',')
@@ -63,6 +73,7 @@ const FiltresActions = ({
     const competencesParams = searchParams.get('c');
 
     if (thematiquesParams) setThematiquesValues(thematiquesParams);
+    if (typologiesParams) setTypologiesValues(typologiesParams);
     if (budgetsParams) setBudgetsValues(budgetsParams);
     if (tempsParams) setTempsValues(tempsParams);
     setSansFiltreCompetencesValue(competencesParams === 'true');
@@ -77,6 +88,9 @@ const FiltresActions = ({
     if (!!thematiquesValues && thematiquesValues?.length > 0) {
       paramsArray.push(`t=${thematiquesValues.join(',')}`);
     }
+    if (!!typologiesValues && typologiesValues?.length > 0) {
+      paramsArray.push(`ty=${typologiesValues.join(',')}`);
+    }
     if (!!budgetsValues && budgetsValues?.length > 0) {
       paramsArray.push(`b=${budgetsValues.join(',')}`);
     }
@@ -97,6 +111,7 @@ const FiltresActions = ({
         collectivite_preset: panier?.collectivite_preset ?? null,
         panier_id: panier?.id ?? '',
         thematique_ids: thematiquesValues,
+        typologies_ids: typologiesValues,
         niveau_budget_ids: budgetsValues,
         niveau_temps_ids: tempsValues,
         match_competences: !sansFiltreCompetencesValue,
@@ -108,6 +123,7 @@ const FiltresActions = ({
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [
     thematiquesValues?.length,
+    typologiesValues?.length,
     budgetsValues?.length,
     tempsValues?.length,
     sansFiltreCompetencesValue,
@@ -124,6 +140,13 @@ const FiltresActions = ({
             setThematiquesValues((args as SelectMultipleOnChangeArgs).values),
           multiple: true,
         },
+        {
+          title: 'Typologies',
+          options: typologies.map(t => ({value: t.id, label: t.nom})),
+          values: typologiesValues,
+          onChange: ({values}) => setTypologiesValues(values),
+          multiple: true,
+        },
         {
           title: 'Ordre de grandeur budgétaire',
           tag: 'Budget',
diff --git a/packages/panier/components/ListeActions/index.tsx b/packages/panier/components/ListeActions/index.tsx
index fb16a1b4f2..5a9f8e3a0a 100644
--- a/packages/panier/components/ListeActions/index.tsx
+++ b/packages/panier/components/ListeActions/index.tsx
@@ -5,6 +5,7 @@ import {
   ActionImpactState,
   ActionImpactTempsMiseEnOeuvre,
   ActionImpactThematique,
+  ActionImpactTypologie,
 } from '@tet/api';
 import {
   Alert,
@@ -39,6 +40,7 @@ type ListeActionsProps = {
   budgets: ActionImpactFourchetteBudgetaire[];
   temps: ActionImpactTempsMiseEnOeuvre[];
   thematiques: ActionImpactThematique[];
+  typologies: ActionImpactTypologie[];
   sansFiltreCompetences: boolean;
   onToggleSelected: (actionId: number, selected: boolean) => void;
   onUpdateStatus: (actionId: number, statusId: string | null) => void;
@@ -50,6 +52,7 @@ const ListeActions = ({
   budgets,
   temps,
   thematiques,
+  typologies,
   sansFiltreCompetences,
   onToggleSelected,
   onUpdateStatus,
@@ -98,7 +101,13 @@ const ListeActions = ({
         return (
           <Tab key={tab.label} label={getTabLabel(tab, actionsFiltrees.length)}>
             <FiltresActions
-              {...{budgets, temps, thematiques, sansFiltreCompetences}}
+              {...{
+                budgets,
+                temps,
+                thematiques,
+                typologies,
+                sansFiltreCompetences,
+              }}
             />
 
             {!tab.status &&
diff --git a/packages/panier/components/PanierRealtime/index.tsx b/packages/panier/components/PanierRealtime/index.tsx
index 26639ed4eb..1690b898fc 100644
--- a/packages/panier/components/PanierRealtime/index.tsx
+++ b/packages/panier/components/PanierRealtime/index.tsx
@@ -6,6 +6,7 @@ import {
   ActionImpactFourchetteBudgetaire,
   ActionImpactTempsMiseEnOeuvre,
   ActionImpactThematique,
+  ActionImpactTypologie,
   Panier,
 } from '@tet/api';
 import { PanierOngletName, useEventTracker, useOngletTracker } from '@tet/ui';
@@ -24,6 +25,7 @@ type PanierRealtimeProps = {
   budgets: ActionImpactFourchetteBudgetaire[];
   temps: ActionImpactTempsMiseEnOeuvre[];
   thematiques: ActionImpactThematique[];
+  typologies: ActionImpactTypologie[];
   sansFiltreCompetences: boolean;
 };
 
@@ -41,6 +43,7 @@ const PanierRealtime = ({
   budgets,
   temps,
   thematiques,
+  typologies,
   sansFiltreCompetences,
 }: PanierRealtimeProps) => {
   const [currentTab, setCurrentTab] = useState<PanierOngletName>('selection');
@@ -128,7 +131,7 @@ const PanierRealtime = ({
           onToggleSelected={handleToggleSelected}
           onUpdateStatus={handleUpdateStatus}
           onChangeTab={handleChangeTab}
-          {...{budgets, temps, thematiques, sansFiltreCompetences}}
+          {...{budgets, temps, thematiques, typologies, sansFiltreCompetences}}
         />
       </div>
 

From 99787335e08cbb33bb932d6c74469fbb220409f5 Mon Sep 17 00:00:00 2001
From: Marc Rutkowski <marc@attractive-media.fr>
Date: Wed, 2 Oct 2024 09:10:36 +0200
Subject: [PATCH 51/91] =?UTF-8?q?Affiche=20les=20actions=20du=20panier=20r?=
 =?UTF-8?q?egroup=C3=A9es=20par=20statut?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../panier/components/PanierActions/index.tsx | 97 ++++++++++++++++---
 1 file changed, 82 insertions(+), 15 deletions(-)

diff --git a/packages/panier/components/PanierActions/index.tsx b/packages/panier/components/PanierActions/index.tsx
index 8334afe417..0fd3772114 100644
--- a/packages/panier/components/PanierActions/index.tsx
+++ b/packages/panier/components/PanierActions/index.tsx
@@ -23,6 +23,15 @@ const PanierActions = ({
     useAjouterActionsRealiseesOuEnCoursState();
   const {nbEnCours, nbRealisees} = ajouterActionsRealiseesOuEnCours;
 
+  // ventile les actions en sections par statut
+  const actionsParStatut = getActionsParStatut(actionsListe);
+  // et détermine les sections à afficher
+  const sections = SECTIONS.map(section =>
+    actionsParStatut[section.statut].length
+      ? {...section, actions: actionsParStatut[section.statut]}
+      : null,
+  ).filter(section => section !== null);
+
   return (
     <div className="lg:h-screen lg:w-2/5 xl:w-1/3 bg-white border-[0.5px] border-primary-3 sticky top-0">
       {actionsListe.length === 0 ? (
@@ -55,7 +64,7 @@ const PanierActions = ({
             <div className="h-48 mt-6">
               <BasketPicto className="mx-auto h-full" />
             </div>
-            <div className="sticky top-0 z-10">
+            <div className="sticky top-0 z-10 bg-white">
               <div className="bg-white text-primary-8 py-6 text-xl font-extrabold text-center">
                 {actionsListe.length} action{actionsListe.length > 1 ? 's' : ''}{' '}
                 dans mon panier
@@ -70,20 +79,32 @@ const PanierActions = ({
             </div>
 
             <div className="grid md:max-lg:grid-cols-2 gap-4">
-              {actionsListe.map(({action, thematiques, typologie}) => (
-                <ActionImpact
-                  key={action.id}
-                  description={action.description}
-                  typologie={typologie}
-                  titre={action.titre}
-                  thematiques={thematiques}
-                  budget={budgets.find(
-                    b => b.niveau === action.fourchette_budgetaire,
-                  )}
-                  panier={true}
-                  isSelected={false}
-                  onToggleSelected={() => onToggleSelected(action.id, false)}
-                />
+              {sections.map(({statut, nom, nomPluriel, actions}) => (
+                <>
+                  <p
+                    key={statut}
+                    className="font-bold uppercase text-primary-10 text-center mb-0"
+                  >
+                    {actions.length} {actions.length > 1 ? nomPluriel : nom}
+                  </p>
+                  {actions.map(({action, thematiques, typologie}) => (
+                    <ActionImpact
+                      key={action.id}
+                      description={action.description}
+                      typologie={typologie}
+                      titre={action.titre}
+                      thematiques={thematiques}
+                      budget={budgets.find(
+                        b => b.niveau === action.fourchette_budgetaire,
+                      )}
+                      panier={true}
+                      isSelected={false}
+                      onToggleSelected={() =>
+                        onToggleSelected(action.id, false)
+                      }
+                    />
+                  ))}
+                </>
               ))}
             </div>
           </div>
@@ -93,4 +114,50 @@ const PanierActions = ({
   );
 };
 
+// pour afficher les actions du panier par statut
+const SECTIONS = [
+  {
+    statut: 'nouvelle',
+    nom: 'nouvelle action',
+    nomPluriel: 'nouvelles actions',
+  },
+  {
+    statut: 'realise',
+    nom: 'action réalisée',
+    nomPluriel: 'actions réalisées',
+  },
+  {
+    statut: 'en_cours',
+    nom: 'action en cours de réalisation',
+    nomPluriel: 'actions en cours de réalisation',
+  },
+  {
+    statut: 'importee',
+    nom: 'action déjà importée',
+    nomPluriel: 'actions déjà importées',
+  },
+] as const;
+type Statut = (typeof SECTIONS)[number]['statut'];
+
+// regroupe les actions par statut
+const getActionsParStatut = (actionsListe: ActionImpactState[]) => {
+  const actionsParStatut: Record<Statut, ActionImpactState[]> = {
+    realise: [],
+    en_cours: [],
+    importee: [],
+    nouvelle: [],
+  };
+  actionsListe.forEach(state => {
+    const statut = state.dejaImportee
+      ? 'importee'
+      : state.statut?.categorie_id === 'realise' ||
+        state.statut?.categorie_id === 'en_cours'
+      ? state.statut.categorie_id
+      : 'nouvelle';
+
+    actionsParStatut[statut].push(state);
+  });
+  return actionsParStatut;
+};
+
 export default PanierActions;

From d912e5b0d8dd2b53c8a44ad8793c3ca2aece5907 Mon Sep 17 00:00:00 2001
From: Marc Rutkowski <marc@attractive-media.fr>
Date: Wed, 2 Oct 2024 10:01:15 +0200
Subject: [PATCH 52/91] =?UTF-8?q?R=C3=A9pare=20un=20test?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/api/src/panier_action_impact/integration.test.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/api/src/panier_action_impact/integration.test.ts b/packages/api/src/panier_action_impact/integration.test.ts
index 032fdcb437..ade0a166ef 100644
--- a/packages/api/src/panier_action_impact/integration.test.ts
+++ b/packages/api/src/panier_action_impact/integration.test.ts
@@ -69,7 +69,7 @@ describe('État du panier', async () => {
 
     expect(selectPanierContenu.error).toBeNull();
     expect(selectPanierContenu.data).toBeDefined();
-    expect(selectPanierContenu.data?.contenu.length).toEqual(1);
+    expect(selectPanierContenu.data?.states.filter(s => s.isinpanier)).toEqual(1);
   });
 });
 describe('État des actions', async () => {
@@ -92,7 +92,7 @@ describe('État des actions', async () => {
 
     expect(selectPanierContenu.error).toBeNull();
     expect(selectPanierContenu.data).toBeDefined();
-    expect(selectPanierContenu.data?.contenu.length).toEqual(1);
+    expect(selectPanierContenu.data?.states.filter(s => s.isinpanier)).toEqual(1);
 
     const { error } = await supabase
       .from('panier')

From 3f162cbc7d315de51a8465ccb1baa33a379a145f Mon Sep 17 00:00:00 2001
From: Marc Rutkowski <marc@attractive-media.fr>
Date: Wed, 2 Oct 2024 10:02:05 +0200
Subject: [PATCH 53/91] =?UTF-8?q?R=C3=A9pare=20un=20passage=20de=20param?=
 =?UTF-8?q?=C3=A8tres?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/panier/app/panier/[id]/utils.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/panier/app/panier/[id]/utils.ts b/packages/panier/app/panier/[id]/utils.ts
index 98a45fc4a0..2884a1b4a1 100644
--- a/packages/panier/app/panier/[id]/utils.ts
+++ b/packages/panier/app/panier/[id]/utils.ts
@@ -39,8 +39,8 @@ export const fetchPanier = async ({
     panierId,
     thematique_ids,
     typologie_ids,
-    budget_ids,
-    temps_ids,
+    niveau_budget_ids: budget_ids,
+    niveau_temps_ids: temps_ids,
   });
 
   return panier;

From 8d4fcc056fda5d8872da59d86efc528a77916ff0 Mon Sep 17 00:00:00 2001
From: Marc Rutkowski <marc@attractive-media.fr>
Date: Wed, 2 Oct 2024 10:04:18 +0200
Subject: [PATCH 54/91] =?UTF-8?q?R=C3=A9pare=20le=20compteur=20d'actions?=
 =?UTF-8?q?=20dans=20le=20panier=20=C3=A0=20la=20validation?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/ValidationPanier/ValiderPanierModale.tsx     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/panier/components/ValidationPanier/ValiderPanierModale.tsx b/packages/panier/components/ValidationPanier/ValiderPanierModale.tsx
index 812fd18d79..526eae4f9a 100644
--- a/packages/panier/components/ValidationPanier/ValiderPanierModale.tsx
+++ b/packages/panier/components/ValidationPanier/ValiderPanierModale.tsx
@@ -26,9 +26,9 @@ import {
 import { panierAPI } from '@tet/panier/src/clientAPI';
 
 const ValiderPanierModale = () => {
-  const { panier } = usePanierContext();
-  const { user } = useUserContext();
-  const contenu = panier?.contenu ?? [];
+  const {panier} = usePanierContext();
+  const {user} = useUserContext();
+  const contenu = panier?.states?.filter(s => s.isinpanier) ?? [];
 
   const steps = [
     "Je crée mon plan et retrouve l'ensemble des fiches actions sélectionnées dans mon panier. ",

From c6c7e827fd7352f9029513f44831d936b06d2a31 Mon Sep 17 00:00:00 2001
From: Marc Rutkowski <marc@attractive-media.fr>
Date: Wed, 2 Oct 2024 10:04:32 +0200
Subject: [PATCH 55/91] Evite une erreur de typage

---
 .../panier/components/PanierActions/index.tsx | 62 ++++++++++---------
 1 file changed, 34 insertions(+), 28 deletions(-)

diff --git a/packages/panier/components/PanierActions/index.tsx b/packages/panier/components/PanierActions/index.tsx
index 0fd3772114..29300f4cb3 100644
--- a/packages/panier/components/PanierActions/index.tsx
+++ b/packages/panier/components/PanierActions/index.tsx
@@ -30,7 +30,7 @@ const PanierActions = ({
     actionsParStatut[section.statut].length
       ? {...section, actions: actionsParStatut[section.statut]}
       : null,
-  ).filter(section => section !== null);
+  );
 
   return (
     <div className="lg:h-screen lg:w-2/5 xl:w-1/3 bg-white border-[0.5px] border-primary-3 sticky top-0">
@@ -79,33 +79,39 @@ const PanierActions = ({
             </div>
 
             <div className="grid md:max-lg:grid-cols-2 gap-4">
-              {sections.map(({statut, nom, nomPluriel, actions}) => (
-                <>
-                  <p
-                    key={statut}
-                    className="font-bold uppercase text-primary-10 text-center mb-0"
-                  >
-                    {actions.length} {actions.length > 1 ? nomPluriel : nom}
-                  </p>
-                  {actions.map(({action, thematiques, typologie}) => (
-                    <ActionImpact
-                      key={action.id}
-                      description={action.description}
-                      typologie={typologie}
-                      titre={action.titre}
-                      thematiques={thematiques}
-                      budget={budgets.find(
-                        b => b.niveau === action.fourchette_budgetaire,
-                      )}
-                      panier={true}
-                      isSelected={false}
-                      onToggleSelected={() =>
-                        onToggleSelected(action.id, false)
-                      }
-                    />
-                  ))}
-                </>
-              ))}
+              {sections.map(section => {
+                if (!section) {
+                  return;
+                }
+                const {statut, nom, nomPluriel, actions} = section;
+                return (
+                  <>
+                    <p
+                      key={statut}
+                      className="font-bold uppercase text-primary-10 text-center mb-0"
+                    >
+                      {actions.length} {actions.length > 1 ? nomPluriel : nom}
+                    </p>
+                    {actions.map(({action, thematiques, typologie}) => (
+                      <ActionImpact
+                        key={action.id}
+                        description={action.description}
+                        typologie={typologie}
+                        titre={action.titre}
+                        thematiques={thematiques}
+                        budget={budgets.find(
+                          b => b.niveau === action.fourchette_budgetaire,
+                        )}
+                        panier={true}
+                        isSelected={false}
+                        onToggleSelected={() =>
+                          onToggleSelected(action.id, false)
+                        }
+                      />
+                    ))}
+                  </>
+                );
+              })}
             </div>
           </div>
         </div>

From 5cca375167e3af5b2a67f1b2e79a8ecb4862044a Mon Sep 17 00:00:00 2001
From: Marc Rutkowski <marc@attractive-media.fr>
Date: Wed, 2 Oct 2024 10:43:05 +0200
Subject: [PATCH 56/91] Fixe les imports

---
 .../src/components/InfoActionImpact/InfoActionImpact.tsx | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/packages/ui/src/components/InfoActionImpact/InfoActionImpact.tsx b/packages/ui/src/components/InfoActionImpact/InfoActionImpact.tsx
index 2631184add..769d2e00f3 100644
--- a/packages/ui/src/components/InfoActionImpact/InfoActionImpact.tsx
+++ b/packages/ui/src/components/InfoActionImpact/InfoActionImpact.tsx
@@ -3,11 +3,10 @@ import {
   ActionImpactTempsMiseEnOeuvre,
   ActionImpactThematique,
 } from '@tet/api';
-
-import {Badge} from 'design-system/Badge';
-import {Button} from 'design-system/Button';
-import {Divider} from 'design-system/Divider';
-import {InfoTooltip} from 'design-system/Tooltip';
+import { Badge } from '@tet/ui/design-system/Badge';
+import { Button } from '@tet/ui/design-system/Button';
+import { Divider } from '@tet/ui/design-system/Divider';
+import { InfoTooltip } from '@tet/ui/design-system/Tooltip';
 
 const URL_AIDES_TERRITOIRES = 'https://aides-territoires.beta.gouv.fr';
 

From c81e777fa810d48e06ec5c7ebd194e6a0f1b4845 Mon Sep 17 00:00:00 2001
From: Marc Rutkowski <marc@attractive-media.fr>
Date: Wed, 2 Oct 2024 10:46:25 +0200
Subject: [PATCH 57/91] Corrige une erreur de typage

---
 .../src/app/Layout/Header/MenuUtilisateur.tsx                 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app.territoiresentransitions.react/src/app/Layout/Header/MenuUtilisateur.tsx b/app.territoiresentransitions.react/src/app/Layout/Header/MenuUtilisateur.tsx
index 8d1a9eaf47..370c5330d0 100644
--- a/app.territoiresentransitions.react/src/app/Layout/Header/MenuUtilisateur.tsx
+++ b/app.territoiresentransitions.react/src/app/Layout/Header/MenuUtilisateur.tsx
@@ -65,7 +65,7 @@ const MenuUtilisateurBtn = forwardRef(
       isUserPath: boolean;
       user: UserData;
     },
-    ref?: Ref<HTMLDivElement>
+    ref?: Ref<HTMLButtonElement>
   ) => (
     <Button
       ref={ref}
@@ -79,7 +79,7 @@ const MenuUtilisateurBtn = forwardRef(
       icon={`${user.isSupport ? 'customer-service' : 'account-circle'}-${
         isUserPath ? 'fill' : 'line'
       }`}
-      style={{maxWidth: '15rem'}}
+      style={{ maxWidth: '15rem' }}
       aria-expanded={isOpen}
     >
       <span className="line-clamp-1">{user.prenom}</span>

From c8e67333f89e0e2ce7df6e38d6b7ecf977b7f817 Mon Sep 17 00:00:00 2001
From: Marc Rutkowski <marc@attractive-media.fr>
Date: Wed, 2 Oct 2024 12:03:29 +0200
Subject: [PATCH 58/91] Ajoute l'url du panier dans le build de l'app

---
 .github/workflows/cd-app.yml | 1 +
 Earthfile                    | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/.github/workflows/cd-app.yml b/.github/workflows/cd-app.yml
index 2ee0b3eeff..9de4fd13af 100644
--- a/.github/workflows/cd-app.yml
+++ b/.github/workflows/cd-app.yml
@@ -41,6 +41,7 @@ jobs:
           --SENTRY_DSN=${{ vars.SENTRY_DSN }}
           --CRISP_WEBSITE_ID=${{ vars.CRISP_WEBSITE_ID }}
           --BACKEND_URL=${{ vars.BACKEND_URL }}
+          --PANIER_URL=${{ vars.PANIER_URL }}
           --POSTHOG_HOST=${{ secrets.POSTHOG_HOST }} --POSTHOG_KEY=${{ secrets.POSTHOG_KEY }}
 
   deploy-app:
diff --git a/Earthfile b/Earthfile
index 390d3ec8a6..17cc5065a7 100644
--- a/Earthfile
+++ b/Earthfile
@@ -370,6 +370,7 @@ app-build: ## construit l'image de l'app
     ARG POSTHOG_HOST
     ARG POSTHOG_KEY
     ARG BACKEND_URL
+    ARG PANIER_URL
     FROM +front-deps
     ENV NX_PUBLIC_SUPABASE_URL=$API_URL
     ENV NX_PUBLIC_SUPABASE_KEY=$ANON_KEY
@@ -378,6 +379,7 @@ app-build: ## construit l'image de l'app
     ENV NX_PUBLIC_POSTHOG_HOST=$POSTHOG_HOST
     ENV NX_PUBLIC_POSTHOG_KEY=$POSTHOG_KEY
     ENV NX_PUBLIC_BACKEND_URL=$BACKEND_URL
+    ENV NX_PUBLIC_PANIER_URL=$PANIER_URL
     LABEL org.opencontainers.image.description="Front-end $ENV_NAME, build depuis $GIT_BRANCH. API: $API_URL"
     # copie les sources des modules à construire
     COPY $APP_DIR/. $APP_DIR/

From e5316b4244e2a496f7d6260623151709f425586b Mon Sep 17 00:00:00 2001
From: Marc Rutkowski <marc@attractive-media.fr>
Date: Wed, 2 Oct 2024 14:11:46 +0200
Subject: [PATCH 59/91] Corrige des erreurs de build du panier suite au dernier
 rebase

---
 .../FiltresActions/BadgesFilters.tsx          |   1 +
 .../components/Landing/SelectCollectivite.tsx |   2 +-
 .../components/Landing/useCollectiviteInfo.ts |   5 +-
 .../Landing/useFilteredCollectivites.ts       |   6 +-
 ...eAjouterActionsRealiseesOuEnCoursState.tsx |   2 +-
 .../PanierRealtime/PartagerLeLien.tsx         |   2 +-
 packages/ui/src/design-system/Tabs/Tabs.tsx   | 115 +++++++++---------
 7 files changed, 66 insertions(+), 67 deletions(-)

diff --git a/packages/panier/components/FiltresActions/BadgesFilters.tsx b/packages/panier/components/FiltresActions/BadgesFilters.tsx
index 1fc2b678ed..0dfe7622e3 100644
--- a/packages/panier/components/FiltresActions/BadgesFilters.tsx
+++ b/packages/panier/components/FiltresActions/BadgesFilters.tsx
@@ -2,6 +2,7 @@ import classNames from 'classnames';
 import { useEffect, useState } from 'react';
 
 import {
+  Badge,
   ButtonMenu,
   Checkbox,
   Field,
diff --git a/packages/panier/components/Landing/SelectCollectivite.tsx b/packages/panier/components/Landing/SelectCollectivite.tsx
index 8b820441a9..d1c42fcc01 100644
--- a/packages/panier/components/Landing/SelectCollectivite.tsx
+++ b/packages/panier/components/Landing/SelectCollectivite.tsx
@@ -2,7 +2,7 @@
 
 import {useState} from 'react';
 import {Select} from '@tet/ui';
-import {useFilteredCollectivites} from '@components/Landing/useFilteredCollectivites';
+import { useFilteredCollectivites } from './useFilteredCollectivites';
 
 /**
  *  Permet de rechercher et sélectionner une collectivité
diff --git a/packages/panier/components/Landing/useCollectiviteInfo.ts b/packages/panier/components/Landing/useCollectiviteInfo.ts
index 4785afe708..f5656190d5 100644
--- a/packages/panier/components/Landing/useCollectiviteInfo.ts
+++ b/packages/panier/components/Landing/useCollectiviteInfo.ts
@@ -1,5 +1,4 @@
-import {makeSearchString} from '@tet/api';
-import {supabase} from 'src/clientAPI';
+import { supabase } from '../../src/clientAPI';
 import useSWR from 'swr';
 
 /** Donne des infos sur une collectivité */
@@ -8,7 +7,7 @@ export const useCollectiviteInfo = (collectiviteId: number | null) => {
   return useSWR(key, async () => {
     if (!collectiviteId) return null;
 
-    const {error, data} = await supabase
+    const { error, data } = await supabase
       .from('site_labellisation')
       .select('collectivite_id, nom, engagee')
       .eq('collectivite_id', collectiviteId);
diff --git a/packages/panier/components/Landing/useFilteredCollectivites.ts b/packages/panier/components/Landing/useFilteredCollectivites.ts
index 831f6f7d33..5a82ac4332 100644
--- a/packages/panier/components/Landing/useFilteredCollectivites.ts
+++ b/packages/panier/components/Landing/useFilteredCollectivites.ts
@@ -1,6 +1,6 @@
-import {makeSearchString} from '@tet/api';
-import {supabase} from 'src/clientAPI';
+import { makeSearchString } from '@tet/api';
 import useSWR from 'swr';
+import { supabase } from '../../src/clientAPI';
 
 /** Donne la liste des collectivités dont le nom inclus la chaîne recherchée */
 export const useFilteredCollectivites = (search: string, limit = 10) => {
@@ -17,7 +17,7 @@ export const useFilteredCollectivites = (search: string, limit = 10) => {
       query.or(processedSearch);
     }
 
-    const {error, data} = await query;
+    const { error, data } = await query;
 
     if (error) {
       throw new Error(key);
diff --git a/packages/panier/components/PanierActions/useAjouterActionsRealiseesOuEnCoursState.tsx b/packages/panier/components/PanierActions/useAjouterActionsRealiseesOuEnCoursState.tsx
index f2aa79e610..e1afc8d330 100644
--- a/packages/panier/components/PanierActions/useAjouterActionsRealiseesOuEnCoursState.tsx
+++ b/packages/panier/components/PanierActions/useAjouterActionsRealiseesOuEnCoursState.tsx
@@ -1,6 +1,6 @@
 import {Panier} from '@tet/api';
 import {useState, useEffect} from 'react';
-import {panierAPI} from 'src/clientAPI';
+import { panierAPI } from '../../src/clientAPI';
 import {usePanierContext} from '../../providers';
 
 /**
diff --git a/packages/panier/components/PanierRealtime/PartagerLeLien.tsx b/packages/panier/components/PanierRealtime/PartagerLeLien.tsx
index 1293c0dbd6..b42fd22ff0 100644
--- a/packages/panier/components/PanierRealtime/PartagerLeLien.tsx
+++ b/packages/panier/components/PanierRealtime/PartagerLeLien.tsx
@@ -2,7 +2,7 @@
 import {useEffect, useState} from 'react';
 import {Card, Button, Icon, useCopyToClipboard, useEventTracker} from '@tet/ui';
 import {Panier} from '@tet/api';
-import Membres from '@components/Picto/Membres';
+import Membres from '../Picto/Membres';
 
 /**
  * Affiche l'encadré invitant au partage du lien vers le panier
diff --git a/packages/ui/src/design-system/Tabs/Tabs.tsx b/packages/ui/src/design-system/Tabs/Tabs.tsx
index 6b99f8f93f..b203f5c2ac 100644
--- a/packages/ui/src/design-system/Tabs/Tabs.tsx
+++ b/packages/ui/src/design-system/Tabs/Tabs.tsx
@@ -69,65 +69,64 @@ export const Tabs = ({
         )}
         role="tablist"
       >
-        {children
-          .filter(elt => elt !== undefined)
-          .map((element, index) => {
-            const isActive = activeTab === index;
-            return (
-              <li role="presentation" className="p-0" key={element.props.label}>
-                <button
-                  className={classNames(
-                    // styles communs
-                    'flex items-center px-3 py-1 font-bold w-max',
-                    // variante au survol
-                    'hover:rounded-md hover:shadow-button hover:!bg-primary-2 hover:text-primary-9',
-                    {
-                      // variante de taille
-                      'text-md': size === 'md',
-                      'text-sm': size === 'sm',
-                      'text-xs': size === 'xs',
-                      // variante pour l'onglet actif
-                      'border border-grey-3 rounded-md shadow-button bg-white text-primary-9':
-                        isActive,
-                      // variante pour les onglets inactifs
-                      'text-primary-10': !isActive,
-                    }
+        {children.map((element, index) => {
+          const isActive = activeTab === index;
+          if (!element) return;
+          return (
+            <li role="presentation" className="p-0" key={element.props.label}>
+              <button
+                className={classNames(
+                  // styles communs
+                  'flex items-center px-3 py-1 font-bold w-max',
+                  // variante au survol
+                  'hover:rounded-md hover:shadow-button hover:!bg-primary-2 hover:text-primary-9',
+                  {
+                    // variante de taille
+                    'text-md': size === 'md',
+                    'text-sm': size === 'sm',
+                    'text-xs': size === 'xs',
+                    // variante pour l'onglet actif
+                    'border border-grey-3 rounded-md shadow-button bg-white text-primary-9':
+                      isActive,
+                    // variante pour les onglets inactifs
+                    'text-primary-10': !isActive,
+                  }
+                )}
+                type="button"
+                role="tab"
+                id={`tab-${index}`}
+                aria-selected={isActive ? 'true' : 'false'}
+                title={element.props.title}
+                onClick={() => handleChange(index)}
+              >
+                {element.props.icon &&
+                  (!element.props.iconPosition ||
+                    element.props.iconPosition === 'left') && (
+                    <Icon
+                      icon={element.props.icon}
+                      size={size}
+                      className={classNames(
+                        'mr-1',
+                        element.props.iconClassName
+                      )}
+                    />
                   )}
-                  type="button"
-                  role="tab"
-                  id={`tab-${index}`}
-                  aria-selected={isActive ? 'true' : 'false'}
-                  title={element.props.title}
-                  onClick={() => handleChange(index)}
-                >
-                  {element.props.icon &&
-                    (!element.props.iconPosition ||
-                      element.props.iconPosition === 'left') && (
-                      <Icon
-                        icon={element.props.icon}
-                        size={size}
-                        className={classNames(
-                          'mr-1',
-                          element.props.iconClassName
-                        )}
-                      />
-                    )}
-                  {element.props.label}
-                  {element.props.icon &&
-                    element.props.iconPosition === 'right' && (
-                      <Icon
-                        icon={element.props.icon}
-                        size={size}
-                        className={classNames(
-                          'ml-1',
-                          element.props.iconClassName
-                        )}
-                      />
-                    )}
-                </button>
-              </li>
-            );
-          })}
+                {element.props.label}
+                {element.props.icon &&
+                  element.props.iconPosition === 'right' && (
+                    <Icon
+                      icon={element.props.icon}
+                      size={size}
+                      className={classNames(
+                        'ml-1',
+                        element.props.iconClassName
+                      )}
+                    />
+                  )}
+              </button>
+            </li>
+          );
+        })}
       </ul>
       {tabsPanel}
     </div>

From f54303fca8686ecf915a91a5b9e55b175063fc02 Mon Sep 17 00:00:00 2001
From: Marc Rutkowski <marc@attractive-media.fr>
Date: Wed, 2 Oct 2024 14:22:32 +0200
Subject: [PATCH 60/91] =?UTF-8?q?Corrige=20la=20construction=20de=20l'url?=
 =?UTF-8?q?=20d'acc=C3=A8s=20au=20panier=20depuis=20l'app?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/Layout/Header/AccesPanierAction.tsx   | 31 ++++++++++---------
 .../src/environmentVariables.ts               |  2 +-
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/app.territoiresentransitions.react/src/app/Layout/Header/AccesPanierAction.tsx b/app.territoiresentransitions.react/src/app/Layout/Header/AccesPanierAction.tsx
index 44c92752aa..d9660154aa 100644
--- a/app.territoiresentransitions.react/src/app/Layout/Header/AccesPanierAction.tsx
+++ b/app.territoiresentransitions.react/src/app/Layout/Header/AccesPanierAction.tsx
@@ -15,22 +15,25 @@ export const AccesPanierAction = () => {
   const collectiviteId = useCollectiviteId();
   const {data} = useNbActionsDansPanier(collectiviteId);
   const {panierId, count} = data || {};
+  const url = panierId
+    ? `${ENV.panier_url}/panier/${panierId}`
+    : collectiviteId
+    ? `${ENV.panier_url}/landing/collectivite/${collectiviteId}`
+    : `${ENV.panier_url}/landing`;
 
   return (
-    panierId && (
-      <Button
-        variant="white"
-        className={classNames('text-primary-9', {'mr-2': !!count})}
-        size="sm"
-        icon="shopping-basket-2-line"
-        notification={count ? {number: count, variant: 'info'} : undefined}
-        onClick={() => {
-          window.open(`${ENV.panier_url}/panier/${panierId}`, '_blank');
-        }}
-      >
-        Panier d'action
-      </Button>
-    )
+    <Button
+      variant="white"
+      className={classNames('text-primary-9', { 'mr-2': !!count })}
+      size="sm"
+      icon="shopping-basket-2-line"
+      notification={count ? { number: count, variant: 'info' } : undefined}
+      onClick={() => {
+        window.open(url, '_blank');
+      }}
+    >
+      Panier d'action
+    </Button>
   );
 };
 
diff --git a/app.territoiresentransitions.react/src/environmentVariables.ts b/app.territoiresentransitions.react/src/environmentVariables.ts
index df65a3cec3..c6f02c011f 100644
--- a/app.territoiresentransitions.react/src/environmentVariables.ts
+++ b/app.territoiresentransitions.react/src/environmentVariables.ts
@@ -4,7 +4,7 @@ export const ENV = {
   supabase_anon_key: process.env.NX_PUBLIC_SUPABASE_KEY,
   supabase_url: process.env.NX_PUBLIC_SUPABASE_URL,
   sentry_dsn: process.env.NX_PUBLIC_SENTRY_DSN,
-  panier_url: process.env.REACT_APP_PANIER_URL,
+  panier_url: process.env.NX_PUBLIC_PANIER_URL,
   posthog: {
     host: process.env.NX_PUBLIC_POSTHOG_HOST,
     key: process.env.NX_PUBLIC_POSTHOG_KEY,

From fc19b1a9bf796bef9216d600b93d0c2cac0a9499 Mon Sep 17 00:00:00 2001
From: Marc Rutkowski <marc@attractive-media.fr>
Date: Wed, 2 Oct 2024 14:48:26 +0200
Subject: [PATCH 61/91] =?UTF-8?q?R=C3=A9pare=20le=20filtrage=20sur=20les?=
 =?UTF-8?q?=20th=C3=A9matiques?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/api/src/panier_action_impact/panierAPI.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/api/src/panier_action_impact/panierAPI.ts b/packages/api/src/panier_action_impact/panierAPI.ts
index 1814cc33ae..f3b6b48566 100644
--- a/packages/api/src/panier_action_impact/panierAPI.ts
+++ b/packages/api/src/panier_action_impact/panierAPI.ts
@@ -124,7 +124,7 @@ export class PanierAPI {
     if (thematique_ids && thematique_ids.length > 0) {
       // @ts-expect-error Le client Supabase ne permet pas de filtrer à ce niveau
       builder.url.searchParams.append(
-        'action_impact_state.thematiques.id',
+        'action_impact_state.thematiques.thematique_id',
         `in.(${thematique_ids.join(',')})`
       );
       // @ts-expect-error Le client Supabase ne permet pas de filtrer à ce niveau

From 8d7101fc90d8da02d9a0fdb197f520e9b77b92f8 Mon Sep 17 00:00:00 2001
From: Marc Rutkowski <marc@attractive-media.fr>
Date: Wed, 2 Oct 2024 17:39:05 +0200
Subject: [PATCH 62/91] =?UTF-8?q?Change=20le=20libell=C3=A9=20de=20l'ongle?=
 =?UTF-8?q?t=20"S=C3=A9lection"=20et=20g=C3=A8re=20le=20singulier=20pour?=
 =?UTF-8?q?=20l'onglet=20"fiches=20d=C3=A9j=C3=A0=20import=C3=A9es"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../panier/components/ListeActions/index.tsx  | 47 +++++++++++--------
 1 file changed, 28 insertions(+), 19 deletions(-)

diff --git a/packages/panier/components/ListeActions/index.tsx b/packages/panier/components/ListeActions/index.tsx
index 5a9f8e3a0a..25bf949763 100644
--- a/packages/panier/components/ListeActions/index.tsx
+++ b/packages/panier/components/ListeActions/index.tsx
@@ -20,19 +20,20 @@ import ListeVide from './ListeVide';
 import FiltresActions from '@tet/panier/components/FiltresActions';
 
 const getTabLabel = (
-  tab: {label: string; status: string | null},
-  actionsNb: number,
+  tab: { label: string; labelOne?: string; status: string | null },
+  actionsNb: number
 ) => {
-  if (tab.status !== null) {
-    if (actionsNb > 1 || tab.status === 'en_cours') {
-      return `${actionsNb} ${tab.label.toLowerCase()}`;
-    } else {
-      return `${actionsNb} ${tab.label
-        .slice(0, tab.label.length - 1)
-        .toLowerCase()}`;
-    }
+  if (actionsNb === 1 && tab.labelOne) {
+    return `1 ${tab.labelOne.toLowerCase()}`;
+  }
+
+  if (actionsNb > 1 || tab.status === 'en_cours') {
+    return `${actionsNb} ${tab.label.toLowerCase()}`;
+  } else {
+    return `${actionsNb} ${tab.label
+      .slice(0, tab.label.length - 1)
+      .toLowerCase()}`;
   }
-  return tab.label;
 };
 
 type ListeActionsProps = {
@@ -62,11 +63,16 @@ const ListeActions = ({
 
   const tabsList: {
     label: string;
+    labelOne?: string;
     shortName: PanierOngletName;
     status: string | null;
   }[] = [
-    {label: 'Sélection', shortName: 'selection', status: null},
-    {label: 'Réalisées', shortName: 'réalisées', status: 'realise'},
+    {
+      label: 'Propositions',
+      shortName: 'selection',
+      status: null,
+    },
+    { label: 'Réalisées', shortName: 'réalisées', status: 'realise' },
     {
       label: 'En cours de réalisation',
       shortName: 'en cours',
@@ -74,10 +80,13 @@ const ListeActions = ({
     },
   ];
 
-  const actionsDejaImportees = actionsListe.filter(state => state.dejaImportee);
+  const actionsDejaImportees = actionsListe.filter(
+    (state) => state.dejaImportee
+  );
   if (actionsDejaImportees.length) {
     tabsList.push({
       label: 'Fiches déjà importées',
+      labelOne: 'Fiche déjà importée',
       shortName: 'importees',
       status: 'importees',
     });
@@ -85,18 +94,18 @@ const ListeActions = ({
 
   return (
     <Tabs
-      onChange={activeTab => onChangeTab(tabsList[activeTab].shortName)}
+      onChange={(activeTab) => onChangeTab(tabsList[activeTab].shortName)}
       className="grow flex flex-col"
       tabPanelClassName="grow flex flex-col"
       tabsListClassName="!justify-start mb-0"
     >
-      {...tabsList.map(tab => {
+      {...tabsList.map((tab) => {
         const actionsFiltrees =
           tab.shortName === 'importees'
             ? actionsDejaImportees
             : tab.shortName === 'selection'
-            ? filtreSelection({actionsListe, sansFiltreCompetences})
-            : actionsListe.filter(a => a.statut?.categorie_id === tab.status);
+            ? filtreSelection({ actionsListe, sansFiltreCompetences })
+            : actionsListe.filter((a) => a.statut?.categorie_id === tab.status);
 
         return (
           <Tab key={tab.label} label={getTabLabel(tab, actionsFiltrees.length)}>
@@ -172,7 +181,7 @@ const ListeActions = ({
                   actionsListe={actionsFiltrees}
                   onUpdateStatus={onUpdateStatus}
                   onToggleSelected={onToggleSelected}
-                  {...{budgets, temps}}
+                  {...{ budgets, temps }}
                 />
               </>
             )}

From 6c440e9c234ca8fbab7d24d35279103928aa0987 Mon Sep 17 00:00:00 2001
From: Marc Rutkowski <marc@attractive-media.fr>
Date: Thu, 3 Oct 2024 15:58:29 +0200
Subject: [PATCH 63/91] =?UTF-8?q?Revert=20"Evite=20de=20charger=20en=20dou?=
 =?UTF-8?q?ble=20les=20informations=20des=20actions=20=C3=A0=20impact"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit c618848be189b0a66c5f6eb88fe27dc87ebfb353.
---
 .../api/src/panier_action_impact/panierAPI.ts |  6 ++-
 .../api/src/panier_action_impact/types.ts     |  9 ++++
 .../panier/components/PanierActions/index.tsx | 52 ++++++-------------
 .../components/PanierRealtime/index.tsx       |  2 +-
 packages/panier/hooks/useLandingPathname.ts   |  4 +-
 5 files changed, 33 insertions(+), 40 deletions(-)

diff --git a/packages/api/src/panier_action_impact/panierAPI.ts b/packages/api/src/panier_action_impact/panierAPI.ts
index f3b6b48566..8be2565887 100644
--- a/packages/api/src/panier_action_impact/panierAPI.ts
+++ b/packages/api/src/panier_action_impact/panierAPI.ts
@@ -4,9 +4,11 @@ import { MesCollectivite, Panier, PanierBase } from './types';
 
 /**
  * On sélectionne toutes les colonnes du panier : *
- * puis les `action_impact` par la relation `action_impact_state` que l'on renomme `states`
+ * puis les `action_impact` par la relation `action_impact_panier` que l'on renomme `contenuPanier`
  */
-export const panierSelect = `*,states:action_impact_state(
+export const panierSelect = `*,
+  contenu:action_impact!action_impact_panier(*,thematiques:thematique(*)),
+  states:action_impact_state(
     *, matches_competences,
     thematiques:action_impact_thematique(...thematique(id,nom)),
     typologie:action_impact_typologie(*),
diff --git a/packages/api/src/panier_action_impact/types.ts b/packages/api/src/panier_action_impact/types.ts
index 954835ef47..08703b2c1f 100644
--- a/packages/api/src/panier_action_impact/types.ts
+++ b/packages/api/src/panier_action_impact/types.ts
@@ -35,6 +35,13 @@ export type ActionImpact = Omit<
   subventions_mobilisables: Link[];
 };
 
+/* Le resumé d'une action à impact, utilisé pour les cartes  */
+export type ActionImpactSnippet =
+  // todo: Omit<ActionImpact, 'description' | 'ressources_externes'>
+  ActionImpact & {
+    thematiques: ActionImpactThematique[];
+  };
+
 /* Une action à impact avec des informations complémentaires, utilisé par la modale */
 export type ActionImpactDetails = ActionImpact & {
   thematiques: ActionImpactThematique[];
@@ -66,6 +73,8 @@ export type PanierBase = Database['public']['Tables']['panier']['Row'];
 export type Panier =
   /* Le panier en tant que tel */
   PanierBase & {
+    /* Liste des actions ajoutée au panier */
+    contenu: ActionImpactSnippet[];
     /* Liste de toutes les actions avec leurs states. */
     states: ActionImpactState[];
   };
diff --git a/packages/panier/components/PanierActions/index.tsx b/packages/panier/components/PanierActions/index.tsx
index 29300f4cb3..d5ea25e20d 100644
--- a/packages/panier/components/PanierActions/index.tsx
+++ b/packages/panier/components/PanierActions/index.tsx
@@ -3,13 +3,13 @@ import {ActionImpact} from '@tet/panier/components/ActionImpact';
 import BasketPicto from '@tet/panier/components/Picto/BasketPicto';
 import EmptyBasketPicto from '@tet/panier/components/Picto/EmptyBasketPicto';
 import ValiderPanierButton from '@tet/panier/components/ValidationPanier/ValiderPanierButton';
-import {ActionImpactFourchetteBudgetaire, ActionImpactState} from '@tet/api';
+import {ActionImpactFourchetteBudgetaire, ActionImpactSnippet} from '@tet/api';
 import {Alert} from '@tet/ui';
 import {AjouterActionsRealiseesOuEnCours} from './AjouterActionsRealiseesOuEnCours';
 import {useAjouterActionsRealiseesOuEnCoursState} from './useAjouterActionsRealiseesOuEnCoursState';
 
 type PanierActionsProps = {
-  actionsListe: ActionImpactState[];
+  actionsListe: ActionImpactSnippet[];
   budgets: ActionImpactFourchetteBudgetaire[];
   onToggleSelected: (actionId: number, selected: boolean) => void;
 };
@@ -79,39 +79,21 @@ const PanierActions = ({
             </div>
 
             <div className="grid md:max-lg:grid-cols-2 gap-4">
-              {sections.map(section => {
-                if (!section) {
-                  return;
-                }
-                const {statut, nom, nomPluriel, actions} = section;
-                return (
-                  <>
-                    <p
-                      key={statut}
-                      className="font-bold uppercase text-primary-10 text-center mb-0"
-                    >
-                      {actions.length} {actions.length > 1 ? nomPluriel : nom}
-                    </p>
-                    {actions.map(({action, thematiques, typologie}) => (
-                      <ActionImpact
-                        key={action.id}
-                        description={action.description}
-                        typologie={typologie}
-                        titre={action.titre}
-                        thematiques={thematiques}
-                        budget={budgets.find(
-                          b => b.niveau === action.fourchette_budgetaire,
-                        )}
-                        panier={true}
-                        isSelected={false}
-                        onToggleSelected={() =>
-                          onToggleSelected(action.id, false)
-                        }
-                      />
-                    ))}
-                  </>
-                );
-              })}
+              {actionsListe.map(action => (
+                <ActionImpact
+                  key={action.id}
+                  description={action.description}
+                  titre={action.titre}
+                  thematiques={action.thematiques}
+                  typologie={action.typologie}
+                  budget={budgets.find(
+                    b => b.niveau === action.fourchette_budgetaire,
+                  )}
+                  panier={true}
+                  isSelected={false}
+                  onToggleSelected={() => onToggleSelected(action.id, false)}
+                />
+              ))}
             </div>
           </div>
         </div>
diff --git a/packages/panier/components/PanierRealtime/index.tsx b/packages/panier/components/PanierRealtime/index.tsx
index 1690b898fc..100718f2cf 100644
--- a/packages/panier/components/PanierRealtime/index.tsx
+++ b/packages/panier/components/PanierRealtime/index.tsx
@@ -136,7 +136,7 @@ const PanierRealtime = ({
       </div>
 
       <PanierActions
-        actionsListe={panier.states.filter(({isinpanier}) => isinpanier)}
+        actionsListe={panier.contenu}
         budgets={budgets}
         onToggleSelected={handleToggleSelected}
       />
diff --git a/packages/panier/hooks/useLandingPathname.ts b/packages/panier/hooks/useLandingPathname.ts
index 0206b9b814..07fc19a252 100644
--- a/packages/panier/hooks/useLandingPathname.ts
+++ b/packages/panier/hooks/useLandingPathname.ts
@@ -13,10 +13,10 @@ const useLandingPathname = () => {
       setLandingPathname(pathname);
     } else if (collectiviteId) {
       setLandingPathname(`/landing/collectivite/${collectiviteId}`);
-    } else if (panier?.id && panier.states.length > 0) {
+    } else if (panier?.id && panier.contenu.length > 0) {
       setLandingPathname(`/landing/panier/${panier.id}`);
     }
-  }, [pathname, collectiviteId, panier?.id, panier?.states.length]);
+  }, [pathname, collectiviteId, panier?.id, panier?.contenu.length]);
 
   return landingPathname;
 };

From f81382dab5b1e3677d2845e876e5ec85577063a9 Mon Sep 17 00:00:00 2001
From: Marc Rutkowski <marc@attractive-media.fr>
Date: Thu, 3 Oct 2024 15:59:37 +0200
Subject: [PATCH 64/91] =?UTF-8?q?Revert=20"R=C3=A9pare=20un=20test"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit cf30f2c597a06e340b8a4be65d89e9e941367a3c.
---
 packages/api/src/panier_action_impact/integration.test.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/api/src/panier_action_impact/integration.test.ts b/packages/api/src/panier_action_impact/integration.test.ts
index ade0a166ef..032fdcb437 100644
--- a/packages/api/src/panier_action_impact/integration.test.ts
+++ b/packages/api/src/panier_action_impact/integration.test.ts
@@ -69,7 +69,7 @@ describe('État du panier', async () => {
 
     expect(selectPanierContenu.error).toBeNull();
     expect(selectPanierContenu.data).toBeDefined();
-    expect(selectPanierContenu.data?.states.filter(s => s.isinpanier)).toEqual(1);
+    expect(selectPanierContenu.data?.contenu.length).toEqual(1);
   });
 });
 describe('État des actions', async () => {
@@ -92,7 +92,7 @@ describe('État des actions', async () => {
 
     expect(selectPanierContenu.error).toBeNull();
     expect(selectPanierContenu.data).toBeDefined();
-    expect(selectPanierContenu.data?.states.filter(s => s.isinpanier)).toEqual(1);
+    expect(selectPanierContenu.data?.contenu.length).toEqual(1);
 
     const { error } = await supabase
       .from('panier')

From 648b7e7a5d6c3a5773d1d0dfdd474700119f7039 Mon Sep 17 00:00:00 2001
From: Marc Rutkowski <marc@attractive-media.fr>
Date: Thu, 3 Oct 2024 18:33:08 +0200
Subject: [PATCH 65/91] =?UTF-8?q?Revert=20"R=C3=A9pare=20le=20compteur=20d?=
 =?UTF-8?q?'actions=20dans=20le=20panier=20=C3=A0=20la=20validation"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 96032e14883cb785dc47ba278318d0f86edd3372.
---
 .../components/ValidationPanier/ValiderPanierModale.tsx     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/panier/components/ValidationPanier/ValiderPanierModale.tsx b/packages/panier/components/ValidationPanier/ValiderPanierModale.tsx
index 526eae4f9a..812fd18d79 100644
--- a/packages/panier/components/ValidationPanier/ValiderPanierModale.tsx
+++ b/packages/panier/components/ValidationPanier/ValiderPanierModale.tsx
@@ -26,9 +26,9 @@ import {
 import { panierAPI } from '@tet/panier/src/clientAPI';
 
 const ValiderPanierModale = () => {
-  const {panier} = usePanierContext();
-  const {user} = useUserContext();
-  const contenu = panier?.states?.filter(s => s.isinpanier) ?? [];
+  const { panier } = usePanierContext();
+  const { user } = useUserContext();
+  const contenu = panier?.contenu ?? [];
 
   const steps = [
     "Je crée mon plan et retrouve l'ensemble des fiches actions sélectionnées dans mon panier. ",

From c489044f2bee4a1809aca762044fcc81aacb71dd Mon Sep 17 00:00:00 2001
From: Marc Rutkowski <marc@attractive-media.fr>
Date: Thu, 3 Oct 2024 18:35:34 +0200
Subject: [PATCH 66/91] =?UTF-8?q?Ajoute=20le=20chargement=20de=20la=20typo?=
 =?UTF-8?q?logie=20pour=20la=20fiche=20r=C3=A9sum=C3=A9=20d'une=20action?=
 =?UTF-8?q?=20du=20panier?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/api/src/panier_action_impact/panierAPI.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/api/src/panier_action_impact/panierAPI.ts b/packages/api/src/panier_action_impact/panierAPI.ts
index 8be2565887..c06645330f 100644
--- a/packages/api/src/panier_action_impact/panierAPI.ts
+++ b/packages/api/src/panier_action_impact/panierAPI.ts
@@ -7,7 +7,7 @@ import { MesCollectivite, Panier, PanierBase } from './types';
  * puis les `action_impact` par la relation `action_impact_panier` que l'on renomme `contenuPanier`
  */
 export const panierSelect = `*,
-  contenu:action_impact!action_impact_panier(*,thematiques:thematique(*)),
+  contenu:action_impact!action_impact_panier(*,thematiques:thematique(*),typologie:action_impact_typologie(*)),
   states:action_impact_state(
     *, matches_competences,
     thematiques:action_impact_thematique(...thematique(id,nom)),

From 3e46466aa4b2488712466f0d35925d27a3443e21 Mon Sep 17 00:00:00 2001
From: Marc Rutkowski <marc@attractive-media.fr>
Date: Thu, 3 Oct 2024 18:37:26 +0200
Subject: [PATCH 67/91] Evite l'affichage d'une bulle vide quand il n'y a pas
 de filtre actif

---
 packages/panier/components/FiltresActions/BadgesFilters.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/panier/components/FiltresActions/BadgesFilters.tsx b/packages/panier/components/FiltresActions/BadgesFilters.tsx
index 0dfe7622e3..361f7353dc 100644
--- a/packages/panier/components/FiltresActions/BadgesFilters.tsx
+++ b/packages/panier/components/FiltresActions/BadgesFilters.tsx
@@ -172,7 +172,7 @@ export const BadgesFilters = ({
             ? {
                 number: badgesList.length,
               }
-            : {}
+            : undefined
         }
       >
         <div className="flex flex-col gap-4 w-72 p-4">

From 1165ecab2d3ed552316705f3c4025f807858aa70 Mon Sep 17 00:00:00 2001
From: Marc Rutkowski <marc@attractive-media.fr>
Date: Thu, 3 Oct 2024 18:39:33 +0200
Subject: [PATCH 68/91] =?UTF-8?q?Change=20un=20libell=C3=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/panier/components/ListeActions/index.tsx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/panier/components/ListeActions/index.tsx b/packages/panier/components/ListeActions/index.tsx
index 25bf949763..06279337ea 100644
--- a/packages/panier/components/ListeActions/index.tsx
+++ b/packages/panier/components/ListeActions/index.tsx
@@ -147,8 +147,8 @@ const ListeActions = ({
                           aux côtés des actions en cours et à venir pour
                           constituer et piloter un plan d'action sur l'outil
                           numérique. Il vous suffit de cocher la case "Ajouter
-                          les actions classées comme “réalisées” au niveau du
-                          panier à droite.
+                          les actions classées “réalisées” au niveau du panier à
+                          droite.
                         </div>
                       ) : (
                         <div className="inline">
@@ -162,8 +162,8 @@ const ListeActions = ({
                             outil numérique
                           </Button>
                           et les piloter, il vous suffit de cocher la case
-                          "Ajouter les actions classées comme “en cours” au
-                          niveau du panier à droite.
+                          "Ajouter les actions classées “en cours” au niveau du
+                          panier à droite.
                         </div>
                       )
                     }

From 8fcb8b81b5cd7b4a3c14b51a352c7d38ed0a697d Mon Sep 17 00:00:00 2001
From: Marc Rutkowski <marc@attractive-media.fr>
Date: Mon, 7 Oct 2024 10:40:56 +0200
Subject: [PATCH 69/91] Refait fonctionner la connexion ws du panier en local

---
 packages/panier/middleware.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/panier/middleware.ts b/packages/panier/middleware.ts
index 3f6eeda2f3..48a8118860 100644
--- a/packages/panier/middleware.ts
+++ b/packages/panier/middleware.ts
@@ -27,15 +27,16 @@ export function middleware(request: NextRequest) {
   // options de la politique de sécurité
   const cspHeader = `
     default-src 'self';
-    script-src ${scriptSrc} *.axept.io *.posthog.com;  
+    script-src ${scriptSrc} *.axept.io *.posthog.com;
     style-src ${styleSrc};
     img-src 'self' blob: data: axeptio.imgix.net;
     font-src 'self';
     object-src 'none';
     connect-src 'self'
       ${process.env.NEXT_PUBLIC_SUPABASE_URL!}
-      ${process.env.NEXT_PUBLIC_SUPABASE_URL!.replace('http', 'ws')} 
+      ${process.env.NEXT_PUBLIC_SUPABASE_URL!.replace('http', 'ws')}
       ws://${request.nextUrl.host}
+      ws://127.0.0.1:54321
       *.posthog.com
       *.axept.io;
     base-uri 'self';

From b590984839f4c6c22ef1c0645de82b4facece25a Mon Sep 17 00:00:00 2001
From: Marc Rutkowski <marc@attractive-media.fr>
Date: Mon, 7 Oct 2024 11:22:20 +0200
Subject: [PATCH 70/91] =?UTF-8?q?Change=20la=20mani=C3=A8re=20dont=20sont?=
 =?UTF-8?q?=20charg=C3=A9es=20et=20filtr=C3=A9es=20les=20actions?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

notamment pour que les actions ajoutées au panier et/ou annotées "en cours" ou "réalisée", ne disparaissent pas quand les filtres sont modifiés
---
 .../api/src/panier_action_impact/panierAPI.ts | 247 +++++++++++-------
 .../api/src/panier_action_impact/types.ts     |  66 +++--
 2 files changed, 185 insertions(+), 128 deletions(-)

diff --git a/packages/api/src/panier_action_impact/panierAPI.ts b/packages/api/src/panier_action_impact/panierAPI.ts
index c06645330f..11b6bbf982 100644
--- a/packages/api/src/panier_action_impact/panierAPI.ts
+++ b/packages/api/src/panier_action_impact/panierAPI.ts
@@ -1,21 +1,14 @@
 import { SupabaseClient } from '@supabase/supabase-js';
 import { Database } from '../database.types';
-import { MesCollectivite, Panier, PanierBase } from './types';
-
-/**
- * On sélectionne toutes les colonnes du panier : *
- * puis les `action_impact` par la relation `action_impact_panier` que l'on renomme `contenuPanier`
- */
-export const panierSelect = `*,
-  contenu:action_impact!action_impact_panier(*,thematiques:thematique(*),typologie:action_impact_typologie(*)),
-  states:action_impact_state(
-    *, matches_competences,
-    thematiques:action_impact_thematique(...thematique(id,nom)),
-    typologie:action_impact_typologie(*),
-    fourchette_budgetaire:action_impact_fourchette_budgetaire(*),
-    temps_de_mise_en_oeuvre:action_impact_temps_de_mise_en_oeuvre(*),
-    actions_liees:action_definition(identifiant,referentiel,nom)
-)`;
+import {
+  ActionImpactDetails,
+  ActionImpactFull,
+  ActionImpactStatut,
+  FiltreAction,
+  MesCollectivite,
+  Panier,
+  PanierBase,
+} from './types';
 
 type RealtimePayload<T> = {
   type: string;
@@ -35,7 +28,7 @@ export class PanierAPI {
   }
 
   async panierFromLanding(collectivite_id: number | null): Promise<PanierBase> {
-    const {data, error} =
+    const { data, error } =
       collectivite_id === null
         ? await this.supabase.rpc('panier_from_landing')
         : await this.supabase.rpc('panier_from_landing', { collectivite_id });
@@ -92,8 +85,8 @@ export class PanierAPI {
   ): Promise<void> {
     if (category_id) {
       await this.supabase.from('action_impact_statut').upsert({
-        action_id: action_id,
-        panier_id: panier_id,
+        action_id,
+        panier_id,
         categorie_id: category_id,
       });
     } else {
@@ -107,84 +100,150 @@ export class PanierAPI {
 
   async fetchPanier({
     panierId,
-    thematique_ids,
-    typologie_ids,
-    niveau_budget_ids,
-    niveau_temps_ids,
+    filtre,
   }: {
     panierId: string;
-    thematique_ids: number[];
-    typologie_ids: number[];
-    niveau_budget_ids: number[];
-    niveau_temps_ids: number[];
+    filtre: FiltreAction;
   }): Promise<Panier | null> {
-    const builder = this.supabase
+    const { data, error } = await this.supabase
       .from('panier')
-      .select(panierSelect)
-      .eq('id', panierId);
+      .select(
+        `*,
+        etatActions:action_impact_state!inner(
+          id: action->>id,
+          statut: statut->>categorie_id,
+          isinpanier,
+          matches_competences
+        )`
+      )
+      .eq('id', panierId)
+      .single();
+    if (error) throw error;
 
-    if (thematique_ids && thematique_ids.length > 0) {
-      // @ts-expect-error Le client Supabase ne permet pas de filtrer à ce niveau
-      builder.url.searchParams.append(
-        'action_impact_state.thematiques.thematique_id',
-        `in.(${thematique_ids.join(',')})`
-      );
-      // @ts-expect-error Le client Supabase ne permet pas de filtrer à ce niveau
-      builder.url.searchParams.append(
-        'action_impact_state.thematiques',
-        'not.is.null'
-      );
-    }
+    // charge toutes les actions par id
+    const actionsDetail = await this.getActionsImpact();
 
-    if (typologie_ids && typologie_ids.length > 0) {
-      // @ts-expect-error Le client Supabase ne permet pas de filtrer à ce niveau
-      builder.url.searchParams.append(
-        'action_impact_state.typologie.id',
-        `in.(${typologie_ids.join(',')})`
-      );
-      // @ts-expect-error Le client Supabase ne permet pas de filtrer à ce niveau
-      builder.url.searchParams.append(
-        'action_impact_state.typologie',
-        'not.is.null'
-      );
-    }
+    // charge les ID des actions déjà importées
+    const actionsDejaImportees = await this.getActionsDejaImportees(
+      data?.collectivite_id ?? data?.collectivite_preset
+    );
 
-    if (niveau_budget_ids && niveau_budget_ids.length > 0) {
-      // @ts-expect-error Le client Supabase ne permet pas de filtrer à ce niveau
-      builder.url.searchParams.append(
-        'action_impact_state.fourchette_budgetaire.niveau',
-        `in.(${niveau_budget_ids.join(',')})`
+    // ajoute les flags d'état à chaque action
+    const actions = actionsDetail?.map((action) => {
+      const etat = data?.etatActions?.find(
+        // la relation calculée caste en string le champ `action_impact_state(action->>id)`
+        // il faut donc caster aussi pour la faire la comparaison
+        (etat) => etat.id === String(action.id)
       );
-      // @ts-expect-error Le client Supabase ne permet pas de filtrer à ce niveau
-      builder.url.searchParams.append(
-        'action_impact_state.fourchette_budgetaire',
-        'not.is.null'
-      );
-    }
+      const { statut, isinpanier, matches_competences } = etat || {};
+      return {
+        ...action,
+        statut: statut as ActionImpactStatut,
+        isinpanier: isinpanier ?? false,
+        matches_competences: matches_competences ?? false,
+        dejaImportee: actionsDejaImportees?.includes(action.id),
+      };
+    });
 
-    if (niveau_temps_ids && niveau_temps_ids.length > 0) {
-      // @ts-expect-error Le client Supabase ne permet pas de filtrer à ce niveau
-      builder.url.searchParams.append(
-        'action_impact_state.temps_de_mise_en_oeuvre.niveau',
-        `in.(${niveau_temps_ids.join(',')})`
-      );
-      // @ts-expect-error Le client Supabase ne permet pas de filtrer à ce niveau
-      builder.url.searchParams.append(
-        'action_impact_state.temps_de_mise_en_oeuvre',
-        'not.is.null'
-      );
-    }
+    return {
+      ...data,
+      //      actions,
+      selection: this.applyFilters(filtre, actions),
+      realise: actions.filter((action) => action.statut === 'realise'),
+      en_cours: actions.filter((action) => action.statut === 'en_cours'),
+      importees: actions.filter((action) => action.dejaImportee),
+      inpanier: actions.filter((action) => action.isinpanier),
+    };
+  }
+
+  /**
+   * Applique les options de filtrage
+   */
+  applyFilters(filtre: FiltreAction, actions: ActionImpactFull[]) {
+    if (!filtre) return actions;
+    const {
+      thematique_ids,
+      typologie_ids,
+      niveau_budget_ids,
+      niveau_temps_ids,
+      matches_competences,
+    } = filtre;
+
+    return actions?.filter((action) => {
+      if (
+        action.dejaImportee ||
+        action.isinpanier ||
+        action.statut === 'en_cours' ||
+        action.statut === 'realise'
+      ) {
+        return false;
+      }
+
+      if (matches_competences && action.matches_competences === false) {
+        return false;
+      }
+
+      if (thematique_ids?.length && action.thematiques?.length) {
+        const thematiques = action.thematiques.map((t) => t.id);
+        if (!thematique_ids.find((id) => thematiques.includes(id))) {
+          return false;
+        }
+      }
+
+      if (
+        typologie_ids?.length &&
+        action.typologie_id &&
+        !typologie_ids.includes(action.typologie_id)
+      ) {
+        return false;
+      }
+
+      if (
+        niveau_budget_ids?.length &&
+        action.fourchette_budgetaire &&
+        !niveau_budget_ids.includes(action.fourchette_budgetaire.niveau)
+      ) {
+        return false;
+      }
+
+      if (
+        niveau_temps_ids?.length &&
+        action.temps_de_mise_en_oeuvre &&
+        !niveau_temps_ids.includes(action.temps_de_mise_en_oeuvre.niveau)
+      ) {
+        return false;
+      }
+
+      return true;
+    });
+  }
+
+  /**
+   * Renvoi le détail de toutes les actions à impact
+   */
+  async getActionsImpact() {
+    const { data, error } = await this.supabase
+      .from('action_impact')
+      .select(
+        `*,
+          thematiques:action_impact_thematique(...thematique(id,nom)),
+          typologie:action_impact_typologie(*),
+          fourchette_budgetaire:action_impact_fourchette_budgetaire(*),
+          temps_de_mise_en_oeuvre:action_impact_temps_de_mise_en_oeuvre(*),
+          actions_liees:action_definition(identifiant,referentiel,nom)
+      `
+      )
+      .returns<ActionImpactDetails[]>();
 
-    const {data, error} = await builder.single<Panier>();
     if (error) throw error;
-    return this.ajouteActionsDejaImportees(data);
+    return data;
   }
 
   /**
    * Renvoi l'id du panier d'une collectivité et le nombre d'actions de celui-ci
    */
   async getCollectivitePanierInfo(collectivite_id: number) {
-    const {data, error} = await this.supabase
+    const { data, error } = await this.supabase
       .from('panier')
       .select('id,actions:action_impact_state(isinpanier)')
       .or(
@@ -193,40 +252,26 @@ export class PanierAPI {
       .is('action_impact_state.isinpanier', true);
     if (error) throw error;
     return data?.[0]
-      ? {panierId: data[0].id, count: data[0].actions?.length ?? 0}
+      ? { panierId: data[0].id, count: data[0].actions?.length ?? 0 }
       : null;
   }
 
   /**
-   * Ajoute aux items du tableau `states` un nouveau flag `dejaImportee`
-   * si une action à impact est liée à une fiche action de la collectivité.
+   * Charge la liste des actions déjà importées (faisant partie d'un plan)
    */
-  async ajouteActionsDejaImportees(panier: Panier) {
-    const collectiviteId =
-      panier?.collectivite_id ?? panier?.collectivite_preset;
+  async getActionsDejaImportees(collectiviteId: number | null) {
     if (!collectiviteId) {
-      return panier;
+      return [];
     }
 
-    const {data, error} = await this.supabase
+    const { data, error } = await this.supabase
       .from('fiche_action')
       .select('action_impact_fiche_action!inner(action_impact_id)')
       .eq('collectivite_id', collectiviteId);
     if (error) throw error;
-    const actionsDejaImportees = data?.flatMap(row =>
-      row.action_impact_fiche_action.map(action => action.action_impact_id)
+    return data?.flatMap((row) =>
+      row.action_impact_fiche_action.map((action) => action.action_impact_id)
     );
-    if (!actionsDejaImportees?.length) {
-      return panier;
-    }
-
-    return {
-      ...panier,
-      states: panier.states?.map(state => ({
-        ...state,
-        dejaImportee: actionsDejaImportees.includes(state.action.id),
-      })),
-    };
   }
 
   /**
diff --git a/packages/api/src/panier_action_impact/types.ts b/packages/api/src/panier_action_impact/types.ts
index 08703b2c1f..12cccc9a4c 100644
--- a/packages/api/src/panier_action_impact/types.ts
+++ b/packages/api/src/panier_action_impact/types.ts
@@ -19,14 +19,12 @@ export type ActionImpactFourchetteBudgetaire =
 export type ActionImpactTempsMiseEnOeuvre =
   Database['public']['Tables']['action_impact_temps_de_mise_en_oeuvre']['Row'];
 
-export type FNV = Database['public']['Tables']['categorie_fnv']['Row'];
-
 export type Link = {
   url: string;
   label: string;
 };
 
-export type ActionImpact = Omit<
+export type ActionImpactBase = Omit<
   Database['public']['Tables']['action_impact']['Row'],
   'rex' | 'ressources_externes' | 'subventions_mobilisables'
 > & {
@@ -35,20 +33,22 @@ export type ActionImpact = Omit<
   subventions_mobilisables: Link[];
 };
 
-/* Le resumé d'une action à impact, utilisé pour les cartes  */
-export type ActionImpactSnippet =
-  // todo: Omit<ActionImpact, 'description' | 'ressources_externes'>
-  ActionImpact & {
-    thematiques: ActionImpactThematique[];
-  };
-
-/* Une action à impact avec des informations complémentaires, utilisé par la modale */
-export type ActionImpactDetails = ActionImpact & {
+/* Une action à impact avec toutes les informations complémentaires */
+export type ActionImpactDetails = Omit<
+  ActionImpactBase,
+  'fourchette_budgetaire' | 'temps_de_mise_en_oeuvre'
+> & {
   thematiques: ActionImpactThematique[];
-} & {categoriesFNV: FNV[]};
+  typologie: ActionImpactTypologie;
+  fourchette_budgetaire: ActionImpactFourchetteBudgetaire | null;
+  temps_de_mise_en_oeuvre: ActionImpactTempsMiseEnOeuvre | null;
+  actions_liees: ActionReferentiel[] | null;
+};
 
-export type ActionImpactStatut =
-  Database['public']['Tables']['action_impact_statut']['Row'];
+/** Action complète + les informations d'état de celle-ci dans le panier */
+export type ActionImpactFull = ActionImpactDetails & ActionImpactState;
+
+export type ActionImpactStatut = 'en_cours' | 'realise' | null | undefined;
 
 export type ActionReferentiel = {
   identifiant: string;
@@ -57,26 +57,29 @@ export type ActionReferentiel = {
 };
 
 export type ActionImpactState = {
-  action: ActionImpact;
-  isinpanier: boolean;
-  statut: ActionImpactStatut | null;
-  thematiques: ActionImpactThematique[];
-  typologie: ActionImpactTypologie;
-  actions_liees: ActionReferentiel[] | null;
-  matches_competences: boolean;
+  statut: ActionImpactStatut;
+  isinpanier?: boolean;
   dejaImportee?: boolean;
+  matches_competences?: boolean;
 };
 
-
 export type PanierBase = Database['public']['Tables']['panier']['Row'];
 
 export type Panier =
   /* Le panier en tant que tel */
   PanierBase & {
-    /* Liste des actions ajoutée au panier */
-    contenu: ActionImpactSnippet[];
-    /* Liste de toutes les actions avec leurs states. */
-    states: ActionImpactState[];
+    /** toutes les actions */
+    //    actions: ActionImpactFull[];
+    /** sélection disponible après filtrage */
+    selection: ActionImpactFull[];
+    /** actions marquées "réalisées" */
+    realise: ActionImpactFull[];
+    /** actions marquées "en cours de réalisation" */
+    en_cours: ActionImpactFull[];
+    /** actions déjà importées dans au moins un plan de la collectivité */
+    importees: ActionImpactFull[];
+    /** actions ajoutées au panier */
+    inpanier: ActionImpactFull[];
   };
 
 export type MaCollectivite = {
@@ -87,3 +90,12 @@ export type MaCollectivite = {
 };
 
 export type MesCollectivite = MaCollectivite[];
+
+/** Options de filtrage */
+export type FiltreAction = {
+  thematique_ids?: number[];
+  typologie_ids?: number[];
+  niveau_budget_ids?: number[];
+  niveau_temps_ids?: number[];
+  matches_competences?: boolean;
+};

From 448a6e404901a41a1afbb9283124d6310a392011 Mon Sep 17 00:00:00 2001
From: Marc Rutkowski <marc@attractive-media.fr>
Date: Mon, 7 Oct 2024 11:30:28 +0200
Subject: [PATCH 71/91] =?UTF-8?q?Ajoute=20le=20tri=20local=20par=20ordre?=
 =?UTF-8?q?=20d'affichage=20des=20th=C3=A9matiques?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/api/src/panier_action_impact/panierAPI.ts | 9 ++++++---
 packages/api/src/panier_action_impact/types.ts     | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/packages/api/src/panier_action_impact/panierAPI.ts b/packages/api/src/panier_action_impact/panierAPI.ts
index 11b6bbf982..01fd554358 100644
--- a/packages/api/src/panier_action_impact/panierAPI.ts
+++ b/packages/api/src/panier_action_impact/panierAPI.ts
@@ -183,7 +183,7 @@ export class PanierAPI {
         return false;
       }
 
-      if (thematique_ids?.length && action.thematiques?.length) {
+      if (thematique_ids?.length) {
         const thematiques = action.thematiques.map((t) => t.id);
         if (!thematique_ids.find((id) => thematiques.includes(id))) {
           return false;
@@ -226,7 +226,7 @@ export class PanierAPI {
       .from('action_impact')
       .select(
         `*,
-          thematiques:action_impact_thematique(...thematique(id,nom)),
+          thematiques:action_impact_thematique(...thematique(id,nom),ordre),
           typologie:action_impact_typologie(*),
           fourchette_budgetaire:action_impact_fourchette_budgetaire(*),
           temps_de_mise_en_oeuvre:action_impact_temps_de_mise_en_oeuvre(*),
@@ -236,7 +236,10 @@ export class PanierAPI {
       .returns<ActionImpactDetails[]>();
 
     if (error) throw error;
-    return data;
+    return data?.map((action) => ({
+      ...action,
+      thematiques: action?.thematiques?.sort((a, b) => a.ordre - b.ordre),
+    }));
   }
 
   /**
diff --git a/packages/api/src/panier_action_impact/types.ts b/packages/api/src/panier_action_impact/types.ts
index 12cccc9a4c..10e90ccb59 100644
--- a/packages/api/src/panier_action_impact/types.ts
+++ b/packages/api/src/panier_action_impact/types.ts
@@ -6,7 +6,7 @@ export type ActionImpactCategorie =
 export type ActionImpactThematique = Omit<
   Database['public']['Tables']['thematique']['Row'],
   'md_id'
->;
+> & { ordre: number };
 
 export type ActionImpactTypologie =
   Database['public']['Tables']['action_impact_typologie']['Row'];

From 8c40a032ab99319dbc3fb45fb13d7b0cb5a33f4a Mon Sep 17 00:00:00 2001
From: Marc Rutkowski <marc@attractive-media.fr>
Date: Mon, 7 Oct 2024 11:30:35 +0200
Subject: [PATCH 72/91] =?UTF-8?q?R=C3=A9pare=20un=20test=20et=20supprime?=
 =?UTF-8?q?=20un=20test=20dupliqu=C3=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../panier_action_impact/integration.test.ts  | 44 +++----------------
 1 file changed, 5 insertions(+), 39 deletions(-)

diff --git a/packages/api/src/panier_action_impact/integration.test.ts b/packages/api/src/panier_action_impact/integration.test.ts
index 032fdcb437..35f90decae 100644
--- a/packages/api/src/panier_action_impact/integration.test.ts
+++ b/packages/api/src/panier_action_impact/integration.test.ts
@@ -1,8 +1,7 @@
 import { beforeAll, describe, it, expect } from 'vitest';
 import { supabase } from '../tests/supabase';
 import { testReset } from '../tests/testReset';
-import { panierSelect } from './panierAPI';
-import { Panier } from './types';
+import { PanierAPI } from './panierAPI';
 
 describe('Création de panier', async () => {
   beforeAll(async () => {
@@ -49,28 +48,6 @@ describe('État du panier', async () => {
     expect(selectPanier.error).toBeNull();
     expect(selectPanier.data).toBeDefined();
   });
-
-  it('On devrait pouvoir ajouter une action puis la retrouver dans le panier', async () => {
-    const demandePanier = await supabase.rpc('panier_from_landing');
-    const panierId = demandePanier.data?.id as string;
-    const actionId = 1;
-    const ajoutAction = await supabase.from('action_impact_panier').insert({
-      action_id: actionId,
-      panier_id: panierId,
-    });
-
-    expect(ajoutAction.error).toBeNull();
-
-    const selectPanierContenu = await supabase
-      .from('panier')
-      .select(panierSelect)
-      .eq('id', panierId)
-      .single<Panier>();
-
-    expect(selectPanierContenu.error).toBeNull();
-    expect(selectPanierContenu.data).toBeDefined();
-    expect(selectPanierContenu.data?.contenu.length).toEqual(1);
-  });
 });
 describe('État des actions', async () => {
   it('On devrait pouvoir ajouter une action puis la retrouver dans le panier', async () => {
@@ -84,22 +61,11 @@ describe('État des actions', async () => {
 
     expect(ajoutAction.error).toBeNull();
 
-    const selectPanierContenu = await supabase
-      .from('panier')
-      .select(panierSelect)
-      .eq('id', panierId)
-      .single<Panier>();
-
-    expect(selectPanierContenu.error).toBeNull();
-    expect(selectPanierContenu.data).toBeDefined();
-    expect(selectPanierContenu.data?.contenu.length).toEqual(1);
+    const api = new PanierAPI(supabase);
+    const selectPanierContenu = await api.fetchPanier({ panierId, filtre: {} });
 
-    const { error } = await supabase
-      .from('panier')
-      .select('*, states:action_impact_state(*)')
-      .eq('id', panierId);
-
-    expect(error).toBeNull();
+    expect(selectPanierContenu).toBeDefined();
+    expect(selectPanierContenu?.inpanier.length).toEqual(1);
   });
 });
 

From 3ce25a89bbc46d0963f8e03de2a8b46bacd390fb Mon Sep 17 00:00:00 2001
From: Marc Rutkowski <marc@attractive-media.fr>
Date: Mon, 7 Oct 2024 11:40:23 +0200
Subject: [PATCH 73/91] =?UTF-8?q?Extrait=20un=20typage=20partag=C3=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/FiltresActions/index.tsx       | 31 ++++++-------------
 .../panier/components/FiltresActions/types.ts | 17 ++++++++++
 2 files changed, 26 insertions(+), 22 deletions(-)
 create mode 100644 packages/panier/components/FiltresActions/types.ts

diff --git a/packages/panier/components/FiltresActions/index.tsx b/packages/panier/components/FiltresActions/index.tsx
index 4cb28f1f45..e8e1e70b60 100644
--- a/packages/panier/components/FiltresActions/index.tsx
+++ b/packages/panier/components/FiltresActions/index.tsx
@@ -2,12 +2,6 @@
 
 import { useEffect, useState } from 'react';
 import { usePathname, useRouter, useSearchParams } from 'next/navigation';
-import {
-  ActionImpactFourchetteBudgetaire,
-  ActionImpactTempsMiseEnOeuvre,
-  ActionImpactThematique,
-  ActionImpactTypologie,
-} from '@tet/api';
 import {
   OptionValue,
   SelectMultipleOnChangeArgs,
@@ -15,21 +9,15 @@ import {
 } from '@tet/ui';
 import { usePanierContext } from '@tet/panier/providers';
 import { BadgesFilters } from './BadgesFilters';
+import { ContenuListesFiltre } from './types';
 
-type FiltresActionsProps = {
-  budgets: ActionImpactFourchetteBudgetaire[];
-  temps: ActionImpactTempsMiseEnOeuvre[];
-  thematiques: ActionImpactThematique[];
-  typologies: ActionImpactTypologie[];
-  sansFiltreCompetences: boolean;
-};
+type FiltresActionsProps = ContenuListesFiltre;
 
 const FiltresActions = ({
   budgets,
   temps,
   thematiques,
   typologies,
-  sansFiltreCompetences,
 }: FiltresActionsProps) => {
   const router = useRouter();
   const pathname = usePathname();
@@ -47,9 +35,8 @@ const FiltresActions = ({
     OptionValue[] | undefined
   >();
   const [tempsValues, setTempsValues] = useState<OptionValue[] | undefined>();
-  const [sansFiltreCompetencesValue, setSansFiltreCompetencesValue] = useState(
-    sansFiltreCompetences,
-  );
+  const [sansFiltreCompetencesValue, setSansFiltreCompetencesValue] =
+    useState(false);
 
   useEffect(() => {
     // Permet de conserver les filtres lors d'un changement d'onglet
@@ -57,11 +44,11 @@ const FiltresActions = ({
     const thematiquesParams = searchParams
       .get('t')
       ?.split(',')
-      .map(val => parseInt(val));
+      .map((val) => parseInt(val));
     const typologiesParams = searchParams
       .get('ty')
       ?.split(',')
-      .map(val => parseInt(val));
+      .map((val) => parseInt(val));
     const budgetsParams = searchParams
       .get('b')
       ?.split(',')
@@ -69,7 +56,7 @@ const FiltresActions = ({
     const tempsParams = searchParams
       .get('m')
       ?.split(',')
-      .map(val => parseInt(val));
+      .map((val) => parseInt(val));
     const competencesParams = searchParams.get('c');
 
     if (thematiquesParams) setThematiquesValues(thematiquesParams);
@@ -142,9 +129,9 @@ const FiltresActions = ({
         },
         {
           title: 'Typologies',
-          options: typologies.map(t => ({value: t.id, label: t.nom})),
+          options: typologies.map((t) => ({ value: t.id, label: t.nom })),
           values: typologiesValues,
-          onChange: ({values}) => setTypologiesValues(values),
+          onChange: ({ values }) => setTypologiesValues(values),
           multiple: true,
         },
         {
diff --git a/packages/panier/components/FiltresActions/types.ts b/packages/panier/components/FiltresActions/types.ts
new file mode 100644
index 0000000000..ad9b30b335
--- /dev/null
+++ b/packages/panier/components/FiltresActions/types.ts
@@ -0,0 +1,17 @@
+import {
+  ActionImpactFourchetteBudgetaire,
+  ActionImpactTempsMiseEnOeuvre,
+  ActionImpactThematique,
+  ActionImpactTypologie,
+} from '@tet/api';
+
+/**
+ * Listes passées au panneau de filtrage pour afficher les différentes
+ * listes déroulantes.
+ */
+export type ContenuListesFiltre = {
+  budgets: ActionImpactFourchetteBudgetaire[];
+  temps: ActionImpactTempsMiseEnOeuvre[];
+  thematiques: ActionImpactThematique[];
+  typologies: ActionImpactTypologie[];
+};

From ab61ee11fef747e69fd454d58ff3aa26e53134ed Mon Sep 17 00:00:00 2001
From: Marc Rutkowski <marc@attractive-media.fr>
Date: Mon, 7 Oct 2024 11:42:59 +0200
Subject: [PATCH 74/91] Utilise le nouveau typage

---
 .../FicheActionImpact/useActionImpact.ts      | 17 +---
 .../panier/app/panier/[id]/PagePanier.tsx     | 18 +---
 packages/panier/app/panier/[id]/page.tsx      | 21 ++---
 packages/panier/app/panier/[id]/utils.ts      | 22 ++---
 .../panier/components/ActionImpact/types.ts   |  3 +-
 .../ListeActions/ListeActionsFiltrees.tsx     | 41 ++++-----
 .../panier/components/ListeActions/index.tsx  | 57 ++----------
 .../AjouterActionsRealiseesOuEnCours.tsx      |  5 +-
 .../panier/components/PanierActions/index.tsx | 90 +++++++++++--------
 ...eAjouterActionsRealiseesOuEnCoursState.tsx | 14 ++-
 .../components/PanierRealtime/index.tsx       | 28 +++---
 .../ValidationPanier/ValiderPanierModale.tsx  |  5 +-
 packages/panier/hooks/useLandingPathname.ts   |  4 +-
 .../InfoActionImpact/InfoActionImpact.tsx     |  3 +-
 14 files changed, 131 insertions(+), 197 deletions(-)

diff --git a/app.territoiresentransitions.react/src/app/pages/collectivite/PlansActions/FicheAction/FicheActionImpact/useActionImpact.ts b/app.territoiresentransitions.react/src/app/pages/collectivite/PlansActions/FicheAction/FicheActionImpact/useActionImpact.ts
index 6592f550c7..64919212e0 100644
--- a/app.territoiresentransitions.react/src/app/pages/collectivite/PlansActions/FicheAction/FicheActionImpact/useActionImpact.ts
+++ b/app.territoiresentransitions.react/src/app/pages/collectivite/PlansActions/FicheAction/FicheActionImpact/useActionImpact.ts
@@ -1,25 +1,16 @@
 import {useQuery} from 'react-query';
 import {supabaseClient} from 'core-logic/api/supabase';
-import {
-  ActionImpact,
-  ActionImpactThematique,
-  ActionImpactTypologie,
-} from '@tet/api';
-
-type ActionImpactDetail = ActionImpact & {
-  thematiques: ActionImpactThematique[];
-  typologie: ActionImpactTypologie | null;
-};
+import { ActionImpactDetails } from '@tet/api';
 
 /**
  * Charge le détail d'une action à impact
  */
 export const useActionImpact = (actionImpactId: number) =>
   useQuery(['action_impact', actionImpactId], async () => {
-    const {data, error} = await supabaseClient
+    const { data, error } = await supabaseClient
       .from('action_impact')
       .select(
-        `titre, 
+        `titre,
         typologie:action_impact_typologie(*),
         thematiques:action_impact_thematique(...thematique(id,nom)),
         budget:action_impact_fourchette_budgetaire(*),
@@ -30,7 +21,7 @@ export const useActionImpact = (actionImpactId: number) =>
       `
       )
       .eq('id', actionImpactId)
-      .returns<ActionImpactDetail[]>();
+      .returns<ActionImpactDetails[]>();
 
     if (error) throw new Error(error.message);
 
diff --git a/packages/panier/app/panier/[id]/PagePanier.tsx b/packages/panier/app/panier/[id]/PagePanier.tsx
index f76546d4d9..e0ad9c7115 100644
--- a/packages/panier/app/panier/[id]/PagePanier.tsx
+++ b/packages/panier/app/panier/[id]/PagePanier.tsx
@@ -2,23 +2,13 @@
 
 import PanierRealtime from '@tet/panier/components/PanierRealtime';
 import Section from '@tet/panier/components/Section';
-import {
-  ActionImpactFourchetteBudgetaire,
-  ActionImpactTempsMiseEnOeuvre,
-  ActionImpactThematique,
-  ActionImpactTypologie,
-  Panier,
-} from '@tet/api';
-import {ControlledAlert} from '@tet/ui';
+import { ContenuListesFiltre } from '@tet/panier/components/FiltresActions/types';
+import { Panier } from '@tet/api';
+import { ControlledAlert } from '@tet/ui';
 
 type PagePanierProps = {
   panier: Panier;
-  budgets: ActionImpactFourchetteBudgetaire[];
-  temps: ActionImpactTempsMiseEnOeuvre[];
-  thematiques: ActionImpactThematique[];
-  typologies: ActionImpactTypologie[];
-  sansFiltreCompetences: boolean;
-};
+} & ContenuListesFiltre;
 
 const PagePanier = (props: PagePanierProps) => {
   return (
diff --git a/packages/panier/app/panier/[id]/page.tsx b/packages/panier/app/panier/[id]/page.tsx
index b4794c3a28..a469efc4c2 100644
--- a/packages/panier/app/panier/[id]/page.tsx
+++ b/packages/panier/app/panier/[id]/page.tsx
@@ -25,19 +25,15 @@ async function Page({
   searchParams: { [key: string]: string | string[] | undefined };
 }) {
   const panierId = params.id;
-  const thematique_ids = extractIdsFromParam(searchParams['t'] as string);
-  const typologie_ids = extractIdsFromParam(searchParams['ty'] as string);
-  const budget_ids = extractIdsFromParam(searchParams['b'] as string);
-  const temps_ids = extractIdsFromParam(searchParams['m'] as string);
-  const sansFiltreCompetences = searchParams['c'] === 'true';
 
-  const panier = await fetchPanier({
-    panierId,
-    thematique_ids,
-    typologie_ids,
-    budget_ids,
-    temps_ids,
-  });
+  const filtre = {
+    thematique_ids: extractIdsFromParam(searchParams['t'] as string),
+    typologie_ids: extractIdsFromParam(searchParams['ty'] as string),
+    niveau_budget_ids: extractIdsFromParam(searchParams['b'] as string),
+    niveau_temps_ids: extractIdsFromParam(searchParams['m'] as string),
+    matches_competences: searchParams['c'] !== 'true',
+  };
+  const panier = await fetchPanier({ panierId, filtre });
 
   if (!panier) return notFound();
 
@@ -62,7 +58,6 @@ async function Page({
           temps,
           thematiques,
           typologies,
-          sansFiltreCompetences,
         }}
       />
     </>
diff --git a/packages/panier/app/panier/[id]/utils.ts b/packages/panier/app/panier/[id]/utils.ts
index 2884a1b4a1..f1902ddc8b 100644
--- a/packages/panier/app/panier/[id]/utils.ts
+++ b/packages/panier/app/panier/[id]/utils.ts
@@ -2,6 +2,7 @@ import {
   ActionImpactCategorie,
   ActionImpactThematique,
   ActionImpactTypologie,
+  FiltreAction,
   Niveau,
   Panier,
   PanierAPI,
@@ -9,38 +10,29 @@ import {
 import { cookies } from 'next/headers';
 import { createClient } from '@tet/panier/src/supabase/server';
 
-const apiKey = process.env.NEXT_PUBLIC_SUPABASE_ANON_KEY!;
-const apiUrl = process.env.NEXT_PUBLIC_SUPABASE_URL!;
+const apiKey = process.env.NEXT_PUBLIC_SUPABASE_ANON_KEY;
+const apiUrl = process.env.NEXT_PUBLIC_SUPABASE_URL;
 const getInit = {
   method: 'GET',
   headers: {
     Authorization: `Bearer ${apiKey}`,
-    apiKey: apiKey,
+    apiKey: apiKey ?? '',
   },
 };
 
 export const fetchPanier = async ({
   panierId,
-  thematique_ids,
-  typologie_ids,
-  budget_ids,
-  temps_ids,
+  filtre,
 }: {
   panierId: string;
-  thematique_ids: number[];
-  typologie_ids: number[];
-  budget_ids: number[];
-  temps_ids: number[];
+  filtre: FiltreAction;
 }): Promise<Panier | null> => {
   const supabase = createClient(cookies());
   const api = new PanierAPI(supabase);
 
   const panier: Panier | null = await api.fetchPanier({
     panierId,
-    thematique_ids,
-    typologie_ids,
-    niveau_budget_ids: budget_ids,
-    niveau_temps_ids: temps_ids,
+    filtre,
   });
 
   return panier;
diff --git a/packages/panier/components/ActionImpact/types.ts b/packages/panier/components/ActionImpact/types.ts
index 9048958813..c1cc822bc5 100644
--- a/packages/panier/components/ActionImpact/types.ts
+++ b/packages/panier/components/ActionImpact/types.ts
@@ -1,5 +1,6 @@
 import {
   ActionImpactFourchetteBudgetaire,
+  ActionImpactStatut,
   ActionImpactTempsMiseEnOeuvre,
   ActionImpactThematique,
   ActionImpactTypologie,
@@ -31,7 +32,7 @@ export type ActionImpactProps = {
   /** Lien vers les subventions mobilisables */
   subventions?: LinkType[] | null;
   /** Statut de l'action */
-  statut?: 'non_pertinent' | 'en_cours' | 'realise' | null;
+  statut?: ActionImpactStatut;
   /** Actions des référentiels liées */
   actionsLiees?: ActionReferentiel[] | null;
   /** Indique si l'action est mise dans le panier */
diff --git a/packages/panier/components/ListeActions/ListeActionsFiltrees.tsx b/packages/panier/components/ListeActions/ListeActionsFiltrees.tsx
index 5486058229..c70456df00 100644
--- a/packages/panier/components/ListeActions/ListeActionsFiltrees.tsx
+++ b/packages/panier/components/ListeActions/ListeActionsFiltrees.tsx
@@ -1,12 +1,12 @@
 import {ActionImpact} from '@tet/panier/components/ActionImpact';
 import {
   ActionImpactFourchetteBudgetaire,
-  ActionImpactState,
+  ActionImpactFull,
   ActionImpactTempsMiseEnOeuvre,
 } from '@tet/api';
 
 type ListeActionsFiltreesProps = {
-  actionsListe: ActionImpactState[];
+  actionsListe: ActionImpactFull[];
   budgets: ActionImpactFourchetteBudgetaire[];
   temps: ActionImpactTempsMiseEnOeuvre[];
   onToggleSelected: (actionId: number, selected: boolean) => void;
@@ -22,40 +22,31 @@ const ListeActionsFiltrees = ({
 }: ListeActionsFiltreesProps) => {
   return (
     <div className="grid md:grid-cols-2 lg:grid-cols-1 xl:grid-cols-2 gap-4">
-      {actionsListe.map(action => (
+      {actionsListe.map((action) => (
         <ActionImpact
-          key={action.action.id}
+          key={action.id}
           actionsLiees={action.actions_liees}
-          titre={action.action.titre}
+          titre={action.titre}
           thematiques={action.thematiques}
           typologie={action.typologie}
           budget={budgets.find(
-            b => b.niveau === action.action.fourchette_budgetaire
+            (b) => b.niveau === action.fourchette_budgetaire?.niveau
           )}
-          description={`${action.action.description}\n\n${action.action.description_complementaire}`}
+          description={`${action.description}\n\n${action.description_complementaire}`}
           miseEnOeuvre={temps.find(
-            t => t.niveau === action.action.temps_de_mise_en_oeuvre
+            (t) => t.niveau === action.temps_de_mise_en_oeuvre?.niveau
           )}
-          ressources={action.action.ressources_externes ?? []}
-          rex={action.action.rex ?? []}
-          subventions={action.action.subventions_mobilisables ?? []}
-          statut={
-            action.statut?.categorie_id as
-              | 'non_pertinent'
-              | 'en_cours'
-              | 'realise'
-              | null
-          }
-          panier={action.isinpanier}
+          ressources={action.ressources_externes ?? []}
+          rex={action.rex ?? []}
+          subventions={action.subventions_mobilisables ?? []}
+          statut={action.statut}
+          panier={action.isinpanier ?? false}
           isSelected={action.isinpanier}
           onToggleSelected={() =>
-            onToggleSelected(action.action.id, !action.isinpanier)
+            onToggleSelected(action.id, !action.isinpanier)
           }
-          onUpdateStatus={statut =>
-            onUpdateStatus(
-              action.action.id,
-              action.statut?.categorie_id === statut ? null : statut
-            )
+          onUpdateStatus={(statut) =>
+            onUpdateStatus(action.id, action.statut === statut ? null : statut)
           }
         />
       ))}
diff --git a/packages/panier/components/ListeActions/index.tsx b/packages/panier/components/ListeActions/index.tsx
index 06279337ea..cd5238c67d 100644
--- a/packages/panier/components/ListeActions/index.tsx
+++ b/packages/panier/components/ListeActions/index.tsx
@@ -1,12 +1,6 @@
 /* eslint-disable react/no-unescaped-entities */
 import {useSearchParams} from 'next/navigation';
-import {
-  ActionImpactFourchetteBudgetaire,
-  ActionImpactState,
-  ActionImpactTempsMiseEnOeuvre,
-  ActionImpactThematique,
-  ActionImpactTypologie,
-} from '@tet/api';
+import { Panier } from '@tet/api';
 import {
   Alert,
   Button,
@@ -18,6 +12,7 @@ import {
 import ListeActionsFiltrees from './ListeActionsFiltrees';
 import ListeVide from './ListeVide';
 import FiltresActions from '@tet/panier/components/FiltresActions';
+import { ContenuListesFiltre } from '../FiltresActions/types';
 
 const getTabLabel = (
   tab: { label: string; labelOne?: string; status: string | null },
@@ -37,24 +32,18 @@ const getTabLabel = (
 };
 
 type ListeActionsProps = {
-  actionsListe: ActionImpactState[];
-  budgets: ActionImpactFourchetteBudgetaire[];
-  temps: ActionImpactTempsMiseEnOeuvre[];
-  thematiques: ActionImpactThematique[];
-  typologies: ActionImpactTypologie[];
-  sansFiltreCompetences: boolean;
+  panier: Panier;
   onToggleSelected: (actionId: number, selected: boolean) => void;
   onUpdateStatus: (actionId: number, statusId: string | null) => void;
   onChangeTab: (tab: PanierOngletName) => void;
-};
+} & ContenuListesFiltre;
 
 const ListeActions = ({
-  actionsListe,
+  panier,
   budgets,
   temps,
   thematiques,
   typologies,
-  sansFiltreCompetences,
   onToggleSelected,
   onUpdateStatus,
   onChangeTab,
@@ -65,12 +54,12 @@ const ListeActions = ({
     label: string;
     labelOne?: string;
     shortName: PanierOngletName;
-    status: string | null;
+    status: 'realise' | 'en_cours' | 'selection' | 'importees';
   }[] = [
     {
       label: 'Propositions',
       shortName: 'selection',
-      status: null,
+      status: 'selection',
     },
     { label: 'Réalisées', shortName: 'réalisées', status: 'realise' },
     {
@@ -80,9 +69,7 @@ const ListeActions = ({
     },
   ];
 
-  const actionsDejaImportees = actionsListe.filter(
-    (state) => state.dejaImportee
-  );
+  const actionsDejaImportees = panier.importees;
   if (actionsDejaImportees.length) {
     tabsList.push({
       label: 'Fiches déjà importées',
@@ -100,12 +87,7 @@ const ListeActions = ({
       tabsListClassName="!justify-start mb-0"
     >
       {...tabsList.map((tab) => {
-        const actionsFiltrees =
-          tab.shortName === 'importees'
-            ? actionsDejaImportees
-            : tab.shortName === 'selection'
-            ? filtreSelection({ actionsListe, sansFiltreCompetences })
-            : actionsListe.filter((a) => a.statut?.categorie_id === tab.status);
+        const actionsFiltrees = panier[tab.status];
 
         return (
           <Tab key={tab.label} label={getTabLabel(tab, actionsFiltrees.length)}>
@@ -115,7 +97,6 @@ const ListeActions = ({
                 temps,
                 thematiques,
                 typologies,
-                sansFiltreCompetences,
               }}
             />
 
@@ -192,24 +173,4 @@ const ListeActions = ({
   );
 };
 
-const filtreSelection = ({
-  actionsListe,
-  sansFiltreCompetences,
-}: {
-  actionsListe: ActionImpactState[];
-  sansFiltreCompetences: boolean;
-}) => {
-  // toutes les actions sauf celles qui ont un statut (en
-  // cours/réalisée), celles qui sont déjà dans le panier ou déjà
-  // importées dans un plan
-  const subset = actionsListe.filter(
-    a => a.statut === null && !a.isinpanier && !a.dejaImportee,
-  );
-
-  return sansFiltreCompetences
-    ? subset
-    : subset.filter(a => a.matches_competences);
-};
-
-
 export default ListeActions;
diff --git a/packages/panier/components/PanierActions/AjouterActionsRealiseesOuEnCours.tsx b/packages/panier/components/PanierActions/AjouterActionsRealiseesOuEnCours.tsx
index 791aa756be..982636cdfe 100644
--- a/packages/panier/components/PanierActions/AjouterActionsRealiseesOuEnCours.tsx
+++ b/packages/panier/components/PanierActions/AjouterActionsRealiseesOuEnCours.tsx
@@ -1,7 +1,6 @@
-import {ActionImpactState} from '@tet/api';
-import {Checkbox} from '@tet/ui';
+import { Checkbox } from '@tet/ui';
 import classNames from 'classnames';
-import {AjouterActionsRealiseesOuEnCoursState} from './useAjouterActionsRealiseesOuEnCoursState';
+import { AjouterActionsRealiseesOuEnCoursState } from './useAjouterActionsRealiseesOuEnCoursState';
 
 /**
  * Affiche les cases à cocher permettant d'ajouter/enlever la sélection
diff --git a/packages/panier/components/PanierActions/index.tsx b/packages/panier/components/PanierActions/index.tsx
index d5ea25e20d..e3194e5e4d 100644
--- a/packages/panier/components/PanierActions/index.tsx
+++ b/packages/panier/components/PanierActions/index.tsx
@@ -3,33 +3,38 @@ import {ActionImpact} from '@tet/panier/components/ActionImpact';
 import BasketPicto from '@tet/panier/components/Picto/BasketPicto';
 import EmptyBasketPicto from '@tet/panier/components/Picto/EmptyBasketPicto';
 import ValiderPanierButton from '@tet/panier/components/ValidationPanier/ValiderPanierButton';
-import {ActionImpactFourchetteBudgetaire, ActionImpactSnippet} from '@tet/api';
-import {Alert} from '@tet/ui';
-import {AjouterActionsRealiseesOuEnCours} from './AjouterActionsRealiseesOuEnCours';
-import {useAjouterActionsRealiseesOuEnCoursState} from './useAjouterActionsRealiseesOuEnCoursState';
+import {
+  ActionImpactFourchetteBudgetaire,
+  ActionImpactFull,
+  Panier,
+} from '@tet/api';
+import { Alert } from '@tet/ui';
+import { AjouterActionsRealiseesOuEnCours } from './AjouterActionsRealiseesOuEnCours';
+import { useAjouterActionsRealiseesOuEnCoursState } from './useAjouterActionsRealiseesOuEnCoursState';
 
 type PanierActionsProps = {
-  actionsListe: ActionImpactSnippet[];
+  panier: Panier;
   budgets: ActionImpactFourchetteBudgetaire[];
   onToggleSelected: (actionId: number, selected: boolean) => void;
 };
 
 const PanierActions = ({
-  actionsListe,
+  panier,
   budgets,
   onToggleSelected,
 }: PanierActionsProps) => {
   const ajouterActionsRealiseesOuEnCours =
     useAjouterActionsRealiseesOuEnCoursState();
-  const {nbEnCours, nbRealisees} = ajouterActionsRealiseesOuEnCours;
+  const { nbEnCours, nbRealisees } = ajouterActionsRealiseesOuEnCours;
 
   // ventile les actions en sections par statut
+  const actionsListe = panier.inpanier;
   const actionsParStatut = getActionsParStatut(actionsListe);
   // et détermine les sections à afficher
-  const sections = SECTIONS.map(section =>
+  const sections = SECTIONS.map((section) =>
     actionsParStatut[section.statut].length
-      ? {...section, actions: actionsParStatut[section.statut]}
-      : null,
+      ? { ...section, actions: actionsParStatut[section.statut] }
+      : null
   );
 
   return (
@@ -64,13 +69,13 @@ const PanierActions = ({
             <div className="h-48 mt-6">
               <BasketPicto className="mx-auto h-full" />
             </div>
-            <div className="sticky top-0 z-10 bg-white">
+            <div className="sticky top-0 z-10 bg-white flex flex-col items-center">
               <div className="bg-white text-primary-8 py-6 text-xl font-extrabold text-center">
                 {actionsListe.length} action{actionsListe.length > 1 ? 's' : ''}{' '}
                 dans mon panier
               </div>
               <AjouterActionsRealiseesOuEnCours
-                className="justify-self-start mt-4"
+                className="mt-4"
                 state={ajouterActionsRealiseesOuEnCours}
               />
 
@@ -79,21 +84,37 @@ const PanierActions = ({
             </div>
 
             <div className="grid md:max-lg:grid-cols-2 gap-4">
-              {actionsListe.map(action => (
-                <ActionImpact
-                  key={action.id}
-                  description={action.description}
-                  titre={action.titre}
-                  thematiques={action.thematiques}
-                  typologie={action.typologie}
-                  budget={budgets.find(
-                    b => b.niveau === action.fourchette_budgetaire,
-                  )}
-                  panier={true}
-                  isSelected={false}
-                  onToggleSelected={() => onToggleSelected(action.id, false)}
-                />
-              ))}
+              {sections.map((section) => {
+                if (!section) {
+                  return;
+                }
+                const { statut, nom, nomPluriel, actions } = section;
+                return (
+                  <div key={statut}>
+                    <p className="font-bold uppercase text-primary-10 text-center mb-4">
+                      {actions.length} {actions.length > 1 ? nomPluriel : nom}
+                    </p>
+                    {actions.map((action) => (
+                      <ActionImpact
+                        key={action.id}
+                        description={action.description}
+                        typologie={action.typologie}
+                        titre={action.titre}
+                        thematiques={action.thematiques}
+                        budget={budgets.find(
+                          (b) =>
+                            b.niveau === action.fourchette_budgetaire?.niveau
+                        )}
+                        panier={true}
+                        isSelected={false}
+                        onToggleSelected={() =>
+                          onToggleSelected(action.id, false)
+                        }
+                      />
+                    ))}
+                  </div>
+                );
+              })}
             </div>
           </div>
         </div>
@@ -128,22 +149,21 @@ const SECTIONS = [
 type Statut = (typeof SECTIONS)[number]['statut'];
 
 // regroupe les actions par statut
-const getActionsParStatut = (actionsListe: ActionImpactState[]) => {
-  const actionsParStatut: Record<Statut, ActionImpactState[]> = {
+const getActionsParStatut = (actionsListe: ActionImpactFull[]) => {
+  const actionsParStatut: Record<Statut, ActionImpactFull[]> = {
     realise: [],
     en_cours: [],
     importee: [],
     nouvelle: [],
   };
-  actionsListe.forEach(state => {
-    const statut = state.dejaImportee
+  actionsListe.forEach((action) => {
+    const statut = action.dejaImportee
       ? 'importee'
-      : state.statut?.categorie_id === 'realise' ||
-        state.statut?.categorie_id === 'en_cours'
-      ? state.statut.categorie_id
+      : action.statut === 'realise' || action.statut === 'en_cours'
+      ? action.statut
       : 'nouvelle';
 
-    actionsParStatut[statut].push(state);
+    actionsParStatut[statut].push(action);
   });
   return actionsParStatut;
 };
diff --git a/packages/panier/components/PanierActions/useAjouterActionsRealiseesOuEnCoursState.tsx b/packages/panier/components/PanierActions/useAjouterActionsRealiseesOuEnCoursState.tsx
index e1afc8d330..ed6f8cd2cc 100644
--- a/packages/panier/components/PanierActions/useAjouterActionsRealiseesOuEnCoursState.tsx
+++ b/packages/panier/components/PanierActions/useAjouterActionsRealiseesOuEnCoursState.tsx
@@ -48,25 +48,23 @@ const useToggleAjoutActions = (
   const panierId = panier?.id;
 
   // le sous-ensemble
-  const actions = panier?.states.filter(
-    state => state.statut?.categorie_id === subset,
-  );
+  const actions = panier?.[subset];
 
   // nombre d'items total et dans le panier
   const count = actions?.length ?? 0;
   const countInPanier =
-    actions?.filter(action => action.isinpanier).length ?? 0;
+    actions?.filter((action) => action.isinpanier).length ?? 0;
 
   // ajoute/enlève les actions du panier
   const toggleAjout = () => {
     if (!actions?.length || !panierId) return;
     if (ajout) {
-      actions.forEach(state =>
-        panierAPI.removeActionFromPanier(state.action.id, panierId),
+      actions.forEach((action) =>
+        panierAPI.removeActionFromPanier(action.id, panierId)
       );
     } else {
-      actions.forEach(state =>
-        panierAPI.addActionToPanier(state.action.id, panierId),
+      actions.forEach((action) =>
+        panierAPI.addActionToPanier(action.id, panierId)
       );
     }
     setAjout(!ajout);
diff --git a/packages/panier/components/PanierRealtime/index.tsx b/packages/panier/components/PanierRealtime/index.tsx
index 100718f2cf..46c0f37b0a 100644
--- a/packages/panier/components/PanierRealtime/index.tsx
+++ b/packages/panier/components/PanierRealtime/index.tsx
@@ -2,13 +2,7 @@
 
 import { useEffect, useState } from 'react';
 import { useRouter } from 'next/navigation';
-import {
-  ActionImpactFourchetteBudgetaire,
-  ActionImpactTempsMiseEnOeuvre,
-  ActionImpactThematique,
-  ActionImpactTypologie,
-  Panier,
-} from '@tet/api';
+import { Panier } from '@tet/api';
 import { PanierOngletName, useEventTracker, useOngletTracker } from '@tet/ui';
 import { panierAPI, supabase } from '@tet/panier/src/clientAPI';
 import ListeActions from '@tet/panier/components/ListeActions';
@@ -19,15 +13,11 @@ import {
   useUserContext,
 } from '@tet/panier/providers';
 import {PartagerLeLien} from './PartagerLeLien';
+import { ContenuListesFiltre } from '../FiltresActions/types';
 
 type PanierRealtimeProps = {
   panier: Panier;
-  budgets: ActionImpactFourchetteBudgetaire[];
-  temps: ActionImpactTempsMiseEnOeuvre[];
-  thematiques: ActionImpactThematique[];
-  typologies: ActionImpactTypologie[];
-  sansFiltreCompetences: boolean;
-};
+} & ContenuListesFiltre;
 
 /**
  * La partie client du Panier d'Action à Impact
@@ -44,7 +34,6 @@ const PanierRealtime = ({
   temps,
   thematiques,
   typologies,
-  sansFiltreCompetences,
 }: PanierRealtimeProps) => {
   const [currentTab, setCurrentTab] = useState<PanierOngletName>('selection');
 
@@ -127,16 +116,21 @@ const PanierRealtime = ({
           }
         </p>
         <ListeActions
-          actionsListe={panier.states}
+          panier={panier}
           onToggleSelected={handleToggleSelected}
           onUpdateStatus={handleUpdateStatus}
           onChangeTab={handleChangeTab}
-          {...{budgets, temps, thematiques, typologies, sansFiltreCompetences}}
+          {...{
+            budgets,
+            temps,
+            thematiques,
+            typologies,
+          }}
         />
       </div>
 
       <PanierActions
-        actionsListe={panier.contenu}
+        panier={panier}
         budgets={budgets}
         onToggleSelected={handleToggleSelected}
       />
diff --git a/packages/panier/components/ValidationPanier/ValiderPanierModale.tsx b/packages/panier/components/ValidationPanier/ValiderPanierModale.tsx
index 812fd18d79..0425072348 100644
--- a/packages/panier/components/ValidationPanier/ValiderPanierModale.tsx
+++ b/packages/panier/components/ValidationPanier/ValiderPanierModale.tsx
@@ -28,7 +28,7 @@ import { panierAPI } from '@tet/panier/src/clientAPI';
 const ValiderPanierModale = () => {
   const { panier } = usePanierContext();
   const { user } = useUserContext();
-  const contenu = panier?.contenu ?? [];
+  const contenu = panier?.inpanier ?? [];
 
   const steps = [
     "Je crée mon plan et retrouve l'ensemble des fiches actions sélectionnées dans mon panier. ",
@@ -177,7 +177,8 @@ const ModeConnecteRattache = ({
   const handleOnClick = async () => {
     const collectivite = collectivites.find(
       (c) => c.collectivite_id === collectiviteId
-    )!;
+    );
+    if (!collectivite) return;
     await tracker('cta_creer_le_plan_click', {
       collectivite_preset: collectivite.collectivite_id,
       panier_id: panier?.id ?? '',
diff --git a/packages/panier/hooks/useLandingPathname.ts b/packages/panier/hooks/useLandingPathname.ts
index 07fc19a252..458e7af454 100644
--- a/packages/panier/hooks/useLandingPathname.ts
+++ b/packages/panier/hooks/useLandingPathname.ts
@@ -13,10 +13,10 @@ const useLandingPathname = () => {
       setLandingPathname(pathname);
     } else if (collectiviteId) {
       setLandingPathname(`/landing/collectivite/${collectiviteId}`);
-    } else if (panier?.id && panier.contenu.length > 0) {
+    } else if (panier?.id && panier.selection.length > 0) {
       setLandingPathname(`/landing/panier/${panier.id}`);
     }
-  }, [pathname, collectiviteId, panier?.id, panier?.contenu.length]);
+  }, [pathname, collectiviteId, panier?.id, panier?.selection.length]);
 
   return landingPathname;
 };
diff --git a/packages/ui/src/components/InfoActionImpact/InfoActionImpact.tsx b/packages/ui/src/components/InfoActionImpact/InfoActionImpact.tsx
index 769d2e00f3..2dfcb77419 100644
--- a/packages/ui/src/components/InfoActionImpact/InfoActionImpact.tsx
+++ b/packages/ui/src/components/InfoActionImpact/InfoActionImpact.tsx
@@ -1,5 +1,6 @@
 import {
   ActionImpactFourchetteBudgetaire,
+  ActionImpactStatut,
   ActionImpactTempsMiseEnOeuvre,
   ActionImpactThematique,
 } from '@tet/api';
@@ -33,7 +34,7 @@ export type ActionImpactDetail = {
   /** Lien vers les subventions mobilisables */
   subventions?: LinkType[] | null;
   /** Statut de l'action */
-  statut?: 'non_pertinent' | 'en_cours' | 'realise' | null;
+  statut?: ActionImpactStatut;
 };
 
 type InfoActionImpactProps = {

From ce73499b0472328349e999d10b21457ac9c9532e Mon Sep 17 00:00:00 2001
From: Marc Rutkowski <marc@attractive-media.fr>
Date: Mon, 7 Oct 2024 12:13:16 +0200
Subject: [PATCH 75/91] =?UTF-8?q?Ajoute/enl=C3=A8ve=20automatiquement=20l'?=
 =?UTF-8?q?action=20du=20panier=20si=20la=20case=20=C3=A0=20cocher=20"Ajou?=
 =?UTF-8?q?ter=20les=20actions=20class=C3=A9es=20<statut>"=20est=20activ?=
 =?UTF-8?q?=C3=A9e=20lors=20du=20changement=20de=20statut=20de=20l'action?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../panier/components/PanierActions/index.tsx |  6 ++--
 .../components/PanierRealtime/index.tsx       | 30 +++++++++++++++++++
 2 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/packages/panier/components/PanierActions/index.tsx b/packages/panier/components/PanierActions/index.tsx
index e3194e5e4d..5212b7c214 100644
--- a/packages/panier/components/PanierActions/index.tsx
+++ b/packages/panier/components/PanierActions/index.tsx
@@ -10,21 +10,21 @@ import {
 } from '@tet/api';
 import { Alert } from '@tet/ui';
 import { AjouterActionsRealiseesOuEnCours } from './AjouterActionsRealiseesOuEnCours';
-import { useAjouterActionsRealiseesOuEnCoursState } from './useAjouterActionsRealiseesOuEnCoursState';
+import { AjouterActionsRealiseesOuEnCoursState } from './useAjouterActionsRealiseesOuEnCoursState';
 
 type PanierActionsProps = {
   panier: Panier;
   budgets: ActionImpactFourchetteBudgetaire[];
+  ajouterActionsRealiseesOuEnCours: AjouterActionsRealiseesOuEnCoursState;
   onToggleSelected: (actionId: number, selected: boolean) => void;
 };
 
 const PanierActions = ({
   panier,
   budgets,
+  ajouterActionsRealiseesOuEnCours,
   onToggleSelected,
 }: PanierActionsProps) => {
-  const ajouterActionsRealiseesOuEnCours =
-    useAjouterActionsRealiseesOuEnCoursState();
   const { nbEnCours, nbRealisees } = ajouterActionsRealiseesOuEnCours;
 
   // ventile les actions en sections par statut
diff --git a/packages/panier/components/PanierRealtime/index.tsx b/packages/panier/components/PanierRealtime/index.tsx
index 46c0f37b0a..c70890b4f2 100644
--- a/packages/panier/components/PanierRealtime/index.tsx
+++ b/packages/panier/components/PanierRealtime/index.tsx
@@ -14,6 +14,7 @@ import {
 } from '@tet/panier/providers';
 import {PartagerLeLien} from './PartagerLeLien';
 import { ContenuListesFiltre } from '../FiltresActions/types';
+import { useAjouterActionsRealiseesOuEnCoursState } from '../PanierActions/useAjouterActionsRealiseesOuEnCoursState';
 
 type PanierRealtimeProps = {
   panier: Panier;
@@ -36,6 +37,8 @@ const PanierRealtime = ({
   typologies,
 }: PanierRealtimeProps) => {
   const [currentTab, setCurrentTab] = useState<PanierOngletName>('selection');
+  const ajouterActionsRealiseesOuEnCours =
+    useAjouterActionsRealiseesOuEnCoursState();
 
   const router = useRouter();
   const { setCollectiviteId } = useCollectiviteContext();
@@ -86,12 +89,38 @@ const PanierRealtime = ({
     statusId: string | null
   ) => {
     await panierAPI.setActionStatut(actionId, panier.id, statusId);
+
+    // ajoute/enlève l'action du panier si la case à cocher "Ajouter les
+    // actions classées <statut>" est activée
+    const inpanier = panier.inpanier.find((a) => a.id === actionId);
+    if (!inpanier) {
+      if (
+        (statusId === 'en_cours' &&
+          ajouterActionsRealiseesOuEnCours.ajoutEnCours) ||
+        (statusId === 'realise' &&
+          ajouterActionsRealiseesOuEnCours.ajoutRealisees)
+      ) {
+        await panierAPI.addActionToPanier(actionId, panier.id);
+      }
+    }
+    if (inpanier && inpanier.statut !== statusId) {
+      if (
+        (inpanier.statut === 'en_cours' &&
+          ajouterActionsRealiseesOuEnCours.ajoutEnCours) ||
+        (inpanier.statut === 'realise' &&
+          ajouterActionsRealiseesOuEnCours.ajoutRealisees)
+      ) {
+        await panierAPI.removeActionFromPanier(actionId, panier.id);
+      }
+    }
+
     await tracker('statut', {
       collectivite_preset: panier.collectivite_preset,
       panier_id: panier.id,
       action_id: actionId,
       category_id: statusId,
     });
+
     router.refresh();
   };
 
@@ -132,6 +161,7 @@ const PanierRealtime = ({
       <PanierActions
         panier={panier}
         budgets={budgets}
+        ajouterActionsRealiseesOuEnCours={ajouterActionsRealiseesOuEnCours}
         onToggleSelected={handleToggleSelected}
       />
 

From e4814ccdc1d82d31d67db20fea5582b1300103a1 Mon Sep 17 00:00:00 2001
From: Marc Rutkowski <marc@attractive-media.fr>
Date: Mon, 7 Oct 2024 16:34:45 +0200
Subject: [PATCH 76/91] =?UTF-8?q?Affiche=20dans=20l'en-t=C3=AAte=20le=20no?=
 =?UTF-8?q?m=20de=20la=20collectivit=C3=A9=20associ=C3=A9e=20au=20panier?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/panier/components/Layout/Header.tsx | 45 +++++++++++++++-----
 1 file changed, 34 insertions(+), 11 deletions(-)

diff --git a/packages/panier/components/Layout/Header.tsx b/packages/panier/components/Layout/Header.tsx
index aa9681fb76..e5425a3dea 100644
--- a/packages/panier/components/Layout/Header.tsx
+++ b/packages/panier/components/Layout/Header.tsx
@@ -2,24 +2,47 @@
 
 import useLandingPathname from '@tet/panier/hooks/useLandingPathname';
 import { Button, HeaderTeT, SITE_BASE_URL } from '@tet/ui';
+import { getAppBaseUrl } from '@tet/api';
+import { useCollectiviteInfo } from '@tet/panier/components/Landing/useCollectiviteInfo';
+import { usePanierContext } from '@tet/panier/providers';
 
 const Header = () => {
   const landingPathname = useLandingPathname();
+  const { panier } = usePanierContext();
+  const { data: collectiviteInfo } = useCollectiviteInfo(
+    panier?.collectivite_id ?? panier?.collectivite_preset ?? null
+  );
 
   return (
     <HeaderTeT
       customRootUrl={landingPathname}
-      quickAccessButtons={(props) => [
-        <Button
-          {...props}
-          key="outil"
-          href={`${SITE_BASE_URL}/outil-numerique`}
-          iconPosition="left"
-          external
-        >
-          Qui sommes-nous ?
-        </Button>,
-      ]}
+      quickAccessButtons={(props) => {
+        const buttons = [
+          <Button
+            {...props}
+            key="outil"
+            href={`${SITE_BASE_URL}/outil-numerique`}
+            iconPosition="left"
+            external
+          >
+            Qui sommes-nous ?
+          </Button>,
+        ];
+        if (collectiviteInfo) {
+          buttons.push(
+            <Button
+              {...props}
+              key="nom"
+              href={`${getAppBaseUrl(
+                document.location.hostname
+              )}/collectivite/${collectiviteInfo.collectivite_id}`}
+            >
+              {collectiviteInfo?.nom}
+            </Button>
+          );
+        }
+        return buttons;
+      }}
     />
   );
 };

From d1ea64645358a22cb707cbaa61d1c2c733ab8db0 Mon Sep 17 00:00:00 2001
From: Marc Rutkowski <marc@attractive-media.fr>
Date: Mon, 7 Oct 2024 16:53:31 +0200
Subject: [PATCH 77/91] =?UTF-8?q?Affiche=20un=20message=20invitant=20?=
 =?UTF-8?q?=C3=A0=20se=20connecter=20quand=20on=20veut=20acc=C3=A9der=20au?=
 =?UTF-8?q?=20panier=20d'une=20collectivit=C3=A9=20d=C3=A9j=C3=A0=20activ?=
 =?UTF-8?q?=C3=A9e?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../panier/components/Landing/CestParti.tsx   | 95 +++++++++++++------
 .../components/Landing/SelectCollectivite.tsx | 28 ++++--
 .../components/Landing/useCollectiviteInfo.ts | 29 +++++-
 3 files changed, 111 insertions(+), 41 deletions(-)

diff --git a/packages/panier/components/Landing/CestParti.tsx b/packages/panier/components/Landing/CestParti.tsx
index ba9adee0c7..6edc441cfa 100644
--- a/packages/panier/components/Landing/CestParti.tsx
+++ b/packages/panier/components/Landing/CestParti.tsx
@@ -6,6 +6,8 @@ import {useParams, usePathname, useRouter} from 'next/navigation';
 import {useEventTracker, Button, Icon} from '@tet/ui';
 import SelectCollectivite from './SelectCollectivite';
 import {useCollectiviteInfo} from './useCollectiviteInfo';
+import { getAuthPaths } from '@tet/api';
+import { useUserContext } from '../../providers';
 
 const CestParti = () => {
   const params = useParams();
@@ -15,57 +17,92 @@ const CestParti = () => {
   const id = params['id'];
   const collectiviteIdFromUrl = pathnameArray[2] === 'collectivite' && id;
   const [collectiviteId, setCollectiviteId] = useState(
-    collectiviteIdFromUrl ? parseInt(id as string) : null,
+    collectiviteIdFromUrl ? parseInt(id as string) : null
   );
-  const {data: collectiviteInfo} = useCollectiviteInfo(collectiviteId);
+  const { data: collectiviteInfo } = useCollectiviteInfo(collectiviteId);
+  const { user } = useUserContext();
 
   const tracker = useEventTracker(
-    collectiviteId ? 'panier/landing/collectivite' : 'panier/landing',
+    collectiviteId ? 'panier/landing/collectivite' : 'panier/landing'
   );
 
   const onClick = async () => {
     const base = await panierAPI.panierFromLanding(collectiviteId);
     collectiviteId
-      ? tracker('cta_panier_click', {collectivite_preset: collectiviteId})
-      : // @ts-expect-error
+      ? tracker('cta_panier_click', { collectivite_preset: collectiviteId })
+      : // @ts-expect-error traque même si la collectivité n'est pas spécifiée
         tracker('cta_panier_click');
     router.push(`/panier/${base.id}`);
   };
 
+  // récupère les urls du module auth.
+  let authPaths;
+  if (typeof window !== 'undefined') {
+    const redirectTo = new URL(document.location.href);
+    redirectTo.pathname = `/landing/collectivite/${collectiviteId}`;
+    authPaths = getAuthPaths(document.location.hostname, redirectTo.toString());
+  }
+
+  const nonRattache =
+    collectiviteInfo?.active && !collectiviteInfo.isOwnCollectivite;
+  const nonConnecte = !user;
+
   return (
-    <div className="flex flex-row gap-4 w-full">
-      {!collectiviteIdFromUrl && (
-        <div className="w-full">
-          <SelectCollectivite
-            collectiviteId={collectiviteId}
-            onSelectCollectivite={setCollectiviteId}
-          />
-          {collectiviteInfo?.engagee && (
-            <div className="flex flex-row mt-4 gap-2">
-              <Icon icon="alert-fill text-warning-1" />
-              <p className="text-xs">
-                <span className="text-warning-1">
-                  Vous êtes membre d&apos;une collectivité déjà engagée dans le
-                  programme Territoire Engagé Transition Écologique ?
-                </span>
-                <br />
-                Le panier d&apos;actions basé principalement sur les actions des
-                référentiels est conçu en priorité pour faciliter le passage à
-                l&apos;action aux collectivités qui ne sont pas encore engagées
-                !
-              </p>
+    <>
+      <div className="flex flex-row gap-4 w-full">
+        {(!collectiviteId || (nonRattache && !nonConnecte)) && (
+          <div className="w-full">
+            <SelectCollectivite
+              collectiviteId={collectiviteId}
+              onSelectCollectivite={setCollectiviteId}
+            />
+            {!collectiviteInfo?.active && collectiviteInfo?.engagee && (
+              <div className="flex flex-row mt-4 gap-2">
+                <Icon icon="alert-fill text-warning-1" />
+                <p className="text-sm">
+                  <span className="text-warning-1">
+                    Vous êtes membre d&apos;une collectivité déjà engagée dans
+                    le programme Territoire Engagé Transition Écologique ?
+                  </span>
+                  <br />
+                  Le panier d&apos;actions basé principalement sur les actions
+                  des référentiels est conçu en priorité pour faciliter le
+                  passage à l&apos;action aux collectivités qui ne sont pas
+                  encore engagées !
+                </p>
+              </div>
+            )}
+          </div>
+        )}
+      </div>
+      {nonRattache && (
+        <>
+          <div className="flex flex-row mt-4 gap-2">
+            <Icon icon="alert-fill text-warning-1" />
+            <p className="text-sm text-warning-1">
+              {nonConnecte
+                ? 'Connectez-vous ou créez un compte pour contribuer sur le panier de cette collectivité.'
+                : "Vous n'êtes pas rattaché à cette collectivité."}
+            </p>
+          </div>
+          {nonConnecte && authPaths && (
+            <div className="flex gap-4 justify-center">
+              <Button href={authPaths.login} variant="outlined">
+                Se connecter
+              </Button>
+              <Button href={authPaths.signUp}>Créer un compte</Button>
             </div>
           )}
-        </div>
+        </>
       )}
       <Button
         className="min-w-max h-12"
-        disabled={!collectiviteId}
+        disabled={!collectiviteId || !!nonRattache}
         onClick={onClick}
       >
         C&apos;est parti !
       </Button>
-    </div>
+    </>
   );
 };
 
diff --git a/packages/panier/components/Landing/SelectCollectivite.tsx b/packages/panier/components/Landing/SelectCollectivite.tsx
index d1c42fcc01..d7529f6164 100644
--- a/packages/panier/components/Landing/SelectCollectivite.tsx
+++ b/packages/panier/components/Landing/SelectCollectivite.tsx
@@ -3,6 +3,7 @@
 import {useState} from 'react';
 import {Select} from '@tet/ui';
 import { useFilteredCollectivites } from './useFilteredCollectivites';
+import { useCollectiviteInfo } from './useCollectiviteInfo';
 
 /**
  *  Permet de rechercher et sélectionner une collectivité
@@ -15,23 +16,34 @@ const SelectCollectivite = ({
   onSelectCollectivite: (id: number | null) => void;
 }) => {
   const [search, setSearch] = useState('');
-  const {data: collectivites, isLoading} = useFilteredCollectivites(search);
+  const { data: collectivites, isLoading } = useFilteredCollectivites(search);
+  const { data: collectiviteInfo } = useCollectiviteInfo(collectiviteId);
+
+  const options =
+    collectivites?.map((c) => ({
+      value: c.collectivite_id,
+      label: `${c.nom} (${c.departement_code})`,
+    })) || [];
+  if (
+    !collectivites?.find((c) => c.collectivite_id === collectiviteId) &&
+    collectiviteInfo
+  ) {
+    options.push({
+      value: collectiviteInfo.collectivite_id,
+      label: collectiviteInfo.nom,
+    });
+  }
 
   return (
     <Select
       placeholder="Rechercher une collectivité"
       debounce={500}
-      options={
-        collectivites?.map(c => ({
-          value: c.collectivite_id!,
-          label: `${c.nom!} (${c.departement_code})`,
-        })) || []
-      }
+      options={options}
       values={collectiviteId ? collectiviteId : undefined}
       isSearcheable
       onSearch={setSearch}
       isLoading={isLoading}
-      onChange={value => {
+      onChange={(value) => {
         const id = collectiviteId === value ? null : (value as number);
         onSelectCollectivite(id);
       }}
diff --git a/packages/panier/components/Landing/useCollectiviteInfo.ts b/packages/panier/components/Landing/useCollectiviteInfo.ts
index f5656190d5..b61a5419d1 100644
--- a/packages/panier/components/Landing/useCollectiviteInfo.ts
+++ b/packages/panier/components/Landing/useCollectiviteInfo.ts
@@ -1,6 +1,13 @@
 import { supabase } from '../../src/clientAPI';
 import useSWR from 'swr';
 
+type Collectivite = {
+  collectivite_id: number;
+  nom: string;
+  engagee?: boolean;
+  active?: boolean;
+};
+
 /** Donne des infos sur une collectivité */
 export const useCollectiviteInfo = (collectiviteId: number | null) => {
   const key = `collectivite-info-${collectiviteId}`;
@@ -9,16 +16,30 @@ export const useCollectiviteInfo = (collectiviteId: number | null) => {
 
     const { error, data } = await supabase
       .from('site_labellisation')
-      .select('collectivite_id, nom, engagee')
-      .eq('collectivite_id', collectiviteId);
+      .select('collectivite_id, nom, engagee, active')
+      .eq('collectivite_id', collectiviteId)
+      .returns<Collectivite[]>();
 
     if (error) {
-      throw new Error(key);
+      throw new Error(error.message);
     }
     if (!data || !data.length) {
       return null;
     }
 
-    return data[0];
+    const { error: errorUserCollectivites, data: userCollectivites } =
+      await supabase
+        .from('mes_collectivites')
+        .select('collectivite_id')
+        .eq('collectivite_id', collectiviteId);
+    if (errorUserCollectivites) {
+      throw new Error(errorUserCollectivites.message);
+    }
+
+    const isOwnCollectivite = !!userCollectivites?.find(
+      (c) => c.collectivite_id === collectiviteId
+    );
+
+    return { ...data[0], isOwnCollectivite };
   });
 };

From 96d534e3448f640526b38998bbb9934a30cfcbf8 Mon Sep 17 00:00:00 2001
From: Marc Rutkowski <marc@attractive-media.fr>
Date: Mon, 7 Oct 2024 17:16:52 +0200
Subject: [PATCH 78/91] Ajoute l'url du panier dans le build du site

---
 .github/workflows/cd-site.yml | 1 +
 Earthfile                     | 2 --
 packages/site/.env.sample     | 1 +
 packages/site/Earthfile       | 4 ++++
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/cd-site.yml b/.github/workflows/cd-site.yml
index 0d581f7c4f..637f749691 100644
--- a/.github/workflows/cd-site.yml
+++ b/.github/workflows/cd-site.yml
@@ -38,6 +38,7 @@ jobs:
           --STRAPI_KEY=${{ secrets.STRAPI_KEY }} --STRAPI_URL=${{ secrets.STRAPI_URL }}
           --POSTHOG_HOST=${{ secrets.POSTHOG_HOST }} --POSTHOG_KEY=${{ secrets.POSTHOG_KEY }}
           --AXEPTIO_ID=${{ vars.AXEPTIO_ID }}
+          --PANIER_URL=${{ vars.PANIER_URL }}
           --CRISP_WEBSITE_ID=${{ vars.CRISP_WEBSITE_ID }}
 
       - name: Deploy site on Koyeb
diff --git a/Earthfile b/Earthfile
index 17cc5065a7..a15ef123f3 100644
--- a/Earthfile
+++ b/Earthfile
@@ -503,8 +503,6 @@ site-deploy:
   ARG --required KOYEB_API_KEY
   BUILD --pass-args ./packages/site+deploy
 
-
-
 site-run: ## construit et lance l'image du site en local
     ARG network=supabase_network_tet
     LOCALLY
diff --git a/packages/site/.env.sample b/packages/site/.env.sample
index 27580ad037..7e92d3ef6b 100644
--- a/packages/site/.env.sample
+++ b/packages/site/.env.sample
@@ -2,3 +2,4 @@ NEXT_PUBLIC_SUPABASE_URL=http://localhost:8000
 NEXT_PUBLIC_SUPABASE_ANON_KEY=${SUPABASE_ANON_KEY}
 NEXT_PUBLIC_CRISP_WEBSITE_ID="// Crisp integration (warning: use different ID by deployment env.)"
 NEXT_PUBLIC_AXEPTIO_ID=${AXEPTIO_ID}
+NEXT_PUBLIC_PANIER_URL=http://localhost:3002
diff --git a/packages/site/Earthfile b/packages/site/Earthfile
index 4b09aae46a..31bfba4768 100644
--- a/packages/site/Earthfile
+++ b/packages/site/Earthfile
@@ -8,6 +8,7 @@ build:
   ARG --required STRAPI_KEY
   ARG --required STRAPI_URL
   ARG --required AXEPTIO_ID
+  ARG --required PANIER_URL
 
   COPY . ./packages/site
 
@@ -22,6 +23,7 @@ build:
   ENV NEXT_PUBLIC_POSTHOG_KEY=$POSTHOG_KEY
   ENV NEXT_PUBLIC_AXEPTIO_ID=$AXEPTIO_ID
   ENV NEXT_PUBLIC_CRISP_WEBSITE_ID=$CRISP_WEBSITE_ID
+  ENV NEXT_PUBLIC_PANIER_URL=$PANIER_URL
 
   RUN pnpm build:site
 
@@ -37,6 +39,7 @@ docker:
   ARG --required STRAPI_KEY
   ARG --required STRAPI_URL
   ARG --required AXEPTIO_ID
+  ARG --required PANIER_URL
   ARG POSTHOG_HOST
   ARG POSTHOG_KEY
 
@@ -48,6 +51,7 @@ docker:
   ENV NEXT_PUBLIC_POSTHOG_KEY=$POSTHOG_KEY
   ENV NEXT_PUBLIC_AXEPTIO_ID=$AXEPTIO_ID
   ENV NEXT_PUBLIC_CRISP_WEBSITE_ID=$CRISP_WEBSITE_ID
+  ENV NEXT_PUBLIC_PANIER_URL=$PANIER_URL
 
   ARG DOCKER_IMAGE=$SITE_IMG_NAME
 

From d3ead48f681516c8cadd7def4328a8aafb410265 Mon Sep 17 00:00:00 2001
From: Marc Rutkowski <marc@attractive-media.fr>
Date: Mon, 7 Oct 2024 17:17:20 +0200
Subject: [PATCH 79/91] =?UTF-8?q?Ajoute=20le=20lien=20vers=20le=20panier?=
 =?UTF-8?q?=20dans=20la=20page=20"outil=20num=C3=A9rique"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/site/app/outil-numerique/PanierActionsImpact.tsx | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/site/app/outil-numerique/PanierActionsImpact.tsx b/packages/site/app/outil-numerique/PanierActionsImpact.tsx
index 6104ca167b..36bb8a6867 100644
--- a/packages/site/app/outil-numerique/PanierActionsImpact.tsx
+++ b/packages/site/app/outil-numerique/PanierActionsImpact.tsx
@@ -37,7 +37,10 @@ const PanierActionsImpact = ({
           texte={description}
           className="paragraphe-primary-10 paragraphe-18 markdown_style colored_marker"
         />
-        <Button href="/contact?objet=panier" className="mt-6 max-lg:mx-auto">
+        <Button
+          href={`${process.env.NEXT_PUBLIC_PANIER_URL}/landing`}
+          className="mt-6 max-lg:mx-auto"
+        >
           {cta}
         </Button>
       </div>

From b35faeeb1342dc8ccbb235da9f79d1a6d52abf5c Mon Sep 17 00:00:00 2001
From: Marc Rutkowski <marc@attractive-media.fr>
Date: Mon, 7 Oct 2024 19:27:36 +0200
Subject: [PATCH 80/91] =?UTF-8?q?Corrige=20l'url=20d'acc=C3=A8s=20=C3=A0?=
 =?UTF-8?q?=20la=20collectivit=C3=A9=20depuis=20l'en-t=C3=AAte=20du=20pani?=
 =?UTF-8?q?er?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/panier/components/Layout/Header.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/panier/components/Layout/Header.tsx b/packages/panier/components/Layout/Header.tsx
index e5425a3dea..8c55e89780 100644
--- a/packages/panier/components/Layout/Header.tsx
+++ b/packages/panier/components/Layout/Header.tsx
@@ -35,7 +35,7 @@ const Header = () => {
               key="nom"
               href={`${getAppBaseUrl(
                 document.location.hostname
-              )}/collectivite/${collectiviteInfo.collectivite_id}`}
+              )}/collectivite/${collectiviteInfo.collectivite_id}/accueil`}
             >
               {collectiviteInfo?.nom}
             </Button>

From 4f163c4dc099af78e42443dfe1fd612da3a5715b Mon Sep 17 00:00:00 2001
From: Marc Rutkowski <marc@attractive-media.fr>
Date: Mon, 7 Oct 2024 19:38:15 +0200
Subject: [PATCH 81/91] =?UTF-8?q?R=C3=A9pare=20l'=C3=A9tat=20de=20la=20cas?=
 =?UTF-8?q?e=20=C3=A0=20cocher=20"Je=20suis=20r=C3=A9f=C3=A9rent.e=20dans.?=
 =?UTF-8?q?.."?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../RejoindreUneCollectivite/RejoindreUneCollectivite.tsx    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/auth/components/RejoindreUneCollectivite/RejoindreUneCollectivite.tsx b/packages/auth/components/RejoindreUneCollectivite/RejoindreUneCollectivite.tsx
index efc8149cca..7050a3313e 100644
--- a/packages/auth/components/RejoindreUneCollectivite/RejoindreUneCollectivite.tsx
+++ b/packages/auth/components/RejoindreUneCollectivite/RejoindreUneCollectivite.tsx
@@ -158,8 +158,9 @@ export const RejoindreUneCollectivite = (
               <Checkbox
                 containerClassname="md:col-span-2"
                 label="Je suis référent.e dans le programme Territoire Engagé Transition Ecologique"
-                onChange={e =>
-                  setFormState(previous => ({
+                checked={est_referent}
+                onChange={(e) =>
+                  setFormState((previous) => ({
                     ...previous,
                     est_referent: e.target.checked,
                   }))

From 5b086382883c9c2aa34926cd37ef36a5e86be396 Mon Sep 17 00:00:00 2001
From: Marc Rutkowski <marc@attractive-media.fr>
Date: Mon, 7 Oct 2024 19:53:55 +0200
Subject: [PATCH 82/91] Ajoute Crisp dans l'app panier

---
 .github/workflows/cd-panier.yml |  1 +
 Earthfile                       |  2 ++
 packages/panier/.env.sample     |  1 +
 packages/panier/app/layout.tsx  | 13 +++++++++++++
 packages/panier/middleware.ts   | 11 +++++++----
 5 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/cd-panier.yml b/.github/workflows/cd-panier.yml
index e9532f04f8..248d165a8c 100644
--- a/.github/workflows/cd-panier.yml
+++ b/.github/workflows/cd-panier.yml
@@ -36,6 +36,7 @@ jobs:
           --ENV_NAME=${{ github.event.inputs.target }}
           --POSTHOG_HOST=${{ secrets.POSTHOG_HOST }} --POSTHOG_KEY=${{ secrets.POSTHOG_KEY }}
           --AXEPTIO_ID=${{ vars.AXEPTIO_ID }}
+          --CRISP_WEBSITE_ID=${{ vars.CRISP_WEBSITE_ID }}
           --ANON_KEY=${{ secrets.ANON_KEY }} --API_URL=${{ secrets.API_URL }}
 
       - name: Deploy panier on Koyeb
diff --git a/Earthfile b/Earthfile
index a15ef123f3..35ba1f572d 100644
--- a/Earthfile
+++ b/Earthfile
@@ -466,6 +466,7 @@ panier-build: ## construit l'image du panier
     ARG POSTHOG_HOST
     ARG POSTHOG_KEY
     ARG AXEPTIO_ID
+    ARG CRISP_WEBSITE_ID
     ARG vars
     FROM +front-deps
     ENV NEXT_PUBLIC_SUPABASE_ANON_KEY=$ANON_KEY
@@ -473,6 +474,7 @@ panier-build: ## construit l'image du panier
     ENV NEXT_PUBLIC_POSTHOG_HOST=$POSTHOG_HOST
     ENV NEXT_PUBLIC_POSTHOG_KEY=$POSTHOG_KEY
     ENV NEXT_PUBLIC_AXEPTIO_ID=$AXEPTIO_ID
+    ENV NEXT_PUBLIC_CRISP_WEBSITE_ID=$CRISP_WEBSITE_ID
     ENV NEXT_TELEMETRY_DISABLED=1
     ENV PUBLIC_PATH="/app/packages/panier/public"
     ENV PORT=80
diff --git a/packages/panier/.env.sample b/packages/panier/.env.sample
index cfdbb855c7..b04f6b760d 100644
--- a/packages/panier/.env.sample
+++ b/packages/panier/.env.sample
@@ -1,2 +1,3 @@
 NEXT_PUBLIC_SUPABASE_URL=http://localhost:8000
 NEXT_PUBLIC_SUPABASE_ANON_KEY=${SUPABASE_ANON_KEY}
+NEXT_PUBLIC_CRISP_WEBSITE_ID=""
diff --git a/packages/panier/app/layout.tsx b/packages/panier/app/layout.tsx
index 59588d0721..a56cc454d7 100644
--- a/packages/panier/app/layout.tsx
+++ b/packages/panier/app/layout.tsx
@@ -2,6 +2,7 @@ import './global.css';
 import Footer from '@tet/panier/components/Layout/Footer';
 import Header from '@tet/panier/components/Layout/Header';
 import { StoreProvider } from '../providers';
+import Script from 'next/script';
 
 export const metadata = {
   title: 'Territoires en Transitions',
@@ -45,6 +46,18 @@ export default function RootLayout({
           <Footer />
         </body>
       </StoreProvider>
+      {/* crisp widget */}
+      <Script id="crisp" type="text/javascript">{`
+          window.$crisp = [];
+          window.CRISP_WEBSITE_ID = '${process.env.NEXT_PUBLIC_CRISP_WEBSITE_ID}';
+          (function () {
+            d = document;
+            s = d.createElement('script');
+            s.src = 'https://client.crisp.chat/l.js';
+            s.async = 1;
+            d.getElementsByTagName('head')[0].appendChild(s);
+          })();
+        `}</Script>
     </html>
   );
 }
diff --git a/packages/panier/middleware.ts b/packages/panier/middleware.ts
index 48a8118860..ed2c671030 100644
--- a/packages/panier/middleware.ts
+++ b/packages/panier/middleware.ts
@@ -27,16 +27,19 @@ export function middleware(request: NextRequest) {
   // options de la politique de sécurité
   const cspHeader = `
     default-src 'self';
-    script-src ${scriptSrc} *.axept.io *.posthog.com;
-    style-src ${styleSrc};
-    img-src 'self' blob: data: axeptio.imgix.net;
-    font-src 'self';
+    script-src ${scriptSrc} *.axept.io *.posthog.com client.crisp.chat;
+    style-src ${styleSrc} client.crisp.chat;
+    img-src 'self' blob: data: axeptio.imgix.net image.crisp.chat client.crisp.chat;
+    font-src 'self' client.crisp.chat;
     object-src 'none';
     connect-src 'self'
       ${process.env.NEXT_PUBLIC_SUPABASE_URL!}
       ${process.env.NEXT_PUBLIC_SUPABASE_URL!.replace('http', 'ws')}
       ws://${request.nextUrl.host}
       ws://127.0.0.1:54321
+      client.crisp.chat
+      wss://client.relay.crisp.chat
+      wss://stream.relay.crisp.chat
       *.posthog.com
       *.axept.io;
     base-uri 'self';

From 6fe5dd9782293ee4e575a0182a118d8ba9904ad5 Mon Sep 17 00:00:00 2001
From: Marc Rutkowski <marc@attractive-media.fr>
Date: Mon, 7 Oct 2024 19:59:52 +0200
Subject: [PATCH 83/91] =?UTF-8?q?Corrige=20une=20erreur=20de=20typage=20qu?=
 =?UTF-8?q?i=20fait=20=C3=A9chouer=20le=20build?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/Landing/useFilteredCollectivites.ts | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/packages/panier/components/Landing/useFilteredCollectivites.ts b/packages/panier/components/Landing/useFilteredCollectivites.ts
index 5a82ac4332..49d3d85560 100644
--- a/packages/panier/components/Landing/useFilteredCollectivites.ts
+++ b/packages/panier/components/Landing/useFilteredCollectivites.ts
@@ -2,6 +2,13 @@ import { makeSearchString } from '@tet/api';
 import useSWR from 'swr';
 import { supabase } from '../../src/clientAPI';
 
+type Collectivite = {
+  collectivite_id: number;
+  nom: string;
+  departement_code?: number;
+  engagee?: boolean;
+};
+
 /** Donne la liste des collectivités dont le nom inclus la chaîne recherchée */
 export const useFilteredCollectivites = (search: string, limit = 10) => {
   const key = `site_labellisation-filtered-${search}`;
@@ -9,15 +16,16 @@ export const useFilteredCollectivites = (search: string, limit = 10) => {
     const query = supabase
       .from('site_labellisation')
       .select('collectivite_id, nom, departement_code, engagee')
-      .order('nom')
-      .limit(limit);
+      .order('nom');
 
     const processedSearch = makeSearchString(search, 'nom');
     if (processedSearch) {
       query.or(processedSearch);
     }
 
-    const { error, data } = await query;
+    query.limit(limit);
+
+    const { error, data } = await query.returns<Collectivite[]>();
 
     if (error) {
       throw new Error(key);

From f2ed73abe26d11379ad13a0b134bd7e408ed43d6 Mon Sep 17 00:00:00 2001
From: Marc Rutkowski <marc@attractive-media.fr>
Date: Tue, 8 Oct 2024 12:09:36 +0200
Subject: [PATCH 84/91] Change le build de l'image de prod du panier

---
 .github/workflows/cd-panier.yml |  2 +-
 Earthfile                       | 44 ++++-------------
 packages/panier/Earthfile       | 84 +++++++++++++++++++++++++++++++++
 packages/panier/next.config.mjs |  5 ++
 4 files changed, 98 insertions(+), 37 deletions(-)
 create mode 100644 packages/panier/Earthfile

diff --git a/.github/workflows/cd-panier.yml b/.github/workflows/cd-panier.yml
index 248d165a8c..2b9656af2c 100644
--- a/.github/workflows/cd-panier.yml
+++ b/.github/workflows/cd-panier.yml
@@ -32,7 +32,7 @@ jobs:
           earthly
           --use-inline-cache --save-inline-cache --push
           --platform=linux/amd64
-          +panier-build
+          +panier-docker
           --ENV_NAME=${{ github.event.inputs.target }}
           --POSTHOG_HOST=${{ secrets.POSTHOG_HOST }} --POSTHOG_KEY=${{ secrets.POSTHOG_KEY }}
           --AXEPTIO_ID=${{ vars.AXEPTIO_ID }}
diff --git a/Earthfile b/Earthfile
index 35ba1f572d..2c30fe1694 100644
--- a/Earthfile
+++ b/Earthfile
@@ -459,45 +459,22 @@ package-api-test: ## lance les tests d'intégration de l'api
         --env SUPABASE_SERVICE_ROLE_KEY=$SERVICE_ROLE_KEY \
         package-api-test:latest
 
-panier-build: ## construit l'image du panier
-    ARG PLATFORM
-    ARG --required ANON_KEY
-    ARG --required API_URL
-    ARG POSTHOG_HOST
-    ARG POSTHOG_KEY
-    ARG AXEPTIO_ID
-    ARG CRISP_WEBSITE_ID
-    ARG vars
-    FROM +front-deps
-    ENV NEXT_PUBLIC_SUPABASE_ANON_KEY=$ANON_KEY
-    ENV NEXT_PUBLIC_SUPABASE_URL=$API_URL
-    ENV NEXT_PUBLIC_POSTHOG_HOST=$POSTHOG_HOST
-    ENV NEXT_PUBLIC_POSTHOG_KEY=$POSTHOG_KEY
-    ENV NEXT_PUBLIC_AXEPTIO_ID=$AXEPTIO_ID
-    ENV NEXT_PUBLIC_CRISP_WEBSITE_ID=$CRISP_WEBSITE_ID
-    ENV NEXT_TELEMETRY_DISABLED=1
-    ENV PUBLIC_PATH="/app/packages/panier/public"
-    ENV PORT=80
-    EXPOSE $PORT
-    # copie les sources des modules à construire
-    COPY $PANIER_DIR $PANIER_DIR
-    COPY $UI_DIR $UI_DIR
-    COPY $API_DIR $API_DIR
-    RUN pnpm run build:panier
-    CMD ["dumb-init", "./node_modules/.bin/next", "start", "./packages/panier/"]
-    SAVE IMAGE --cache-from=$PANIER_IMG_NAME --push $PANIER_IMG_NAME
+panier-docker: ## construit l'image du panier
+  BUILD --pass-args ./packages/panier+docker
+
+panier-deploy:
+  ARG --required KOYEB_API_KEY
+  BUILD --pass-args ./packages/panier+deploy
 
-panier-run: ## construit et lance l'image du panier en local
+panier-run: ## lance l'image du panier en local
     ARG network=supabase_network_tet
     LOCALLY
     RUN docker run -d --rm \
         --name panier_tet \
         --network $network \
-        --publish 3001:80 \
+        --publish 3002:3000 \
         $PANIER_IMG_NAME
 
-
-
 site-docker:
   BUILD --pass-args ./packages/site+docker
 
@@ -949,11 +926,6 @@ auth-deploy:
     FROM +koyeb
     RUN ./koyeb services update $ENV_NAME-auth/front --docker $AUTH_IMG_NAME
 
-panier-deploy:
-    ARG --required KOYEB_API_KEY
-    FROM +koyeb
-    RUN ./koyeb services update $ENV_NAME-panier/front --docker $PANIER_IMG_NAME
-
 app-deploy: ## Déploie le front dans une app Koyeb existante
     ARG --required KOYEB_API_KEY
     FROM +koyeb
diff --git a/packages/panier/Earthfile b/packages/panier/Earthfile
new file mode 100644
index 0000000000..2a3c6cc023
--- /dev/null
+++ b/packages/panier/Earthfile
@@ -0,0 +1,84 @@
+VERSION 0.8
+
+build:
+  FROM ../../+node-alpine-with-all-deps
+
+  ARG --required ANON_KEY
+  ARG --required API_URL
+  ARG --required AXEPTIO_ID
+
+  COPY . ./packages/panier
+
+  # Disable telemetry during build
+  ENV NEXT_TELEMETRY_DISABLED=1
+
+  ENV NEXT_PUBLIC_SUPABASE_ANON_KEY=$ANON_KEY
+  ENV NEXT_PUBLIC_SUPABASE_URL=$API_URL
+  ENV NEXT_PUBLIC_POSTHOG_HOST=$POSTHOG_HOST
+  ENV NEXT_PUBLIC_POSTHOG_KEY=$POSTHOG_KEY
+  ENV NEXT_PUBLIC_AXEPTIO_ID=$AXEPTIO_ID
+  ENV NEXT_PUBLIC_CRISP_WEBSITE_ID=$CRISP_WEBSITE_ID
+
+  RUN pnpm build:panier
+
+  SAVE ARTIFACT ./packages/panier/.next
+  SAVE ARTIFACT ./packages/panier/public
+
+# See official Dockerfile at https://github.com/vercel/next.js/blob/canary/examples/with-docker/Dockerfile
+docker:
+  FROM ../../+node-alpine
+
+  ARG --required ANON_KEY
+  ARG --required API_URL
+  ARG --required AXEPTIO_ID
+  ARG POSTHOG_HOST
+  ARG POSTHOG_KEY
+  ARG CRISP_WEBSITE_ID
+
+  ENV NEXT_PUBLIC_SUPABASE_ANON_KEY=$ANON_KEY
+  ENV NEXT_PUBLIC_SUPABASE_URL=$API_URL
+  ENV NEXT_PUBLIC_POSTHOG_HOST=$POSTHOG_HOST
+  ENV NEXT_PUBLIC_POSTHOG_KEY=$POSTHOG_KEY
+  ENV NEXT_PUBLIC_AXEPTIO_ID=$AXEPTIO_ID
+  ENV NEXT_PUBLIC_CRISP_WEBSITE_ID=$CRISP_WEBSITE_ID
+
+  ARG DOCKER_IMAGE=$PANIER_IMG_NAME
+
+  # ENV PUBLIC_PATH="/app/public"
+
+  RUN addgroup --system --gid 1001 nodejs
+  RUN adduser --system --uid 1001 nextjs
+
+  COPY +build/public ./public
+
+  # Set the correct permission for prerender cache
+  RUN mkdir .next
+  RUN chown nextjs:nodejs .next
+
+  # Automatically leverage output traces to reduce docker image size
+  # https://nextjs.org/docs/advanced-features/output-file-tracing
+  COPY --chown=nextjs:nodejs +build/.next/standalone ./
+  COPY --chown=nextjs:nodejs +build/.next/static ./packages/panier/.next/static
+
+  USER nextjs
+
+
+  # Prepare the app for production
+  ENV NEXT_TELEMETRY_DISABLED=1
+  ENV HOSTNAME="0.0.0.0"
+  ENV NODE_ENV production
+
+  ENV PORT=3000
+  EXPOSE 3000
+
+  # server.js is created by next build from the standalone output
+  # https://nextjs.org/docs/pages/api-reference/next-config-js/output
+  CMD ["node", "packages/panier/server.js"]
+
+  SAVE IMAGE --push $DOCKER_IMAGE
+
+deploy:
+  ARG --required KOYEB_API_KEY
+  FROM ../../+koyeb --KOYEB_API_KEY=$KOYEB_API_KEY
+  RUN ./koyeb services update $ENV_NAME-panier/front --docker $PANIER_IMG_NAME
+
diff --git a/packages/panier/next.config.mjs b/packages/panier/next.config.mjs
index 76bbea748c..95c3a9292b 100644
--- a/packages/panier/next.config.mjs
+++ b/packages/panier/next.config.mjs
@@ -9,6 +9,11 @@ const nextConfig = {
     // See: https://github.com/gregberge/svgr
     svgr: false,
   },
+
+  // Useful for self-hosting in a Docker container
+  // See https://nextjs.org/docs/app/api-reference/next-config-js/output#automatically-copying-traced-files
+  output: 'standalone',
+
   // active le mode strict pour détecter les problèmes en dev
   reactStrictMode: true,
   // active la minification

From 5f7b251ee4440bd56f4751e6e553534fbd3c0595 Mon Sep 17 00:00:00 2001
From: Marc Rutkowski <marc@attractive-media.fr>
Date: Tue, 8 Oct 2024 12:11:46 +0200
Subject: [PATCH 85/91] =?UTF-8?q?Rend=20le=20panneau=20"inviter=20des=20me?=
 =?UTF-8?q?mbres"=20r=C3=A9duit=20par=20d=C3=A9faut?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/panier/components/PanierRealtime/PartagerLeLien.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/panier/components/PanierRealtime/PartagerLeLien.tsx b/packages/panier/components/PanierRealtime/PartagerLeLien.tsx
index b42fd22ff0..93898ed515 100644
--- a/packages/panier/components/PanierRealtime/PartagerLeLien.tsx
+++ b/packages/panier/components/PanierRealtime/PartagerLeLien.tsx
@@ -8,7 +8,7 @@ import Membres from '../Picto/Membres';
  * Affiche l'encadré invitant au partage du lien vers le panier
  */
 export const PartagerLeLien = ({panier}: {panier: Panier}) => {
-  const [opened, setOpened] = useState(true);
+  const [opened, setOpened] = useState(false);
   const [copied, setCopied] = useState(false);
   const [timeoutId, setTimeoutId] = useState<number | null>(null);
 

From 9d0bd7b01ae9d42ea5b632f3471600d37b77411c Mon Sep 17 00:00:00 2001
From: Marc Rutkowski <marc@attractive-media.fr>
Date: Tue, 8 Oct 2024 12:16:22 +0200
Subject: [PATCH 86/91] =?UTF-8?q?Supprime=20un=20lien=20dupliqu=C3=A9=20da?=
 =?UTF-8?q?ns=20le=20pied-de-page?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/panier/components/Layout/Footer.tsx | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/packages/panier/components/Layout/Footer.tsx b/packages/panier/components/Layout/Footer.tsx
index f38db24acb..09d20af899 100644
--- a/packages/panier/components/Layout/Footer.tsx
+++ b/packages/panier/components/Layout/Footer.tsx
@@ -1,22 +1,9 @@
 'use client';
 
-import { FooterTeT, SITE_BASE_URL } from '@tet/ui';
+import { FooterTeT } from '@tet/ui';
 
 const Footer = () => {
-  return (
-    <FooterTeT
-      customLinks={[
-        {
-          label: 'Statistiques',
-          href: `${SITE_BASE_URL}/stats`,
-        },
-        {
-          label: 'Budget',
-          href: `${SITE_BASE_URL}/budget`,
-        },
-      ]}
-    />
-  );
+  return <FooterTeT />;
 };
 
 export default Footer;

From fa9ecde1fc079f2ccf400e595a70d74080fdd761 Mon Sep 17 00:00:00 2001
From: Marc Rutkowski <marc@attractive-media.fr>
Date: Tue, 8 Oct 2024 17:06:36 +0200
Subject: [PATCH 87/91] =?UTF-8?q?D=C3=A9cale=20un=20peu=20vers=20la=20droi?=
 =?UTF-8?q?te=20le=20panneau=20"inviter=20des=20membres"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/panier/components/PanierRealtime/PartagerLeLien.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/panier/components/PanierRealtime/PartagerLeLien.tsx b/packages/panier/components/PanierRealtime/PartagerLeLien.tsx
index 93898ed515..ea2e543be3 100644
--- a/packages/panier/components/PanierRealtime/PartagerLeLien.tsx
+++ b/packages/panier/components/PanierRealtime/PartagerLeLien.tsx
@@ -35,7 +35,7 @@ export const PartagerLeLien = ({panier}: {panier: Panier}) => {
   }, [copied]);
 
   return opened ? (
-    <Card className="fixed bottom-0 rounded-b-none -mb-1 left-4 shadow-md w-96 z-10">
+    <Card className="fixed bottom-0 rounded-b-none -mb-1 left-20 shadow-md w-96 z-10">
       <div
         onClick={() => setOpened(false)}
         className="ml-auto cursor-pointer h-fit w-fit"
@@ -71,7 +71,7 @@ export const PartagerLeLien = ({panier}: {panier: Panier}) => {
       </Button>
     </Card>
   ) : (
-    <div className="fixed bottom-0 left-4">
+    <div className="fixed bottom-0 left-20">
       <Button
         className="rounded-b-none -mb-1"
         icon="user-add-line"

From df6a1e982ff4cb3a9c3eb0f09547de7303c2b7ec Mon Sep 17 00:00:00 2001
From: Marc Rutkowski <marc@attractive-media.fr>
Date: Tue, 8 Oct 2024 17:12:22 +0200
Subject: [PATCH 88/91] =?UTF-8?q?Rend=20non=20cliquable=20le=20nom=20de=20?=
 =?UTF-8?q?la=20collectivit=C3=A9=20dans=20l'en-t=C3=AAte=20du=20panier=20?=
 =?UTF-8?q?si=20l'utilisateur=20n'est=20pas=20rattach=C3=A9=20=C3=A0=20cel?=
 =?UTF-8?q?le-ci?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/panier/components/Layout/Header.tsx | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/packages/panier/components/Layout/Header.tsx b/packages/panier/components/Layout/Header.tsx
index 8c55e89780..244bffc37f 100644
--- a/packages/panier/components/Layout/Header.tsx
+++ b/packages/panier/components/Layout/Header.tsx
@@ -5,6 +5,7 @@ import { Button, HeaderTeT, SITE_BASE_URL } from '@tet/ui';
 import { getAppBaseUrl } from '@tet/api';
 import { useCollectiviteInfo } from '@tet/panier/components/Landing/useCollectiviteInfo';
 import { usePanierContext } from '@tet/panier/providers';
+import classNames from 'classnames';
 
 const Header = () => {
   const landingPathname = useLandingPathname();
@@ -33,11 +34,19 @@ const Header = () => {
             <Button
               {...props}
               key="nom"
-              href={`${getAppBaseUrl(
-                document.location.hostname
-              )}/collectivite/${collectiviteInfo.collectivite_id}/accueil`}
+              className={classNames({
+                'hover:!bg-white hover:!border-white hover:!text-primary !cursor-default':
+                  !collectiviteInfo.isOwnCollectivite,
+              })}
+              href={
+                collectiviteInfo.isOwnCollectivite
+                  ? `${getAppBaseUrl(
+                      document.location.hostname
+                    )}/collectivite/${collectiviteInfo.collectivite_id}/accueil`
+                  : undefined
+              }
             >
-              {collectiviteInfo?.nom}
+              {collectiviteInfo.nom}
             </Button>
           );
         }

From 09a37799db1d1147188b60dc7d1874c4737737b0 Mon Sep 17 00:00:00 2001
From: Marc Rutkowski <marc@attractive-media.fr>
Date: Tue, 8 Oct 2024 17:31:08 +0200
Subject: [PATCH 89/91] =?UTF-8?q?Garde=20le=20s=C3=A9lecteur=20de=20collec?=
 =?UTF-8?q?tivit=C3=A9=20affich=C3=A9=20m=C3=AAme=20apr=C3=A8s=20la=20s?=
 =?UTF-8?q?=C3=A9lection=20d'une=20collectivit=C3=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../panier/components/Landing/CestParti.tsx   | 46 +++++++++----------
 1 file changed, 22 insertions(+), 24 deletions(-)

diff --git a/packages/panier/components/Landing/CestParti.tsx b/packages/panier/components/Landing/CestParti.tsx
index 6edc441cfa..521ca0f705 100644
--- a/packages/panier/components/Landing/CestParti.tsx
+++ b/packages/panier/components/Landing/CestParti.tsx
@@ -50,30 +50,28 @@ const CestParti = () => {
   return (
     <>
       <div className="flex flex-row gap-4 w-full">
-        {(!collectiviteId || (nonRattache && !nonConnecte)) && (
-          <div className="w-full">
-            <SelectCollectivite
-              collectiviteId={collectiviteId}
-              onSelectCollectivite={setCollectiviteId}
-            />
-            {!collectiviteInfo?.active && collectiviteInfo?.engagee && (
-              <div className="flex flex-row mt-4 gap-2">
-                <Icon icon="alert-fill text-warning-1" />
-                <p className="text-sm">
-                  <span className="text-warning-1">
-                    Vous êtes membre d&apos;une collectivité déjà engagée dans
-                    le programme Territoire Engagé Transition Écologique ?
-                  </span>
-                  <br />
-                  Le panier d&apos;actions basé principalement sur les actions
-                  des référentiels est conçu en priorité pour faciliter le
-                  passage à l&apos;action aux collectivités qui ne sont pas
-                  encore engagées !
-                </p>
-              </div>
-            )}
-          </div>
-        )}
+        <div className="w-full">
+          <SelectCollectivite
+            collectiviteId={collectiviteId}
+            onSelectCollectivite={setCollectiviteId}
+          />
+          {!collectiviteInfo?.active && collectiviteInfo?.engagee && (
+            <div className="flex flex-row mt-4 gap-2">
+              <Icon icon="alert-fill text-warning-1" />
+              <p className="text-sm">
+                <span className="text-warning-1">
+                  Vous êtes membre d&apos;une collectivité déjà engagée dans le
+                  programme Territoire Engagé Transition Écologique ?
+                </span>
+                <br />
+                Le panier d&apos;actions basé principalement sur les actions des
+                référentiels est conçu en priorité pour faciliter le passage à
+                l&apos;action aux collectivités qui ne sont pas encore engagées
+                !
+              </p>
+            </div>
+          )}
+        </div>
       </div>
       {nonRattache && (
         <>

From 04a95cd121706b009d450ca8ac1cd859d3aebcd9 Mon Sep 17 00:00:00 2001
From: Marc Rutkowski <marc@attractive-media.fr>
Date: Tue, 8 Oct 2024 17:48:03 +0200
Subject: [PATCH 90/91] =?UTF-8?q?Evite=20de=20s=C3=A9lectionner=20un=20ite?=
 =?UTF-8?q?m=20absent=20de=20la=20liste=20des=20collectivit=C3=A9s=20d'un?=
 =?UTF-8?q?=20utilisateur=20lors=20de=20la=20transformation=20du=20panier?=
 =?UTF-8?q?=20en=20plan=20d'action?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/ValidationPanier/ValiderPanierModale.tsx    | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/panier/components/ValidationPanier/ValiderPanierModale.tsx b/packages/panier/components/ValidationPanier/ValiderPanierModale.tsx
index 0425072348..a69d29ecb5 100644
--- a/packages/panier/components/ValidationPanier/ValiderPanierModale.tsx
+++ b/packages/panier/components/ValidationPanier/ValiderPanierModale.tsx
@@ -170,8 +170,13 @@ const ModeConnecteRattache = ({
   const router = useRouter();
   const { collectiviteId: savedCollectiviteId } = useCollectiviteContext();
 
+  // vérifie que l'id est bien présent dans la liste
+  const found =
+    savedCollectiviteId &&
+    !!collectivites?.find((c) => c.collectivite_id === savedCollectiviteId);
+
   const [collectiviteId, setCollectiviteId] = useState<OptionValue>(
-    savedCollectiviteId ? savedCollectiviteId : collectivites[0].collectivite_id
+    found ? savedCollectiviteId : collectivites[0].collectivite_id
   );
 
   const handleOnClick = async () => {

From a75e380cc9209672a5f6a885afa3ab5c519e20ae Mon Sep 17 00:00:00 2001
From: Marc Rutkowski <marc@attractive-media.fr>
Date: Tue, 8 Oct 2024 18:35:15 +0200
Subject: [PATCH 91/91] Change l'infobulle

---
 .../FiltresActions/BadgesFilters.tsx          | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/packages/panier/components/FiltresActions/BadgesFilters.tsx b/packages/panier/components/FiltresActions/BadgesFilters.tsx
index 361f7353dc..331669c37e 100644
--- a/packages/panier/components/FiltresActions/BadgesFilters.tsx
+++ b/packages/panier/components/FiltresActions/BadgesFilters.tsx
@@ -6,7 +6,7 @@ import {
   ButtonMenu,
   Checkbox,
   Field,
-  Icon,
+  InfoTooltip,
   OptionValue,
   SelectMultiple,
   SelectMultipleOnChangeArgs,
@@ -74,16 +74,16 @@ export const BadgesFilters = ({
       badge.filter.onChange(badge.filter.value ?? false);
     } else {
       const values: OptionValue[] | undefined = badge.filter.values?.filter(
-        v => v !== badge.value,
+        (v) => v !== badge.value
       );
 
-      badge.filter.onChange({selectedValue, values});
+      badge.filter.onChange({ selectedValue, values });
     }
   };
 
   /** Supprime tous les filtres sélectionnés */
   const handleClearFilters = () => {
-    badgesList?.forEach(badge => {
+    badgesList?.forEach((badge) => {
       if (badge.filter.type === 'checkbox') {
         badge.filter.onChange(false);
       } else {
@@ -99,16 +99,16 @@ export const BadgesFilters = ({
   useEffect(() => {
     const newList: BadgeType[] = [];
 
-    filters.forEach(filter => {
+    filters.forEach((filter) => {
       if (filter.type === 'checkbox') {
         if (filter.value)
-          newList.push({filter, value: 'true', label: filter.title});
+          newList.push({ filter, value: 'true', label: filter.title });
       } else {
         if (filter.values !== undefined) {
           const options = getFlatOptions(filter.options);
 
-          filter.values.forEach(value => {
-            const option = options.find(opt => opt.value === value);
+          filter.values.forEach((value) => {
+            const option = options.find((opt) => opt.value === value);
 
             option &&
               newList.push({
@@ -176,19 +176,19 @@ export const BadgesFilters = ({
         }
       >
         <div className="flex flex-col gap-4 w-72 p-4">
-          {filters.map(filter =>
+          {filters.map((filter) =>
             filter.type === 'checkbox' ? (
-              <div className="flex flex-row" key={filter.title}>
+              <div className="flex flex-row items-end" key={filter.title}>
                 <Checkbox
                   label={filter.title}
                   checked={filter.value}
-                  onChange={evt => filter.onChange(evt.currentTarget.checked)}
+                  onChange={(evt) => filter.onChange(evt.currentTarget.checked)}
                 />
                 {!!filter.tooltip && (
-                  <Icon
-                    icon="information-line"
-                    className="cursor-pointer"
-                    title={filter.tooltip}
+                  <InfoTooltip
+                    iconClassName="text-primary-8"
+                    label={filter.tooltip}
+                    size="md"
                   />
                 )}
               </div>
@@ -201,7 +201,7 @@ export const BadgesFilters = ({
                   small
                 />
               </Field>
-            ),
+            )
           )}
         </div>
       </ButtonMenu>