msb-public
/
wiki
mirror of https://github.com/requarks/wiki
1
0
Code Issues Projects Releases Wiki Activity

feat: new page UI + db fixes + installer improvements

Browse Source
pull/621/head
Nicolas Giard 6 years ago
parent 04c972c1d0
commit 4bb522f9d9
21 changed files with 357 additions and 182 deletions
Show Stats Download Patch File Download Diff File

5
client/components/login.vue
Unescape View File

@ -223,7 +223,7 @@ export default {
<style lang="scss">
.login {
background-color: mc('blue', '800');
background-image: url('../static/svg/login-bg-motif.svg');
background-image: url('../static/svg/motif-blocks.svg');
background-repeat: repeat;
background-size: 200px;
width: 100%;
@ -246,10 +246,9 @@ export default {
content: '';
position: absolute;
background-color: #0d47a1;
background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='100%25' height='100%25' viewBox='0 0 1600 800'%3E%3Cg %3E%3Cpath fill='%231356b1' d='M486 705.8c-109.3-21.8-223.4-32.2-335.3-19.4C99.5 692.1 49 703 0 719.8V800h843.8c-115.9-33.2-230.8-68.1-347.6-92.2C492.8 707.1 489.4 706.5 486 705.8z'/%3E%3Cpath fill='%231866c1' d='M1600 0H0v719.8c49-16.8 99.5-27.8 150.7-33.5c111.9-12.7 226-2.4 335.3 19.4c3.4 0.7 6.8 1.4 10.2 2c116.8 24 231.7 59 347.6 92.2H1600V0z'/%3E%3Cpath fill='%231c75d2' d='M478.4 581c3.2 0.8 6.4 1.7 9.5 2.5c196.2 52.5 388.7 133.5 593.5 176.6c174.2 36.6 349.5 29.2 518.6-10.2V0H0v574.9c52.3-17.6 106.5-27.7 161.1-30.9C268.4 537.4 375.7 554.2 478.4 581z'/%3E%3Cpath fill='%231f86e2' d='M0 0v429.4c55.6-18.4 113.5-27.3 171.4-27.7c102.8-0.8 203.2 22.7 299.3 54.5c3 1 5.9 2 8.9 3c183.6 62 365.7 146.1 562.4 192.1c186.7 43.7 376.3 34.4 557.9-12.6V0H0z'/%3E%3Cpath fill='%232196f3' d='M181.8 259.4c98.2 6 191.9 35.2 281.3 72.1c2.8 1.1 5.5 2.3 8.3 3.4c171 71.6 342.7 158.5 531.3 207.7c198.8 51.8 403.4 40.8 597.3-14.8V0H0v283.2C59 263.6 120.6 255.7 181.8 259.4z'/%3E%3Cpath fill='%2355a4f5' d='M1600 0H0v136.3c62.3-20.9 127.7-27.5 192.2-19.2c93.6 12.1 180.5 47.7 263.3 89.6c2.6 1.3 5.1 2.6 7.7 3.9c158.4 81.1 319.7 170.9 500.3 223.2c210.5 61 430.8 49 636.6-16.6V0z'/%3E%3Cpath fill='%2374b2f7' d='M454.9 86.3C600.7 177 751.6 269.3 924.1 325c208.6 67.4 431.3 60.8 637.9-5.3c12.8-4.1 25.4-8.4 38.1-12.9V0H288.1c56 21.3 108.7 50.6 159.7 82C450.2 83.4 452.5 84.9 454.9 86.3z'/%3E%3Cpath fill='%238ec0f8' d='M1600 0H498c118.1 85.8 243.5 164.5 386.8 216.2c191.8 69.2 400 74.7 595 21.1c40.8-11.2 81.1-25.2 120.3-41.7V0z'/%3E%3Cpath fill='%23a5cffa' d='M1397.5 154.8c47.2-10.6 93.6-25.3 138.6-43.8c21.7-8.9 43-18.8 63.9-29.5V0H643.4c62.9 41.7 129.7 78.2 202.1 107.4C1020.4 178.1 1214.2 196.1 1397.5 154.8z'/%3E%3Cpath fill='%23bbdefb' d='M1315.3 72.4c75.3-12.6 148.9-37.1 216.8-72.4h-723C966.8 71 1144.7 101 1315.3 72.4z'/%3E%3C/g%3E%3C/svg%3E");
background-image: url('../static/svg/motif-overlay.svg');
background-attachment: fixed;
background-size: cover;
/* background by SVGBackgrounds.com */
opacity: .5;
top: 0;
left: 0;

1
client/scss/app.scss
Unescape View File

@ -18,6 +18,7 @@
@import '~xterm/dist/xterm.css';
// @import 'node_modules/diff2html/dist/diff2html.min';
@import 'pages/new';
@import 'pages/welcome';
@import 'pages/error';

81
client/scss/pages/_new.scss
Unescape View File

@ -0,0 +1,81 @@
.newpage {
background: linear-gradient(to bottom, mc('blue', '900') 0%, mc('blue', '800') 100%);
height: 100%;
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
color: mc('grey', '50');
&::before {
content: '';
display:block;
width: 100%;
height: 100%;
position: absolute;
top: 0;
left: 0;
background-image: url('../static/svg/motif-circuit.svg');
background-position: center center;
background-repeat: repeat;
background-size: 200px;
z-index: 0;
opacity: .75;
animation: onboardingBgReveal 80s linear infinite;
@include keyframes(onboardingBgReveal) {
0% {
background-position-y: 0;
}
100% {
background-position-y: -2000px;
}
}
}
&::after {
content: '';
position: absolute;
background-color: #0d47a1;
background-image: url('../static/svg/motif-overlay.svg');
background-attachment: fixed;
background-size: cover;
opacity: .5;
top: 0;
left: 0;
width: 100vw;
height: 100vh;
}
&-content {
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
z-index: 2;
}
img {
height: 250px;
margin-bottom: 3rem;
z-index: 2;
animation-duration: 3s;
@include until($tablet) {
height: 200px;
}
}
h1 {
font-size: 1.5rem;
margin-bottom: 1rem;
z-index: 2;
}
h2 {
margin-bottom: 3rem;
z-index: 2;
}
.v-btn {
z-index: 2;
}
}

22
client/scss/pages/_welcome.scss
Unescape View File

@ -15,7 +15,7 @@
position: absolute;
top: 0;
left: 0;
background-image: url('../static/svg/login-bg-motif.svg');
background-image: url('../static/svg/motif-blocks.svg');
background-position: center center;
background-repeat: repeat;
background-size: 500px;
@ -33,20 +33,12 @@
}
}
&::after {
content: '';
display: block;
width: 95vw;
height: 95vh;
border: 3px dotted rgba(255,255,255,.2);
border-radius: 50px;
position: absolute;
top: 0;
left: 0;
right: 0;
bottom: 0;
margin: auto;
z-index: 1;
&-content {
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
z-index: 2;
}
img {

66
client/static/svg/henry-thinking.svg
Unescape View File

@ -0,0 +1,66 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg width="100%" height="100%" viewBox="0 0 305 415" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linecap:round;stroke-linejoin:round;">
<path d="M294.071,253.036C283.079,230.708 265.666,216.243 239.645,214.576C217.44,213.154 199.977,221.13 188.688,240.764C183.28,250.17 179.734,260.376 177.471,270.996C176.686,274.684 176.072,278.408 175.38,282.115C173.136,275.175 171.412,268.267 169.986,261.299C168.107,252.118 165.923,242.935 167.39,233.436C168.472,226.43 168.716,219.236 171.947,212.7C170.692,203.821 177.688,197.297 178.697,189.042C179.283,184.244 180.186,179.485 181.015,174.277C197.968,170.933 213.153,162.58 227.303,152.078C230.068,150.026 229.986,148.815 226.983,147.292C226.248,146.919 225.552,146.47 225.102,146.209C228.141,143.832 231.225,141.577 234.119,139.102C236.226,137.3 235.987,135.948 233.505,134.941C227.818,132.633 224.313,128.354 222.126,122.79C219.399,115.851 219.339,108.682 220.293,101.441C220.383,100.759 220.957,99.87 221.556,99.564C236.213,92.073 247.296,80.598 257.115,67.726C265.513,56.716 270.836,44.069 276.056,31.407C279.415,23.257 282.433,14.964 285.461,6.683C286.184,4.704 287.087,2.001 284.983,0.701C283.436,-0.255 280.938,-0.035 278.932,0.213C276.633,0.496 274.423,1.439 272.153,2.01C255.851,6.112 239.823,11.074 224.534,18.102C218.098,21.061 212.022,24.801 205.718,28.221C204.897,27.061 204.124,25.772 203.153,24.655C202.176,23.532 201.076,22.484 199.9,21.571C196.344,18.813 195.235,19.291 194.491,23.649C193.706,28.243 192.756,32.797 190.067,36.851C189.667,36.599 189.367,36.511 189.233,36.312C184.429,29.156 179.659,21.978 174.825,14.843C174.25,13.995 173.335,13.376 172.579,12.651C171.808,13.466 170.772,14.157 170.321,15.121C169.304,17.291 168.578,19.597 167.674,22.003C165.947,21.342 164.469,20.769 162.986,20.21C146.61,14.043 129.772,11.813 112.714,16.228C99.449,19.662 87.497,25.689 81.331,39.143C80.433,41.102 79.523,41.467 77.502,40.893C67.649,38.094 57.651,36.083 47.399,35.32C39.266,34.714 31.132,33.958 23.05,32.881C16.645,32.028 10.325,30.554 3.955,29.419C0.607,28.822 -0.697,30.329 0.357,33.547C0.88,35.145 1.533,36.709 2.237,38.238C7.808,50.33 14.836,61.552 23.618,71.52C34.748,84.152 48.364,93.23 64.624,98.078C65.81,98.431 67.026,98.682 68.228,98.98C68.239,99.239 68.251,99.499 68.262,99.758C65.896,100.226 63.53,100.695 61.163,101.163C61.11,101.325 61.056,101.487 61.003,101.649C63.539,102.265 66.075,102.882 68.812,103.547C68.899,108.99 67.301,114.438 65.613,119.909C64.296,124.181 62.063,127.284 57.5,128.339C55.676,128.761 55.076,129.979 55.766,131.747C56.509,133.652 57.281,135.545 58.252,137.973C56.451,138.5 54.743,139.097 52.989,139.49C50.043,140.149 49.563,140.862 50.459,143.79C52.616,150.84 56.828,156.459 62.519,161.044C63.127,161.534 63.696,162.074 64.184,162.504C58.232,166.91 52.47,171.105 46.789,175.405C42.432,178.704 39.443,182.988 38.79,188.502C37.469,199.653 33.033,209.547 27.298,219.052C22.794,226.517 18.505,234.134 14.61,241.928C13.27,244.608 12.652,248.125 13.032,251.09C13.826,257.291 15.335,263.421 16.862,269.501C18.538,276.173 22.317,278.083 28.894,275.976C30.529,275.453 32.143,274.865 34.022,274.219C34.13,276.395 34.142,278.176 34.319,279.94C34.972,286.467 35.011,293.145 36.49,299.485C41.388,320.48 46.777,341.362 52.051,362.268C54.365,371.441 57.436,380.441 57.199,390.106C57.083,394.807 56.548,399.102 53.146,402.851C50.341,405.942 51.919,409.35 56.044,409.904C57.153,410.053 58.302,410.057 59.418,409.961C64.932,409.488 70.455,409.076 75.949,408.416C81.87,407.705 82.758,406.917 82.701,400.999C82.523,382.608 85.223,364.514 88.009,346.426C88.749,341.621 89.591,336.785 90.979,332.14C92.275,327.797 95.775,326.865 99.347,329.558C101.125,330.899 102.881,332.448 104.152,334.252C116.397,351.636 125.216,370.755 132.456,390.662C133.432,393.348 133.061,395.808 131.527,398.16C130.195,400.202 128.769,402.193 127.59,404.321C125.365,408.334 126.822,411.973 131.055,413.606C136.912,415.864 142.686,414.907 148.452,413.297C153.762,411.813 155.773,409.792 156.083,404.227C156.579,395.333 156.744,386.415 156.826,377.505C156.942,364.835 156.856,352.163 156.856,339.782C161.713,341.165 166.289,342.941 171.029,343.725C183.748,345.829 195.655,343.967 206.081,335.601C210.169,332.32 214.573,329.417 218.942,326.507C222.93,323.851 227.436,323.609 231.946,324.658C239.004,326.299 245.392,334.266 246.251,342.173C247.176,350.68 244.205,355.721 236.019,359.979C234.885,360.57 233.353,361.998 233.411,362.952C233.541,365.079 235.663,364.728 237.216,364.698C241.44,364.619 245.666,364.294 249.885,364.381C272.38,364.846 295.002,345.353 300.393,325.96C307.347,300.946 305.513,276.276 294.071,253.036" style="fill:#910a07;fill-rule:nonzero;"/>
<path d="M66.509,303.488C66.504,303.485 66.498,303.481 66.493,303.478C66.498,303.481 66.504,303.485 66.509,303.488" style="fill:#920c09;fill-rule:nonzero;"/>
<path d="M196.38,76.803L196.379,76.803L196.38,76.804L196.38,76.803Z" style="fill:#fdea8e;"/>
<path d="M152.341,330.192C150.612,326.071 149.123,321.828 147.093,317.861C144.629,313.045 142.095,308.169 138.852,303.878C136.56,300.846 133.376,298.086 130,296.355C121.348,291.92 112.361,288.138 103.521,284.067C102.362,283.533 101.279,282.831 100.161,282.207C99.469,281.968 98.776,281.729 98.084,281.49C97.946,281.449 97.809,281.409 97.672,281.369C93.068,279.566 88.44,277.825 83.866,275.95C72.764,271.401 61.697,266.765 50.576,262.262C49.841,261.965 48.443,262.175 47.91,262.706C45.742,264.87 43.766,267.228 41.779,269.566C41.276,270.158 40.664,270.94 40.665,271.633C40.681,278.76 40.264,285.945 41.016,293.002C43.105,312.608 47.487,331.779 52.792,350.765C55.689,361.134 58.63,371.558 60.407,382.149C61.736,390.071 62.497,398.547 56.073,405.329C55.994,405.412 56.093,405.664 56.164,406.457C59.563,406.053 62.948,405.65 66.334,405.247C69.501,403.454 71.007,400.932 71.748,398.138C71.841,397.788 71.921,397.435 71.992,397.078C72.133,396.364 72.233,395.637 72.307,394.904C72.491,393.071 72.509,391.198 72.579,389.398C73.033,377.711 73.079,365.977 72.584,354.293C72.186,344.897 68.722,336.176 64.066,328.049C62.846,325.92 60.771,324.238 58.936,322.514C55.289,319.088 54.204,315.133 56.403,310.58C57.742,307.807 59.27,305.1 60.968,302.533C63.037,299.407 64.47,299.412 67.119,302.215C67.487,302.603 67.723,303.116 68.02,303.572C70.004,304.8 71.913,306.21 73.897,307.435C75.088,308.17 76.306,308.838 77.584,309.36C83.11,311.617 88.856,313.402 94.62,314.987C98.899,316.164 102.031,318.442 104.067,322.311C110,333.585 116.232,344.716 121.757,356.188C126.751,366.557 130.942,377.312 135.537,387.876C137.589,392.592 137.166,396.974 134.161,401.149C133.067,402.668 132.011,404.228 131.09,405.856C129.873,408.005 130.423,409.302 132.741,410.146C137.083,411.727 141.39,411.145 145.729,410.044C151.408,408.603 152.035,407.964 152.657,402.185C152.727,401.533 152.765,400.874 152.768,400.219C152.864,382.586 153.016,364.954 153.007,347.321C153.006,345.894 152.979,344.466 152.935,343.039C152.802,338.756 152.517,334.474 152.341,330.192" style="fill:#fde98e;fill-rule:nonzero;"/>
<path d="M294.78,264.455C294.091,262.419 293.338,260.433 292.519,258.498C291.701,256.563 290.816,254.679 289.863,252.849C289.197,251.571 288.486,250.329 287.753,249.103C282.188,239.795 274.671,232.004 264.837,226.02C264.838,226.021 264.838,226.022 264.839,226.022C265.532,227.087 266.146,228.215 266.933,229.206C271.965,235.536 274.34,242.984 276.05,250.713C276.418,252.375 275.641,252.932 274.017,252.645C269.339,251.816 264.677,250.819 259.964,250.278C252.26,249.394 244.887,250.796 237.954,254.331C237.737,254.441 237.596,254.7 237.256,255.066C250.293,262.011 252.919,273.993 253.089,287.197C253.112,288.957 252.489,289.538 250.789,289.395C247.436,289.115 244.075,288.752 240.717,288.757C230.835,288.771 222.423,292.372 216.86,300.638C209.567,311.475 198.695,317.056 187.376,322.134C179.059,325.864 170.367,326.176 161.55,324.244C160.381,323.988 159.301,323.32 158.132,323.072C157.686,322.977 157.104,323.526 156.583,323.781C156.677,324.854 156.725,325.938 156.802,327.015C156.879,328.092 156.985,329.163 157.196,330.213C157.699,332.716 157.802,335.545 160.815,336.743C175.266,342.488 189.278,342.804 202.521,333.431C207.34,330.021 212.065,326.47 216.975,323.198C221.505,320.18 226.69,319.657 231.865,320.731C242.162,322.868 247.049,330.392 249.616,339.763C251.143,345.334 250.238,350.797 247.21,355.74C246.119,357.52 244.494,358.973 243.388,360.257C247.411,360.257 251.675,360.735 255.798,360.174C274.328,357.652 292.976,340.879 297.439,322.649C302.24,303.035 301.257,283.593 294.78,264.455" style="fill:#fffab6;fill-rule:nonzero;"/>
<path d="M176.067,322.844C191.437,319.831 205.006,313.051 214.527,300.009C222.737,288.762 233.939,285.426 247.157,286.848C247.903,286.929 248.644,287.053 249.391,287.105C249.752,287.13 250.12,287.034 250.734,286.965C251.255,281.345 250.099,276.037 248.356,270.772C246.115,264.003 241.355,259.625 235.246,256.414C234.466,256.004 233.85,255.286 233.158,254.711C233.898,254.099 234.554,253.32 235.391,252.899C246.635,247.244 258.414,246.912 270.468,249.483C271.373,249.676 272.272,249.896 274.026,250.3C272.693,246.269 271.778,242.693 270.342,239.341C268.032,233.95 264.711,229.184 260.338,225.202C259.652,224.578 259.062,223.849 258.427,223.169C256.088,222.258 253.801,221.02 251.441,220.244C250.654,219.985 249.86,219.778 249.053,219.652C243.431,218.771 237.669,218.192 231.993,218.361C215.594,218.849 202.544,225.914 193.724,239.853C185.413,252.986 181.27,267.65 179.247,282.956C178.701,287.089 177.635,291.198 179.626,295.356C180.092,296.329 179.42,298.141 178.775,299.288C177.539,301.483 175.939,303.472 174.504,305.556C171.769,309.526 168.071,312.01 163.335,313.013C160.787,313.553 158.279,314.278 155.591,314.96C155.772,316.484 155.935,317.861 156.098,319.238C162.171,323.645 169.324,324.166 176.067,322.844" style="fill:#fdea8e;fill-rule:nonzero;"/>
<path d="M68.146,247.439C67.763,247.692 67.691,249.182 68.054,249.652C69.224,251.167 70.411,253.026 72.041,253.773C86.191,260.259 100.548,266.157 116.125,268.432C121.609,269.233 126.206,268.441 129.132,263.199C132.913,256.425 136.908,249.757 140.394,242.834C143.928,235.815 146.964,228.545 150.201,221.377C154.029,212.901 153.596,204.668 148.771,196.683C148.442,196.139 148.307,195.478 148.082,194.872C148.081,194.872 148.05,194.836 148.05,194.836C147.866,194.671 147.682,194.507 147.498,194.343C137.8,193.349 128.102,192.354 118.404,191.36C118.175,191.376 117.946,191.393 117.717,191.41C116.985,191.515 116.254,191.621 115.522,191.727C112.403,192.931 109.205,193.971 106.206,195.422C105.027,195.993 104.283,197.475 103.36,198.559C102.3,199.803 101.477,201.387 100.174,202.26C96.332,204.836 92.304,207.133 88.059,209.715C89.704,210.562 91.419,210.907 91.664,211.705C91.988,212.755 91.217,214.181 90.812,215.411C89.26,220.124 87.802,224.874 86.038,229.508C84.989,232.264 85.863,234.166 88.349,234.785C91.181,235.49 94.223,235.73 97.15,235.605C105.351,235.254 112.667,232.411 118.958,227.057C119.295,226.77 119.763,226.636 120.169,226.431L120.256,226.345C120.403,226.184 120.549,226.023 120.696,225.863C122.899,223.327 125.102,220.791 127.305,218.255C129.863,215.1 132.421,211.944 134.979,208.788C135.215,208.967 135.451,209.145 135.687,209.324C133.246,212.602 130.805,215.88 128.364,219.158C128.189,219.368 127.999,219.568 127.817,219.773C127.636,219.978 127.463,220.189 127.323,220.42C121.79,229.549 116.292,238.699 110.74,247.816C109.2,250.345 108.276,250.29 105.773,248.693C103.93,247.517 101.83,246.449 99.71,246.053C92.069,244.623 84.371,243.498 76.695,242.258L76.694,242.258L76.695,242.258C73.829,243.961 70.922,245.602 68.146,247.439" style="fill:#fdea8e;fill-rule:nonzero;"/>
<path d="M274.449,11.043C271.854,16.58 269.965,23.829 267.401,29.38C266.546,31.23 265.703,33.086 264.878,34.949C258.809,48.661 251.712,61.73 241.674,72.996C235.098,80.374 227.144,85.99 218.368,90.434C214.545,92.37 212.602,91.969 209.552,88.873C206.657,85.933 203.911,82.845 201.1,79.822C201.072,80.09 200.985,80.39 200.931,80.672C200.878,80.953 200.859,81.216 200.966,81.408C204.822,88.301 205.967,95.867 206.252,103.567C206.497,110.191 206.323,116.831 206.301,123.463C206.284,128.59 204.851,133.064 199.969,135.985C201.71,138.214 203.223,140.328 204.927,142.276C206.296,143.84 205.825,144.91 204.703,146.407C198.508,154.677 190.186,159.689 180.559,163.004C167.194,167.606 153.656,170.943 139.372,170.497C133.405,170.311 127.659,169.334 122.156,167.014C117.938,165.236 113.582,164.375 108.997,164.98C108.743,166.57 108.035,167.707 106.944,168.476C106.29,168.938 105.498,169.266 104.584,169.48C103.399,169.758 102.155,169.963 101.084,170.494C100.165,170.95 99.454,171.825 98.651,172.514C99.495,173.165 100.249,174.179 101.196,174.411C115.586,177.942 130.182,177.917 144.84,176.788C162.242,175.448 179.13,171.696 195.568,165.916C205.828,162.309 214.742,156.28 223.697,149.987C222.465,149.114 221.348,148.53 220.514,147.672C219.733,146.868 218.792,145.771 218.799,144.81C218.804,144.167 220.279,143.413 221.208,142.921C224.121,141.377 227.087,139.933 230.783,138.072C221.79,133.103 217.965,125.685 216.681,117.071C215.903,111.852 216.508,106.434 216.397,101.107C216.341,98.418 217.231,96.687 220.044,95.964C221.449,95.602 222.7,94.598 223.987,93.828C237.556,85.712 247.951,74.324 256.815,61.474C264.216,50.746 269.023,38.676 273.851,26.66C275.684,22.097 277.353,17.467 279.036,12.844C279.597,11.302 281.786,5.077 282.357,3.54" style="fill:#fffab6;fill-rule:nonzero;"/>
<path d="M21.08,265.865C21.129,265.388 21.166,264.91 21.16,264.433C21.135,262.282 20.822,260.116 20.994,257.986C21.339,253.728 23.08,251.729 27.287,250.938C30.387,250.355 32.482,248.598 34.353,246.259C40.84,238.152 43.748,228.671 45.131,218.587C45.169,218.308 45.197,218.028 45.221,217.747C45.789,211.083 48.885,206.62 55.695,204.901C59.951,203.827 64.056,202.161 68.24,200.793C74.193,198.849 79.154,195.39 83.199,190.687C83.953,189.811 84.04,188.232 84.143,186.953C84.304,184.952 83.661,182.709 84.358,180.969C85.486,178.153 85.26,176.423 82.295,175.396C81.741,175.303 81.187,175.21 80.634,175.116C80.233,175.199 79.833,175.282 79.432,175.364C79.083,175.399 78.733,175.434 78.383,175.469C78.231,175.44 78.079,175.41 77.926,175.381C78.06,175.241 78.195,175.101 78.329,174.961C78.569,174.791 78.809,174.622 79.05,174.452C79.562,173.534 93.389,169.912 96.41,168.948C100.793,167.55 103.457,166.681 105.237,165.581C106.425,164.847 106.137,162.574 104.161,162.081C102.542,161.436 100.921,160.919 99.294,160.539C94.415,159.396 89.483,159.479 84.368,161.031C81.401,161.93 78.074,161.632 74.915,161.917C73.82,162.016 72.495,161.889 71.686,162.454C63.845,167.924 56.034,173.441 48.339,179.113C44.787,181.731 42.791,185.505 42.326,189.879C41.157,200.869 36.727,210.581 31.176,219.956C26.593,227.697 22.246,235.585 18.006,243.521C17.037,245.336 16.218,247.756 16.58,249.66C17.426,254.115 18.609,258.507 19.778,262.9C20.168,264.365 20.556,265.83 20.93,267.297C20.971,266.82 21.031,266.342 21.08,265.865" style="fill:#fce98d;fill-rule:nonzero;"/>
<path d="M94.527,43.014C93.674,45.64 93.101,48.28 92.949,51.008C92.797,53.737 93.065,56.554 93.895,59.534C105.152,50.775 117.613,45.378 131.56,42.934C145.386,40.51 158.933,41.346 172.527,44.519C173.434,41.213 174.231,38.307 175.029,35.4C175.405,35.31 175.781,35.22 176.157,35.129C178.304,38.757 180.45,42.386 182.597,46.014C184.256,44.307 185.916,42.6 187.637,40.83C182.614,33.598 177.807,26.678 172.765,19.418C172.298,20.687 172.02,21.38 171.788,22.089C171.527,22.89 171.294,23.701 171.074,24.515C170.611,26.224 169.526,26.782 167.878,26.226C166.991,25.927 166.124,25.563 165.26,25.199C151.349,19.344 136.931,16.696 121.836,18.32C110.416,19.549 100.221,23.781 91.537,31.269C89.063,33.403 87.337,36.403 85.268,39.006C87.881,39.213 89.803,38.717 91.741,38.647C93.015,38.601 94.311,39.168 95.598,39.46C95.241,40.645 94.884,41.829 94.527,43.014Z" style="fill:#fde98d;fill-rule:nonzero;"/>
<path d="M163.839,198.142C163.324,197.782 162.641,197.621 162.012,197.472C158.199,196.566 154.379,195.691 150.562,194.805C151.945,199.124 153.804,203.363 154.55,207.789C155.088,210.978 155.005,214.803 153.716,217.681C147.18,232.275 140.246,246.695 133.229,261.067C131.945,263.697 129.752,265.932 127.764,268.157C124.989,271.262 121.211,271.061 117.543,270.646C104.869,269.213 92.945,265.154 81.303,260.131C78.466,258.907 75.428,258.05 72.785,256.506C70.433,255.132 68.092,253.346 66.481,251.192C64.253,248.212 65.055,246.495 68.352,244.737C69.71,244.013 71.898,243.952 71.567,241.495C66.747,240.801 61.919,240.16 57.113,239.38C55.73,239.156 55.056,239.427 54.677,240.839C53.707,244.456 52.664,248.056 51.532,251.626C51.001,253.3 51.487,254.098 53.055,254.869C64.745,260.618 76.524,266.207 88.002,272.357C99.793,278.674 112.254,280.847 125.445,280.354C129.619,280.197 132.65,278.84 134.619,275.134C145.701,254.28 156.831,233.452 167.863,212.572C169.577,209.329 166.905,200.289 163.839,198.142" style="fill:#fffab6;fill-rule:nonzero;"/>
<path d="M65.211,58.909C53.505,54.386 41.617,50.325 29.754,46.221C25.901,44.889 21.897,43.996 17.817,42.861C17.817,43.537 17.746,43.821 17.83,44.046C18.092,44.746 18.358,45.455 18.72,46.106C28.486,63.682 41.822,77.625 60.162,86.324C63.911,88.102 67.988,89.188 72.14,90.675C73.164,87.63 73.786,85.472 74.609,83.394C76.295,79.133 78.106,74.922 79.832,70.676C80.635,68.698 80.386,67.14 78.247,66.01C73.869,63.696 69.787,60.677 65.211,58.909" style="fill:#ffe9a5;fill-rule:nonzero;"/>
<path d="M180.284,45.346C179.836,44.765 179.394,44.179 178.972,43.58C178.125,42.377 177.359,41.118 176.171,39.29C175.667,41.129 175.126,42.385 175.008,43.679C174.743,46.605 173.041,46.821 170.702,46.355C166.862,45.591 163.021,44.498 159.144,44.32C151.981,43.992 144.745,43.708 137.624,44.348C127.352,45.272 117.279,47.572 108.178,52.742C103.721,55.273 99.534,58.284 95.26,61.13C92.618,62.889 91.998,62.745 91.542,59.597C90.791,54.42 90.201,49.213 91.889,44.076C91.303,44.792 90.61,45.476 89.937,46.166C89.924,46.179 89.912,46.193 89.899,46.206C89.235,46.888 88.592,47.576 88.092,48.31C87.753,48.806 87.481,49.322 87.311,49.871C84.034,60.479 84.513,71.044 88.984,81.844C90.24,80.487 91.282,79.32 92.369,78.196C97.346,73.051 102.681,68.382 109.064,64.983C128.29,54.745 148.448,52.259 169.592,57.435C170.688,57.703 172.445,57.947 172.987,57.361C173.745,56.541 174.487,55.704 175.217,54.857C177.406,52.315 179.491,49.677 181.63,47.088C181.185,46.505 180.732,45.927 180.284,45.346" style="fill:#fffab6;fill-rule:nonzero;"/>
<path d="M86.656,180.61C86.021,182.326 85.88,184.501 86.318,186.274C86.973,188.919 86.255,190.839 84.533,192.648C79.305,198.137 73.004,201.726 65.706,203.808C61.215,205.09 56.842,206.819 52.479,208.513C49.556,209.647 48.538,212.234 47.879,215.12C46.28,222.124 45.089,229.295 42.654,236.008C40.939,240.735 37.744,245.045 34.622,249.087C33.237,250.881 30.519,251.944 28.197,252.644C24.623,253.721 23.248,254.917 23.124,258.629C23.058,260.597 23.106,262.571 23.185,264.54C23.279,266.881 24.132,268.731 26.664,269.331C33.526,267.407 39.567,264.369 43.422,258.919C44.707,257.102 45.75,255.017 46.498,252.616C50.419,240.036 53.836,227.3 57.558,214.657C57.794,213.857 58.694,212.866 59.465,212.671C70.174,209.949 78.825,203.421 87.866,197.582C91.593,195.175 92.246,191.765 91.653,187.812C91.46,186.523 91.007,185.274 90.744,183.992C90.316,181.901 90.652,180.015 92.644,178.849C95.387,177.245 95.58,175.031 94.321,172.15C91.633,172.927 88.964,173.699 86.295,174.47C87.491,176.457 87.488,178.363 86.656,180.61" style="fill:#fffab6;fill-rule:nonzero;"/>
<path d="M66.493,303.478C65.87,303.096 65.246,302.714 64.623,302.332C63.787,303.014 62.757,303.56 62.156,304.409C61.08,305.93 60.189,307.597 59.35,309.268C56.307,315.324 56.597,317.166 61.483,321.828C68.918,328.923 71.718,338.281 73.739,347.82C76.081,358.874 75.732,370.177 75.4,381.408C75.257,386.245 74.727,391.115 73.846,395.873C73.254,399.07 71.739,402.095 70.637,405.197C71.964,405.05 73.288,404.849 74.615,404.727C75.057,404.687 75.5,404.655 75.943,404.637C78.184,404.548 78.883,403.543 78.944,401.293C79.171,393.049 79.285,384.779 80.081,376.581C81.503,361.951 82.978,347.303 85.252,332.791C86.442,325.192 83.918,319.881 78.605,315.175C74.963,311.948 71.321,308.72 67.728,305.439C67.312,305.059 67.042,304.517 66.759,303.991C66.664,303.815 66.568,303.642 66.464,303.476L66.465,303.476L66.509,303.488L66.465,303.476C66.474,303.477 66.484,303.477 66.493,303.478" style="fill:#fffab6;fill-rule:nonzero;"/>
<path d="M171.908,302.343C166.197,286.784 161.528,270.942 159.101,254.507C158.461,250.176 157.996,245.82 157.451,241.475C155.218,245.998 152.872,250.473 150.694,255.022C149.968,256.538 149.261,258.063 148.582,259.6C146.566,264.168 146.612,268.922 148.072,273.859C149.843,279.848 151.094,286.009 152.274,292.152C153.452,298.286 154.265,304.49 155.28,310.933C161.775,309.608 168.277,308.832 171.908,302.343" style="fill:#5aa0c1;fill-rule:nonzero;"/>
<path d="M136.547,298.451C140.287,301.124 142.803,305.739 145.333,309.813C147.971,314.063 149.964,318.712 152.24,323.186C151.547,315.219 150.8,307.262 149.678,299.35C149.197,295.96 148.647,292.577 148.003,289.206C146.715,282.465 145.05,275.768 142.807,269.139C140.793,272.368 138.894,275.456 136.952,278.515C134.867,281.798 132.015,283.958 127.983,283.897C121.627,283.801 115.274,283.548 108.92,283.362C111.32,284.597 113.741,285.794 116.116,287.074C122.987,290.777 130.245,293.947 136.547,298.451" style="fill:#fffab6;fill-rule:nonzero;"/>
<path d="M158.132,323.072C159.301,323.32 160.381,323.988 161.55,324.244C170.367,326.176 179.059,325.864 187.376,322.134C198.695,317.056 209.567,311.475 216.86,300.638C222.423,292.372 230.835,288.771 240.717,288.757C244.075,288.752 247.436,289.115 250.789,289.395C252.489,289.538 253.112,288.957 253.089,287.197C252.919,273.993 250.293,262.011 237.256,255.066C237.596,254.7 237.737,254.441 237.954,254.331C244.887,250.796 252.26,249.394 259.964,250.278C264.677,250.819 269.339,251.816 274.017,252.645C275.641,252.932 276.418,252.375 276.05,250.713C274.34,242.984 271.965,235.536 266.933,229.206C266.145,228.215 265.532,227.086 264.838,226.022L264.838,226.021C262.701,225.071 260.564,224.12 258.427,223.169C259.062,223.849 259.652,224.577 260.338,225.201C264.711,229.183 268.032,233.949 270.342,239.341C271.778,242.693 272.693,246.268 274.026,250.3C272.272,249.896 271.373,249.675 270.468,249.482C258.414,246.911 246.635,247.244 235.391,252.899C234.554,253.319 233.898,254.098 233.158,254.71C233.85,255.286 234.466,256.004 235.246,256.413C241.355,259.624 246.115,264.002 248.356,270.771C250.099,276.036 251.255,281.345 250.734,286.965C250.12,287.034 249.752,287.129 249.391,287.104C248.644,287.052 247.903,286.928 247.157,286.848C233.939,285.425 222.737,288.761 214.527,300.008C205.006,313.051 191.437,319.83 176.067,322.843C169.323,324.166 162.171,323.645 156.098,319.237C156.26,320.752 156.421,322.266 156.583,323.781C157.103,323.526 157.686,322.977 158.132,323.072" style="fill:#e8be74;fill-rule:nonzero;"/>
<path d="M114.562,232.678C108.898,236.23 102.613,237.217 96.078,237.64C92.136,237.895 88.506,237.947 85.236,235.251C83.533,233.846 82.982,232.348 83.648,230.339C85.325,225.276 87.031,220.224 88.707,215.161C88.906,214.557 88.986,213.914 89.146,213.176C88.537,212.922 88.029,212.728 87.536,212.503C85.241,211.456 84.9,210.212 86.895,208.546C89.249,206.581 91.898,204.962 94.473,203.275C95.96,202.301 97.58,201.532 99.086,200.585C99.785,200.147 100.81,199.578 100.911,198.944C101.612,194.531 105.181,193.418 108.523,191.984C108.685,191.915 108.827,191.8 108.964,191.673C109.102,191.547 109.234,191.408 109.375,191.29C107.499,191.291 105.623,191.31 103.747,191.315C101.871,191.321 99.996,191.314 98.121,191.264C96.341,191.216 95.403,191.605 95.182,193.623C94.897,196.236 93.524,198.337 91.234,199.81C88.318,201.686 85.381,203.545 82.596,205.605C79.135,208.164 78.161,212.178 76.454,216.065C81.167,215.655 81.448,216.07 80.657,220.277C79.949,224.042 79.202,227.834 78.956,231.645C78.491,238.836 78.67,238.644 85.693,239.846C92.585,241.026 99.388,242.72 106.257,244.046C106.977,244.185 108.167,243.582 108.654,242.95C111.281,239.542 113.754,236.016 116.281,232.531C115.701,232.57 114.995,232.406 114.562,232.678" style="fill:#fffab6;fill-rule:nonzero;"/>
<path d="M16.454,38.212C24.497,40.6 32.339,43.11 40.284,45.81C45.346,47.53 62.149,54.084 62.246,54.108C64.992,54.801 81.501,63.705 81.501,63.705C81.501,63.705 80.711,60.087 82.206,53.156C82.886,50.889 83.567,48.622 84.239,46.384C78.202,44.888 72.457,43.113 66.58,42.095C58.572,40.707 50.465,39.894 42.401,38.837C31.835,37.452 21.268,36.07 10.702,34.686C12.619,35.861 14.537,37.037 16.454,38.212" style="fill:#fbe68c;fill-rule:nonzero;"/>
<path d="M163.838,182.3C166.49,181.837 169.083,180.929 171.631,180.022C173.282,179.434 175.016,178.659 174.81,176.345C174.162,176.396 173.508,176.415 172.864,176.503C162.291,177.947 151.752,179.722 141.141,180.766C128.971,181.965 116.763,181.622 104.754,179.009C101.229,178.242 98.09,177.616 95.778,181.192C95.682,181.341 95.484,181.422 95.337,181.538C93.44,183.026 94.857,184.669 95.322,186.109C95.521,186.726 96.785,187.345 97.582,187.368C108.08,187.675 118.58,187.875 129.08,188.101C129.081,188.101 129.082,188.101 129.082,188.101C129.081,188.101 129.08,188.101 129.079,188.1C140.669,186.182 152.267,184.321 163.838,182.3" style="fill:#5aa0c1;fill-rule:nonzero;"/>
<path d="M122.156,167.015C127.66,169.335 133.405,170.312 139.372,170.498C153.656,170.944 167.195,167.607 180.56,163.005C190.186,159.69 198.508,154.678 204.703,146.408C205.825,144.911 206.297,143.841 204.927,142.277C203.223,140.329 201.71,138.215 199.969,135.986C204.851,133.065 206.285,128.591 206.301,123.464C206.323,116.832 206.498,110.192 206.252,103.568C205.967,95.868 204.822,88.302 200.966,81.409C200.859,81.217 200.878,80.954 200.932,80.673C200.985,80.391 201.072,80.091 201.1,79.823C199.526,78.817 197.952,77.811 196.379,76.804C196.839,77.814 197.314,78.817 197.758,79.834C199.29,83.343 201.264,86.735 202.251,90.393C205.094,100.927 204.828,111.755 204.431,122.542C204.258,127.233 203.374,131.696 198.785,134.391C197.271,135.28 197.619,136.484 198.607,137.703C200.312,139.806 201.932,141.976 203.733,144.307C199.47,148.915 195.705,153.939 189.968,156.663C177.432,162.614 164.289,166.776 150.45,168.033C141.791,168.819 132.965,169.188 124.633,165.691C119.536,163.552 114.288,162.442 108.768,162.591C108.845,163.387 108.921,164.184 108.998,164.981C113.582,164.376 117.938,165.237 122.156,167.015" style="fill:#e8be74;fill-rule:nonzero;"/>
<path d="M74.08,211.112C71.29,212.287 68.75,213.806 66.01,214.402C62.248,215.221 60.707,217.27 60.019,220.92C59.109,225.74 57.583,230.443 56.26,235.428C62.568,236.343 68.54,237.21 74.515,238.077C75.102,232.141 75.667,226.432 76.233,220.718C72.11,221.216 71.432,220.447 72.465,216.287C72.884,214.603 73.495,212.966 74.08,211.112" style="fill:#fbe68c;fill-rule:nonzero;"/>
<path d="M68.352,244.737C65.054,246.495 64.253,248.212 66.481,251.192C68.091,253.346 70.433,255.132 72.785,256.506C75.428,258.05 78.466,258.907 81.303,260.131C92.945,265.154 104.869,269.213 117.542,270.646C121.211,271.061 124.989,271.262 127.763,268.157C129.752,265.932 131.945,263.697 133.229,261.067C140.246,246.695 147.179,232.275 153.716,217.681C155.005,214.803 155.088,210.978 154.55,207.789C153.803,203.363 151.944,199.124 150.562,194.805C149.735,194.828 148.908,194.85 148.081,194.872C148.306,195.478 148.441,196.139 148.77,196.683C153.595,204.668 154.028,212.901 150.2,221.377C146.963,228.544 143.927,235.815 140.393,242.833C136.907,249.757 132.912,256.425 129.131,263.199C126.205,268.44 121.609,269.233 116.124,268.432C100.547,266.157 86.19,260.259 72.04,253.773C70.411,253.026 69.223,251.167 68.053,249.652C67.69,249.182 67.763,247.692 68.145,247.439C70.922,245.601 73.828,243.961 76.694,242.258L76.693,242.258C74.984,242.004 73.276,241.75 71.567,241.495C71.898,243.952 69.709,244.013 68.352,244.737" style="fill:#e8be74;fill-rule:nonzero;"/>
<path d="M26.664,269.331C24.132,268.73 23.279,266.881 23.185,264.539C23.106,262.571 23.058,260.596 23.124,258.629C23.248,254.917 24.623,253.721 28.197,252.644C30.519,251.944 33.237,250.88 34.622,249.087C37.744,245.045 40.939,240.735 42.654,236.007C45.089,229.295 46.28,222.124 47.879,215.12C48.538,212.234 49.556,209.647 52.479,208.512C56.842,206.819 61.215,205.089 65.706,203.808C73.004,201.726 79.305,198.137 84.533,192.647C86.255,190.839 86.973,188.919 86.318,186.274C85.879,184.501 86.021,182.326 86.656,180.61C87.488,178.363 87.491,176.457 86.295,174.47C84.962,174.779 83.628,175.087 82.294,175.396C85.26,176.423 85.486,178.154 84.358,180.969C83.661,182.709 84.304,184.952 84.143,186.954C84.04,188.232 83.953,189.811 83.199,190.688C79.153,195.39 74.193,198.849 68.24,200.794C64.056,202.161 59.951,203.827 55.694,204.902C48.885,206.62 45.789,211.083 45.221,217.748C45.197,218.028 45.169,218.309 45.131,218.587C43.748,228.671 40.839,238.152 34.353,246.259C32.481,248.599 30.387,250.355 27.287,250.938C23.08,251.729 21.339,253.729 20.994,257.986C20.822,260.116 21.135,262.283 21.16,264.433C21.166,264.91 21.128,265.388 21.08,265.865C21.031,266.343 20.971,266.82 20.93,267.298C21.598,268.733 22.158,269.681 22.751,270.191C23.74,271.041 24.824,270.676 26.664,269.331" style="fill:#e8be74;fill-rule:nonzero;"/>
<path d="M71.436,94.891C71.417,94.644 71.399,94.396 71.38,94.148C68.891,93.466 66.304,93.025 63.927,92.063C40.665,82.648 24.183,66.112 13.483,43.614C12.892,42.372 12.656,41.384 12.782,40.604C12.991,39.304 14.205,38.58 16.454,38.211C14.537,37.036 12.62,35.86 10.702,34.685C8.815,34.394 6.927,34.103 4.656,33.752C5.224,35.265 5.555,36.522 6.142,37.644C8.314,41.792 10.439,45.973 12.82,50C21.825,65.235 32.963,78.395 48.757,87.12C55.275,90.722 61.778,94.191 69.29,95.152C69.983,95.241 70.719,94.986 71.436,94.891" style="fill:#fffab6;fill-rule:nonzero;"/>
<path d="M137.983,188.96C138.499,189.13 139.006,189.369 139.537,189.459C145.995,190.552 152.481,191.503 158.911,192.74C163.539,193.631 168.317,194.565 169.634,200.421C173.235,196.484 175.695,188.758 176.387,179.831C169.569,184.267 161.648,184.842 153.959,186.212C148.64,187.16 143.31,188.046 137.983,188.96" style="fill:#7ec7e6;fill-rule:nonzero;"/>
<path d="M176.157,35.129C175.781,35.219 175.405,35.31 175.029,35.4C174.231,38.307 173.434,41.213 172.526,44.518C158.932,41.346 145.386,40.51 131.559,42.933C117.613,45.377 105.152,50.775 93.895,59.534C93.065,56.553 92.797,53.736 92.949,51.008C93.101,48.28 93.674,45.64 94.527,43.014C94.292,43.108 94.058,43.203 93.823,43.297C93.179,43.557 92.534,43.816 91.889,44.075C90.202,49.213 90.791,54.42 91.542,59.597C91.999,62.745 92.619,62.889 95.26,61.13C99.534,58.284 103.721,55.273 108.178,52.742C117.279,47.572 127.352,45.272 137.624,44.348C144.745,43.708 151.981,43.992 159.145,44.32C163.021,44.498 166.862,45.591 170.702,46.355C173.042,46.821 174.743,46.605 175.009,43.679C175.126,42.385 175.668,41.129 176.172,39.29C177.359,41.118 178.126,42.377 178.972,43.58C179.394,44.179 179.836,44.764 180.284,45.346C180.732,45.927 181.185,46.505 181.63,47.088C181.952,46.73 182.275,46.372 182.597,46.014C180.45,42.385 178.304,38.757 176.157,35.129" style="fill:#e8be74;fill-rule:nonzero;"/>
<path d="M73.846,395.873C74.727,391.115 75.257,386.246 75.4,381.408C75.732,370.178 76.081,358.874 73.739,347.821C71.718,338.281 68.918,328.923 61.483,321.828C56.597,317.166 56.307,315.324 59.35,309.268C60.189,307.597 61.08,305.93 62.156,304.409C62.757,303.56 63.787,303.015 64.623,302.332C65.247,302.714 65.87,303.096 66.493,303.478C65.87,303.096 65.247,302.714 64.623,302.332C65.247,302.714 65.87,303.096 66.493,303.478C67.002,303.509 67.512,303.54 68.021,303.571C67.724,303.116 67.487,302.603 67.12,302.214C64.47,299.411 63.037,299.407 60.969,302.533C59.27,305.1 57.743,307.807 56.404,310.58C54.205,315.133 55.289,319.088 58.937,322.514C60.772,324.238 62.847,325.92 64.067,328.049C68.723,336.175 72.186,344.897 72.584,354.292C73.079,365.977 73.033,377.71 72.579,389.398C72.509,391.198 72.492,393.07 72.307,394.904C72.234,395.637 72.133,396.364 71.992,397.078C71.922,397.435 71.841,397.788 71.748,398.137C71.007,400.931 69.502,403.454 66.335,405.247C66.561,405.244 66.786,405.242 67.012,405.239C68.221,405.225 69.429,405.211 70.637,405.197C71.739,402.095 73.254,399.07 73.846,395.873" style="fill:#e8be74;fill-rule:nonzero;"/>
<path d="M66.493,303.478C66.483,303.477 66.474,303.477 66.464,303.476L66.509,303.488C66.504,303.485 66.498,303.481 66.493,303.478" style="fill:#e8be74;fill-rule:nonzero;"/>
<path d="M172.832,297.246C173.219,298.089 173.399,299.027 173.675,299.921C174.8,298.795 175.844,297.644 175.835,296.147C175.832,295.648 175.712,295.111 175.44,294.523C171.22,285.433 169.196,275.692 167.129,265.985C164.983,255.909 162.414,245.862 163.383,235.396C163.541,233.683 163.701,231.971 163.86,230.258C163.677,230.198 163.495,230.138 163.312,230.078C162.018,232.72 160.724,235.363 159.431,238.005C160.458,245.895 161.162,253.843 162.588,261.66C164.81,273.84 167.619,285.901 172.832,297.246" style="fill:#7ec7e6;fill-rule:nonzero;"/>
<path d="M118.958,227.056C112.667,232.41 105.35,235.253 97.149,235.604C94.223,235.729 91.181,235.489 88.349,234.784C85.862,234.165 84.989,232.263 86.038,229.507C87.801,224.874 89.26,220.123 90.811,215.41C91.216,214.18 91.987,212.755 91.664,211.704C91.418,210.907 89.704,210.561 88.059,209.714C92.303,207.132 96.332,204.835 100.174,202.259C101.477,201.386 102.3,199.803 103.36,198.558C104.282,197.474 105.026,195.992 106.205,195.421C109.204,193.97 112.403,192.93 115.521,191.726L113.565,191.587C112.169,191.488 110.772,191.389 109.375,191.289C109.234,191.407 109.102,191.546 108.964,191.673C108.827,191.799 108.685,191.914 108.523,191.983C105.181,193.417 101.612,194.53 100.911,198.944C100.81,199.577 99.784,200.146 99.086,200.584C97.58,201.531 95.96,202.3 94.473,203.274C91.898,204.961 89.249,206.58 86.895,208.545C84.9,210.211 85.241,211.455 87.536,212.502C88.029,212.727 88.537,212.921 89.146,213.175C88.986,213.913 88.906,214.557 88.707,215.16C87.031,220.223 85.325,225.276 83.647,230.338C82.981,232.347 83.533,233.845 85.236,235.25C88.505,237.946 92.136,237.894 96.078,237.639C102.613,237.216 108.898,236.229 114.562,232.677C114.995,232.405 115.701,232.569 116.28,232.53C117.577,230.497 118.873,228.464 120.169,226.43C119.762,226.635 119.295,226.769 118.958,227.056" style="fill:#e8be74;fill-rule:nonzero;"/>
<path d="M103.521,284.066C112.361,288.138 121.348,291.92 130.001,296.355C133.377,298.085 136.56,300.846 138.852,303.878C142.096,308.169 144.629,313.044 147.094,317.86C149.124,321.827 150.612,326.071 152.342,330.191C152.309,327.856 152.274,325.521 152.24,323.186C149.964,318.712 147.97,314.063 145.332,309.813C142.803,305.739 140.287,301.124 136.547,298.451C130.245,293.947 122.987,290.777 116.116,287.074C113.741,285.794 111.32,284.597 108.92,283.362C106.001,282.977 103.081,282.592 100.162,282.206C101.28,282.83 102.362,283.532 103.521,284.066" style="fill:#e8be74;fill-rule:nonzero;"/>
<path d="M159.101,254.507C161.528,270.942 166.197,286.784 171.908,302.343C172.497,301.536 173.087,300.728 173.675,299.921C173.399,299.027 173.219,298.088 172.832,297.245C167.619,285.9 164.81,273.839 162.588,261.659C161.162,253.843 160.458,245.894 159.431,238.005C158.771,239.161 158.112,240.318 157.451,241.475C157.996,245.821 158.462,250.177 159.101,254.507" style="fill:#23509c;fill-rule:nonzero;"/>
<path d="M175.376,176.352C175.206,176.341 175.018,176.338 174.81,176.345C175.016,178.658 173.282,179.434 171.631,180.022C169.083,180.929 166.49,181.836 163.838,182.3C152.267,184.321 140.669,186.182 129.079,188.1C129.08,188.1 129.081,188.1 129.083,188.1C132.048,188.386 135.015,188.673 137.983,188.96C143.31,188.046 148.64,187.16 153.959,186.212C161.648,184.842 169.569,184.267 176.388,179.831C176.364,179.492 176.461,179.098 176.569,178.7C176.864,177.604 177.237,176.473 175.376,176.352" style="fill:#23509c;fill-rule:nonzero;"/>
<path d="M74.894,124.765C76.511,124.35 76.855,123.206 76.239,121.493C73.885,114.949 74.077,108.436 77.469,102.244C78.708,99.983 80.425,98.111 83.422,98.407C83.703,98.341 83.985,98.274 84.266,98.208C78.559,97.571 77.569,98.116 75.291,103.21C74.649,104.648 74.013,106.186 73.856,107.727C73.711,109.155 73.583,110.585 73.463,112.015C73.143,115.853 72.824,119.871 72.531,123.713" style="fill:#fff;fill-rule:nonzero;"/>
<path d="M88.473,121.999C89.061,121.561 90.895,122.251 91.196,121.666C93.484,117.228 93.537,114.409 93.304,109.585C93.294,109.396 93.248,106.21 93.179,106.024C92.971,105.467 91.552,104.921 91.287,104.367L91.286,104.366C90.646,103.291 90.125,102.112 89.315,101.185C88.927,100.74 87.99,100.774 87.302,100.592C88.251,102.55 89.548,104.419 90.08,106.484C91.448,111.795 90.451,116.975 88.473,121.999" style="fill:#f8f1ed;fill-rule:nonzero;"/>
<path d="M84.955,83.037C84.933,82.716 84.912,82.396 84.89,82.075C84.792,81.85 84.695,81.625 84.597,81.399C83.951,79.253 83.304,77.107 82.658,74.96C82.425,74.945 82.192,74.931 81.958,74.916C80.644,78.371 79.329,81.827 78.014,85.283C78.871,85.01 79.729,84.741 80.585,84.464C82.042,83.991 83.499,83.513 84.955,83.037" style="fill:#e5a86e;fill-rule:nonzero;"/>
<path d="M77.719,91.861C78.053,89.3 79.294,87.42 81.314,86.328C82.526,85.673 84.018,85.301 85.762,85.236C85.493,84.503 85.224,83.77 84.955,83.037C83.499,83.513 82.043,83.991 80.585,84.464C79.73,84.741 78.872,85.01 78.015,85.283C77.407,87.086 76.709,88.866 76.225,90.702C76.067,91.299 76.118,91.748 76.369,91.968C76.62,92.189 77.072,92.18 77.719,91.861" style="fill:#e8be74;fill-rule:nonzero;"/>
<path d="M85.118,156.358C85.934,156.261 86.892,150.04 84.046,149.506C84.259,150.868 84.259,150.868 84.046,149.506C83.635,149.014 83.223,148.522 82.812,148.03C82.441,148.653 82.069,149.275 81.698,149.899C82.088,152.294 82.477,154.687 82.866,157.08C83.617,156.84 84.367,156.599 85.118,156.358C85.031,155.8 85.031,155.8 85.118,156.358ZM69.967,158.649C71.317,158.34 72.667,158.03 74.017,157.721L74.018,157.721C74.232,157.733 74.446,157.745 74.66,157.758L74.874,157.77C75,157.781 75.127,157.791 75.253,157.802L75.634,157.833C76.889,157.852 78.144,157.872 79.399,157.892C80.234,157.671 81.068,157.45 81.904,157.229C82.225,157.18 82.545,157.13 82.866,157.08C82.477,154.686 82.088,152.293 81.698,149.898C79.003,151.043 76.257,151.478 73.38,151.147C72.969,151.099 72.555,151.036 72.139,150.957C70.3,150.609 69.188,149.922 69.268,147.924C69.175,147.157 69.175,147.157 69.268,147.925C70.473,147.696 71.677,147.468 72.882,147.24L72.883,147.24C73.794,147.279 74.758,147.488 75.646,147.447C75.942,147.434 76.229,147.393 76.503,147.309C77.586,146.975 79.204,146.022 79.292,145.202C79.764,140.797 79.743,136.365 76.393,132.805C73.347,129.568 73.054,128.746 74.894,124.754C74.23,124.449 72.568,123.652 72.568,123.652C72.568,123.652 73.143,116.418 73.429,112.823C74.003,105.594 75.411,102.957 75.411,102.957C75.411,102.957 72.218,107.502 70.841,111.542C69.257,116.19 67.903,123.472 67.349,124.501C65.346,128.216 64.211,128.997 60.066,131.85C59.58,134.578 64.841,136.181 61.556,139.234C59.591,141.061 57.099,142.32 54.505,144.062C56.698,150.041 60.731,155.116 66.279,159.113C66.858,159.53 67.374,159.797 67.848,159.882C68.265,159.957 68.647,159.875 69.013,159.648C69.342,159.445 69.657,159.128 69.967,158.65C69.521,158.198 69.521,158.197 69.967,158.649Z" style="fill:#fdea8e;fill-rule:nonzero;"/>
<path d="M135.687,209.323C135.451,209.144 135.215,208.966 134.979,208.788C132.421,211.943 129.863,215.099 127.305,218.255C127.658,218.556 128.011,218.857 128.364,219.158C130.805,215.879 133.246,212.601 135.687,209.323" style="fill:#e8be74;fill-rule:nonzero;"/>
<path d="M84.891,82.075C84.793,81.85 84.696,81.624 84.598,81.399" style="fill:none;stroke:#c76238;stroke-width:0.1px;"/>
<path d="M120.695,225.862C120.548,226.023 120.402,226.183 120.256,226.344" style="fill:none;stroke:#c76238;stroke-width:0.1px;"/>
<path d="M148.049,194.835C147.865,194.671 147.682,194.506 147.498,194.342" style="fill:none;stroke:#c76238;stroke-width:0.1px;"/>
<path d="M118.403,191.359C118.174,191.376 117.945,191.392 117.716,191.409" style="fill:none;stroke:#c76238;stroke-width:0.1px;"/>
<path d="M98.084,281.49C98.031,281.419 97.97,281.373 97.901,281.353C97.833,281.332 97.756,281.338 97.672,281.369C97.809,281.409 97.947,281.45 98.084,281.49" style="fill:#e8be74;fill-rule:nonzero;"/>
<path d="M144.414,126.224C143.409,128.663 141.432,130.622 138.363,130.475C135.321,130.329 133.653,128.276 132.666,125.737C130.088,119.102 130.427,112.512 133.711,106.207C134.894,103.936 136.706,102.117 139.672,102.216C142.538,102.311 144.17,104.177 145.055,106.475C146.148,109.313 146.723,112.35 147.62,115.659C146.592,119.156 145.817,122.819 144.414,126.224M147.788,127.673C150.444,123.095 151.542,118.126 151.621,112.891C151.634,112.052 151.627,111.185 151.438,110.374C150.456,106.149 149.692,101.503 144.574,100.388C138.323,99.025 132.446,99.921 127.907,105.086C125.472,107.856 125.537,108.948 125.537,108.948L124.88,121.134C124.88,121.134 127.487,127.01 129.103,129.875C131.053,133.332 136.392,135.528 140.54,135.295C144.499,135.073 146.327,133.097 148.208,128.905C148.055,128.487 147.645,127.92 147.788,127.673" style="fill:#f8f1ed;fill-rule:nonzero;"/>
<path d="M195.672,76.297C195.856,76.411 196.04,76.525 196.225,76.639" style="fill:none;stroke:#c76238;stroke-width:0.1px;"/>
<path d="M66.493,303.478L66.493,303.478" style="fill:none;stroke:#920c09;stroke-width:0.1px;"/>
<path d="M66.493,303.478C66.498,303.481 66.504,303.485 66.509,303.488" style="fill:none;stroke:#920c09;stroke-width:0.1px;"/>
<path d="M66.493,303.478C65.87,303.096 65.246,302.714 64.623,302.332" style="fill:none;stroke:#920c09;stroke-width:0.1px;"/>
<path d="M81.85,114.229C79.876,114.171 78.378,115.378 78.388,117.017C78.405,119.699 80.41,122.932 82.114,123.023C83.683,123.108 85.993,120.342 86.123,118.223C86.238,116.348 84.039,114.293 81.85,114.229" style="fill:#fff;fill-rule:nonzero;"/>
<path d="M85.325,108.908C85.94,108.748 86.7,107.707 86.738,107.03C86.861,104.808 84.875,101.879 83.733,102.397C82.838,102.803 82.298,103.99 81.949,104.41C82.042,107.034 83.899,109.28 85.325,108.908" style="fill:#fff;fill-rule:nonzero;"/>
<path d="M217.991,86.438C230.321,79.789 240.098,70.519 247.793,58.835C256.411,45.747 262.171,31.267 268.694,17.152C268.854,16.805 268.714,16.319 268.714,15.677C244.203,23.722 221.526,34.049 205.848,55.794C207.747,56.084 209.351,56.163 210.85,56.603C212.454,57.074 213.959,57.885 215.507,58.547C214.578,59.963 213.931,61.739 212.669,62.731C208.155,66.28 203.431,69.563 199.116,72.707C202.975,76.677 207.296,80.936 211.386,85.408C213.462,87.677 215.284,87.898 217.991,86.438" style="fill:#ffe9a5;fill-rule:nonzero;"/>
<path d="M141.933,113.609C139.619,113.579 138.918,111.779 139.099,109.916C139.188,109.005 140.014,108.165 140.642,107.306C140.732,107.184 140.817,107.06 140.896,106.937C141.614,108.046 142.332,109.155 143.128,110.384C143.393,110.794 143.667,111.217 143.952,111.658C143.046,112.571 142.483,113.616 141.933,113.609M138.704,127.047C136.93,127.148 134.807,123.774 134.721,121.236C134.557,118.449 136.09,118.1 137.779,118.022C140.185,117.912 142.644,119.512 142.716,121.164C142.805,123.236 140.268,126.957 138.704,127.047M139.672,102.216C136.705,102.117 134.894,103.936 133.711,106.207C130.427,112.512 130.087,119.102 132.666,125.737C133.653,128.276 135.321,130.329 138.363,130.475C141.431,130.622 143.409,128.663 144.414,126.224C145.817,122.819 146.592,119.156 147.619,115.659C146.723,112.35 146.148,109.313 145.055,106.475C144.169,104.177 142.538,102.311 139.672,102.216" style="fill:#930e0b;fill-rule:nonzero;"/>
<path d="M137.779,118.022C136.09,118.099 134.557,118.448 134.721,121.235C134.807,123.774 136.93,127.148 138.704,127.046C140.268,126.957 142.805,123.235 142.715,121.164C142.644,119.512 140.185,117.912 137.779,118.022" style="fill:#fff;fill-rule:nonzero;"/>
<path d="M140.896,106.936C140.817,107.06 140.732,107.183 140.642,107.306C140.014,108.165 139.188,109.004 139.099,109.916C138.918,111.779 139.619,113.578 141.933,113.608C142.483,113.616 143.046,112.57 143.952,111.657C143.667,111.216 143.393,110.793 143.128,110.384C142.332,109.155 141.614,108.045 140.896,106.936" style="fill:#dfd5dc;fill-rule:nonzero;"/>
<path d="M205.848,55.794C207.747,56.084 209.352,56.163 210.85,56.603C212.455,57.074 213.959,57.885 215.507,58.547C214.578,59.964 213.932,61.739 212.669,62.731C208.155,66.28 203.432,69.563 199.117,72.707C202.975,76.677 207.297,80.936 211.386,85.408C213.462,87.677 215.284,87.898 217.991,86.438C222.078,84.234 225.859,81.716 229.401,78.944L233.494,72.903L231.467,72.677L235.295,70.951L233.719,69.675L237.472,69.75L238.373,67.723L232.293,64.495L239.199,64.045L235.821,59.616L240.625,54.811L232.518,53.31L244.454,40.173L232.518,44.152L234.094,42.35L246.781,29.664L231.392,37.921L232.368,34.994L229.425,33.445C220.557,39.285 212.558,46.488 205.848,55.794" style="fill:#e8be74;fill-rule:nonzero;"/>
<path d="M205.848,55.794C207.747,56.084 209.352,56.163 210.85,56.603C212.455,57.074 213.959,57.885 215.507,58.547C214.578,59.964 213.932,61.739 212.669,62.731C208.155,66.28 203.432,69.563 199.117,72.707C202.975,76.677 207.297,80.936 211.386,85.408C213.462,87.677 215.284,87.898 217.991,86.438C220.146,85.276 222.195,84.006 224.196,82.685L230.191,74.104L225.837,74.104L231.842,71.101L223.435,68.849L236.046,68.098L224.936,62.994L236.496,63.144L233.494,59.991L237.697,56.087L229.29,54.736L240.1,43.326L229.29,46.779L231.692,42.575L242.652,33.117L227.188,41.825L229.89,36.12L227.257,34.923C219.254,40.494 212.005,47.254 205.848,55.794" style="fill:#fffab6;fill-rule:nonzero;"/>
<path d="M72.14,90.675C73.163,87.63 73.785,85.472 74.608,83.394C76.295,79.133 78.106,74.922 79.831,70.676C80.635,68.698 80.385,67.14 78.247,66.01C73.868,63.696 69.786,60.677 65.211,58.909C59.846,56.837 54.441,54.868 49.021,52.941L40.069,51.984L51.38,57.389L41.271,56.388L48.277,58.69L51.98,62.593L48.377,63.194L51.78,64.895L49.078,65.996L53.782,68.398C53.782,68.398 47.376,68.599 45.674,68.999C45.674,68.999 53.381,72.502 57.485,72.702C57.485,72.702 52.981,74.003 48.577,73.503C48.577,73.503 51.079,76.806 56.084,77.106L51.38,78.708L56.822,84.652C57.916,85.229 59.029,85.787 60.162,86.324C63.91,88.102 67.987,89.188 72.14,90.675" style="fill:#e8be74;fill-rule:nonzero;"/>
<path d="M74.608,83.394C76.295,79.133 78.106,74.922 79.831,70.676C80.635,68.699 80.385,67.14 78.247,66.01C73.868,63.696 69.786,60.677 65.21,58.909C61.247,57.378 57.258,55.911 53.26,54.466L48.877,54.186L55.383,58.089L47.876,57.789L54.582,62.893L53.381,63.194L55.984,64.895L50.078,66.397L57.485,68.999L50.078,69.6L60.688,72.002C60.688,72.002 55.883,74.504 52.48,74.804L59.987,76.806L54.883,79.709L60.069,86.278C60.1,86.293 60.13,86.309 60.162,86.324C63.91,88.102 67.987,89.188 72.14,90.675C73.163,87.63 73.785,85.472 74.608,83.394" style="fill:#fffab6;fill-rule:nonzero;"/>
<path d="M125.571,107.184C127.074,96.567 132.873,92.852 144.224,94.15C146.918,94.458 149.981,95.845 151.902,97.727C156.221,101.961 161.153,104.603 167.118,105.814C160.58,107.775 158.399,113.317 156.136,118.655C154.372,122.817 152.084,126.441 148.207,128.905C146.326,133.097 142.498,134.074 138.539,134.295C134.391,134.528 131.052,132.332 129.103,128.875C127.486,126.01 126.407,123.092 125.879,120.135C125.704,119.149 125.589,118.159 125.536,117.165C125.484,116.19 125.494,115.212 125.561,114.23C125.566,114.159 125.574,114.089 125.58,114.018C125.809,111.065 126.577,108.083 127.906,105.086C127.814,105.169 127.718,105.255 127.626,105.338C126.992,105.907 126.347,106.487 125.571,107.184M91.287,104.367C91.552,104.921 91.971,105.468 92.179,106.025C92.248,106.21 92.294,106.397 92.303,106.585C92.536,111.41 92.484,116.229 90.196,120.667C89.894,121.252 89.06,121.562 88.473,122C87.275,123.475 88.74,123.31 89.461,123.604C91.271,124.341 93.242,124.829 94.855,125.871C97.499,127.577 97.568,130.567 94.997,132.385C93.351,133.549 91.375,134.301 89.468,135.029C85.749,136.45 84.623,138.386 84.999,143.311C85.241,146.477 87.787,147.259 90.156,147.497C94.982,147.983 99.878,147.793 104.698,148.318C108.925,148.778 113.108,149.749 117.258,150.716C117.9,150.866 118.264,152.207 118.756,152.998C117.911,153.387 116.825,154.329 116.26,154.082C110.263,151.454 103.935,152.407 97.716,151.966C95.994,151.843 94.282,151.587 92.574,151.269C89.727,150.74 86.892,150.04 84.046,149.506C84.403,151.79 84.76,154.074 85.118,156.358C85.934,156.261 86.749,156.177 87.563,156.109C89.189,155.973 90.81,155.899 92.422,155.914C95.648,155.942 98.844,156.322 102.003,157.249C102.793,157.48 103.58,157.746 104.365,158.049C106.636,158.926 108.282,160.121 108.767,162.591C114.287,162.442 119.535,163.552 124.632,165.691C132.964,169.188 141.79,168.819 150.45,168.033C164.288,166.775 177.431,162.613 189.967,156.662C195.704,153.939 199.469,148.915 203.733,144.307C201.932,141.976 200.311,139.806 198.607,137.703C197.618,136.484 197.27,135.28 198.784,134.391C203.373,131.696 204.257,127.233 204.43,122.542C204.827,111.754 205.093,100.927 202.25,90.393C201.263,86.735 199.29,83.343 197.758,79.833C197.314,78.817 196.839,77.814 196.378,76.804L196.224,76.639C196.04,76.526 195.856,76.411 195.671,76.297C194.699,75.579 193.621,74.963 192.786,74.109C192.12,73.427 191.277,72.391 191.382,71.632C191.482,70.905 192.604,69.996 193.447,69.748C199.026,68.102 204.088,65.576 208.352,61.568C208.67,61.269 208.93,60.909 209.839,59.859C207.222,59.859 205.305,59.976 203.412,59.814C202.31,59.72 200.634,59.456 200.324,58.768C199.966,57.975 200.564,56.442 201.2,55.555C211.695,40.916 224.963,29.529 241.531,22.336C251.064,18.198 260.849,14.634 270.573,10.951C271.693,10.526 273.152,10.995 274.453,11.049C278.172,9.185 280.307,5.988 282.357,3.54C280.213,4.117 276.322,4.877 274.174,5.433C250.613,11.533 227.429,18.573 206.936,32.333C204.897,33.702 203.649,33.305 202.552,31.02C201.567,28.967 200.063,27.163 198.787,25.25C198.473,25.348 198.159,25.446 197.844,25.544C197.12,34.524 192.193,41.332 186.669,47.809C183.322,51.734 179.753,55.475 176.518,59.487C174.656,61.796 172.749,62.296 169.926,61.533C159.69,58.766 149.235,57.737 138.719,59.228C119.411,61.967 103.091,70.331 90.619,85.65C89.638,86.855 88.894,87.499 88.232,87.593C88.043,87.619 87.86,87.601 87.681,87.538C87.591,87.506 87.503,87.463 87.414,87.409C86.883,87.085 86.365,86.359 85.762,85.236L85.761,85.236L85.762,85.237C84.017,85.302 82.525,85.673 81.314,86.328C79.294,87.42 78.053,89.3 77.719,91.861C78.084,91.782 78.446,91.684 78.815,91.626C86.596,90.401 92.326,92.356 91.719,102.273C91.671,102.557 91.624,102.841 91.576,103.123C91.479,103.536 91.383,103.952 91.287,104.367" style="fill:#fdea8e;fill-rule:nonzero;"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 49 KiB

7
client/static/svg/login-bg.svg
Unescape View File

@ -1,7 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg width="100%" height="100%" viewBox="0 0 1500 1000" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:1.41421;">
<path d="M1500,543c0,0 -135.753,54.677 -252.197,101.577c-106.023,42.702 -223.596,47.2 -332.571,12.724c-56.088,-17.745 -118.404,-37.46 -173.999,-55.048c-103.773,-32.831 -216.376,-22.709 -312.631,28.103c0,0 0,0.001 0,0.001c-94.821,50.055 -206.441,57.476 -307.053,20.415c-63.317,-23.322 -121.549,-44.772 -121.549,-44.772l0,417l1500,0l0,-480Z" style="fill:#fff;fill-opacity:0.282609;"/>
<path d="M1510,580c0,0 -144.155,47.882 -252.311,83.806c-74.651,24.796 -156.199,17.958 -225.679,-18.923c0,0 0,0 0,0c-62.207,-33.021 -133.629,-44.415 -203.023,-32.389c-98.381,17.051 -244.859,42.438 -352.664,61.121c-92.259,15.99 -187.076,8.079 -275.41,-22.977c-93.342,-32.818 -200.913,-70.638 -200.913,-70.638l0,466l1500,0l10,-466Z" style="fill:#fff;fill-opacity:0.550725;"/>
<path d="M1500,650c0,0 -143.367,28.581 -239.425,47.731c-56.087,11.181 -113.694,12.508 -170.237,3.922c-74.75,-11.351 -183.318,-27.838 -261.719,-39.743c-65.252,-9.909 -131.707,-8.759 -196.577,3.4c-49.655,9.308 -109.704,20.564 -158.992,29.803c-63.125,11.833 -127.839,12.479 -191.188,1.911c-111.875,-18.665 -281.862,-47.024 -281.862,-47.024l0,430l1500,0l0,-430Z" style="fill:#fff;"/>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 1.5 KiB

0
client/static/svg/login-bg-motif.svg → client/static/svg/motif-blocks.svg
Unescape View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 587 B

After

Width:  |  Height:  |  Size: 587 B

3
client/static/svg/motif-circuit.svg
View File

File diff suppressed because one or more lines are too long
Side by Side

After

Width:  |  Height:  |  Size: 5.2 KiB

0
client/static/svg/config-bg.svg → client/static/svg/motif-grid.svg
Unescape View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

15
client/static/svg/motif-overlay.svg
Unescape View File

@ -0,0 +1,15 @@
<!-- background by SVGBackgrounds.com -->
<svg xmlns='http://www.w3.org/2000/svg' width='100%' height='100%' viewBox='0 0 1600 800'>
<g>
<path fill='#1356b1' d='M486 705.8c-109.3-21.8-223.4-32.2-335.3-19.4C99.5 692.1 49 703 0 719.8V800h843.8c-115.9-33.2-230.8-68.1-347.6-92.2C492.8 707.1 489.4 706.5 486 705.8z'/>
<path fill='#1866c1' d='M1600 0H0v719.8c49-16.8 99.5-27.8 150.7-33.5c111.9-12.7 226-2.4 335.3 19.4c3.4 0.7 6.8 1.4 10.2 2c116.8 24 231.7 59 347.6 92.2H1600V0z'/>
<path fill='#1c75d2' d='M478.4 581c3.2 0.8 6.4 1.7 9.5 2.5c196.2 52.5 388.7 133.5 593.5 176.6c174.2 36.6 349.5 29.2 518.6-10.2V0H0v574.9c52.3-17.6 106.5-27.7 161.1-30.9C268.4 537.4 375.7 554.2 478.4 581z'/>
<path fill='#1f86e2' d='M0 0v429.4c55.6-18.4 113.5-27.3 171.4-27.7c102.8-0.8 203.2 22.7 299.3 54.5c3 1 5.9 2 8.9 3c183.6 62 365.7 146.1 562.4 192.1c186.7 43.7 376.3 34.4 557.9-12.6V0H0z'/>
<path fill='#2196f3' d='M181.8 259.4c98.2 6 191.9 35.2 281.3 72.1c2.8 1.1 5.5 2.3 8.3 3.4c171 71.6 342.7 158.5 531.3 207.7c198.8 51.8 403.4 40.8 597.3-14.8V0H0v283.2C59 263.6 120.6 255.7 181.8 259.4z'/>
<path fill='#55a4f5' d='M1600 0H0v136.3c62.3-20.9 127.7-27.5 192.2-19.2c93.6 12.1 180.5 47.7 263.3 89.6c2.6 1.3 5.1 2.6 7.7 3.9c158.4 81.1 319.7 170.9 500.3 223.2c210.5 61 430.8 49 636.6-16.6V0z'/>
<path fill='#74b2f7' d='M454.9 86.3C600.7 177 751.6 269.3 924.1 325c208.6 67.4 431.3 60.8 637.9-5.3c12.8-4.1 25.4-8.4 38.1-12.9V0H288.1c56 21.3 108.7 50.6 159.7 82C450.2 83.4 452.5 84.9 454.9 86.3z'/>
<path fill='#8ec0f8' d='M1600 0H498c118.1 85.8 243.5 164.5 386.8 216.2c191.8 69.2 400 74.7 595 21.1c40.8-11.2 81.1-25.2 120.3-41.7V0z'/>
<path fill='#a5cffa' d='M1397.5 154.8c47.2-10.6 93.6-25.3 138.6-43.8c21.7-8.9 43-18.8 63.9-29.5V0H643.4c62.9 41.7 129.7 78.2 202.1 107.4C1020.4 178.1 1214.2 196.1 1397.5 154.8z'/>
<path fill='#bbdefb' d='M1315.3 72.4c75.3-12.6 148.9-37.1 216.8-72.4h-723C966.8 71 1144.7 101 1315.3 72.4z'/>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.9 KiB

150
dev/installer/main.go
Unescape View File

@ -3,100 +3,106 @@ package main
import (
"fmt"
"runtime"
"time"
"github.com/gosuri/uiprogress"
"github.com/manifoldco/promptui"
"github.com/ttacon/chalk"
"github.com/bugsnag/bugsnag-go"
"github.com/fatih/color"
"gopkg.in/AlecAivazis/survey.v1"
)
var logo = `
__ __ _ _ _ _
/ / /\ \ (_) | _(_) (_)___
\ \/ \/ / | |/ / | | / __|
\ /\ /| | <| |_ | \__ \
\/ \/ |_|_|\_\_(_)/ |___/
|__/
`
var finish = `
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
| |
| Open http://localhost:3000/ in your browser |
| to complete the installation! |
| |
<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
`
var qs = []*survey.Question{
{
Name: "location",
Prompt: &survey.Input{
Message: "Where do you want to install Wiki.js?",
Default: "./wiki",
},
Validate: survey.Required,
},
{
Name: "dbtype",
Prompt: &survey.Select{
Message: "Select a DB Driver:",
Options: []string{"MariabDB", "MS SQL Server", "MySQL", "PostgreSQL", "SQLite"},
Default: "PostgreSQL",
},
},
{
Name: "port",
Prompt: &survey.Input{
Message: "Server Port:",
Default: "3000",
},
},
}
func main() {
fmt.Println(chalk.Yellow.Color(logo))
fmt.Println(chalk.Bold.TextStyle("Installer for Wiki.js 2.x"))
bugsnag.Configure(bugsnag.Configuration{
APIKey: "37770b3b08864599fd47c4edba5aa656",
ReleaseStage: "dev",
})
bold := color.New(color.FgWhite).Add(color.Bold)
logo := `
__ __ _ _ _ _
/ / /\ \ (_) | _(_) (_)___
\ \/ \/ / | |/ / | | / __|
\ /\ /| | <| |_ | \__ \
\/ \/ |_|_|\_\_(_)/ |___/
|__/
`
color.Yellow(logo)
bold.Println("\nInstaller for Wiki.js 2.x")
fmt.Printf("%s-%s\n\n", runtime.GOOS, runtime.GOARCH)
// Check system requirements
fmt.Println(chalk.Bold.TextStyle("Verifying system requirements..."))
bold.Println("Verifying system requirements...")
CheckNodeJs()
CheckRAM()
fmt.Println(chalk.Bold.TextStyle("\nSetup"))
// Prompt for build to install
fmt.Println()
promptBuild := promptui.Select{
Label: "Select Build to install",
Items: []string{"Stable", "Dev"},
Templates: &promptui.SelectTemplates{
Help: " ",
Selected: chalk.Green.Color("✔") + " Build: {{ . }}",
},
}
_, _, err := promptBuild.Run()
// the answers will be written to this struct
answers := struct {
Location string
DBType string `survey:"dbtype"`
Port int
}{}
// perform the questions
err := survey.Ask(qs, &answers)
if err != nil {
fmt.Printf("Prompt failed %v\n", err)
fmt.Println(err.Error())
return
}
// Choose database driver
promptDB := promptui.Select{
Label: "Select database driver",
Items: []string{"MariaDB", "MySQL", "MS SQL Server", "PostgreSQL", "SQLite"},
Templates: &promptui.SelectTemplates{
Help: " ",
Selected: chalk.Green.Color("✔") + " Database Driver: {{ . }}",
},
Size: 10,
}
_, _, err = promptDB.Run()
// Port
promptPort := promptui.Prompt{
Label: "Port",
Default: "3000",
Templates: &promptui.PromptTemplates{
Success: chalk.Green.Color("✔") + " Port: {{ . }}",
},
}
_, err = promptPort.Run()
fmt.Printf("%s chose %d.", answers.Location, answers.Port)
// Download archives...
fmt.Println(chalk.Bold.TextStyle("\nDownloading packages..."))
bold.Println("\nDownloading packages...")
uiprogress.Start()
bar := uiprogress.AddBar(100)
// uiprogress.Start()
// bar := uiprogress.AddBar(100)
bar.AppendCompleted()
bar.PrependElapsed()
// bar.AppendCompleted()
// bar.PrependElapsed()
for bar.Incr() {
time.Sleep(time.Millisecond * 20)
}
// for bar.Incr() {
// time.Sleep(time.Millisecond * 20)
// }
finish := `
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
| |
| Open http://localhost:3000/ in your browser |
| to complete the installation! |
| |
<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
`
color.Yellow("\n\n" + finish)
fmt.Println("\n" + chalk.Yellow.Color(finish))
fmt.Println("Press any key to continue.")
fmt.Scanln()
}

15
dev/installer/syscheck.go
Unescape View File

@ -3,15 +3,14 @@ package main
import (
"fmt"
"log"
"os"
"os/exec"
"github.com/blang/semver"
"github.com/fatih/color"
"github.com/pbnjay/memory"
"github.com/ttacon/chalk"
)
const nodejsSemverRange = ">=8.11.3 <10.0.0"
const nodejsSemverRange = ">=8.11.4 <11.0.0"
const ramMin = 768
// CheckNodeJs checks if Node.js is installed and has minimal supported version
@ -25,11 +24,10 @@ func CheckNodeJs() bool {
validRange := semver.MustParseRange(nodejsSemverRange)
nodeVersion, err := semver.ParseTolerant(string(cmdOutput[:]))
if !validRange(nodeVersion) {
fmt.Printf(chalk.Red.Color("Error: Installed Node.js version is not supported! %s"), nodejsSemverRange)
os.Exit(1)
panic(fmt.Errorf(color.RedString("Error: Installed Node.js version %s is not supported! %s\n"), nodeVersion, nodejsSemverRange))
}
fmt.Printf(chalk.Green.Color("✔")+" Node.js %s: OK\n", nodeVersion.String())
fmt.Printf(color.GreenString("✔")+" Node.js %s: OK\n", nodeVersion.String())
return true
}
@ -38,11 +36,10 @@ func CheckNodeJs() bool {
func CheckRAM() bool {
var totalRAM = memory.TotalMemory() / 1024 / 1024
if totalRAM < ramMin {
fmt.Printf(chalk.Red.Color("Error: System does not meet RAM requirements. %s MB minimum."), ramMin)
os.Exit(1)
panic(fmt.Errorf(color.RedString("Error: System does not meet RAM requirements. %s MB minimum.\n"), ramMin))
}
fmt.Printf(chalk.Green.Color("✔")+" Total System RAM %d MB: OK\n", totalRAM)
fmt.Printf(color.GreenString("✔")+" Total System RAM %d MB: OK\n", totalRAM)
return true
}

4
server/app/data.yml
Unescape View File

@ -66,6 +66,10 @@ jobs:
onInit: true
cron: '*/15 * * * *'
concurrency: 0
renderPage:
onInit: false
cron: false
concurrency: 1
syncGraphLocales:
onInit: true
cron: '0 0 * * *'

26
server/controllers/common.js
Unescape View File

@ -1,5 +1,8 @@
const express = require('express')
const router = express.Router()
const pageHelper = require('../helpers/page')
/* global WIKI */
/**
* Create/Edit document
@ -25,15 +28,20 @@ router.get(['/p', '/p/*'], (req, res, next) => {
/**
* View document
*/
router.get('/', (req, res, next) => {
res.render('welcome')
})
/**
* View document
*/
router.get('/*', (req, res, next) => {
res.render('page')
router.get('/*', async (req, res, next) => {
const pageArgs = pageHelper.parsePath(req.path)
const page = await WIKI.models.pages.getPage({
path: pageArgs.path,
locale: pageArgs.locale,
userId: req.user.id
})
if (page) {
res.render('page')
} else if (pageArgs.path === 'home') {
res.render('welcome')
} else {
res.render('new')
}
})
module.exports = router

1
server/db/migrations/2.0.0.js
Unescape View File

@ -87,6 +87,7 @@ exports.up = knex => {
table.string('description')
table.boolean('isPrivate').notNullable().defaultTo(false)
table.boolean('isPublished').notNullable().defaultTo(false)
table.string('privateNS')
table.string('publishStartDate')
table.string('publishEndDate')
table.text('content')

60
server/helpers/entry.js
Unescape View File

@ -1,60 +0,0 @@
/* global appdata, ROOTPATH */
const crypto = require('crypto')
const path = require('path')
const qs = require('querystring')
const _ = require('lodash')
module.exports = {
/**
* Parse raw url path and make it safe
*
* @param {String} urlPath The url path
* @return {String} Safe entry path
*/
parsePath (urlPath) {
urlPath = qs.unescape(urlPath)
let wlist = new RegExp('[^a-z0-9' + appdata.regex.cjk + appdata.regex.arabic + '/-]', 'g')
urlPath = _.toLower(urlPath).replace(wlist, '')
if (urlPath === '/') {
urlPath = 'home'
}
let urlParts = _.filter(_.split(urlPath, '/'), (p) => { return !_.isEmpty(p) })
return _.join(urlParts, '/')
},
/**
* Gets the full original path of a document.
*
* @param {String} entryPath The entry path
* @return {String} The full path.
*/
getFullPath (entryPath) {
return path.join(appdata.repoPath, entryPath + '.md')
},
/**
* Gets the full cache path of a document.
*
* @param {String} entryPath The entry path
* @return {String} The full cache path.
*/
getCachePath (entryPath) {
return path.join(appdata.cachePath, crypto.createHash('md5').update(entryPath).digest('hex') + '.json')
},
/**
* Gets the entry path from full path.
*
* @param {String} fullPath The full path
* @return {String} The entry path
*/
getEntryPathFromFullPath (fullPath) {
let absRepoPath = path.resolve(ROOTPATH, appdata.repoPath)
return _.chain(fullPath).replace(absRepoPath, '').replace('.md', '').replace(new RegExp('\\\\', 'g'), '/').value()
}
}

30
server/helpers/page.js
Unescape View File

@ -0,0 +1,30 @@
const qs = require('querystring')
const _ = require('lodash')
module.exports = {
/**
* Parse raw url path and make it safe
*/
parsePath (rawPath) {
let pathObj = {
locale: 'en',
path: 'home',
private: false,
privateNS: ''
}
// Clean Path
rawPath = _.trim(qs.unescape(rawPath))
if (_.startsWith(rawPath, '/')) { rawPath = rawPath.substring(1) }
if (rawPath === '') { rawPath = 'home' }
// Extract Info
let pathParts = _.filter(_.split(rawPath, '/'), p => !_.isEmpty(p))
if (pathParts[0].length === 2) {
pathObj = pathParts[0]
pathParts.shift()
}
pathObj.path = _.join(pathParts, '/')
return pathObj
}
}

1
server/jobs/render-page.js
Unescape View File

@ -6,7 +6,6 @@ module.exports = async (job) => {
WIKI.logger.info(`Rendering page ${job.data.path}...`)
try {
WIKI.logger.info(`Rendering page ${job.data.path}: [ COMPLETED ]`)
} catch (err) {
WIKI.logger.error(`Rendering page ${job.data.path}: [ FAILED ]`)

23
server/models/pages.js
Unescape View File

@ -1,4 +1,5 @@
const Model = require('objection').Model
const _ = require('lodash')
/* global WIKI */
@ -19,6 +20,7 @@ module.exports = class Page extends Model {
title: {type: 'string'},
description: {type: 'string'},
isPublished: {type: 'boolean'},
privateNS: {type: 'string'},
publishStartDate: {type: 'string'},
publishEndDate: {type: 'string'},
content: {type: 'string'},
@ -87,6 +89,27 @@ module.exports = class Page extends Model {
this.updatedAt = new Date().toISOString()
}
static async getPage(opts) {
const page = await WIKI.models.pages.query().where({
path: opts.path,
localeCode: opts.locale
}).andWhere(builder => {
builder.where({
isPublished: true
}).orWhere({
isPublished: false,
authorId: opts.userId
})
}).andWhere(builder => {
if (opts.private) {
builder.where({ isPrivate: true, privateNS: opts.privateNS })
} else {
builder.where({ isPrivate: false })
}
}).first()
return page
}
static async createPage(opts) {
await WIKI.models.pages.renderPage(opts)
const page = await WIKI.models.pages.query().insertAndFetch({

16
server/views/new.pug
Unescape View File

@ -0,0 +1,16 @@
extends master.pug
block body
#root.is-fullscreen
v-app
.newpage
.newpage-content
img.animated.fadeIn(src='/svg/henry-thinking.svg', alt='Henry')
.headline= t('newpage.title')
.subheading.mt-3= t('newpage.subtitle')
v-btn.mt-5(href='/e/home', large)
v-icon(left) add
span= t('newpage.create')
v-btn.mt-2(color='blue lighten-4', href='javascript:window.history.go(-1);', large, outline)
v-icon(left) arrow_back
span= t('newpage.goback')

13
server/views/welcome.pug
Unescape View File

@ -4,9 +4,10 @@ block body
#root.is-fullscreen
v-app
.onboarding
img.animated.fadeIn(src='/svg/logo-wikijs.svg', alt='Wiki.js')
.headline= t('welcome.title')
.subheading.mt-3= t('welcome.subtitle')
v-btn.mt-5(color='primary', href='/e/home', large)
v-icon(left) add
span= t('welcome.createhome')
.onboarding-content
img.animated.fadeIn(src='/svg/logo-wikijs.svg', alt='Wiki.js')
.headline= t('welcome.title')
.subheading.mt-3= t('welcome.subtitle')
v-btn.mt-5(color='primary', href='/e/home', large)
v-icon(left) add
span= t('welcome.createhome')

Write Preview
Loading…
Cancel
Save