Skip to content

PostgreSQL backup tool with Point-In-Time-Recovery and restore verification

FEATURE (s3): Add support of virtual-styled-domains and S3 prefix

Rostislav Dugin408675023a95
diff --git a/assets/logo.svg b/assets/logo.svg
index 5b9e3b41..9e47459b 100644
--- a/assets/logo.svg
+++ b/assets/logo.svg
@@ -1,25 +1,44 @@
-<svg width="283" height="61" viewBox="0 0 283 61" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M73.368 18.6H78.776V41H73.368V18.6ZM76.76 23.048V18.6H81.144C83.0427 18.6 84.632 18.8987 85.912 19.496C87.2133 20.072 88.1947 20.904 88.856 21.992C89.5173 23.08 89.848 24.392 89.848 25.928C89.848 27.4213 89.5173 28.7227 88.856 29.832C88.1947 30.92 87.2133 31.7627 85.912 32.36C84.632 32.936 83.0427 33.224 81.144 33.224H76.76V28.776H81.144C82.232 28.776 83.0853 28.5307 83.704 28.04C84.3227 27.5493 84.632 26.8453 84.632 25.928C84.632 24.9893 84.3227 24.2747 83.704 23.784C83.0853 23.2933 82.232 23.048 81.144 23.048H76.76ZM97.7535 29.8C97.7535 31.1227 98.0095 32.296 98.5215 33.32C99.0548 34.3227 99.7908 35.112 100.73 35.688C101.69 36.264 102.81 36.552 104.09 36.552C105.348 36.552 106.447 36.264 107.385 35.688C108.346 35.112 109.082 34.3227 109.594 33.32C110.127 32.296 110.394 31.1227 110.394 29.8C110.394 28.4773 110.138 27.3147 109.626 26.312C109.114 25.288 108.388 24.488 107.45 23.912C106.511 23.336 105.391 23.048 104.09 23.048C102.81 23.048 101.69 23.336 100.73 23.912C99.7908 24.488 99.0548 25.288 98.5215 26.312C98.0095 27.3147 97.7535 28.4773 97.7535 29.8ZM92.0255 29.8C92.0255 28.072 92.3242 26.4933 92.9215 25.064C93.5402 23.6347 94.3935 22.3973 95.4815 21.352C96.5695 20.3067 97.8495 19.5067 99.3215 18.952C100.794 18.376 102.383 18.088 104.09 18.088C105.818 18.088 107.407 18.376 108.858 18.952C110.33 19.5067 111.61 20.3067 112.698 21.352C113.786 22.3973 114.628 23.6347 115.226 25.064C115.823 26.4933 116.122 28.072 116.122 29.8C116.122 31.528 115.823 33.1173 115.226 34.568C114.65 36.0187 113.818 37.2773 112.73 38.344C111.663 39.4107 110.394 40.2427 108.922 40.84C107.45 41.416 105.839 41.704 104.09 41.704C102.319 41.704 100.698 41.416 99.2255 40.84C97.7535 40.2427 96.4735 39.4107 95.3855 38.344C94.3188 37.2773 93.4868 36.0187 92.8895 34.568C92.3135 33.1173 92.0255 31.528 92.0255 29.8ZM122.051 33.128C122.499 33.9387 123 34.6427 123.555 35.24C124.131 35.8373 124.749 36.296 125.411 36.616C126.093 36.936 126.808 37.096 127.555 37.096C128.344 37.096 128.995 36.904 129.507 36.52C130.019 36.1147 130.275 35.5707 130.275 34.888C130.275 34.312 130.125 33.8533 129.827 33.512C129.528 33.1493 129.048 32.808 128.387 32.488C127.725 32.168 126.851 31.8053 125.763 31.4C125.229 31.208 124.611 30.9413 123.907 30.6C123.224 30.2587 122.573 29.8213 121.955 29.288C121.336 28.7333 120.824 28.072 120.419 27.304C120.013 26.5147 119.811 25.5653 119.811 24.456C119.811 23.1333 120.152 21.992 120.835 21.032C121.539 20.072 122.477 19.3467 123.651 18.856C124.845 18.344 126.168 18.088 127.619 18.088C129.112 18.088 130.403 18.3333 131.491 18.824C132.6 19.3147 133.517 19.9333 134.243 20.68C134.968 21.4267 135.523 22.184 135.907 22.952L131.779 25.256C131.459 24.7227 131.085 24.264 130.659 23.88C130.253 23.4747 129.795 23.1653 129.283 22.952C128.792 22.7173 128.259 22.6 127.683 22.6C126.915 22.6 126.328 22.7707 125.923 23.112C125.517 23.432 125.315 23.8373 125.315 24.328C125.315 24.84 125.507 25.288 125.891 25.672C126.296 26.056 126.861 26.408 127.587 26.728C128.333 27.048 129.229 27.3893 130.275 27.752C131.064 28.0507 131.8 28.4027 132.483 28.808C133.165 29.192 133.763 29.6613 134.275 30.216C134.808 30.7707 135.224 31.4107 135.523 32.136C135.821 32.8613 135.971 33.6933 135.971 34.632C135.971 35.7627 135.736 36.776 135.267 37.672C134.819 38.5467 134.2 39.2827 133.411 39.88C132.643 40.4773 131.757 40.9253 130.755 41.224C129.773 41.544 128.76 41.704 127.715 41.704C126.264 41.704 124.909 41.448 123.651 40.936C122.413 40.4027 121.336 39.688 120.419 38.792C119.501 37.896 118.787 36.9147 118.275 35.848L122.051 33.128ZM137.347 23.432V18.6H155.075V23.432H148.899V41H143.491V23.432H137.347ZM167.035 32.904V28.744H178.363C178.469 30.536 178.288 32.2107 177.819 33.768C177.349 35.3253 176.624 36.7013 175.643 37.896C174.661 39.0907 173.435 40.0293 171.963 40.712C170.491 41.3733 168.805 41.704 166.907 41.704C165.115 41.704 163.472 41.4267 161.979 40.872C160.485 40.296 159.195 39.4853 158.107 38.44C157.019 37.3733 156.165 36.1147 155.547 34.664C154.949 33.192 154.651 31.5707 154.651 29.8C154.651 28.0293 154.96 26.4293 155.579 25C156.197 23.5493 157.072 22.312 158.203 21.288C159.333 20.264 160.656 19.4747 162.171 18.92C163.685 18.3653 165.328 18.088 167.099 18.088C168.677 18.088 170.096 18.312 171.355 18.76C172.613 19.208 173.723 19.8373 174.683 20.648C175.664 21.4373 176.507 22.3547 177.211 23.4L172.411 25.896C171.899 25 171.205 24.264 170.331 23.688C169.477 23.0907 168.4 22.792 167.099 22.792C165.861 22.792 164.72 23.0693 163.675 23.624C162.651 24.1787 161.829 24.9787 161.211 26.024C160.613 27.048 160.315 28.3067 160.315 29.8C160.315 31.272 160.603 32.552 161.179 33.64C161.776 34.7067 162.576 35.5387 163.579 36.136C164.603 36.712 165.776 37 167.099 37C167.909 37 168.645 36.904 169.307 36.712C169.968 36.4987 170.533 36.2107 171.003 35.848C171.472 35.464 171.867 35.0267 172.187 34.536C172.528 34.024 172.795 33.48 172.987 32.904H167.035ZM187.593 30.856H193.193L200.201 41H193.865L187.593 30.856ZM181.993 18.6H187.401V41H181.993V18.6ZM185.385 23.176V18.6H190.153C192.073 18.6 193.673 18.9093 194.953 19.528C196.233 20.1467 197.204 21.0107 197.865 22.12C198.526 23.208 198.857 24.4773 198.857 25.928C198.857 27.3573 198.526 28.6267 197.865 29.736C197.204 30.824 196.233 31.6773 194.953 32.296C193.673 32.9147 192.073 33.224 190.153 33.224H185.385V29.032H189.769C190.494 29.032 191.113 28.9253 191.625 28.712C192.158 28.4773 192.564 28.1467 192.841 27.72C193.118 27.272 193.257 26.7387 193.257 26.12C193.257 25.5013 193.118 24.9787 192.841 24.552C192.564 24.104 192.158 23.7627 191.625 23.528C191.113 23.2933 190.494 23.176 189.769 23.176H185.385ZM206.296 41V36.552H217.592V41H206.296ZM206.296 23.048V18.6H217.592V23.048H206.296ZM206.296 31.4V27.048H216.952V31.4H206.296ZM202.712 18.6H207.896V41H202.712V18.6ZM224.457 33.128C224.905 33.9387 225.406 34.6427 225.961 35.24C226.537 35.8373 227.156 36.296 227.817 36.616C228.5 36.936 229.214 37.096 229.961 37.096C230.75 37.096 231.401 36.904 231.913 36.52C232.425 36.1147 232.681 35.5707 232.681 34.888C232.681 34.312 232.532 33.8533 232.233 33.512C231.934 33.1493 231.454 32.808 230.793 32.488C230.132 32.168 229.257 31.8053 228.169 31.4C227.636 31.208 227.017 30.9413 226.313 30.6C225.63 30.2587 224.98 29.8213 224.361 29.288C223.742 28.7333 223.23 28.072 222.825 27.304C222.42 26.5147 222.217 25.5653 222.217 24.456C222.217 23.1333 222.558 21.992 223.241 21.032C223.945 20.072 224.884 19.3467 226.057 18.856C227.252 18.344 228.574 18.088 230.025 18.088C231.518 18.088 232.809 18.3333 233.897 18.824C235.006 19.3147 235.924 19.9333 236.649 20.68C237.374 21.4267 237.929 22.184 238.313 22.952L234.185 25.256C233.865 24.7227 233.492 24.264 233.065 23.88C232.66 23.4747 232.201 23.1653 231.689 22.952C231.198 22.7173 230.665 22.6 230.089 22.6C229.321 22.6 228.734 22.7707 228.329 23.112C227.924 23.432 227.721 23.8373 227.721 24.328C227.721 24.84 227.913 25.288 228.297 25.672C228.702 26.056 229.268 26.408 229.993 26.728C230.74 27.048 231.636 27.3893 232.681 27.752C233.47 28.0507 234.206 28.4027 234.889 28.808C235.572 29.192 236.169 29.6613 236.681 30.216C237.214 30.7707 237.63 31.4107 237.929 32.136C238.228 32.8613 238.377 33.6933 238.377 34.632C238.377 35.7627 238.142 36.776 237.673 37.672C237.225 38.5467 236.606 39.2827 235.817 39.88C235.049 40.4773 234.164 40.9253 233.161 41.224C232.18 41.544 231.166 41.704 230.121 41.704C228.67 41.704 227.316 41.448 226.057 40.936C224.82 40.4027 223.742 39.688 222.825 38.792C221.908 37.896 221.193 36.9147 220.681 35.848L224.457 33.128ZM241.833 18.6H247.241V33.256C247.241 34.3867 247.54 35.304 248.137 36.008C248.734 36.712 249.63 37.064 250.825 37.064C252.041 37.064 252.948 36.712 253.545 36.008C254.142 35.304 254.441 34.3867 254.441 33.256V18.6H259.849V33.64C259.849 35.048 259.614 36.2747 259.145 37.32C258.697 38.3653 258.057 39.2293 257.225 39.912C256.414 40.5733 255.454 41.0747 254.345 41.416C253.257 41.7573 252.084 41.928 250.825 41.928C249.566 41.928 248.393 41.7573 247.305 41.416C246.217 41.0747 245.257 40.5733 244.425 39.912C243.614 39.2293 242.974 38.3653 242.505 37.32C242.057 36.2747 241.833 35.048 241.833 33.64V18.6ZM266.895 33.128C267.343 33.9387 267.844 34.6427 268.399 35.24C268.975 35.8373 269.593 36.296 270.255 36.616C270.937 36.936 271.652 37.096 272.399 37.096C273.188 37.096 273.839 36.904 274.351 36.52C274.863 36.1147 275.119 35.5707 275.119 34.888C275.119 34.312 274.969 33.8533 274.671 33.512C274.372 33.1493 273.892 32.808 273.231 32.488C272.569 32.168 271.695 31.8053 270.607 31.4C270.073 31.208 269.455 30.9413 268.751 30.6C268.068 30.2587 267.417 29.8213 266.799 29.288C266.18 28.7333 265.668 28.072 265.263 27.304C264.857 26.5147 264.655 25.5653 264.655 24.456C264.655 23.1333 264.996 21.992 265.679 21.032C266.383 20.072 267.321 19.3467 268.495 18.856C269.689 18.344 271.012 18.088 272.463 18.088C273.956 18.088 275.247 18.3333 276.335 18.824C277.444 19.3147 278.361 19.9333 279.087 20.68C279.812 21.4267 280.367 22.184 280.751 22.952L276.623 25.256C276.303 24.7227 275.929 24.264 275.503 23.88C275.097 23.4747 274.639 23.1653 274.127 22.952C273.636 22.7173 273.103 22.6 272.527 22.6C271.759 22.6 271.172 22.7707 270.767 23.112C270.361 23.432 270.159 23.8373 270.159 24.328C270.159 24.84 270.351 25.288 270.735 25.672C271.14 26.056 271.705 26.408 272.431 26.728C273.177 27.048 274.073 27.3893 275.119 27.752C275.908 28.0507 276.644 28.4027 277.327 28.808C278.009 29.192 278.607 29.6613 279.119 30.216C279.652 30.7707 280.068 31.4107 280.367 32.136C280.665 32.8613 280.815 33.6933 280.815 34.632C280.815 35.7627 280.58 36.776 280.111 37.672C279.663 38.5467 279.044 39.2827 278.255 39.88C277.487 40.4773 276.601 40.9253 275.599 41.224C274.617 41.544 273.604 41.704 272.559 41.704C271.108 41.704 269.753 41.448 268.495 40.936C267.257 40.4027 266.18 39.688 265.263 38.792C264.345 37.896 263.631 36.9147 263.118 35.848L266.895 33.128Z" fill="black"/>
-<g clip-path="url(#clip0_221_213)">
-<path d="M13 9L29 9.5L37 9L44.5 14.5L51.5 29.5L52.5 38L51 43.5L45 39.5L38 37L26 33L22.5 30L13 20V9Z" fill="#155DFC"/>
-<path d="M4.05934 27.4656C14.7992 34.7283 16.8146 38.2615 19.6252 36.9747C20.368 36.6342 22.3667 35.4081 22.9893 29.9845C22.8119 29.9762 22.4619 29.9774 22.0774 30.1262C19.668 31.0643 19.7371 36.3794 18.5359 36.3854C18.5169 36.3854 18.4752 36.3854 18.4217 36.3699C18.3038 36.3485 18.1586 36.3033 17.9407 36.2021C17.3039 35.9045 16.9848 35.7545 16.5015 35.4628C16.5015 35.4628 16.0075 35.1688 15.5575 34.8545C14.8933 34.3903 14.5135 33.8308 13.7683 33.1618C13.1446 32.6023 13.1362 32.7487 11.6804 31.6797C11.1792 31.3119 10.8114 31.0214 10.0959 30.4548C8.92098 29.525 8.10912 28.8822 7.4163 28.2834C6.54968 27.5347 5.37712 26.4288 4.07838 24.8943C2.89749 22.6742 1.49042 20.366 0.776174 20.5981C0.320246 20.7469 0.250012 21.8707 0.338103 22.6242C0.632135 25.1658 3.09034 26.8121 4.05934 27.4668V27.4656Z" fill="#003A86"/>
-<path d="M5.3057 26.7942C11.0828 27.918 16.8587 29.0429 22.6357 30.1667C23.3071 31.2059 24.019 31.8523 24.5059 32.232C24.5059 32.232 27.3783 34.4712 31.74 34.3045C31.9495 34.2962 32.4697 34.2557 33.1768 34.3319C33.903 34.4105 34.0292 34.4879 35.1827 34.6962C36.3683 34.9105 36.5017 34.8771 36.9755 35.0604C37.5266 35.2735 37.9171 35.5402 38.1909 35.7295C38.6444 36.0425 38.7515 36.1949 39.6194 36.9449C40.1003 37.3603 40.3408 37.5686 40.561 37.7353C40.9657 38.0412 41.6145 38.5281 42.5371 38.921C43.062 39.1436 43.5787 39.2959 44.0691 39.44C44.3382 39.5185 44.5643 39.5793 44.725 39.6197C44.806 40.3959 44.8631 41.5006 44.725 42.8112C44.581 44.1814 44.481 45.1361 43.9048 46.2158C43.6489 46.6955 42.7192 48.3716 40.7134 49.1038C40.3086 49.2514 39.067 49.6847 37.5826 49.2859C37.0838 49.1526 36.1576 48.8895 35.4243 48.0098C34.672 47.1062 34.5922 46.117 34.5732 45.8218C34.5363 45.254 34.4851 44.4695 35.0291 43.8159C35.4589 43.3005 36.1755 42.9672 36.8528 43.0255C37.6635 43.0957 37.8873 43.6838 38.4528 43.5362C38.723 43.466 38.7206 43.3195 39.4658 42.5398C40.1372 41.8375 40.2931 41.7946 40.3169 41.5494C40.3729 40.9613 39.5515 40.4387 39.223 40.2292C38.9777 40.0733 38.3778 39.7292 37.3076 39.5912C36.6969 39.5126 35.5124 39.3733 34.147 39.9257C32.4816 40.5983 31.6472 41.8529 31.3817 42.266C30.6841 43.3469 30.5151 44.36 30.4091 45.0314C30.3508 45.404 30.1913 46.5837 30.5008 48.0705C30.9341 50.1561 32.0102 51.5203 32.3543 51.931C33.8471 53.7118 35.6446 54.3701 36.4874 54.6666C40.4288 56.0534 43.9787 54.5987 44.6631 54.3023C48.4248 52.675 50.101 49.5061 50.9247 47.9502C52.4901 44.9921 52.6889 42.3315 52.9008 39.5007C52.9722 38.5531 53.1329 35.7652 52.5365 32.2058C52.1116 29.675 51.4925 27.8823 50.8342 25.9752C49.4605 21.9957 47.9475 19.1506 47.4606 18.2554C47.4606 18.2554 45.5107 14.6734 42.2633 10.8391C41.63 10.0915 40.9919 9.388 39.9539 8.80231C39.292 8.42972 38.1016 7.8976 35.0303 7.82975C33.4768 7.79523 31.2769 7.87498 28.6473 8.4071C28.7795 8.60947 28.9104 8.81184 29.0425 9.0154C28.3188 8.63566 27.2653 8.1333 25.9427 7.67856C24.638 7.22978 23.65 7.02503 22.0822 6.706C19.6311 6.20721 17.786 5.99532 17.3408 5.94651C15.3504 5.7251 13.8933 5.68105 12.4172 5.79414C11.4839 5.86556 10.6304 5.99294 9.74237 6.49291C9.17811 6.81075 8.78528 7.17502 8.31387 7.61785C7.40202 8.47376 6.82467 9.2511 6.55087 9.6237C4.61169 12.2617 3.64269 13.5818 2.72131 15.1246C2.72131 15.1246 2.05111 16.2472 0.928549 18.7113C0.747606 19.1077 0.434528 19.8113 0.358342 20.7791C0.346438 20.9279 0.308344 21.4112 0.38215 21.8731C0.569045 23.0468 1.43805 23.8456 2.32728 24.6086C4.29266 26.2954 5.67116 27.2525 5.67116 27.2525C5.89376 27.4013 8.04722 28.9084 9.89593 30.3524C12.9136 32.7106 14.4219 33.8903 15.3456 34.7224C15.3456 34.7224 16.1158 35.4164 17.6753 36.1199C18.1395 36.3294 18.499 36.4532 18.9216 36.3854C19.5335 36.2866 19.918 35.8402 20.2906 35.3973C20.4251 35.2366 20.7025 34.8855 21.5894 32.9022C21.8096 32.4106 21.9191 32.1642 22.0524 31.8309C22.1631 31.5547 22.4346 30.8595 22.7322 29.8488C22.9667 29.0548 23.4309 27.4811 23.694 25.7312C23.9333 24.142 24.2797 21.8397 23.6631 18.953C23.6071 18.6935 22.994 15.9281 21.2727 13.3199C20.3763 11.9617 19.5026 11.1343 19.3169 10.9593C18.755 10.4344 18.23 10.0451 17.8277 9.77369C18.2193 9.79274 18.7562 9.84512 19.3776 9.98678C19.8359 10.0903 21.068 10.4082 22.4167 11.2938C23.7357 12.1593 24.5261 13.1485 24.8785 13.6342C26.1236 15.3496 26.4534 17.0519 26.657 18.1018C26.895 19.3315 26.9569 20.6029 27.0069 21.5969C27.0653 22.7921 27.0236 23.1551 27.1593 24.0289C27.2522 24.6289 27.4141 25.63 27.939 26.7942C28.7283 28.5441 29.8615 29.6095 30.2889 29.9857C31.0496 30.6535 31.7281 30.9976 33.0852 31.688C34.2208 32.2654 34.9613 32.5118 35.7898 32.5999C36.1529 32.638 36.4588 32.638 36.6707 32.6308C36.4612 32.1344 36.3303 31.6904 36.2457 31.3392C36.1731 31.0392 36.0612 30.5631 36.0326 29.9262C36.01 29.4238 36.0481 28.9977 36.0934 28.6798C36.1826 29.0667 36.316 29.5679 36.5183 30.1393C36.6159 30.4143 36.9683 31.3809 37.704 32.632C38.2504 33.5629 38.9123 34.3807 40.0134 35.52C41.0633 36.6044 42.6097 38.0615 44.7239 39.6233C38.023 35.9509 31.3234 32.2785 24.6225 28.606" fill="#155DFC"/>
-<path d="M34.3218 19.8339C34.9634 19.4339 35.5062 19.147 35.9026 18.953C36.2645 18.7744 36.4514 18.7053 36.6728 18.6494C36.8264 18.6101 37.3204 18.4982 37.9597 18.5851C38.2251 18.622 38.5989 18.6768 39.0239 18.9125C39.5322 19.1946 39.8072 19.5672 39.8751 19.6624C39.956 19.7767 40.1322 20.0279 40.2393 20.3922C40.306 20.6148 40.2917 20.6981 40.381 20.8993C40.475 21.11 40.5786 21.2219 40.7452 21.4266C40.8798 21.5909 41.0631 21.829 41.2726 22.1361C41.1619 22.0742 40.6012 21.7707 40.0167 21.7814C39.7524 21.7861 39.4894 21.8528 39.4894 21.8528C39.2775 21.9064 39.1358 21.973 39.0846 21.9945C38.612 22.1909 37.5323 21.9302 37.099 21.2243C36.8252 20.779 37.0169 20.491 36.6919 20.2005C36.5717 20.0934 36.4133 20.0136 35.7015 19.9279C35.3646 19.8874 34.8944 19.8446 34.3242 19.8362L34.3218 19.8339Z" fill="#003C8D"/>
-<path d="M50.0688 23.8932C49.4748 23.848 48.5236 23.8516 47.432 24.2004C46.594 24.4682 45.9559 24.8479 45.5273 25.1527C45.8916 25.0729 46.3654 24.9801 46.9249 24.8991C47.0582 24.8801 47.488 24.8194 48.0903 24.767C48.6724 24.717 49.4438 24.6706 50.3688 24.6753C50.2688 24.4146 50.1688 24.1539 50.0688 23.892V23.8932Z" fill="#0052C9"/>
-<path d="M51.3497 27.4883C50.6866 27.4656 49.7534 27.5109 48.6915 27.818C47.957 28.0299 47.3535 28.3132 46.8916 28.5727C47.2154 28.5251 47.6225 28.4727 48.0927 28.4287C48.2499 28.4144 48.7117 28.3715 49.3391 28.3453C49.926 28.3204 50.6985 28.3061 51.6211 28.3406C51.5306 28.0573 51.4402 27.7728 51.3509 27.4894L51.3497 27.4883Z" fill="#0052C9"/>
-<path d="M52.2068 30.5238C51.5996 30.4893 50.6271 30.5202 49.5676 30.9666C49.1474 31.144 48.7962 31.3511 48.5117 31.5511C48.7034 31.513 48.9676 31.4666 49.2831 31.4237C49.9474 31.3356 50.4557 31.3202 50.9652 31.3071C51.333 31.2976 51.8115 31.294 52.3746 31.313L52.2068 30.5226V30.5238Z" fill="#0052C9"/>
-<path d="M34.7876 36.4187C36.5637 36.9651 38.4362 37.577 40.1064 38.121C41.1409 38.4579 41.986 38.7376 42.5384 38.9209C40.5826 36.8234 38.6279 34.7271 36.672 32.6296C36.3852 32.626 35.9352 32.6046 35.3959 32.5022C35.0126 32.4296 34.1377 32.232 32.3163 31.2416C31.4783 30.7857 31.0592 30.5583 30.6545 30.2583C28.6689 28.787 27.9035 26.6656 27.6844 26.0347C27.4904 25.474 27.3571 24.2241 27.0987 21.748C26.763 18.5375 26.813 18.3327 26.5821 17.4018C26.4023 16.6769 25.9988 14.9651 24.8798 13.3902C24.5108 12.8699 23.0644 10.895 20.3658 10.0606C19.2384 9.71178 18.248 9.67249 17.585 9.6963C18.1195 10.0832 18.8504 10.6665 19.6218 11.4748C20.0039 11.8748 21.6193 13.6128 22.7835 16.4614C23.1478 17.3518 23.7823 18.9399 23.9382 21.1112C24.0537 22.7147 23.8608 23.9694 23.8168 24.242C23.5263 26.0395 22.9525 27.137 22.6835 29.6726C22.6609 29.8845 22.6454 30.0583 22.6371 30.1678C23.0168 30.7476 23.3858 31.1797 23.6668 31.4797C23.9394 31.7701 24.162 31.9618 24.231 32.0296C24.231 32.0296 24.6203 32.3737 25.0667 32.6725C27.1106 34.0438 34.7876 36.4187 34.7876 36.4187Z" fill="#0051C8"/>
-<path d="M36.079 28.6025C35.9968 29.2239 35.9468 30.1703 36.1992 31.2702C36.3254 31.8178 36.4789 32.2011 36.6539 32.6296C37.061 33.6296 37.5705 34.8688 38.6752 36.1068C39.4931 37.0235 40.3216 37.5782 40.987 38.027C41.2703 38.2174 41.6501 38.4722 42.1798 38.7448C43.1988 39.271 44.1178 39.5281 44.7594 39.6638C44.6606 39.2495 44.5606 38.8365 44.4618 38.4222C43.4381 37.9401 42.2036 37.2365 40.9406 36.2021C40.4811 35.8247 40.149 35.5116 39.9942 35.3628C39.4074 34.7974 38.2955 33.7165 37.3634 32.0178C36.6325 30.6857 36.2706 29.4643 36.079 28.6001V28.6025Z" fill="#00398B"/>
-<path d="M41.4848 48.7514C42.0895 48.5419 42.9633 48.1514 43.8299 47.4158C44.618 46.7467 45.0739 46.0694 45.2584 45.7742C45.8 44.9111 46.0096 44.154 46.1548 43.616C46.3179 43.0124 46.4917 42.1196 46.4738 41.0173C46.7 41.1447 47.0202 41.3101 47.4154 41.4732C48.2832 41.8303 48.9939 41.9589 49.4368 42.0351C50.3201 42.1887 51.0129 42.1982 51.5486 42.2018C52.0009 42.2053 52.3807 42.1887 52.6568 42.1708C52.689 41.8851 52.7199 41.5958 52.7485 41.3042C52.8092 40.6899 52.8592 40.0864 52.9009 39.4959C52.5295 39.4912 52.139 39.4757 51.7307 39.4471C51.4188 39.4245 51.1176 39.3948 50.8295 39.3614C50.4379 39.415 49.9129 39.4674 49.2915 39.4709C47.494 39.4793 46.1881 39.071 45.8643 38.965C45.2572 38.7662 44.7715 38.5436 44.4358 38.3722C44.4954 38.5936 44.5727 38.9091 44.6406 39.2912C44.7215 39.7447 44.9108 40.959 44.7239 42.8089C44.5989 44.0457 44.5358 44.6778 44.2477 45.4361C44.0001 46.0896 43.3299 47.5122 41.4824 48.7478L41.4848 48.7514Z" fill="#0050C8"/>
-<path d="M30.1304 34.8605C29.84 34.5891 28.9222 33.7236 28.1353 32.7951C27.9472 32.5737 27.6341 32.1999 27.2603 31.6702C27.1365 31.494 27.0068 31.3023 26.8735 31.0928C26.5592 30.5988 26.1497 29.9464 25.7902 29.0132C25.5676 28.4346 25.4331 27.9287 25.3497 27.5537C25.1247 28.6227 25.1605 29.5108 25.2283 30.0917C25.3057 30.7607 25.4521 31.2476 25.5783 31.6571C25.714 32.0987 25.9164 32.6653 26.2259 33.301C26.6532 33.5189 27.0211 33.6891 27.3008 33.8129C28.0877 34.1617 28.7162 34.3843 29.1245 34.5272C29.5328 34.6712 29.8793 34.7819 30.1316 34.8605H30.1304Z" fill="#003C8D"/>
-<path d="M40.7837 35.2878C40.917 34.72 41.1503 34.3307 41.3051 34.1129C41.7325 33.5093 42.2431 33.2808 42.8133 33.0189C43.274 32.807 43.6419 32.6451 43.9811 32.8046C44.043 32.8332 44.0716 32.8582 44.4287 33.0879C44.5525 33.17 44.7335 33.2879 44.9561 33.4224C45.5382 33.7748 47.8619 35.1271 51.251 35.5199C53.5473 35.7866 55.3127 35.4937 56.3317 35.3164C58.4137 34.9545 60.1017 34.3152 61.3052 33.7569C60.6434 35.5021 59.7351 36.5389 59.1815 37.0758C57.0578 39.1364 54.4568 39.3435 52.8164 39.503C52.4474 39.5388 51.1498 39.6352 49.3701 39.3614C45.4953 38.7662 42.5479 36.7722 40.7837 35.289V35.2878Z" fill="#8BC7FE"/>
-<path d="M40.5268 36.0676C40.9315 36.558 41.4065 37.0782 41.9577 37.602C42.7469 38.352 43.5171 38.9412 44.2028 39.4007C44.1933 39.1983 44.1575 38.9388 44.0528 38.6615C44.0218 38.5805 43.9885 38.5067 43.9552 38.4389C44.2873 38.6222 44.6528 38.7972 45.048 38.9507C46.9384 39.6828 48.6895 39.6126 49.8906 39.4198C48.2728 39.2019 46.1646 38.69 43.929 37.4734C43.1493 37.0485 42.4541 36.5925 41.8434 36.139C41.8148 36.1176 41.5946 35.9414 41.2851 35.6985C41.078 35.5366 40.9077 35.4033 40.7958 35.3164C40.7054 35.5676 40.6149 35.8176 40.5244 36.0687L40.5268 36.0676Z" fill="#00398B"/>
-<path d="M60.5587 35.3152C59.5004 37.0687 58.1374 37.946 57.5922 38.2615C57.1101 38.5401 56.3863 38.8912 55.4435 39.1067C55.4316 39.1103 54.2174 39.4305 52.0913 39.5424C51.7806 39.559 51.477 39.5626 51.477 39.5626C51.477 39.5626 51.1033 39.5674 50.7176 39.5519C47.3689 39.4233 44.1251 38.0567 44.1251 38.0567C43.6239 37.8591 42.8001 37.5068 41.9526 36.9925C41.2062 36.5402 40.7931 36.1771 40.5741 35.9723C40.4693 35.8735 40.3848 35.789 40.3276 35.7295C40.7752 34.9391 41.2228 34.1498 41.6716 33.3594C42.0906 33.7784 42.712 34.3569 43.5215 34.9545C44.6524 35.789 47.8915 38.1829 52.2806 38.0389C57.1875 37.8794 60.4551 34.6498 61.3051 33.7534C61.1587 34.151 60.9254 34.7045 60.5575 35.3128L60.5587 35.3152Z" fill="#0087F7"/>
-<path d="M39.6445 35.0212C39.7255 34.8474 39.8421 34.6129 40.0017 34.3498C40.0755 34.2284 40.3409 33.7939 40.6588 33.4534C40.9111 33.1832 41.6051 32.4392 42.6229 32.4082C43.1955 32.3904 43.6669 32.6046 43.9824 32.8034C43.7741 32.8225 43.4896 32.8629 43.1598 32.9546C42.8098 33.0534 42.4122 33.1427 42.0599 33.4224C41.5694 33.8117 41.298 34.3367 40.7838 35.4283C40.6802 35.6497 40.6004 35.833 40.5504 35.9509C40.3576 35.764 40.1636 35.5688 39.9671 35.364C39.8564 35.2485 39.7493 35.1343 39.6445 35.02V35.0212Z" fill="#0051CB"/>
+<svg width="305" height="85" viewBox="0 0 305 85" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_228_215)">
+<path d="M11.7963 38.9765C24.2676 47.41 26.6078 51.5126 29.8714 50.0184C30.734 49.623 33.0549 48.1993 33.7778 41.9014C33.5719 41.8918 33.1655 41.8932 32.719 42.0659C29.9212 43.1552 30.0014 49.3272 28.6066 49.3341C28.5845 49.3341 28.5361 49.3341 28.4739 49.3162C28.3371 49.2913 28.1684 49.2387 27.9155 49.1212C27.1759 48.7757 26.8055 48.6015 26.2443 48.2628C26.2443 48.2628 25.6706 47.9214 25.1481 47.5565C24.3768 47.0174 23.9358 46.3677 23.0705 45.5908C22.3461 44.9411 22.3365 45.1112 20.6459 43.8699C20.0639 43.4427 19.6368 43.1054 18.806 42.4475C17.4417 41.3679 16.499 40.6214 15.6945 39.9261C14.6881 39.0567 13.3266 37.7725 11.8185 35.9907C10.4472 33.4127 8.81332 30.7324 7.98394 31.0019C7.45451 31.1747 7.37296 32.4796 7.47525 33.3546C7.81668 36.3059 10.6711 38.2176 11.7963 38.9779V38.9765Z" fill="#003A86"/>
+<path d="M13.2437 38.1969C19.9521 39.5018 26.659 40.808 33.3674 42.1129C34.147 43.3197 34.9736 44.0703 35.539 44.5113C35.539 44.5113 38.8745 47.1114 43.9393 46.9179C44.1826 46.9082 44.7867 46.8612 45.6078 46.9496C46.451 47.0409 46.5975 47.1307 47.937 47.3726C49.3137 47.6214 49.4686 47.5827 50.0187 47.7956C50.6587 48.0431 51.1121 48.3527 51.43 48.5725C51.9567 48.936 52.0811 49.113 53.0888 49.9838C53.6473 50.4662 53.9265 50.7081 54.1822 50.9017C54.6522 51.2569 55.4056 51.8223 56.4769 52.2784C57.0865 52.5369 57.6864 52.7139 58.2559 52.8811C58.5683 52.9724 58.8309 53.0429 59.0175 53.0899C59.1115 53.9911 59.1779 55.2739 59.0175 56.7958C58.8503 58.3869 58.7342 59.4955 58.0651 60.7492C57.7679 61.3063 56.6884 63.2526 54.3592 64.1027C53.8892 64.2741 52.4474 64.7773 50.7237 64.3142C50.1445 64.1594 49.0691 63.8539 48.2176 62.8324C47.3439 61.7832 47.2513 60.6345 47.2292 60.2917C47.1863 59.6323 47.1269 58.7214 47.7586 57.9625C48.2576 57.364 49.0898 56.9769 49.8763 57.0447C50.8177 57.1262 51.0776 57.8091 51.7342 57.6377C52.0479 57.5561 52.0452 57.3861 52.9105 56.4807C53.6901 55.6651 53.8712 55.6153 53.8988 55.3306C53.9638 54.6477 53.01 54.0409 52.6285 53.7976C52.3438 53.6165 51.6471 53.217 50.4044 53.0567C49.6952 52.9655 48.3198 52.8037 46.7343 53.4451C44.8005 54.2261 43.8315 55.6831 43.5232 56.1627C42.7132 57.4179 42.5169 58.5942 42.3939 59.3739C42.3261 59.8065 42.1409 61.1764 42.5003 62.9029C43.0035 65.3247 44.2531 66.9088 44.6526 67.3857C46.386 69.4537 48.4733 70.2181 49.452 70.5623C54.0288 72.1727 58.1508 70.4835 58.9457 70.1393C63.3138 68.2497 65.2601 64.5699 66.2166 62.7633C68.0344 59.3282 68.2652 56.2388 68.5112 52.9516C68.5942 51.8513 68.7808 48.6139 68.0883 44.4808C67.5948 41.542 66.876 39.4603 66.1116 37.2458C64.5164 32.6248 62.7595 29.321 62.1941 28.2815C62.1941 28.2815 59.9299 24.1222 56.1589 19.6698C55.4235 18.8017 54.6826 17.9847 53.4772 17.3046C52.7087 16.872 51.3264 16.2541 47.76 16.1753C45.9561 16.1352 43.4016 16.2278 40.3481 16.8457C40.5015 17.0807 40.6536 17.3157 40.807 17.5521C39.9665 17.1111 38.7432 16.5278 37.2075 15.9997C35.6924 15.4786 34.5451 15.2408 32.7246 14.8704C29.8784 14.2912 27.7359 14.0451 27.2189 13.9885C24.9077 13.7313 23.2157 13.6802 21.5016 13.8115C20.4179 13.8945 19.4268 14.0424 18.3956 14.6229C17.7404 14.992 17.2842 15.415 16.7368 15.9292C15.678 16.9231 15.0076 17.8258 14.6896 18.2584C12.4378 21.3216 11.3126 22.8546 10.2427 24.6461C10.2427 24.6461 9.46449 25.9496 8.16097 28.811C7.95086 29.2713 7.58731 30.0882 7.49885 31.212C7.48502 31.3848 7.44079 31.946 7.52649 32.4824C7.74351 33.8453 8.7526 34.7729 9.78519 35.6589C12.0674 37.6177 13.6681 38.729 13.6681 38.729C13.9266 38.9018 16.4272 40.6518 18.5739 42.3286C22.0781 45.0669 23.8295 46.4368 24.9021 47.403C24.9021 47.403 25.7965 48.2089 27.6073 49.0259C28.1464 49.2692 28.5639 49.4129 29.0546 49.3341C29.7651 49.2194 30.2116 48.701 30.6442 48.1868C30.8004 48.0002 31.1225 47.5924 32.1523 45.2895C32.4081 44.7186 32.5352 44.4325 32.6901 44.0454C32.8186 43.7247 33.1338 42.9174 33.4794 41.7439C33.7517 40.8219 34.2908 38.9944 34.5963 36.9625C34.8741 35.1171 35.2764 32.4437 34.5603 29.0916C34.4954 28.7902 33.7835 25.5791 31.7847 22.5505C30.7438 20.9733 29.7292 20.0126 29.5135 19.8094C28.8611 19.1998 28.2515 18.7478 27.7842 18.4326C28.239 18.4547 28.8625 18.5155 29.584 18.68C30.1162 18.8003 31.5469 19.1694 33.1131 20.1978C34.6447 21.2027 35.5625 22.3514 35.9717 22.9154C37.4176 24.9073 37.8005 26.884 38.0368 28.1032C38.3133 29.5312 38.3852 31.0075 38.4432 32.1617C38.511 33.5495 38.4626 33.9711 38.6202 34.9858C38.728 35.6824 38.916 36.845 39.5256 38.1969C40.4421 40.2289 41.758 41.466 42.2543 41.9028C43.1376 42.6783 43.9255 43.0778 45.5013 43.8795C46.82 44.55 47.6798 44.8361 48.6419 44.9384C49.0635 44.9826 49.4188 44.9826 49.6648 44.9743C49.4216 44.3979 49.2695 43.8823 49.1714 43.4745C49.087 43.1262 48.9571 42.5733 48.9239 41.8337C48.8977 41.2504 48.9419 40.7555 48.9944 40.3864C49.0981 40.8357 49.2529 41.4176 49.4879 42.0811C49.6012 42.4005 50.0104 43.5229 50.8647 44.9757C51.4992 46.0567 52.2677 47.0063 53.5464 48.3292C54.7656 49.5885 56.5612 51.2804 59.0162 53.094C51.2351 48.8296 43.4555 44.5652 35.6745 40.3007" fill="#155DFC"/>
+<path d="M46.9375 30.1145C47.6826 29.65 48.3129 29.3169 48.7732 29.0915C49.1934 28.8842 49.4105 28.804 49.6676 28.7391C49.8459 28.6934 50.4195 28.5635 51.1618 28.6644C51.4701 28.7073 51.9041 28.7708 52.3976 29.0445C52.9879 29.3722 53.3072 29.8048 53.386 29.9154C53.48 30.0481 53.6846 30.3398 53.809 30.7628C53.8864 31.0212 53.8698 31.118 53.9735 31.3516C54.0827 31.5963 54.2029 31.7262 54.3964 31.964C54.5526 32.1547 54.7655 32.4312 55.0088 32.7878C54.8803 32.716 54.2292 32.3635 53.5505 32.3759C53.2436 32.3814 52.9381 32.4589 52.9381 32.4589C52.6921 32.5211 52.5276 32.5985 52.4681 32.6233C51.9193 32.8514 50.6656 32.5487 50.1624 31.729C49.8445 31.212 50.0671 30.8775 49.6897 30.5402C49.5501 30.4158 49.3662 30.3232 48.5396 30.2237C48.1484 30.1767 47.6024 30.1269 46.9403 30.1172L46.9375 30.1145Z" fill="#003C8D"/>
+<path d="M65.2227 34.8282C64.533 34.7756 63.4285 34.7798 62.1609 35.1848C61.1878 35.4958 60.4469 35.9368 59.9492 36.2907C60.3722 36.198 60.9224 36.0902 61.572 35.9962C61.7269 35.9741 62.2259 35.9036 62.9253 35.8428C63.6013 35.7847 64.497 35.7308 65.5711 35.7364C65.455 35.4336 65.3388 35.1309 65.2227 34.8268V34.8282Z" fill="#0052C9"/>
+<path d="M66.71 39.0027C65.94 38.9765 64.8563 39.029 63.6233 39.3856C62.7704 39.6317 62.0695 39.9607 61.5332 40.262C61.9092 40.2067 62.3819 40.1459 62.9279 40.0948C63.1104 40.0782 63.6468 40.0284 64.3752 39.998C65.0567 39.969 65.9538 39.9524 67.0251 39.9925C66.9201 39.6635 66.815 39.3331 66.7113 39.0041L66.71 39.0027Z" fill="#0052C9"/>
+<path d="M67.7052 42.5276C67.0003 42.4875 65.8709 42.5235 64.6407 43.0419C64.1527 43.2478 63.7449 43.4883 63.4146 43.7206C63.6371 43.6763 63.944 43.6224 64.3103 43.5727C65.0816 43.4704 65.6719 43.4524 66.2635 43.4372C66.6906 43.4261 67.2463 43.422 67.9001 43.4441L67.7052 42.5263V42.5276Z" fill="#0052C9"/>
+<path d="M47.4777 49.3728C49.5401 50.0073 51.7145 50.7178 53.6539 51.3495C54.8551 51.7407 55.8365 52.0656 56.4779 52.2784C54.2068 49.8428 51.937 47.4085 49.6659 44.9729C49.3328 44.9688 48.8103 44.9439 48.1841 44.825C47.739 44.7407 46.723 44.5112 44.608 43.3611C43.6349 42.8317 43.1483 42.5677 42.6783 42.2194C40.3726 40.5108 39.4838 38.0475 39.2295 37.3149C39.0042 36.6639 38.8493 35.2124 38.5494 32.3372C38.1596 28.6091 38.2176 28.3714 37.9495 27.2904C37.7407 26.4486 37.2721 24.4608 35.9727 22.632C35.5442 22.028 33.8647 19.7347 30.731 18.7657C29.422 18.3607 28.2719 18.3151 27.502 18.3427C28.1226 18.792 28.9713 19.4693 29.8671 20.4079C30.3108 20.8723 32.1866 22.8905 33.5385 26.1984C33.9615 27.2323 34.6983 29.0764 34.8793 31.5977C35.0134 33.4597 34.7895 34.9166 34.7383 35.2332C34.4011 37.3205 33.7348 38.5949 33.4224 41.5393C33.3961 41.7853 33.3782 41.9871 33.3685 42.1143C33.8094 42.7875 34.2379 43.2893 34.5642 43.6376C34.8807 43.9749 35.1392 44.1974 35.2194 44.2762C35.2194 44.2762 35.6714 44.6757 36.1898 45.0227C38.5632 46.6151 47.4777 49.3728 47.4777 49.3728Z" fill="#0051C8"/>
+<path d="M48.9774 40.2966C48.882 41.0182 48.824 42.1171 49.117 43.3943C49.2635 44.0302 49.4419 44.4753 49.6451 44.9729C50.1178 46.1341 50.7094 47.5731 51.9922 49.0107C52.9419 50.075 53.904 50.7192 54.6767 51.2403C55.0057 51.4615 55.4466 51.7573 56.0617 52.0739C57.245 52.6848 58.3121 52.9834 59.0572 53.141C58.9425 52.66 58.8264 52.1803 58.7116 51.6993C57.5228 51.1394 56.0894 50.3225 54.6228 49.1213C54.0892 48.6831 53.7035 48.3195 53.5238 48.1467C52.8424 47.4901 51.5513 46.235 50.4689 44.2624C49.6202 42.7156 49.2 41.2974 48.9774 40.2938V40.2966Z" fill="#00398B"/>
+<path d="M55.2547 63.6935C55.9569 63.4503 56.9715 62.9969 57.9779 62.1426C58.893 61.3657 59.4224 60.5792 59.6366 60.2364C60.2656 59.2342 60.5089 58.3551 60.6775 57.7303C60.8669 57.0294 61.0687 55.9927 61.048 54.7127C61.3106 54.8606 61.6825 55.0527 62.1414 55.2421C63.1491 55.6568 63.9743 55.8061 64.4886 55.8945C65.5142 56.0729 66.3187 56.0839 66.9408 56.0881C67.466 56.0922 67.907 56.0729 68.2277 56.0521C68.265 55.7204 68.301 55.3845 68.3341 55.0458C68.4046 54.3325 68.4627 53.6317 68.5111 52.9461C68.0798 52.9406 67.6264 52.9226 67.1523 52.8894C66.7901 52.8631 66.4404 52.8286 66.1059 52.7899C65.6511 52.8521 65.0415 52.9129 64.3199 52.917C62.2326 52.9267 60.7162 52.4526 60.3402 52.3296C59.6353 52.0987 59.0713 51.8402 58.6815 51.6412C58.7506 51.8983 58.8404 52.2646 58.9192 52.7083C59.0132 53.235 59.233 54.6449 59.016 56.793C58.8708 58.2293 58.7976 58.9633 58.4631 59.8438C58.1755 60.6027 57.3973 62.2546 55.252 63.6894L55.2547 63.6935Z" fill="#0050C8"/>
+<path d="M42.0701 47.5634C41.7328 47.2482 40.667 46.2433 39.7533 45.1651C39.5349 44.908 39.1714 44.474 38.7373 43.8588C38.5936 43.6542 38.4429 43.4317 38.2881 43.1884C37.9232 42.6147 37.4476 41.8572 37.0302 40.7735C36.7717 40.1017 36.6155 39.5142 36.5187 39.0788C36.2575 40.3201 36.2989 41.3513 36.3777 42.0259C36.4676 42.8027 36.6376 43.3681 36.7841 43.8436C36.9417 44.3565 37.1767 45.0144 37.5361 45.7526C38.0324 46.0056 38.4595 46.2032 38.7843 46.347C39.698 46.752 40.4279 47.0105 40.902 47.1764C41.3762 47.3436 41.7784 47.4722 42.0715 47.5634H42.0701Z" fill="#003C8D"/>
+<path d="M54.4404 48.0596C54.5952 47.4002 54.8662 46.9482 55.0459 46.6953C55.5421 45.9944 56.1351 45.729 56.7973 45.4249C57.3322 45.1789 57.7594 44.9909 58.1533 45.1761C58.2252 45.2093 58.2584 45.2383 58.6731 45.5051C58.8168 45.6005 59.0269 45.7373 59.2854 45.8935C59.9614 46.3027 62.6596 47.873 66.5951 48.3292C69.2616 48.6388 71.3115 48.2988 72.4948 48.0928C74.9124 47.6726 76.8726 46.9303 78.2701 46.282C77.5015 48.3084 76.4468 49.5124 75.804 50.1358C73.338 52.5286 70.3176 52.7691 68.4128 52.9544C67.9843 52.9958 66.4776 53.1078 64.411 52.7899C59.9116 52.0987 56.489 49.7834 54.4404 48.061V48.0596Z" fill="#8BC7FE"/>
+<path d="M54.1419 48.965C54.6119 49.5345 55.1634 50.1386 55.8035 50.7468C56.7199 51.6177 57.6143 52.3019 58.4105 52.8355C58.3994 52.6005 58.358 52.2991 58.2363 51.9771C58.2004 51.8831 58.1617 51.7974 58.123 51.7186C58.5086 51.9314 58.933 52.1346 59.3919 52.313C61.587 53.1631 63.6204 53.0815 65.0152 52.8576C63.1366 52.6046 60.6885 52.0102 58.0926 50.5975C57.1872 50.104 56.3799 49.5746 55.6708 49.0479C55.6376 49.0231 55.3819 48.8185 55.0225 48.5365C54.7819 48.3485 54.5843 48.1937 54.4543 48.0928C54.3493 48.3844 54.2442 48.6747 54.1392 48.9664L54.1419 48.965Z" fill="#00398B"/>
+<path d="M77.4035 48.0914C76.1746 50.1275 74.5919 51.1463 73.9588 51.5126C73.3989 51.8361 72.5585 52.2438 71.4637 52.494C71.4499 52.4982 70.0399 52.87 67.5711 53C67.2103 53.0193 66.8578 53.0235 66.8578 53.0235C66.8578 53.0235 66.4238 53.029 65.9759 53.011C62.0875 52.8617 58.3207 51.2748 58.3207 51.2748C57.7388 51.0454 56.7822 50.6362 55.798 50.0391C54.9313 49.5138 54.4516 49.0922 54.1973 48.8544C54.0756 48.7397 53.9775 48.6415 53.9111 48.5724C54.4309 47.6546 54.9506 46.7381 55.4718 45.8203C55.9583 46.3068 56.6799 46.9786 57.6199 47.6725C58.9331 48.6415 62.6943 51.4214 67.7909 51.2541C73.4888 51.0689 77.2832 47.3187 78.2702 46.2778C78.1002 46.7395 77.8292 47.3823 77.4021 48.0886L77.4035 48.0914Z" fill="#0087F7"/>
+<path d="M53.1177 47.75C53.2117 47.5482 53.3471 47.2759 53.5324 46.9704C53.6181 46.8294 53.9263 46.3248 54.2954 45.9295C54.5885 45.6157 55.3943 44.7518 56.5762 44.7158C57.2411 44.6951 57.7885 44.9439 58.1548 45.1747C57.9129 45.1969 57.5825 45.2439 57.1996 45.3503C56.7932 45.465 56.3315 45.5687 55.9224 45.8935C55.3529 46.3456 55.0377 46.9552 54.4405 48.2227C54.3203 48.4798 54.2277 48.6927 54.1696 48.8296C53.9457 48.6125 53.7204 48.3858 53.4923 48.1481C53.3637 48.014 53.2393 47.8813 53.1177 47.7486V47.75Z" fill="#0051CB"/>
</g>
+<g clip-path="url(#clip1_228_215)">
+<path d="M24 17L41.5 18L52 17L61.5 27.5L66 39.5L68 48L64 56L59 53L38 46L33.5 42L27 44.5L17.5 27L24 17Z" fill="#155DFC"/>
+<path d="M11.7963 38.9765C24.2676 47.41 26.6078 51.5126 29.8714 50.0184C30.734 49.623 33.0549 48.1993 33.7778 41.9014C33.5719 41.8918 33.1655 41.8932 32.719 42.0659C29.9212 43.1552 30.0014 49.3272 28.6066 49.3341C28.5845 49.3341 28.5361 49.3341 28.4739 49.3162C28.3371 49.2913 28.1684 49.2387 27.9155 49.1212C27.1759 48.7757 26.8055 48.6015 26.2443 48.2628C26.2443 48.2628 25.6706 47.9214 25.1481 47.5565C24.3768 47.0174 23.9358 46.3677 23.0705 45.5908C22.3461 44.9411 22.3365 45.1112 20.6459 43.8699C20.0639 43.4427 19.6368 43.1054 18.806 42.4475C17.4417 41.3679 16.499 40.6214 15.6945 39.9261C14.6881 39.0567 13.3266 37.7725 11.8185 35.9907C10.4472 33.4127 8.81332 30.7324 7.98394 31.0019C7.45451 31.1747 7.37296 32.4796 7.47525 33.3546C7.81668 36.3059 10.6711 38.2176 11.7963 38.9779V38.9765Z" fill="#003A86"/>
+<path d="M13.2437 38.1969C19.9521 39.5018 26.659 40.808 33.3674 42.1129C34.147 43.3197 34.9736 44.0703 35.539 44.5113C35.539 44.5113 38.8745 47.1114 43.9393 46.9179C44.1826 46.9082 44.7867 46.8612 45.6078 46.9496C46.451 47.0409 46.5975 47.1307 47.937 47.3726C49.3137 47.6214 49.4686 47.5827 50.0187 47.7956C50.6587 48.0431 51.1121 48.3527 51.43 48.5725C51.9567 48.936 52.0811 49.113 53.0888 49.9838C53.6473 50.4662 53.9265 50.7081 54.1822 50.9017C54.6522 51.2569 55.4056 51.8223 56.4769 52.2784C57.0865 52.5369 57.6864 52.7139 58.2559 52.8811C58.5683 52.9724 58.8309 53.0429 59.0175 53.0899C59.1115 53.9911 59.1779 55.2739 59.0175 56.7958C58.8503 58.3869 58.7342 59.4955 58.0651 60.7492C57.7679 61.3063 56.6884 63.2526 54.3592 64.1027C53.8892 64.2741 52.4474 64.7773 50.7237 64.3142C50.1445 64.1594 49.0691 63.8539 48.2176 62.8324C47.3439 61.7832 47.2513 60.6345 47.2292 60.2917C47.1863 59.6323 47.1269 58.7214 47.7586 57.9625C48.2576 57.364 49.0898 56.9769 49.8763 57.0447C50.8177 57.1262 51.0776 57.8091 51.7342 57.6377C52.0479 57.5561 52.0452 57.3861 52.9105 56.4807C53.6901 55.6651 53.8712 55.6153 53.8988 55.3306C53.9638 54.6477 53.01 54.0409 52.6285 53.7976C52.3438 53.6165 51.6471 53.217 50.4044 53.0567C49.6952 52.9655 48.3198 52.8037 46.7343 53.4451C44.8005 54.2261 43.8315 55.6831 43.5232 56.1627C42.7132 57.4179 42.5169 58.5942 42.3939 59.3739C42.3261 59.8065 42.1409 61.1764 42.5003 62.9029C43.0035 65.3247 44.2531 66.9088 44.6526 67.3857C46.386 69.4537 48.4733 70.2181 49.452 70.5623C54.0288 72.1727 58.1508 70.4835 58.9457 70.1393C63.3138 68.2497 65.2601 64.5699 66.2166 62.7633C68.0344 59.3282 68.2652 56.2388 68.5112 52.9516C68.5942 51.8513 68.7808 48.6139 68.0883 44.4808C67.5948 41.542 66.876 39.4603 66.1116 37.2458C64.5164 32.6248 62.7595 29.321 62.1941 28.2815C62.1941 28.2815 59.9299 24.1222 56.1589 19.6698C55.4235 18.8017 54.6826 17.9847 53.4772 17.3046C52.7087 16.872 51.3264 16.2541 47.76 16.1753C45.9561 16.1352 43.4016 16.2278 40.3481 16.8457C40.5015 17.0807 40.6536 17.3157 40.807 17.5521C39.9665 17.1111 38.7432 16.5278 37.2075 15.9997C35.6924 15.4786 34.5451 15.2408 32.7246 14.8704C29.8784 14.2912 27.7359 14.0451 27.2189 13.9885C24.9077 13.7313 23.2157 13.6802 21.5016 13.8115C20.4179 13.8945 19.4268 14.0424 18.3956 14.6229C17.7404 14.992 17.2842 15.415 16.7368 15.9292C15.678 16.9231 15.0076 17.8258 14.6896 18.2584C12.4378 21.3216 11.3126 22.8546 10.2427 24.6461C10.2427 24.6461 9.46449 25.9496 8.16097 28.811C7.95086 29.2713 7.58731 30.0882 7.49885 31.212C7.48502 31.3848 7.44079 31.946 7.52649 32.4824C7.74351 33.8453 8.7526 34.7729 9.78519 35.6589C12.0674 37.6177 13.6681 38.729 13.6681 38.729C13.9266 38.9018 16.4272 40.6518 18.5739 42.3286C22.0781 45.0669 23.8295 46.4368 24.9021 47.403C24.9021 47.403 25.7965 48.2089 27.6073 49.0259C28.1464 49.2692 28.5639 49.4129 29.0546 49.3341C29.7651 49.2194 30.2116 48.701 30.6442 48.1868C30.8004 48.0002 31.1225 47.5924 32.1523 45.2895C32.4081 44.7186 32.5352 44.4325 32.6901 44.0454C32.8186 43.7247 33.1338 42.9174 33.4794 41.7439C33.7517 40.8219 34.2908 38.9944 34.5963 36.9625C34.8741 35.1171 35.2764 32.4437 34.5603 29.0916C34.4954 28.7902 33.7835 25.5791 31.7847 22.5505C30.7438 20.9733 29.7292 20.0126 29.5135 19.8094C28.8611 19.1998 28.2515 18.7478 27.7842 18.4326C28.239 18.4547 28.8625 18.5155 29.584 18.68C30.1162 18.8003 31.5469 19.1694 33.1131 20.1978C34.6447 21.2027 35.5625 22.3514 35.9717 22.9154C37.4176 24.9073 37.8005 26.884 38.0368 28.1032C38.3133 29.5312 38.3852 31.0075 38.4432 32.1617C38.511 33.5495 38.4626 33.9711 38.6202 34.9858C38.728 35.6824 38.916 36.845 39.5256 38.1969C40.4421 40.2289 41.758 41.466 42.2543 41.9028C43.1376 42.6783 43.9255 43.0778 45.5013 43.8795C46.82 44.55 47.6798 44.8361 48.6419 44.9384C49.0635 44.9826 49.4188 44.9826 49.6648 44.9743C49.4216 44.3979 49.2695 43.8823 49.1714 43.4745C49.087 43.1262 48.9571 42.5733 48.9239 41.8337C48.8977 41.2504 48.9419 40.7555 48.9944 40.3864C49.0981 40.8357 49.2529 41.4176 49.4879 42.0811C49.6012 42.4005 50.0104 43.5229 50.8647 44.9757C51.4992 46.0567 52.2677 47.0063 53.5464 48.3292C54.7656 49.5885 56.5612 51.2804 59.0162 53.094C51.2351 48.8296 43.4555 44.5652 35.6745 40.3007" fill="#155DFC"/>
+<path d="M46.9375 30.1145C47.6826 29.65 48.3129 29.3169 48.7732 29.0915C49.1934 28.8842 49.4105 28.804 49.6676 28.7391C49.8459 28.6934 50.4195 28.5635 51.1618 28.6644C51.4701 28.7073 51.9041 28.7708 52.3976 29.0445C52.9879 29.3722 53.3072 29.8048 53.386 29.9154C53.48 30.0481 53.6846 30.3398 53.809 30.7628C53.8864 31.0212 53.8698 31.118 53.9735 31.3516C54.0827 31.5963 54.2029 31.7262 54.3964 31.964C54.5526 32.1547 54.7655 32.4312 55.0088 32.7878C54.8803 32.716 54.2292 32.3635 53.5505 32.3759C53.2436 32.3814 52.9381 32.4589 52.9381 32.4589C52.6921 32.5211 52.5276 32.5985 52.4681 32.6233C51.9193 32.8514 50.6656 32.5487 50.1624 31.729C49.8445 31.212 50.0671 30.8775 49.6897 30.5402C49.5501 30.4158 49.3662 30.3232 48.5396 30.2237C48.1484 30.1767 47.6024 30.1269 46.9403 30.1172L46.9375 30.1145Z" fill="#003C8D"/>
+<path d="M65.2227 34.8282C64.533 34.7756 63.4285 34.7798 62.1609 35.1848C61.1878 35.4958 60.4469 35.9368 59.9492 36.2907C60.3722 36.198 60.9224 36.0902 61.572 35.9962C61.7269 35.9741 62.2259 35.9036 62.9253 35.8428C63.6013 35.7847 64.497 35.7308 65.5711 35.7364C65.455 35.4336 65.3388 35.1309 65.2227 34.8268V34.8282Z" fill="#0052C9"/>
+<path d="M66.71 39.0027C65.94 38.9765 64.8563 39.029 63.6233 39.3856C62.7704 39.6317 62.0695 39.9607 61.5332 40.262C61.9092 40.2067 62.3819 40.1459 62.9279 40.0948C63.1104 40.0782 63.6468 40.0284 64.3752 39.998C65.0567 39.969 65.9538 39.9524 67.0251 39.9925C66.9201 39.6635 66.815 39.3331 66.7113 39.0041L66.71 39.0027Z" fill="#0052C9"/>
+<path d="M67.7052 42.5276C67.0003 42.4875 65.8709 42.5235 64.6407 43.0419C64.1527 43.2478 63.7449 43.4883 63.4146 43.7206C63.6371 43.6763 63.944 43.6224 64.3103 43.5727C65.0816 43.4704 65.6719 43.4524 66.2635 43.4372C66.6906 43.4261 67.2463 43.422 67.9001 43.4441L67.7052 42.5263V42.5276Z" fill="#0052C9"/>
+<path d="M47.4777 49.3728C49.5401 50.0073 51.7145 50.7178 53.6539 51.3495C54.8551 51.7407 55.8365 52.0656 56.4779 52.2784C54.2068 49.8428 51.937 47.4085 49.6659 44.9729C49.3328 44.9688 48.8103 44.9439 48.1841 44.825C47.739 44.7407 46.723 44.5112 44.608 43.3611C43.6349 42.8317 43.1483 42.5677 42.6783 42.2194C40.3726 40.5108 39.4838 38.0475 39.2295 37.3149C39.0042 36.6639 38.8493 35.2124 38.5494 32.3372C38.1596 28.6091 38.2176 28.3714 37.9495 27.2904C37.7407 26.4486 37.2721 24.4608 35.9727 22.632C35.5442 22.028 33.8647 19.7347 30.731 18.7657C29.422 18.3607 28.2719 18.3151 27.502 18.3427C28.1226 18.792 28.9713 19.4693 29.8671 20.4079C30.3108 20.8723 32.1866 22.8905 33.5385 26.1984C33.9615 27.2323 34.6983 29.0764 34.8793 31.5977C35.0134 33.4597 34.7895 34.9166 34.7383 35.2332C34.4011 37.3205 33.7348 38.5949 33.4224 41.5393C33.3961 41.7853 33.3782 41.9871 33.3685 42.1143C33.8094 42.7875 34.2379 43.2893 34.5642 43.6376C34.8807 43.9749 35.1392 44.1974 35.2194 44.2762C35.2194 44.2762 35.6714 44.6757 36.1898 45.0227C38.5632 46.6151 47.4777 49.3728 47.4777 49.3728Z" fill="#0051C8"/>
+<path d="M48.9774 40.2966C48.882 41.0182 48.824 42.1171 49.117 43.3943C49.2635 44.0302 49.4419 44.4753 49.6451 44.9729C50.1178 46.1341 50.7094 47.5731 51.9922 49.0107C52.9419 50.075 53.904 50.7192 54.6767 51.2403C55.0057 51.4615 55.4466 51.7573 56.0617 52.0739C57.245 52.6848 58.3121 52.9834 59.0572 53.141C58.9425 52.66 58.8264 52.1803 58.7116 51.6993C57.5228 51.1394 56.0894 50.3225 54.6228 49.1213C54.0892 48.6831 53.7035 48.3195 53.5238 48.1467C52.8424 47.4901 51.5513 46.235 50.4689 44.2624C49.6202 42.7156 49.2 41.2974 48.9774 40.2938V40.2966Z" fill="#00398B"/>
+<path d="M55.2547 63.6935C55.9569 63.4503 56.9715 62.9969 57.9779 62.1426C58.893 61.3657 59.4224 60.5792 59.6366 60.2364C60.2656 59.2342 60.5089 58.3551 60.6775 57.7303C60.8669 57.0294 61.0687 55.9927 61.048 54.7127C61.3106 54.8606 61.6825 55.0527 62.1414 55.2421C63.1491 55.6568 63.9743 55.8061 64.4886 55.8945C65.5142 56.0729 66.3187 56.0839 66.9408 56.0881C67.466 56.0922 67.907 56.0729 68.2277 56.0521C68.265 55.7204 68.301 55.3845 68.3341 55.0458C68.4046 54.3325 68.4627 53.6317 68.5111 52.9461C68.0798 52.9406 67.6264 52.9226 67.1523 52.8894C66.7901 52.8631 66.4404 52.8286 66.1059 52.7899C65.6511 52.8521 65.0415 52.9129 64.3199 52.917C62.2326 52.9267 60.7162 52.4526 60.3402 52.3296C59.6353 52.0987 59.0713 51.8402 58.6815 51.6412C58.7506 51.8983 58.8404 52.2646 58.9192 52.7083C59.0132 53.235 59.233 54.6449 59.016 56.793C58.8708 58.2293 58.7976 58.9633 58.4631 59.8438C58.1755 60.6027 57.3973 62.2546 55.252 63.6894L55.2547 63.6935Z" fill="#0050C8"/>
+<path d="M42.0701 47.5634C41.7328 47.2482 40.667 46.2433 39.7533 45.1651C39.5349 44.908 39.1714 44.474 38.7373 43.8588C38.5936 43.6542 38.4429 43.4317 38.2881 43.1884C37.9232 42.6147 37.4476 41.8572 37.0302 40.7735C36.7717 40.1017 36.6155 39.5142 36.5187 39.0788C36.2575 40.3201 36.2989 41.3513 36.3777 42.0259C36.4676 42.8027 36.6376 43.3681 36.7841 43.8436C36.9417 44.3565 37.1767 45.0144 37.5361 45.7526C38.0324 46.0056 38.4595 46.2032 38.7843 46.347C39.698 46.752 40.4279 47.0105 40.902 47.1764C41.3762 47.3436 41.7784 47.4722 42.0715 47.5634H42.0701Z" fill="#003C8D"/>
+<path d="M54.4404 48.0596C54.5952 47.4002 54.8662 46.9482 55.0459 46.6953C55.5421 45.9944 56.1351 45.729 56.7973 45.4249C57.3322 45.1789 57.7594 44.9909 58.1533 45.1761C58.2252 45.2093 58.2584 45.2383 58.6731 45.5051C58.8168 45.6005 59.0269 45.7373 59.2854 45.8935C59.9614 46.3027 62.6596 47.873 66.5951 48.3292C69.2616 48.6388 71.3115 48.2988 72.4948 48.0928C74.9124 47.6726 76.8726 46.9303 78.2701 46.282C77.5015 48.3084 76.4468 49.5124 75.804 50.1358C73.338 52.5286 70.3176 52.7691 68.4128 52.9544C67.9843 52.9958 66.4776 53.1078 64.411 52.7899C59.9116 52.0987 56.489 49.7834 54.4404 48.061V48.0596Z" fill="#8BC7FE"/>
+<path d="M54.1419 48.965C54.6119 49.5345 55.1634 50.1386 55.8035 50.7468C56.7199 51.6177 57.6143 52.3019 58.4105 52.8355C58.3994 52.6005 58.358 52.2991 58.2363 51.9771C58.2004 51.8831 58.1617 51.7974 58.123 51.7186C58.5086 51.9314 58.933 52.1346 59.3919 52.313C61.587 53.1631 63.6204 53.0815 65.0152 52.8576C63.1366 52.6046 60.6885 52.0102 58.0926 50.5975C57.1872 50.104 56.3799 49.5746 55.6708 49.0479C55.6376 49.0231 55.3819 48.8185 55.0225 48.5365C54.7819 48.3485 54.5843 48.1937 54.4543 48.0928C54.3493 48.3844 54.2442 48.6747 54.1392 48.9664L54.1419 48.965Z" fill="#00398B"/>
+<path d="M77.4035 48.0914C76.1746 50.1275 74.5919 51.1463 73.9588 51.5126C73.3989 51.8361 72.5585 52.2438 71.4637 52.494C71.4499 52.4982 70.0399 52.87 67.5711 53C67.2103 53.0193 66.8578 53.0235 66.8578 53.0235C66.8578 53.0235 66.4238 53.029 65.9759 53.011C62.0875 52.8617 58.3207 51.2748 58.3207 51.2748C57.7388 51.0454 56.7822 50.6362 55.798 50.0391C54.9313 49.5138 54.4516 49.0922 54.1973 48.8544C54.0756 48.7397 53.9775 48.6415 53.9111 48.5724C54.4309 47.6546 54.9506 46.7381 55.4718 45.8203C55.9583 46.3068 56.6799 46.9786 57.6199 47.6725C58.9331 48.6415 62.6943 51.4214 67.7909 51.2541C73.4888 51.0689 77.2832 47.3187 78.2702 46.2778C78.1002 46.7395 77.8292 47.3823 77.4021 48.0886L77.4035 48.0914Z" fill="#0087F7"/>
+<path d="M53.1177 47.75C53.2117 47.5482 53.3471 47.2759 53.5324 46.9704C53.6181 46.8294 53.9263 46.3248 54.2954 45.9295C54.5885 45.6157 55.3943 44.7518 56.5762 44.7158C57.2411 44.6951 57.7885 44.9439 58.1548 45.1747C57.9129 45.1969 57.5825 45.2439 57.1996 45.3503C56.7932 45.465 56.3315 45.5687 55.9224 45.8935C55.3529 46.3456 55.0377 46.9552 54.4405 48.2227C54.3203 48.4798 54.2277 48.6927 54.1696 48.8296C53.9457 48.6125 53.7204 48.3858 53.4923 48.1481C53.3637 48.014 53.2393 47.8813 53.1177 47.7486V47.75Z" fill="#0051CB"/>
+</g>
+<path d="M95.368 30.6H100.776V53H95.368V30.6ZM98.76 35.048V30.6H103.144C105.043 30.6 106.632 30.8987 107.912 31.496C109.213 32.072 110.195 32.904 110.856 33.992C111.517 35.08 111.848 36.392 111.848 37.928C111.848 39.4213 111.517 40.7227 110.856 41.832C110.195 42.92 109.213 43.7627 107.912 44.36C106.632 44.936 105.043 45.224 103.144 45.224H98.76V40.776H103.144C104.232 40.776 105.085 40.5307 105.704 40.04C106.323 39.5493 106.632 38.8453 106.632 37.928C106.632 36.9893 106.323 36.2747 105.704 35.784C105.085 35.2933 104.232 35.048 103.144 35.048H98.76ZM119.754 41.8C119.754 43.1227 120.01 44.296 120.522 45.32C121.055 46.3227 121.791 47.112 122.73 47.688C123.69 48.264 124.81 48.552 126.09 48.552C127.348 48.552 128.447 48.264 129.385 47.688C130.346 47.112 131.082 46.3227 131.594 45.32C132.127 44.296 132.394 43.1227 132.394 41.8C132.394 40.4773 132.138 39.3147 131.626 38.312C131.114 37.288 130.388 36.488 129.45 35.912C128.511 35.336 127.391 35.048 126.09 35.048C124.81 35.048 123.69 35.336 122.73 35.912C121.791 36.488 121.055 37.288 120.522 38.312C120.01 39.3147 119.754 40.4773 119.754 41.8ZM114.026 41.8C114.026 40.072 114.324 38.4933 114.922 37.064C115.54 35.6347 116.394 34.3973 117.482 33.352C118.57 32.3067 119.85 31.5067 121.322 30.952C122.794 30.376 124.383 30.088 126.09 30.088C127.818 30.088 129.407 30.376 130.858 30.952C132.33 31.5067 133.61 32.3067 134.698 33.352C135.786 34.3973 136.628 35.6347 137.226 37.064C137.823 38.4933 138.122 40.072 138.122 41.8C138.122 43.528 137.823 45.1173 137.226 46.568C136.65 48.0187 135.818 49.2773 134.73 50.344C133.663 51.4107 132.394 52.2427 130.922 52.84C129.45 53.416 127.839 53.704 126.09 53.704C124.319 53.704 122.698 53.416 121.226 52.84C119.754 52.2427 118.474 51.4107 117.386 50.344C116.319 49.2773 115.487 48.0187 114.89 46.568C114.314 45.1173 114.026 43.528 114.026 41.8ZM144.051 45.128C144.499 45.9387 145 46.6427 145.555 47.24C146.131 47.8373 146.749 48.296 147.411 48.616C148.093 48.936 148.808 49.096 149.555 49.096C150.344 49.096 150.995 48.904 151.507 48.52C152.019 48.1147 152.275 47.5707 152.275 46.888C152.275 46.312 152.125 45.8533 151.827 45.512C151.528 45.1493 151.048 44.808 150.387 44.488C149.725 44.168 148.851 43.8053 147.763 43.4C147.229 43.208 146.611 42.9413 145.907 42.6C145.224 42.2587 144.573 41.8213 143.955 41.288C143.336 40.7333 142.824 40.072 142.419 39.304C142.013 38.5147 141.811 37.5653 141.811 36.456C141.811 35.1333 142.152 33.992 142.835 33.032C143.539 32.072 144.477 31.3467 145.651 30.856C146.845 30.344 148.168 30.088 149.619 30.088C151.112 30.088 152.403 30.3333 153.491 30.824C154.6 31.3147 155.517 31.9333 156.243 32.68C156.968 33.4267 157.523 34.184 157.907 34.952L153.779 37.256C153.459 36.7227 153.085 36.264 152.659 35.88C152.253 35.4747 151.795 35.1653 151.283 34.952C150.792 34.7173 150.259 34.6 149.683 34.6C148.915 34.6 148.328 34.7707 147.923 35.112C147.517 35.432 147.315 35.8373 147.315 36.328C147.315 36.84 147.507 37.288 147.891 37.672C148.296 38.056 148.861 38.408 149.587 38.728C150.333 39.048 151.229 39.3893 152.275 39.752C153.064 40.0507 153.8 40.4027 154.483 40.808C155.165 41.192 155.763 41.6613 156.275 42.216C156.808 42.7707 157.224 43.4107 157.523 44.136C157.821 44.8613 157.971 45.6933 157.971 46.632C157.971 47.7627 157.736 48.776 157.267 49.672C156.819 50.5467 156.2 51.2827 155.411 51.88C154.643 52.4773 153.757 52.9253 152.755 53.224C151.773 53.544 150.76 53.704 149.715 53.704C148.264 53.704 146.909 53.448 145.651 52.936C144.413 52.4027 143.336 51.688 142.419 50.792C141.501 49.896 140.787 48.9147 140.275 47.848L144.051 45.128ZM159.347 35.432V30.6H177.075V35.432H170.899V53H165.491V35.432H159.347ZM189.035 44.904V40.744H200.363C200.469 42.536 200.288 44.2107 199.819 45.768C199.349 47.3253 198.624 48.7013 197.643 49.896C196.661 51.0907 195.435 52.0293 193.963 52.712C192.491 53.3733 190.805 53.704 188.907 53.704C187.115 53.704 185.472 53.4267 183.979 52.872C182.485 52.296 181.195 51.4853 180.107 50.44C179.019 49.3733 178.165 48.1147 177.547 46.664C176.949 45.192 176.651 43.5707 176.651 41.8C176.651 40.0293 176.96 38.4293 177.579 37C178.197 35.5493 179.072 34.312 180.203 33.288C181.333 32.264 182.656 31.4747 184.171 30.92C185.685 30.3653 187.328 30.088 189.099 30.088C190.677 30.088 192.096 30.312 193.355 30.76C194.613 31.208 195.723 31.8373 196.683 32.648C197.664 33.4373 198.507 34.3547 199.211 35.4L194.411 37.896C193.899 37 193.205 36.264 192.331 35.688C191.477 35.0907 190.4 34.792 189.099 34.792C187.861 34.792 186.72 35.0693 185.675 35.624C184.651 36.1787 183.829 36.9787 183.211 38.024C182.613 39.048 182.315 40.3067 182.315 41.8C182.315 43.272 182.603 44.552 183.179 45.64C183.776 46.7067 184.576 47.5387 185.579 48.136C186.603 48.712 187.776 49 189.099 49C189.909 49 190.645 48.904 191.307 48.712C191.968 48.4987 192.533 48.2107 193.003 47.848C193.472 47.464 193.867 47.0267 194.187 46.536C194.528 46.024 194.795 45.48 194.987 44.904H189.035ZM209.593 42.856H215.193L222.201 53H215.865L209.593 42.856ZM203.993 30.6H209.401V53H203.993V30.6ZM207.385 35.176V30.6H212.153C214.073 30.6 215.673 30.9093 216.953 31.528C218.233 32.1467 219.204 33.0107 219.865 34.12C220.526 35.208 220.857 36.4773 220.857 37.928C220.857 39.3573 220.526 40.6267 219.865 41.736C219.204 42.824 218.233 43.6773 216.953 44.296C215.673 44.9147 214.073 45.224 212.153 45.224H207.385V41.032H211.769C212.494 41.032 213.113 40.9253 213.625 40.712C214.158 40.4773 214.564 40.1467 214.841 39.72C215.118 39.272 215.257 38.7387 215.257 38.12C215.257 37.5013 215.118 36.9787 214.841 36.552C214.564 36.104 214.158 35.7627 213.625 35.528C213.113 35.2933 212.494 35.176 211.769 35.176H207.385ZM228.296 53V48.552H239.592V53H228.296ZM228.296 35.048V30.6H239.592V35.048H228.296ZM228.296 43.4V39.048H238.952V43.4H228.296ZM224.712 30.6H229.896V53H224.712V30.6ZM246.457 45.128C246.905 45.9387 247.406 46.6427 247.961 47.24C248.537 47.8373 249.156 48.296 249.817 48.616C250.5 48.936 251.214 49.096 251.961 49.096C252.75 49.096 253.401 48.904 253.913 48.52C254.425 48.1147 254.681 47.5707 254.681 46.888C254.681 46.312 254.532 45.8533 254.233 45.512C253.934 45.1493 253.454 44.808 252.793 44.488C252.132 44.168 251.257 43.8053 250.169 43.4C249.636 43.208 249.017 42.9413 248.313 42.6C247.63 42.2587 246.98 41.8213 246.361 41.288C245.742 40.7333 245.23 40.072 244.825 39.304C244.42 38.5147 244.217 37.5653 244.217 36.456C244.217 35.1333 244.558 33.992 245.241 33.032C245.945 32.072 246.884 31.3467 248.057 30.856C249.252 30.344 250.574 30.088 252.025 30.088C253.518 30.088 254.809 30.3333 255.897 30.824C257.006 31.3147 257.924 31.9333 258.649 32.68C259.374 33.4267 259.929 34.184 260.313 34.952L256.185 37.256C255.865 36.7227 255.492 36.264 255.065 35.88C254.66 35.4747 254.201 35.1653 253.689 34.952C253.198 34.7173 252.665 34.6 252.089 34.6C251.321 34.6 250.734 34.7707 250.329 35.112C249.924 35.432 249.721 35.8373 249.721 36.328C249.721 36.84 249.913 37.288 250.297 37.672C250.702 38.056 251.268 38.408 251.993 38.728C252.74 39.048 253.636 39.3893 254.681 39.752C255.47 40.0507 256.206 40.4027 256.889 40.808C257.572 41.192 258.169 41.6613 258.681 42.216C259.214 42.7707 259.63 43.4107 259.929 44.136C260.228 44.8613 260.377 45.6933 260.377 46.632C260.377 47.7627 260.142 48.776 259.673 49.672C259.225 50.5467 258.606 51.2827 257.817 51.88C257.049 52.4773 256.164 52.9253 255.161 53.224C254.18 53.544 253.166 53.704 252.121 53.704C250.67 53.704 249.316 53.448 248.057 52.936C246.82 52.4027 245.742 51.688 244.825 50.792C243.908 49.896 243.193 48.9147 242.681 47.848L246.457 45.128ZM263.833 30.6H269.241V45.256C269.241 46.3867 269.54 47.304 270.137 48.008C270.734 48.712 271.63 49.064 272.825 49.064C274.041 49.064 274.948 48.712 275.545 48.008C276.142 47.304 276.441 46.3867 276.441 45.256V30.6H281.849V45.64C281.849 47.048 281.614 48.2747 281.145 49.32C280.697 50.3653 280.057 51.2293 279.225 51.912C278.414 52.5733 277.454 53.0747 276.345 53.416C275.257 53.7573 274.084 53.928 272.825 53.928C271.566 53.928 270.393 53.7573 269.305 53.416C268.217 53.0747 267.257 52.5733 266.425 51.912C265.614 51.2293 264.974 50.3653 264.505 49.32C264.057 48.2747 263.833 47.048 263.833 45.64V30.6ZM288.895 45.128C289.343 45.9387 289.844 46.6427 290.399 47.24C290.975 47.8373 291.593 48.296 292.255 48.616C292.937 48.936 293.652 49.096 294.399 49.096C295.188 49.096 295.839 48.904 296.351 48.52C296.863 48.1147 297.119 47.5707 297.119 46.888C297.119 46.312 296.969 45.8533 296.671 45.512C296.372 45.1493 295.892 44.808 295.231 44.488C294.569 44.168 293.695 43.8053 292.607 43.4C292.073 43.208 291.455 42.9413 290.751 42.6C290.068 42.2587 289.417 41.8213 288.799 41.288C288.18 40.7333 287.668 40.072 287.263 39.304C286.857 38.5147 286.655 37.5653 286.655 36.456C286.655 35.1333 286.996 33.992 287.679 33.032C288.383 32.072 289.321 31.3467 290.495 30.856C291.689 30.344 293.012 30.088 294.463 30.088C295.956 30.088 297.247 30.3333 298.335 30.824C299.444 31.3147 300.361 31.9333 301.087 32.68C301.812 33.4267 302.367 34.184 302.751 34.952L298.623 37.256C298.303 36.7227 297.929 36.264 297.503 35.88C297.097 35.4747 296.639 35.1653 296.127 34.952C295.636 34.7173 295.103 34.6 294.527 34.6C293.759 34.6 293.172 34.7707 292.767 35.112C292.361 35.432 292.159 35.8373 292.159 36.328C292.159 36.84 292.351 37.288 292.735 37.672C293.14 38.056 293.705 38.408 294.431 38.728C295.177 39.048 296.073 39.3893 297.119 39.752C297.908 40.0507 298.644 40.4027 299.327 40.808C300.009 41.192 300.607 41.6613 301.119 42.216C301.652 42.7707 302.068 43.4107 302.367 44.136C302.665 44.8613 302.815 45.6933 302.815 46.632C302.815 47.7627 302.58 48.776 302.111 49.672C301.663 50.5467 301.044 51.2827 300.255 51.88C299.487 52.4773 298.601 52.9253 297.599 53.224C296.617 53.544 295.604 53.704 294.559 53.704C293.108 53.704 291.753 53.448 290.495 52.936C289.257 52.4027 288.18 51.688 287.263 50.792C286.345 49.896 285.631 48.9147 285.118 47.848L288.895 45.128Z" fill="#155DFC"/>
<defs>
-<clipPath id="clip0_221_213">
-<rect width="61" height="61" fill="white"/>
+<clipPath id="clip0_228_215">
+<rect width="70.8333" height="70.8333" fill="white" transform="translate(7.08301 7.08337)"/>
+</clipPath>
+<clipPath id="clip1_228_215">
+<rect width="70.8333" height="70.8333" fill="white" transform="translate(7.08301 7.08337)"/>
</clipPath>
</defs>
</svg>
diff --git a/backend/internal/features/storages/models/s3/model.go b/backend/internal/features/storages/models/s3/model.go
index 65a6d84e..54be1f3b 100644
--- a/backend/internal/features/storages/models/s3/model.go
+++ b/backend/internal/features/storages/models/s3/model.go
@@ -22,6 +22,9 @@ type S3Storage struct {
S3AccessKey string `json:"s3AccessKey" gorm:"not null;type:text;column:s3_access_key"`
S3SecretKey string `json:"s3SecretKey" gorm:"not null;type:text;column:s3_secret_key"`
S3Endpoint string `json:"s3Endpoint" gorm:"type:text;column:s3_endpoint"`
+
+ S3Prefix string `json:"s3Prefix" gorm:"type:text;column:s3_prefix"`
+ S3UseVirtualHostedStyle bool `json:"s3UseVirtualHostedStyle" gorm:"default:false;column:s3_use_virtual_hosted_style"`
}
func (s *S3Storage) TableName() string {
@@ -34,11 +37,13 @@ func (s *S3Storage) SaveFile(logger *slog.Logger, fileID uuid.UUID, file io.Read
return err
}
+ objectKey := s.buildObjectKey(fileID.String())
+
// Upload the file using MinIO client with streaming (size = -1 for unknown size)
_, err = client.PutObject(
context.TODO(),
s.S3Bucket,
- fileID.String(),
+ objectKey,
file,
-1,
minio.PutObjectOptions{},
@@ -56,10 +61,12 @@ func (s *S3Storage) GetFile(fileID uuid.UUID) (io.ReadCloser, error) {
return nil, err
}
+ objectKey := s.buildObjectKey(fileID.String())
+
object, err := client.GetObject(
context.TODO(),
s.S3Bucket,
- fileID.String(),
+ objectKey,
minio.GetObjectOptions{},
)
if err != nil {
@@ -90,11 +97,13 @@ func (s *S3Storage) DeleteFile(fileID uuid.UUID) error {
return err
}
+ objectKey := s.buildObjectKey(fileID.String())
+
// Delete the object using MinIO client
err = client.RemoveObject(
context.TODO(),
s.S3Bucket,
- fileID.String(),
+ objectKey,
minio.RemoveObjectOptions{},
)
if err != nil {
@@ -150,6 +159,7 @@ func (s *S3Storage) TestConnection() error {
// Test write and delete permissions by uploading and removing a small test file
testFileID := uuid.New().String() + "-test"
+ testObjectKey := s.buildObjectKey(testFileID)
testData := []byte("test connection")
testReader := bytes.NewReader(testData)
@@ -157,7 +167,7 @@ func (s *S3Storage) TestConnection() error {
_, err = client.PutObject(
ctx,
s.S3Bucket,
- testFileID,
+ testObjectKey,
testReader,
int64(len(testData)),
minio.PutObjectOptions{},
@@ -170,7 +180,7 @@ func (s *S3Storage) TestConnection() error {
err = client.RemoveObject(
ctx,
s.S3Bucket,
- testFileID,
+ testObjectKey,
minio.RemoveObjectOptions{},
)
if err != nil {
@@ -189,6 +199,7 @@ func (s *S3Storage) Update(incoming *S3Storage) {
s.S3Bucket = incoming.S3Bucket
s.S3Region = incoming.S3Region
s.S3Endpoint = incoming.S3Endpoint
+ s.S3UseVirtualHostedStyle = incoming.S3UseVirtualHostedStyle
if incoming.S3AccessKey != "" {
s.S3AccessKey = incoming.S3AccessKey
@@ -197,6 +208,24 @@ func (s *S3Storage) Update(incoming *S3Storage) {
if incoming.S3SecretKey != "" {
s.S3SecretKey = incoming.S3SecretKey
}
+
+ // we do not allow to change the prefix after creation,
+ // otherwise we will have to migrate all the data to the new prefix
+}
+
+func (s *S3Storage) buildObjectKey(fileName string) string {
+ if s.S3Prefix == "" {
+ return fileName
+ }
+
+ prefix := s.S3Prefix
+ prefix = strings.TrimPrefix(prefix, "/")
+
+ if !strings.HasSuffix(prefix, "/") {
+ prefix = prefix + "/"
+ }
+
+ return prefix + fileName
}
func (s *S3Storage) getClient() (*minio.Client, error) {
@@ -215,11 +244,18 @@ func (s *S3Storage) getClient() (*minio.Client, error) {
endpoint = fmt.Sprintf("s3.%s.amazonaws.com", s.S3Region)
}
+ // Configure bucket lookup strategy
+ bucketLookup := minio.BucketLookupAuto
+ if s.S3UseVirtualHostedStyle {
+ bucketLookup = minio.BucketLookupDNS
+ }
+
// Initialize the MinIO client
minioClient, err := minio.New(endpoint, &minio.Options{
- Creds: credentials.NewStaticV4(s.S3AccessKey, s.S3SecretKey, ""),
- Secure: useSSL,
- Region: s.S3Region,
+ Creds: credentials.NewStaticV4(s.S3AccessKey, s.S3SecretKey, ""),
+ Secure: useSSL,
+ Region: s.S3Region,
+ BucketLookup: bucketLookup,
})
if err != nil {
return nil, fmt.Errorf("failed to initialize MinIO client: %w", err)
diff --git a/backend/migrations/20251116075135_add_virtual_host_and_prefix_to_s3.sql b/backend/migrations/20251116075135_add_virtual_host_and_prefix_to_s3.sql
new file mode 100644
index 00000000..40dc77df
--- /dev/null
+++ b/backend/migrations/20251116075135_add_virtual_host_and_prefix_to_s3.sql
@@ -0,0 +1,17 @@
+-- +goose Up
+-- +goose StatementBegin
+ALTER TABLE s3_storages
+ ADD COLUMN s3_prefix TEXT;
+
+ALTER TABLE s3_storages
+ ADD COLUMN s3_use_virtual_hosted_style BOOLEAN NOT NULL DEFAULT FALSE;
+-- +goose StatementEnd
+
+-- +goose Down
+-- +goose StatementBegin
+ALTER TABLE s3_storages
+ DROP COLUMN s3_use_virtual_hosted_style;
+
+ALTER TABLE s3_storages
+ DROP COLUMN s3_prefix;
+-- +goose StatementEnd
diff --git a/frontend/src/entity/storages/models/S3Storage.ts b/frontend/src/entity/storages/models/S3Storage.ts
index 3216ee28..40c741bc 100644
--- a/frontend/src/entity/storages/models/S3Storage.ts
+++ b/frontend/src/entity/storages/models/S3Storage.ts
@@ -4,4 +4,6 @@ export interface S3Storage {
s3AccessKey: string;
s3SecretKey: string;
s3Endpoint?: string;
+ s3Prefix?: string;
+ s3UseVirtualHostedStyle?: boolean;
}
diff --git a/frontend/src/features/databases/ui/CreateDatabaseComponent.tsx b/frontend/src/features/databases/ui/CreateDatabaseComponent.tsx
index aa61e1e1..2c3c9d09 100644
--- a/frontend/src/features/databases/ui/CreateDatabaseComponent.tsx
+++ b/frontend/src/features/databases/ui/CreateDatabaseComponent.tsx
@@ -16,7 +16,7 @@ import { EditDatabaseSpecificDataComponent } from './edit/EditDatabaseSpecificDa
interface Props {
workspaceId: string;
- onCreated: () => void;
+ onCreated: (databaseId: string) => void;
onClose: () => void;
}
@@ -58,7 +58,7 @@ export const CreateDatabaseComponent = ({ workspaceId, onCreated, onClose }: Pro
await backupsApi.makeBackup(createdDatabase.id);
}
- onCreated();
+ onCreated(createdDatabase.id);
onClose();
} catch (error) {
alert(error);
diff --git a/frontend/src/features/databases/ui/DatabasesComponent.tsx b/frontend/src/features/databases/ui/DatabasesComponent.tsx
index 6aa35896..f7da05a7 100644
--- a/frontend/src/features/databases/ui/DatabasesComponent.tsx
+++ b/frontend/src/features/databases/ui/DatabasesComponent.tsx
@@ -14,6 +14,8 @@ interface Props {
isCanManageDBs: boolean;
}
+const SELECTED_DATABASE_STORAGE_KEY = 'selectedDatabaseId';
+
export const DatabasesComponent = ({ contentHeight, workspace, isCanManageDBs }: Props) => {
const [isLoading, setIsLoading] = useState(true);
const [databases, setDatabases] = useState<Database[]>([]);
@@ -22,7 +24,16 @@ export const DatabasesComponent = ({ contentHeight, workspace, isCanManageDBs }:
const [isShowAddDatabase, setIsShowAddDatabase] = useState(false);
const [selectedDatabaseId, setSelectedDatabaseId] = useState<string | undefined>(undefined);
- const loadDatabases = (isSilent = false) => {
+ const updateSelectedDatabaseId = (databaseId: string | undefined) => {
+ setSelectedDatabaseId(databaseId);
+ if (databaseId) {
+ localStorage.setItem(`${SELECTED_DATABASE_STORAGE_KEY}_${workspace.id}`, databaseId);
+ } else {
+ localStorage.removeItem(`${SELECTED_DATABASE_STORAGE_KEY}_${workspace.id}`);
+ }
+ };
+
+ const loadDatabases = (isSilent = false, selectDatabaseId?: string) => {
if (!isSilent) {
setIsLoading(true);
}
@@ -31,8 +42,17 @@ export const DatabasesComponent = ({ contentHeight, workspace, isCanManageDBs }:
.getDatabases(workspace.id)
.then((databases) => {
setDatabases(databases);
- if (!selectedDatabaseId && !isSilent) {
- setSelectedDatabaseId(databases[0]?.id);
+ if (selectDatabaseId) {
+ updateSelectedDatabaseId(selectDatabaseId);
+ } else if (!selectedDatabaseId && !isSilent) {
+ const savedDatabaseId = localStorage.getItem(
+ `${SELECTED_DATABASE_STORAGE_KEY}_${workspace.id}`,
+ );
+ const databaseToSelect =
+ savedDatabaseId && databases.some((db) => db.id === savedDatabaseId)
+ ? savedDatabaseId
+ : databases[0]?.id;
+ updateSelectedDatabaseId(databaseToSelect);
}
})
.catch((e) => alert(e.message))
@@ -95,7 +115,7 @@ export const DatabasesComponent = ({ contentHeight, workspace, isCanManageDBs }:
key={database.id}
database={database}
selectedDatabaseId={selectedDatabaseId}
- setSelectedDatabaseId={setSelectedDatabaseId}
+ setSelectedDatabaseId={updateSelectedDatabaseId}
/>
))
: searchQuery && (
@@ -119,10 +139,11 @@ export const DatabasesComponent = ({ contentHeight, workspace, isCanManageDBs }:
loadDatabases();
}}
onDatabaseDeleted={() => {
- loadDatabases();
- setSelectedDatabaseId(
- databases.filter((database) => database.id !== selectedDatabaseId)[0]?.id,
+ const remainingDatabases = databases.filter(
+ (database) => database.id !== selectedDatabaseId,
);
+ updateSelectedDatabaseId(remainingDatabases[0]?.id);
+ loadDatabases();
}}
isCanManageDBs={isCanManageDBs}
/>
@@ -141,8 +162,8 @@ export const DatabasesComponent = ({ contentHeight, workspace, isCanManageDBs }:
<CreateDatabaseComponent
workspaceId={workspace.id}
- onCreated={() => {
- loadDatabases();
+ onCreated={(databaseId) => {
+ loadDatabases(false, databaseId);
setIsShowAddDatabase(false);
}}
onClose={() => setIsShowAddDatabase(false)}
diff --git a/frontend/src/features/notifiers/ui/edit/EditNotifierComponent.tsx b/frontend/src/features/notifiers/ui/edit/EditNotifierComponent.tsx
index ac502f43..eba90e67 100644
--- a/frontend/src/features/notifiers/ui/edit/EditNotifierComponent.tsx
+++ b/frontend/src/features/notifiers/ui/edit/EditNotifierComponent.tsx
@@ -255,7 +255,10 @@ export function EditNotifierComponent({
<EditTelegramNotifierComponent
notifier={notifier}
setNotifier={setNotifier}
- setIsUnsaved={setIsUnsaved}
+ setUnsaved={() => {
+ setIsUnsaved(true);
+ setIsTestNotificationSuccess(false);
+ }}
/>
)}
@@ -263,7 +266,10 @@ export function EditNotifierComponent({
<EditEmailNotifierComponent
notifier={notifier}
setNotifier={setNotifier}
- setIsUnsaved={setIsUnsaved}
+ setUnsaved={() => {
+ setIsUnsaved(true);
+ setIsTestNotificationSuccess(false);
+ }}
/>
)}
@@ -271,7 +277,10 @@ export function EditNotifierComponent({
<EditWebhookNotifierComponent
notifier={notifier}
setNotifier={setNotifier}
- setIsUnsaved={setIsUnsaved}
+ setUnsaved={() => {
+ setIsUnsaved(true);
+ setIsTestNotificationSuccess(false);
+ }}
/>
)}
@@ -279,7 +288,10 @@ export function EditNotifierComponent({
<EditSlackNotifierComponent
notifier={notifier}
setNotifier={setNotifier}
- setIsUnsaved={setIsUnsaved}
+ setUnsaved={() => {
+ setIsUnsaved(true);
+ setIsTestNotificationSuccess(false);
+ }}
/>
)}
@@ -287,14 +299,20 @@ export function EditNotifierComponent({
<EditDiscordNotifierComponent
notifier={notifier}
setNotifier={setNotifier}
- setIsUnsaved={setIsUnsaved}
+ setUnsaved={() => {
+ setIsUnsaved(true);
+ setIsTestNotificationSuccess(false);
+ }}
/>
)}
{notifier?.notifierType === NotifierType.TEAMS && (
<EditTeamsNotifierComponent
notifier={notifier}
setNotifier={setNotifier}
- setIsUnsaved={setIsUnsaved}
+ setUnsaved={() => {
+ setIsUnsaved(true);
+ setIsTestNotificationSuccess(false);
+ }}
/>
)}
</div>
diff --git a/frontend/src/features/notifiers/ui/edit/notifiers/EditDiscordNotifierComponent.tsx b/frontend/src/features/notifiers/ui/edit/notifiers/EditDiscordNotifierComponent.tsx
index afde3552..198e4f8b 100644
--- a/frontend/src/features/notifiers/ui/edit/notifiers/EditDiscordNotifierComponent.tsx
+++ b/frontend/src/features/notifiers/ui/edit/notifiers/EditDiscordNotifierComponent.tsx
@@ -5,10 +5,10 @@ import type { Notifier } from '../../../../../entity/notifiers';
interface Props {
notifier: Notifier;
setNotifier: (notifier: Notifier) => void;
- setIsUnsaved: (isUnsaved: boolean) => void;
+ setUnsaved: () => void;
}
-export function EditDiscordNotifierComponent({ notifier, setNotifier, setIsUnsaved }: Props) {
+export function EditDiscordNotifierComponent({ notifier, setNotifier, setUnsaved }: Props) {
return (
<>
<div className="flex">
@@ -26,7 +26,7 @@ export function EditDiscordNotifierComponent({ notifier, setNotifier, setIsUnsav
channelWebhookUrl: e.target.value.trim(),
},
});
- setIsUnsaved(true);
+ setUnsaved();
}}
size="small"
className="w-full"
diff --git a/frontend/src/features/notifiers/ui/edit/notifiers/EditEmailNotifierComponent.tsx b/frontend/src/features/notifiers/ui/edit/notifiers/EditEmailNotifierComponent.tsx
index 593f8560..981f2f5b 100644
--- a/frontend/src/features/notifiers/ui/edit/notifiers/EditEmailNotifierComponent.tsx
+++ b/frontend/src/features/notifiers/ui/edit/notifiers/EditEmailNotifierComponent.tsx
@@ -6,10 +6,10 @@ import type { Notifier } from '../../../../../entity/notifiers';
interface Props {
notifier: Notifier;
setNotifier: (notifier: Notifier) => void;
- setIsUnsaved: (isUnsaved: boolean) => void;
+ setUnsaved: () => void;
}
-export function EditEmailNotifierComponent({ notifier, setNotifier, setIsUnsaved }: Props) {
+export function EditEmailNotifierComponent({ notifier, setNotifier, setUnsaved }: Props) {
return (
<>
<div className="mb-1 flex items-center">
@@ -26,7 +26,7 @@ export function EditEmailNotifierComponent({ notifier, setNotifier, setIsUnsaved
targetEmail: e.target.value.trim(),
},
});
- setIsUnsaved(true);
+ setUnsaved();
}}
size="small"
className="w-full max-w-[250px]"
@@ -52,7 +52,7 @@ export function EditEmailNotifierComponent({ notifier, setNotifier, setIsUnsaved
smtpHost: e.target.value.trim(),
},
});
- setIsUnsaved(true);
+ setUnsaved();
}}
size="small"
className="w-full max-w-[250px]"
@@ -75,7 +75,7 @@ export function EditEmailNotifierComponent({ notifier, setNotifier, setIsUnsaved
smtpPort: Number(e.target.value),
},
});
- setIsUnsaved(true);
+ setUnsaved();
}}
size="small"
className="w-full max-w-[250px]"
@@ -97,7 +97,7 @@ export function EditEmailNotifierComponent({ notifier, setNotifier, setIsUnsaved
smtpUser: e.target.value.trim(),
},
});
- setIsUnsaved(true);
+ setUnsaved();
}}
size="small"
className="w-full max-w-[250px]"
@@ -120,7 +120,7 @@ export function EditEmailNotifierComponent({ notifier, setNotifier, setIsUnsaved
smtpPassword: e.target.value.trim(),
},
});
- setIsUnsaved(true);
+ setUnsaved();
}}
size="small"
className="w-full max-w-[250px]"
@@ -142,7 +142,7 @@ export function EditEmailNotifierComponent({ notifier, setNotifier, setIsUnsaved
from: e.target.value.trim(),
},
});
- setIsUnsaved(true);
+ setUnsaved();
}}
size="small"
className="w-full max-w-[250px]"
diff --git a/frontend/src/features/notifiers/ui/edit/notifiers/EditSlackNotifierComponent.tsx b/frontend/src/features/notifiers/ui/edit/notifiers/EditSlackNotifierComponent.tsx
index 93d3e2ba..27bb8146 100644
--- a/frontend/src/features/notifiers/ui/edit/notifiers/EditSlackNotifierComponent.tsx
+++ b/frontend/src/features/notifiers/ui/edit/notifiers/EditSlackNotifierComponent.tsx
@@ -5,10 +5,10 @@ import type { Notifier } from '../../../../../entity/notifiers';
interface Props {
notifier: Notifier;
setNotifier: (notifier: Notifier) => void;
- setIsUnsaved: (isUnsaved: boolean) => void;
+ setUnsaved: () => void;
}
-export function EditSlackNotifierComponent({ notifier, setNotifier, setIsUnsaved }: Props) {
+export function EditSlackNotifierComponent({ notifier, setNotifier, setUnsaved }: Props) {
return (
<>
<div className="mb-1 ml-[130px] max-w-[200px]" style={{ lineHeight: 1 }}>
@@ -38,7 +38,7 @@ export function EditSlackNotifierComponent({ notifier, setNotifier, setIsUnsaved
botToken: e.target.value.trim(),
},
});
- setIsUnsaved(true);
+ setUnsaved();
}}
size="small"
className="w-full"
@@ -63,7 +63,7 @@ export function EditSlackNotifierComponent({ notifier, setNotifier, setIsUnsaved
targetChatId: e.target.value.trim(),
},
});
- setIsUnsaved(true);
+ setUnsaved();
}}
size="small"
className="w-full"
diff --git a/frontend/src/features/notifiers/ui/edit/notifiers/EditTeamsNotifierComponent.tsx b/frontend/src/features/notifiers/ui/edit/notifiers/EditTeamsNotifierComponent.tsx
index 0bea827c..d2c500c3 100644
--- a/frontend/src/features/notifiers/ui/edit/notifiers/EditTeamsNotifierComponent.tsx
+++ b/frontend/src/features/notifiers/ui/edit/notifiers/EditTeamsNotifierComponent.tsx
@@ -7,10 +7,10 @@ import type { Notifier } from '../../../../../entity/notifiers';
interface Props {
notifier: Notifier;
setNotifier: (notifier: Notifier) => void;
- setIsUnsaved: (isUnsaved: boolean) => void;
+ setUnsaved: () => void;
}
-export function EditTeamsNotifierComponent({ notifier, setNotifier, setIsUnsaved }: Props) {
+export function EditTeamsNotifierComponent({ notifier, setNotifier, setUnsaved }: Props) {
const value = notifier?.teamsNotifier?.powerAutomateUrl || '';
const onChange = (e: React.ChangeEvent<HTMLInputElement>) => {
@@ -22,7 +22,7 @@ export function EditTeamsNotifierComponent({ notifier, setNotifier, setIsUnsaved
powerAutomateUrl,
},
});
- setIsUnsaved(true);
+ setUnsaved();
};
return (
diff --git a/frontend/src/features/notifiers/ui/edit/notifiers/EditTelegramNotifierComponent.tsx b/frontend/src/features/notifiers/ui/edit/notifiers/EditTelegramNotifierComponent.tsx
index ede4d2d7..b2d49d19 100644
--- a/frontend/src/features/notifiers/ui/edit/notifiers/EditTelegramNotifierComponent.tsx
+++ b/frontend/src/features/notifiers/ui/edit/notifiers/EditTelegramNotifierComponent.tsx
@@ -7,10 +7,10 @@ import type { Notifier } from '../../../../../entity/notifiers';
interface Props {
notifier: Notifier;
setNotifier: (notifier: Notifier) => void;
- setIsUnsaved: (isUnsaved: boolean) => void;
+ setUnsaved: () => void;
}
-export function EditTelegramNotifierComponent({ notifier, setNotifier, setIsUnsaved }: Props) {
+export function EditTelegramNotifierComponent({ notifier, setNotifier, setUnsaved }: Props) {
const [isShowHowToGetChatId, setIsShowHowToGetChatId] = useState(false);
useEffect(() => {
@@ -42,7 +42,7 @@ export function EditTelegramNotifierComponent({ notifier, setNotifier, setIsUnsa
botToken: e.target.value.trim(),
},
});
- setIsUnsaved(true);
+ setUnsaved();
}}
size="small"
className="w-full"
@@ -78,7 +78,7 @@ export function EditTelegramNotifierComponent({ notifier, setNotifier, setIsUnsa
targetChatId: e.target.value.trim(),
},
});
- setIsUnsaved(true);
+ setUnsaved();
}}
size="small"
className="w-full"
@@ -137,7 +137,7 @@ export function EditTelegramNotifierComponent({ notifier, setNotifier, setIsUnsa
threadId: checked ? notifier.telegramNotifier.threadId : undefined,
},
});
- setIsUnsaved(true);
+ setUnsaved();
}}
size="small"
/>
@@ -171,7 +171,7 @@ export function EditTelegramNotifierComponent({ notifier, setNotifier, setIsUnsa
threadId: !isNaN(threadId!) ? threadId : undefined,
},
});
- setIsUnsaved(true);
+ setUnsaved();
}}
size="small"
className="w-full"
diff --git a/frontend/src/features/notifiers/ui/edit/notifiers/EditWebhookNotifierComponent.tsx b/frontend/src/features/notifiers/ui/edit/notifiers/EditWebhookNotifierComponent.tsx
index e79aa990..2365db95 100644
--- a/frontend/src/features/notifiers/ui/edit/notifiers/EditWebhookNotifierComponent.tsx
+++ b/frontend/src/features/notifiers/ui/edit/notifiers/EditWebhookNotifierComponent.tsx
@@ -7,10 +7,10 @@ import { WebhookMethod } from '../../../../../entity/notifiers/models/webhook/We
interface Props {
notifier: Notifier;
setNotifier: (notifier: Notifier) => void;
- setIsUnsaved: (isUnsaved: boolean) => void;
+ setUnsaved: () => void;
}
-export function EditWebhookNotifierComponent({ notifier, setNotifier, setIsUnsaved }: Props) {
+export function EditWebhookNotifierComponent({ notifier, setNotifier, setUnsaved }: Props) {
return (
<>
<div className="flex items-center">
@@ -27,7 +27,7 @@ export function EditWebhookNotifierComponent({ notifier, setNotifier, setIsUnsav
webhookUrl: e.target.value.trim(),
},
});
- setIsUnsaved(true);
+ setUnsaved();
}}
size="small"
className="w-full"
@@ -50,7 +50,7 @@ export function EditWebhookNotifierComponent({ notifier, setNotifier, setIsUnsav
webhookMethod: value,
},
});
- setIsUnsaved(true);
+ setUnsaved();
}}
size="small"
className="w-full"
diff --git a/frontend/src/features/storages/ui/edit/EditStorageComponent.tsx b/frontend/src/features/storages/ui/edit/EditStorageComponent.tsx
index c90fb26f..72d1c366 100644
--- a/frontend/src/features/storages/ui/edit/EditStorageComponent.tsx
+++ b/frontend/src/features/storages/ui/edit/EditStorageComponent.tsx
@@ -250,7 +250,10 @@ export function EditStorageComponent({
<EditS3StorageComponent
storage={storage}
setStorage={setStorage}
- setIsUnsaved={setIsUnsaved}
+ setUnsaved={() => {
+ setIsUnsaved(true);
+ setIsTestConnectionSuccess(false);
+ }}
/>
)}
@@ -258,7 +261,10 @@ export function EditStorageComponent({
<EditGoogleDriveStorageComponent
storage={storage}
setStorage={setStorage}
- setIsUnsaved={setIsUnsaved}
+ setUnsaved={() => {
+ setIsUnsaved(true);
+ setIsTestConnectionSuccess(false);
+ }}
/>
)}
@@ -266,7 +272,10 @@ export function EditStorageComponent({
<EditNASStorageComponent
storage={storage}
setStorage={setStorage}
- setIsUnsaved={setIsUnsaved}
+ setUnsaved={() => {
+ setIsUnsaved(true);
+ setIsTestConnectionSuccess(false);
+ }}
/>
)}
</div>
diff --git a/frontend/src/features/storages/ui/edit/storages/EditGoogleDriveStorageComponent.tsx b/frontend/src/features/storages/ui/edit/storages/EditGoogleDriveStorageComponent.tsx
index 8d39a0fd..7bd3c7a3 100644
--- a/frontend/src/features/storages/ui/edit/storages/EditGoogleDriveStorageComponent.tsx
+++ b/frontend/src/features/storages/ui/edit/storages/EditGoogleDriveStorageComponent.tsx
@@ -7,10 +7,10 @@ import type { StorageOauthDto } from '../../../../../entity/storages/models/Stor
interface Props {
storage: Storage;
setStorage: (storage: Storage) => void;
- setIsUnsaved: (isUnsaved: boolean) => void;
+ setUnsaved: () => void;
}
-export function EditGoogleDriveStorageComponent({ storage, setStorage, setIsUnsaved }: Props) {
+export function EditGoogleDriveStorageComponent({ storage, setStorage, setUnsaved }: Props) {
const goToAuthUrl = () => {
if (!storage?.googleDriveStorage?.clientId || !storage?.googleDriveStorage?.clientSecret) {
return;
@@ -60,7 +60,7 @@ export function EditGoogleDriveStorageComponent({ storage, setStorage, setIsUnsa
clientId: e.target.value.trim(),
},
});
- setIsUnsaved(true);
+ setUnsaved();
}}
size="small"
className="w-full max-w-[250px]"
@@ -83,7 +83,7 @@ export function EditGoogleDriveStorageComponent({ storage, setStorage, setIsUnsa
clientSecret: e.target.value.trim(),
},
});
- setIsUnsaved(true);
+ setUnsaved();
}}
size="small"
className="w-full max-w-[250px]"
diff --git a/frontend/src/features/storages/ui/edit/storages/EditNASStorageComponent.tsx b/frontend/src/features/storages/ui/edit/storages/EditNASStorageComponent.tsx
index 3cd4cca4..56d2691b 100644
--- a/frontend/src/features/storages/ui/edit/storages/EditNASStorageComponent.tsx
+++ b/frontend/src/features/storages/ui/edit/storages/EditNASStorageComponent.tsx
@@ -6,10 +6,10 @@ import type { Storage } from '../../../../../entity/storages';
interface Props {
storage: Storage;
setStorage: (storage: Storage) => void;
- setIsUnsaved: (isUnsaved: boolean) => void;
+ setUnsaved: () => void;
}
-export function EditNASStorageComponent({ storage, setStorage, setIsUnsaved }: Props) {
+export function EditNASStorageComponent({ storage, setStorage, setUnsaved }: Props) {
return (
<>
<div className="mb-1 flex items-center">
@@ -26,7 +26,7 @@ export function EditNASStorageComponent({ storage, setStorage, setIsUnsaved }: P
host: e.target.value.trim(),
},
});
- setIsUnsaved(true);
+ setUnsaved();
}}
size="small"
className="w-full max-w-[250px]"
@@ -48,7 +48,7 @@ export function EditNASStorageComponent({ storage, setStorage, setIsUnsaved }: P
port: value,
},
});
- setIsUnsaved(true);
+ setUnsaved();
}}
size="small"
className="w-full max-w-[250px]"
@@ -72,7 +72,7 @@ export function EditNASStorageComponent({ storage, setStorage, setIsUnsaved }: P
share: e.target.value.trim(),
},
});
- setIsUnsaved(true);
+ setUnsaved();
}}
size="small"
className="w-full max-w-[250px]"
@@ -94,7 +94,7 @@ export function EditNASStorageComponent({ storage, setStorage, setIsUnsaved }: P
username: e.target.value.trim(),
},
});
- setIsUnsaved(true);
+ setUnsaved();
}}
size="small"
className="w-full max-w-[250px]"
@@ -116,7 +116,7 @@ export function EditNASStorageComponent({ storage, setStorage, setIsUnsaved }: P
password: e.target.value,
},
});
- setIsUnsaved(true);
+ setUnsaved();
}}
size="small"
className="w-full max-w-[250px]"
@@ -138,7 +138,7 @@ export function EditNASStorageComponent({ storage, setStorage, setIsUnsaved }: P
useSsl: checked,
},
});
- setIsUnsaved(true);
+ setUnsaved();
}}
size="small"
/>
@@ -162,7 +162,7 @@ export function EditNASStorageComponent({ storage, setStorage, setIsUnsaved }: P
domain: e.target.value.trim() || undefined,
},
});
- setIsUnsaved(true);
+ setUnsaved();
}}
size="small"
className="w-full max-w-[250px]"
@@ -197,7 +197,7 @@ export function EditNASStorageComponent({ storage, setStorage, setIsUnsaved }: P
path: pathValue || undefined,
},
});
- setIsUnsaved(true);
+ setUnsaved();
}}
size="small"
className="w-full max-w-[250px]"
diff --git a/frontend/src/features/storages/ui/edit/storages/EditS3StorageComponent.tsx b/frontend/src/features/storages/ui/edit/storages/EditS3StorageComponent.tsx
index bda11847..1ef7161f 100644
--- a/frontend/src/features/storages/ui/edit/storages/EditS3StorageComponent.tsx
+++ b/frontend/src/features/storages/ui/edit/storages/EditS3StorageComponent.tsx
@@ -1,15 +1,20 @@
-import { InfoCircleOutlined } from '@ant-design/icons';
-import { Input, Tooltip } from 'antd';
+import { DownOutlined, InfoCircleOutlined, UpOutlined } from '@ant-design/icons';
+import { Checkbox, Input, Tooltip } from 'antd';
+import { useState } from 'react';
import type { Storage } from '../../../../../entity/storages';
interface Props {
storage: Storage;
setStorage: (storage: Storage) => void;
- setIsUnsaved: (isUnsaved: boolean) => void;
+ setUnsaved: () => void;
}
-export function EditS3StorageComponent({ storage, setStorage, setIsUnsaved }: Props) {
+export function EditS3StorageComponent({ storage, setStorage, setUnsaved }: Props) {
+ const hasAdvancedValues =
+ !!storage?.s3Storage?.s3Prefix || !!storage?.s3Storage?.s3UseVirtualHostedStyle;
+ const [showAdvanced, setShowAdvanced] = useState(hasAdvancedValues);
+
return (
<>
<div className="mb-2 flex items-center">
@@ -36,7 +41,7 @@ export function EditS3StorageComponent({ storage, setStorage, setIsUnsaved }: Pr
s3Bucket: e.target.value.trim(),
},
});
- setIsUnsaved(true);
+ setUnsaved();
}}
size="small"
className="w-full max-w-[250px]"
@@ -58,7 +63,7 @@ export function EditS3StorageComponent({ storage, setStorage, setIsUnsaved }: Pr
s3Region: e.target.value.trim(),
},
});
- setIsUnsaved(true);
+ setUnsaved();
}}
size="small"
className="w-full max-w-[250px]"
@@ -67,7 +72,7 @@ export function EditS3StorageComponent({ storage, setStorage, setIsUnsaved }: Pr
</div>
<div className="mb-1 flex items-center">
- <div className="min-w-[110px]">Access Key</div>
+ <div className="min-w-[110px]">Access key</div>
<Input.Password
value={storage?.s3Storage?.s3AccessKey || ''}
onChange={(e) => {
@@ -80,7 +85,7 @@ export function EditS3StorageComponent({ storage, setStorage, setIsUnsaved }: Pr
s3AccessKey: e.target.value.trim(),
},
});
- setIsUnsaved(true);
+ setUnsaved();
}}
size="small"
className="w-full max-w-[250px]"
@@ -89,7 +94,7 @@ export function EditS3StorageComponent({ storage, setStorage, setIsUnsaved }: Pr
</div>
<div className="mb-1 flex items-center">
- <div className="min-w-[110px]">Secret Key</div>
+ <div className="min-w-[110px]">Secret key</div>
<Input.Password
value={storage?.s3Storage?.s3SecretKey || ''}
onChange={(e) => {
@@ -102,7 +107,7 @@ export function EditS3StorageComponent({ storage, setStorage, setIsUnsaved }: Pr
s3SecretKey: e.target.value.trim(),
},
});
- setIsUnsaved(true);
+ setUnsaved();
}}
size="small"
className="w-full max-w-[250px]"
@@ -124,7 +129,7 @@ export function EditS3StorageComponent({ storage, setStorage, setIsUnsaved }: Pr
s3Endpoint: e.target.value.trim(),
},
});
- setIsUnsaved(true);
+ setUnsaved();
}}
size="small"
className="w-full max-w-[250px]"
@@ -138,6 +143,85 @@ export function EditS3StorageComponent({ storage, setStorage, setIsUnsaved }: Pr
<InfoCircleOutlined className="ml-2" style={{ color: 'gray' }} />
</Tooltip>
</div>
+
+ <div className="mt-4 mb-3 flex items-center">
+ <div
+ className="flex cursor-pointer items-center text-sm text-blue-600 hover:text-blue-800"
+ onClick={() => setShowAdvanced(!showAdvanced)}
+ >
+ <span className="mr-2">Advanced settings</span>
+
+ {showAdvanced ? (
+ <UpOutlined style={{ fontSize: '12px' }} />
+ ) : (
+ <DownOutlined style={{ fontSize: '12px' }} />
+ )}
+ </div>
+ </div>
+
+ {showAdvanced && (
+ <>
+ <div className="mb-1 flex items-center">
+ <div className="min-w-[110px]">Folder prefix</div>
+ <Input
+ value={storage?.s3Storage?.s3Prefix || ''}
+ onChange={(e) => {
+ if (!storage?.s3Storage) return;
+
+ setStorage({
+ ...storage,
+ s3Storage: {
+ ...storage.s3Storage,
+ s3Prefix: e.target.value.trim(),
+ },
+ });
+ setUnsaved();
+ }}
+ size="small"
+ className="w-full max-w-[250px]"
+ placeholder="my-prefix/ (optional)"
+ />
+
+ <Tooltip
+ className="cursor-pointer"
+ title="Optional prefix for all object keys (e.g., 'backups/' or 'my_team/'). May not work with some S3-compatible storages."
+ >
+ <InfoCircleOutlined className="ml-2" style={{ color: 'gray' }} />
+ </Tooltip>
+ </div>
+
+ <div className="mb-1 flex items-center">
+ <div className="min-w-[110px]">Virtual host</div>
+
+ <Checkbox
+ checked={storage?.s3Storage?.s3UseVirtualHostedStyle || false}
+ onChange={(e) => {
+ if (!storage?.s3Storage) return;
+
+ setStorage({
+ ...storage,
+ s3Storage: {
+ ...storage.s3Storage,
+ s3UseVirtualHostedStyle: e.target.checked,
+ },
+ });
+ setUnsaved();
+ }}
+ >
+ Use virtual-styled domains
+ </Checkbox>
+
+ <Tooltip
+ className="cursor-pointer"
+ title="Use virtual-hosted-style URLs (bucket.s3.region.amazonaws.com) instead of path-style (s3.region.amazonaws.com/bucket). May be required if you see COS errors."
+ >
+ <InfoCircleOutlined className="ml-2" style={{ color: 'gray' }} />
+ </Tooltip>
+ </div>
+ </>
+ )}
+
+ <div className="mb-5" />
</>
);
}
diff --git a/frontend/src/features/storages/ui/show/storages/ShowS3StorageComponent.tsx b/frontend/src/features/storages/ui/show/storages/ShowS3StorageComponent.tsx
index f35bba35..4eb8fdb6 100644
--- a/frontend/src/features/storages/ui/show/storages/ShowS3StorageComponent.tsx
+++ b/frontend/src/features/storages/ui/show/storages/ShowS3StorageComponent.tsx
@@ -31,6 +31,20 @@ export function ShowS3StorageComponent({ storage }: Props) {
<div className="min-w-[110px]">Endpoint</div>
{storage?.s3Storage?.s3Endpoint || '-'}
</div>
+
+ {storage?.s3Storage?.s3Prefix && (
+ <div className="mb-1 flex items-center">
+ <div className="min-w-[110px]">Prefix</div>
+ {storage.s3Storage.s3Prefix}
+ </div>
+ )}
+
+ {storage?.s3Storage?.s3UseVirtualHostedStyle && (
+ <div className="mb-1 flex items-center">
+ <div className="min-w-[110px]">Virtual Host</div>
+ Enabled
+ </div>
+ )}
</>
);
}