diff --git a/package-lock.json b/package-lock.json index e56d5d8bbcf7d19cb2b502c8275c09a8d30eb7b6..31f3a6f043da624d9d3c6de7b4f9106a47b92f80 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,12 +11,16 @@ "@mdi/font": "5.9.55", "@vuelidate/core": "^2.0.0-alpha.40", "@vuelidate/validators": "^2.0.0-alpha.28", + "axios": "^0.26.1", "core-js": "^3.8.3", + "cssom": "^0.5.0", "roboto-fontface": "*", "vue": "^3.2.13", "vue-router": "^4.0.3", + "vuelidate": "^0.7.7", "vuetify": "^3.0.0-beta.0", "vuex": "^4.0.0", + "vuex-persistedstate": "^4.1.0", "webfontloader": "^1.0.0" }, "devDependencies": { @@ -4469,6 +4473,14 @@ "postcss": "^8.1.0" } }, + "node_modules/axios": { + "version": "0.26.1", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.26.1.tgz", + "integrity": "sha512-fPwcX4EvnSHuInCMItEhAGnaSEXRBjtzh9fOtsE6E1G6p7vl7edEeZe11QHf18+6+9gR5PbKV/sGKNaD8YaMeA==", + "dependencies": { + "follow-redirects": "^1.14.8" + } + }, "node_modules/babel-jest": { "version": "27.5.1", "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-27.5.1.tgz", @@ -6000,10 +6012,9 @@ } }, "node_modules/cssom": { - "version": "0.4.4", - "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.4.4.tgz", - "integrity": "sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw==", - "dev": true + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.5.0.tgz", + "integrity": "sha512-iKuQcq+NdHqlAcwUY0o/HL69XQrUaQdMjmStJ8JFmUaiiQErlhrmuigkg/CU4E2J0IyUKUrMAgl36TvN67MqTw==" }, "node_modules/cssstyle": { "version": "2.3.0", @@ -6099,7 +6110,6 @@ "version": "4.2.2", "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz", "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -7735,7 +7745,6 @@ "version": "1.14.9", "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.9.tgz", "integrity": "sha512-MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w==", - "dev": true, "funding": [ { "type": "individual", @@ -10993,6 +11002,12 @@ } } }, + "node_modules/jsdom/node_modules/cssom": { + "version": "0.4.4", + "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.4.4.tgz", + "integrity": "sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw==", + "dev": true + }, "node_modules/jsdom/node_modules/parse5": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz", @@ -14078,6 +14093,11 @@ "node": ">=4" } }, + "node_modules/shvl": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/shvl/-/shvl-2.0.3.tgz", + "integrity": "sha512-V7C6S9Hlol6SzOJPnQ7qzOVEWUQImt3BNmmzh40wObhla3XOYMe4gGiYzLrJd5TFa+cI2f9LKIRJTTKZSTbWgw==" + }, "node_modules/sigmund": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz", @@ -15455,6 +15475,15 @@ "integrity": "sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw==", "dev": true }, + "node_modules/vuelidate": { + "version": "0.7.7", + "resolved": "https://registry.npmjs.org/vuelidate/-/vuelidate-0.7.7.tgz", + "integrity": "sha512-pT/U2lDI67wkIqI4tum7cMSIfGcAMfB+Phtqh2ttdXURwvHRBJEAQ0tVbUsW9Upg83Q5QH59bnCoXI7A9JDGnA==", + "engines": { + "node": ">= 4.0.0", + "npm": ">= 3.0.0" + } + }, "node_modules/vuetify": { "version": "3.0.0-beta.1", "resolved": "https://registry.npmjs.org/vuetify/-/vuetify-3.0.0-beta.1.tgz", @@ -15526,6 +15555,19 @@ "vue": "^3.0.2" } }, + "node_modules/vuex-persistedstate": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/vuex-persistedstate/-/vuex-persistedstate-4.1.0.tgz", + "integrity": "sha512-3SkEj4NqwM69ikJdFVw6gObeB0NHyspRYMYkR/EbhR0hbvAKyR5gksVhtAfY1UYuWUOCCA0QNGwv9pOwdj+XUQ==", + "deprecated": "Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.", + "dependencies": { + "deepmerge": "^4.2.2", + "shvl": "^2.0.3" + }, + "peerDependencies": { + "vuex": "^3.0 || ^4.0.0-rc" + } + }, "node_modules/w3c-hr-time": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz", @@ -19685,6 +19727,14 @@ "postcss-value-parser": "^4.2.0" } }, + "axios": { + "version": "0.26.1", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.26.1.tgz", + "integrity": "sha512-fPwcX4EvnSHuInCMItEhAGnaSEXRBjtzh9fOtsE6E1G6p7vl7edEeZe11QHf18+6+9gR5PbKV/sGKNaD8YaMeA==", + "requires": { + "follow-redirects": "^1.14.8" + } + }, "babel-jest": { "version": "27.5.1", "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-27.5.1.tgz", @@ -20820,10 +20870,9 @@ } }, "cssom": { - "version": "0.4.4", - "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.4.4.tgz", - "integrity": "sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw==", - "dev": true + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.5.0.tgz", + "integrity": "sha512-iKuQcq+NdHqlAcwUY0o/HL69XQrUaQdMjmStJ8JFmUaiiQErlhrmuigkg/CU4E2J0IyUKUrMAgl36TvN67MqTw==" }, "cssstyle": { "version": "2.3.0", @@ -20903,8 +20952,7 @@ "deepmerge": { "version": "4.2.2", "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz", - "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==", - "dev": true + "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==" }, "default-gateway": { "version": "6.0.3", @@ -22127,8 +22175,7 @@ "follow-redirects": { "version": "1.14.9", "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.9.tgz", - "integrity": "sha512-MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w==", - "dev": true + "integrity": "sha512-MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w==" }, "form-data": { "version": "3.0.1", @@ -24519,6 +24566,12 @@ "xml-name-validator": "^3.0.0" }, "dependencies": { + "cssom": { + "version": "0.4.4", + "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.4.4.tgz", + "integrity": "sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw==", + "dev": true + }, "parse5": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz", @@ -26797,6 +26850,11 @@ "rechoir": "^0.6.2" } }, + "shvl": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/shvl/-/shvl-2.0.3.tgz", + "integrity": "sha512-V7C6S9Hlol6SzOJPnQ7qzOVEWUQImt3BNmmzh40wObhla3XOYMe4gGiYzLrJd5TFa+cI2f9LKIRJTTKZSTbWgw==" + }, "sigmund": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz", @@ -27854,6 +27912,11 @@ "integrity": "sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw==", "dev": true }, + "vuelidate": { + "version": "0.7.7", + "resolved": "https://registry.npmjs.org/vuelidate/-/vuelidate-0.7.7.tgz", + "integrity": "sha512-pT/U2lDI67wkIqI4tum7cMSIfGcAMfB+Phtqh2ttdXURwvHRBJEAQ0tVbUsW9Upg83Q5QH59bnCoXI7A9JDGnA==" + }, "vuetify": { "version": "3.0.0-beta.1", "resolved": "https://registry.npmjs.org/vuetify/-/vuetify-3.0.0-beta.1.tgz", @@ -27897,6 +27960,15 @@ "@vue/devtools-api": "^6.0.0-beta.11" } }, + "vuex-persistedstate": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/vuex-persistedstate/-/vuex-persistedstate-4.1.0.tgz", + "integrity": "sha512-3SkEj4NqwM69ikJdFVw6gObeB0NHyspRYMYkR/EbhR0hbvAKyR5gksVhtAfY1UYuWUOCCA0QNGwv9pOwdj+XUQ==", + "requires": { + "deepmerge": "^4.2.2", + "shvl": "^2.0.3" + } + }, "w3c-hr-time": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz", diff --git a/package.json b/package.json index 5dddaffb68bedb7cf3877ac2223fbd6b4be0e135..5ee7221e441487e60c51111e7f8105fb7f22f33e 100644 --- a/package.json +++ b/package.json @@ -12,12 +12,16 @@ "@mdi/font": "5.9.55", "@vuelidate/core": "^2.0.0-alpha.40", "@vuelidate/validators": "^2.0.0-alpha.28", + "axios": "^0.26.1", "core-js": "^3.8.3", + "cssom": "^0.5.0", "roboto-fontface": "*", "vue": "^3.2.13", "vue-router": "^4.0.3", + "vuelidate": "^0.7.7", "vuetify": "^3.0.0-beta.0", "vuex": "^4.0.0", + "vuex-persistedstate": "^4.1.0", "webfontloader": "^1.0.0" }, "devDependencies": { diff --git a/src/assets/logo3.svg b/src/assets/logo3.svg new file mode 100644 index 0000000000000000000000000000000000000000..7c883df9b1f9eec34501ef530ebce37143bd674b --- /dev/null +++ b/src/assets/logo3.svg @@ -0,0 +1 @@ +<svg id="svg" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="400" height="185.1063829787234" viewBox="0, 0, 400,185.1063829787234"><g id="svgg"><path id="path0" d="M0.000 92.593 L 0.000 185.185 200.000 185.185 L 400.000 185.185 400.000 92.593 L 400.000 0.000 200.000 0.000 L 0.000 0.000 0.000 92.593 M263.849 42.764 C 265.676 43.010,267.326 43.343,268.036 43.610 C 268.680 43.853,270.312 44.305,271.663 44.615 C 273.075 44.939,274.798 45.485,275.717 45.899 C 276.596 46.296,277.731 46.727,278.241 46.858 C 279.055 47.067,280.556 47.700,280.556 47.834 C 280.556 47.861,280.720 48.351,280.921 48.922 L 281.286 49.961 280.754 51.508 C 280.461 52.359,279.968 53.514,279.659 54.074 C 279.350 54.634,278.918 55.759,278.698 56.574 C 278.478 57.389,278.018 58.563,277.675 59.183 C 277.333 59.803,276.874 60.970,276.655 61.776 C 276.216 63.397,275.684 64.566,274.672 66.136 C 273.698 67.648,273.513 67.722,272.351 67.063 C 271.822 66.763,270.681 66.296,269.815 66.026 C 268.949 65.755,267.616 65.252,266.852 64.908 C 266.088 64.565,264.713 64.107,263.796 63.891 C 262.880 63.675,261.088 63.233,259.815 62.907 C 256.539 62.069,250.801 62.014,248.981 62.803 C 248.370 63.068,247.287 63.474,246.574 63.704 C 244.564 64.353,241.224 66.979,240.091 68.801 C 239.902 69.104,239.515 69.604,239.230 69.912 C 238.945 70.220,238.494 71.012,238.229 71.671 C 237.963 72.331,237.502 73.254,237.204 73.723 C 236.898 74.205,236.504 75.252,236.299 76.130 C 236.099 76.986,235.683 78.769,235.374 80.093 C 234.127 85.440,234.080 93.692,235.268 98.519 C 235.506 99.486,235.892 101.142,236.126 102.197 C 236.418 103.520,236.746 104.441,237.182 105.160 C 237.529 105.734,237.975 106.611,238.173 107.108 C 238.778 108.630,242.128 112.232,243.618 112.962 C 244.029 113.163,244.646 113.535,244.989 113.788 C 248.326 116.250,261.799 116.303,267.419 113.876 C 268.087 113.587,269.579 113.094,270.734 112.780 C 271.898 112.463,273.364 111.912,274.022 111.544 C 275.307 110.826,276.175 110.766,277.327 111.318 L 277.870 111.579 277.919 120.373 C 277.980 131.509,278.033 131.322,274.545 132.312 C 273.938 132.484,273.025 132.836,272.515 133.095 C 271.925 133.394,270.177 133.856,267.693 134.370 C 265.550 134.814,263.255 135.300,262.593 135.451 C 258.054 136.487,245.676 136.329,241.204 135.179 C 240.083 134.891,238.168 134.432,236.948 134.160 C 235.712 133.885,234.236 133.417,233.615 133.103 C 233.002 132.793,231.848 132.304,231.050 132.015 C 230.253 131.727,229.198 131.197,228.707 130.836 C 228.216 130.476,227.411 130.002,226.918 129.784 C 226.425 129.566,225.808 129.159,225.547 128.880 C 225.286 128.601,224.796 128.204,224.458 127.998 C 223.428 127.372,219.627 123.677,218.874 122.570 C 218.485 121.997,218.040 121.480,217.887 121.421 C 217.733 121.362,217.384 120.872,217.111 120.333 C 216.838 119.793,216.340 119.031,216.004 118.638 C 215.669 118.245,215.176 117.370,214.908 116.694 C 214.641 116.017,214.192 115.130,213.911 114.722 C 213.326 113.876,213.140 113.420,212.584 111.481 C 212.366 110.718,211.942 109.531,211.643 108.844 C 211.270 107.989,210.956 106.707,210.643 104.770 C 210.392 103.216,209.978 100.819,209.723 99.444 C 208.552 93.130,208.580 85.840,209.799 79.577 C 210.101 78.027,210.525 75.759,210.741 74.537 C 210.998 73.082,211.350 71.835,211.758 70.926 C 212.102 70.162,212.524 68.972,212.697 68.282 C 212.869 67.592,213.322 66.509,213.703 65.875 C 214.084 65.241,214.583 64.205,214.812 63.572 C 215.042 62.940,215.499 62.107,215.829 61.721 C 216.159 61.334,216.652 60.578,216.925 60.040 C 217.197 59.501,217.695 58.751,218.030 58.373 C 218.366 57.995,218.895 57.310,219.206 56.852 C 219.944 55.766,223.734 51.973,224.810 51.245 C 225.271 50.933,225.950 50.410,226.320 50.082 C 226.689 49.755,227.397 49.257,227.894 48.975 C 228.390 48.693,229.213 48.185,229.722 47.846 C 230.231 47.507,231.190 47.013,231.852 46.747 C 232.514 46.482,233.436 46.023,233.902 45.727 C 234.369 45.430,235.654 44.945,236.772 44.643 C 237.885 44.342,239.505 43.847,240.370 43.543 C 241.805 43.040,242.586 42.906,247.407 42.337 C 249.580 42.081,260.970 42.376,263.849 42.764 M64.352 43.673 C 65.778 43.896,67.986 44.205,69.259 44.359 C 72.514 44.753,75.319 45.339,76.296 45.831 C 76.755 46.062,77.838 46.466,78.704 46.729 C 79.569 46.992,80.679 47.462,81.168 47.773 C 81.658 48.084,82.575 48.598,83.205 48.915 C 85.406 50.019,88.465 53.069,89.574 55.263 C 89.930 55.968,90.419 56.843,90.661 57.209 C 91.681 58.749,92.415 64.597,92.062 68.366 C 91.500 74.368,90.192 77.353,86.296 81.525 C 85.634 82.234,84.843 82.941,84.537 83.096 C 84.231 83.250,83.565 83.687,83.056 84.065 C 82.546 84.444,81.713 84.903,81.204 85.086 C 80.694 85.269,80.002 85.584,79.664 85.787 L 79.051 86.155 79.479 86.612 C 79.977 87.142,83.044 88.892,84.259 89.339 C 85.261 89.708,88.390 92.123,89.167 93.127 C 89.472 93.522,90.034 94.217,90.415 94.672 C 90.796 95.126,91.358 96.104,91.664 96.845 C 91.970 97.586,92.380 98.454,92.575 98.772 C 94.479 101.879,94.466 113.511,92.553 117.300 C 92.242 117.917,91.785 118.960,91.537 119.619 C 91.289 120.278,90.821 121.123,90.497 121.497 C 90.173 121.871,89.699 122.528,89.444 122.956 C 88.833 123.983,85.089 127.630,84.158 128.105 C 83.756 128.311,83.259 128.666,83.056 128.895 C 82.852 129.123,82.185 129.539,81.574 129.818 C 80.963 130.098,79.994 130.612,79.422 130.961 C 78.849 131.310,77.682 131.786,76.829 132.019 C 75.976 132.253,74.560 132.723,73.682 133.065 C 69.940 134.525,63.692 134.856,41.389 134.779 C 23.814 134.718,24.337 134.749,23.804 133.719 C 23.294 132.733,23.468 45.194,23.981 44.167 C 24.498 43.134,23.489 43.182,43.704 43.227 C 61.269 43.266,61.830 43.278,64.352 43.673 M49.276 62.482 C 48.606 63.195,48.527 64.017,48.527 70.278 C 48.527 79.071,48.177 78.519,53.760 78.517 C 61.684 78.514,65.294 76.689,66.468 72.090 C 67.511 68.003,65.969 64.677,62.407 63.335 C 62.051 63.201,61.509 62.946,61.204 62.769 C 59.719 61.909,50.034 61.676,49.276 62.482 M163.056 66.928 C 164.278 67.195,166.444 67.622,167.870 67.878 C 169.671 68.201,170.802 68.511,171.574 68.893 C 172.185 69.196,173.433 69.695,174.347 70.002 C 175.261 70.309,176.303 70.795,176.662 71.081 C 177.021 71.368,177.815 71.830,178.426 72.107 C 179.037 72.385,179.829 72.886,180.185 73.221 C 180.542 73.557,181.125 74.024,181.481 74.260 C 182.119 74.682,183.355 75.801,184.630 77.111 C 186.563 79.097,187.044 79.658,187.377 80.311 C 187.579 80.706,188.086 81.444,188.505 81.950 C 188.924 82.456,189.438 83.329,189.647 83.889 C 189.857 84.449,190.217 85.157,190.448 85.463 C 191.098 86.323,191.271 86.720,191.857 88.691 C 192.157 89.700,192.566 90.804,192.767 91.145 C 193.238 91.943,193.586 93.492,194.068 96.944 C 194.282 98.472,194.637 100.639,194.857 101.759 C 195.339 104.207,195.453 113.353,195.029 115.556 C 194.902 116.218,194.511 118.662,194.161 120.989 C 193.443 125.758,193.285 126.454,192.683 127.500 C 192.449 127.907,192.027 129.064,191.745 130.070 C 191.450 131.122,191.045 132.123,190.791 132.424 C 190.548 132.712,190.070 133.597,189.729 134.391 C 189.387 135.184,188.894 136.055,188.633 136.325 C 188.372 136.596,187.904 137.250,187.592 137.779 C 186.385 139.825,181.919 144.300,180.216 145.170 C 179.843 145.360,179.370 145.703,179.167 145.931 C 178.963 146.159,178.046 146.710,177.130 147.154 C 176.213 147.599,175.204 148.131,174.887 148.335 C 174.570 148.540,173.445 148.965,172.387 149.281 C 171.329 149.596,170.023 150.060,169.486 150.313 C 164.803 152.514,144.931 152.495,140.009 150.285 C 139.240 149.940,138.105 149.528,137.487 149.369 C 135.748 148.924,134.769 148.540,134.340 148.137 C 134.124 147.934,133.371 147.526,132.668 147.231 C 131.964 146.935,131.094 146.447,130.733 146.147 C 130.373 145.846,129.623 145.325,129.067 144.990 C 128.511 144.654,127.722 144.064,127.315 143.678 C 124.886 141.380,123.148 139.617,123.148 139.450 C 123.148 139.345,122.824 138.944,122.427 138.559 C 122.030 138.174,121.393 137.278,121.012 136.568 C 120.630 135.858,120.089 135.015,119.809 134.693 C 119.529 134.371,119.156 133.663,118.980 133.119 C 118.804 132.575,118.342 131.546,117.954 130.833 C 117.509 130.015,117.042 128.716,116.688 127.309 C 116.379 126.084,115.959 124.702,115.754 124.239 C 114.520 121.451,113.889 109.881,114.539 102.002 C 114.943 97.113,115.093 96.209,115.908 93.766 C 116.310 92.561,116.735 91.074,116.854 90.463 C 116.972 89.852,117.265 88.977,117.504 88.519 C 118.304 86.986,118.835 85.841,119.157 84.952 C 119.333 84.468,119.772 83.718,120.134 83.286 C 120.496 82.853,120.937 82.167,121.115 81.759 C 121.293 81.352,121.701 80.771,122.022 80.469 C 122.343 80.166,122.803 79.583,123.046 79.172 C 123.537 78.340,127.501 74.505,128.290 74.098 C 128.569 73.955,129.130 73.534,129.537 73.163 C 129.944 72.792,130.569 72.373,130.926 72.231 C 131.282 72.090,132.116 71.619,132.778 71.185 C 133.440 70.752,134.481 70.256,135.093 70.084 C 135.704 69.912,136.779 69.486,137.483 69.136 C 138.864 68.449,139.989 68.146,142.869 67.687 C 143.887 67.525,145.369 67.226,146.163 67.024 C 149.703 66.120,159.112 66.066,163.056 66.928 M345.185 66.840 C 346.153 67.058,348.111 67.445,349.537 67.700 C 352.833 68.290,353.443 68.451,354.355 68.979 C 354.764 69.216,355.903 69.671,356.886 69.990 C 357.933 70.331,358.966 70.806,359.383 71.139 C 359.773 71.451,360.541 71.907,361.089 72.150 C 361.638 72.394,362.391 72.869,362.763 73.206 C 363.136 73.542,363.816 74.076,364.275 74.392 C 365.978 75.563,369.594 79.463,370.546 81.156 C 370.875 81.740,371.366 82.456,371.637 82.746 C 371.908 83.036,372.371 83.891,372.665 84.646 C 372.960 85.401,373.384 86.269,373.608 86.574 C 374.093 87.237,374.266 87.691,374.908 89.985 C 375.176 90.945,375.549 92.032,375.738 92.402 C 376.926 94.730,378.078 106.899,377.659 112.685 C 377.152 119.687,376.504 124.106,375.672 126.236 C 375.321 127.135,374.898 128.412,374.732 129.074 C 374.324 130.697,374.083 131.296,373.592 131.895 C 373.364 132.174,373.004 132.865,372.792 133.432 C 372.243 134.897,371.769 135.777,371.296 136.204 C 371.071 136.407,370.718 136.907,370.512 137.315 C 370.306 137.722,369.776 138.472,369.332 138.981 C 367.090 141.560,366.138 142.562,365.463 143.057 C 365.056 143.356,364.570 143.791,364.385 144.023 C 364.199 144.255,363.657 144.666,363.181 144.937 C 362.705 145.208,362.065 145.662,361.759 145.945 C 361.454 146.228,360.495 146.799,359.630 147.215 C 358.764 147.631,357.729 148.170,357.331 148.414 C 356.932 148.658,355.807 149.079,354.831 149.349 C 353.855 149.620,352.488 150.091,351.793 150.396 C 346.898 152.545,327.429 152.462,322.579 150.271 C 321.797 149.918,321.068 149.630,320.958 149.630 C 320.428 149.630,317.619 148.616,317.130 148.248 C 316.824 148.019,315.908 147.523,315.093 147.147 C 314.279 146.771,313.404 146.267,313.149 146.027 C 312.894 145.787,312.227 145.323,311.667 144.997 C 311.106 144.671,310.356 144.119,310.000 143.771 C 309.644 143.422,308.627 142.435,307.740 141.577 C 306.854 140.718,306.004 139.775,305.852 139.480 C 305.699 139.185,305.363 138.805,305.103 138.635 C 304.844 138.466,304.424 137.915,304.168 137.411 C 303.913 136.907,303.456 136.212,303.152 135.866 C 302.613 135.252,301.672 133.452,301.668 133.028 C 301.667 132.911,301.383 132.393,301.036 131.877 C 300.388 130.916,300.056 130.046,299.549 127.994 C 299.389 127.348,299.018 126.265,298.723 125.586 C 298.004 123.930,297.627 121.486,297.132 115.280 C 296.524 107.654,297.286 96.258,298.613 93.132 C 298.890 92.479,299.348 91.111,299.631 90.093 C 300.277 87.769,300.331 87.627,300.854 86.919 C 301.091 86.599,301.543 85.682,301.859 84.882 C 302.176 84.081,302.675 83.175,302.970 82.868 C 303.265 82.561,303.697 81.933,303.931 81.471 C 304.757 79.839,308.909 75.444,310.904 74.089 C 311.484 73.695,312.079 73.228,312.225 73.053 C 312.371 72.877,313.057 72.457,313.749 72.120 C 314.442 71.783,315.256 71.299,315.558 71.045 C 315.860 70.791,316.919 70.319,317.912 69.996 C 318.904 69.673,320.051 69.216,320.460 68.979 C 321.363 68.457,322.035 68.276,324.907 67.783 C 326.130 67.573,327.880 67.228,328.796 67.016 C 332.463 66.168,341.757 66.069,345.185 66.840 M151.134 85.643 C 150.485 85.791,149.090 86.332,148.034 86.845 C 146.979 87.358,146.052 87.779,145.974 87.781 C 145.643 87.788,142.973 90.528,142.628 91.216 C 142.420 91.630,142.112 92.083,141.944 92.223 C 141.465 92.620,140.823 94.029,140.382 95.648 C 140.161 96.463,139.784 97.546,139.546 98.056 C 137.864 101.648,137.976 117.037,139.711 120.833 C 139.944 121.343,140.285 122.343,140.468 123.056 C 140.816 124.406,141.344 125.634,141.661 125.830 C 141.762 125.893,142.207 126.503,142.650 127.187 C 143.956 129.207,146.766 131.355,148.775 131.870 C 151.671 132.612,154.257 132.948,155.741 132.775 C 159.465 132.341,162.567 131.466,163.349 130.628 C 163.595 130.365,164.107 129.990,164.486 129.796 C 164.865 129.601,165.512 128.987,165.923 128.430 C 166.334 127.874,166.823 127.337,167.011 127.236 C 167.198 127.136,167.539 126.529,167.768 125.888 C 167.997 125.247,168.465 124.204,168.808 123.570 C 171.496 118.603,171.497 99.780,168.810 94.934 C 168.463 94.308,168.087 93.447,167.974 93.020 C 167.649 91.786,164.391 88.149,163.056 87.530 C 162.750 87.388,161.875 86.974,161.111 86.610 C 158.675 85.450,153.983 84.995,151.134 85.643 M333.771 85.644 C 333.012 85.781,331.987 86.137,331.364 86.480 C 330.766 86.808,329.844 87.239,329.313 87.437 C 328.775 87.639,328.135 88.053,327.865 88.373 C 327.599 88.689,327.057 89.183,326.661 89.470 C 326.264 89.758,325.802 90.265,325.634 90.598 C 325.467 90.931,325.054 91.495,324.717 91.852 C 324.288 92.305,323.902 93.082,323.435 94.432 C 323.067 95.495,322.679 96.470,322.571 96.600 C 320.674 98.886,320.625 117.960,322.508 121.681 C 322.744 122.147,323.150 123.189,323.412 123.996 C 323.750 125.042,324.129 125.755,324.733 126.481 C 325.198 127.042,325.742 127.813,325.942 128.195 C 326.141 128.577,326.656 129.110,327.087 129.379 C 327.518 129.649,328.144 130.106,328.477 130.396 C 329.642 131.408,330.400 131.679,334.440 132.529 C 338.060 133.291,344.101 132.226,346.123 130.469 C 346.596 130.058,347.242 129.582,347.560 129.410 C 347.877 129.238,348.398 128.674,348.716 128.157 C 349.034 127.640,349.462 127.127,349.667 127.017 C 350.014 126.831,351.111 124.718,351.111 124.234 C 351.111 124.114,351.439 123.299,351.841 122.424 C 354.005 117.707,353.951 99.869,351.761 95.874 C 351.526 95.444,351.139 94.480,350.902 93.731 C 350.621 92.844,350.257 92.143,349.860 91.722 C 349.525 91.366,349.134 90.851,348.993 90.577 C 348.697 90.006,345.834 87.407,345.500 87.407 C 345.378 87.407,344.611 87.074,343.796 86.667 C 341.319 85.428,337.247 85.013,333.771 85.644 M49.660 96.592 C 48.572 97.355,48.519 97.816,48.519 106.362 L 48.519 114.175 49.102 114.883 L 49.686 115.592 55.167 115.511 C 62.618 115.402,63.735 115.112,66.149 112.653 C 67.659 111.116,68.055 110.259,68.329 107.926 C 69.028 101.995,66.965 98.869,61.262 97.218 C 59.007 96.565,58.628 96.523,53.796 96.390 C 50.556 96.301,50.038 96.326,49.660 96.592 " stroke="none" fill="#ffffff" fill-rule="evenodd"></path><path id="path1" d="M247.407 42.337 C 242.586 42.906,241.805 43.040,240.370 43.543 C 239.505 43.847,237.885 44.342,236.772 44.643 C 235.654 44.945,234.369 45.430,233.902 45.727 C 233.436 46.023,232.514 46.482,231.852 46.747 C 231.190 47.013,230.231 47.507,229.722 47.846 C 229.213 48.185,228.390 48.693,227.894 48.975 C 227.397 49.257,226.689 49.755,226.320 50.082 C 225.950 50.410,225.271 50.933,224.810 51.245 C 223.734 51.973,219.944 55.766,219.206 56.852 C 218.895 57.310,218.366 57.995,218.030 58.373 C 217.695 58.751,217.197 59.501,216.925 60.040 C 216.652 60.578,216.159 61.334,215.829 61.721 C 215.499 62.107,215.042 62.940,214.812 63.572 C 214.583 64.205,214.084 65.241,213.703 65.875 C 213.322 66.509,212.869 67.592,212.697 68.282 C 212.524 68.972,212.102 70.162,211.758 70.926 C 211.350 71.835,210.998 73.082,210.741 74.537 C 210.525 75.759,210.101 78.027,209.799 79.577 C 208.580 85.840,208.552 93.130,209.723 99.444 C 209.978 100.819,210.392 103.216,210.643 104.770 C 210.956 106.707,211.270 107.989,211.643 108.844 C 211.942 109.531,212.366 110.718,212.584 111.481 C 213.140 113.420,213.326 113.876,213.911 114.722 C 214.192 115.130,214.641 116.017,214.908 116.694 C 215.176 117.370,215.669 118.245,216.004 118.638 C 216.340 119.031,216.838 119.793,217.111 120.333 C 217.384 120.872,217.733 121.362,217.887 121.421 C 218.040 121.480,218.485 121.997,218.874 122.570 C 219.627 123.677,223.428 127.372,224.458 127.998 C 224.796 128.204,225.286 128.601,225.547 128.880 C 225.808 129.159,226.425 129.566,226.918 129.784 C 227.411 130.002,228.216 130.476,228.707 130.836 C 229.198 131.197,230.253 131.727,231.050 132.015 C 231.848 132.304,233.002 132.793,233.615 133.103 C 234.236 133.417,235.712 133.885,236.948 134.160 C 238.168 134.432,240.083 134.891,241.204 135.179 C 245.676 136.329,258.054 136.487,262.593 135.451 C 263.255 135.300,265.550 134.814,267.693 134.370 C 270.177 133.856,271.925 133.394,272.515 133.095 C 273.025 132.836,273.938 132.484,274.545 132.312 C 278.033 131.322,277.980 131.509,277.919 120.373 L 277.870 111.579 277.327 111.318 C 276.175 110.766,275.307 110.826,274.022 111.544 C 273.364 111.912,271.898 112.463,270.734 112.780 C 269.579 113.094,268.087 113.587,267.419 113.876 C 261.799 116.303,248.326 116.250,244.989 113.788 C 244.646 113.535,244.029 113.163,243.618 112.962 C 242.128 112.232,238.778 108.630,238.173 107.108 C 237.975 106.611,237.529 105.734,237.182 105.160 C 236.746 104.441,236.418 103.520,236.126 102.197 C 235.892 101.142,235.506 99.486,235.268 98.519 C 234.080 93.692,234.127 85.440,235.374 80.093 C 235.683 78.769,236.099 76.986,236.299 76.130 C 236.504 75.252,236.898 74.205,237.204 73.723 C 237.502 73.254,237.963 72.331,238.229 71.671 C 238.494 71.012,238.945 70.220,239.230 69.912 C 239.515 69.604,239.902 69.104,240.091 68.801 C 241.224 66.979,244.564 64.353,246.574 63.704 C 247.287 63.474,248.370 63.068,248.981 62.803 C 250.801 62.014,256.539 62.069,259.815 62.907 C 261.088 63.233,262.880 63.675,263.796 63.891 C 264.713 64.107,266.088 64.565,266.852 64.908 C 267.616 65.252,268.949 65.755,269.815 66.026 C 270.681 66.296,271.822 66.763,272.351 67.063 C 273.513 67.722,273.698 67.648,274.672 66.136 C 275.684 64.566,276.216 63.397,276.655 61.776 C 276.874 60.970,277.333 59.803,277.675 59.183 C 278.018 58.563,278.478 57.389,278.698 56.574 C 278.918 55.759,279.350 54.634,279.659 54.074 C 279.968 53.514,280.461 52.359,280.754 51.508 L 281.286 49.961 280.921 48.922 C 280.720 48.351,280.556 47.861,280.556 47.834 C 280.556 47.700,279.055 47.067,278.241 46.858 C 277.731 46.727,276.596 46.296,275.717 45.899 C 274.798 45.485,273.075 44.939,271.663 44.615 C 270.312 44.305,268.680 43.853,268.036 43.610 C 265.458 42.640,251.923 41.805,247.407 42.337 M25.000 43.306 C 24.481 43.402,24.278 43.573,23.981 44.167 C 23.468 45.194,23.294 132.733,23.804 133.719 C 24.337 134.749,23.814 134.718,41.389 134.779 C 63.692 134.856,69.940 134.525,73.682 133.065 C 74.560 132.723,75.976 132.253,76.829 132.019 C 77.682 131.786,78.849 131.310,79.422 130.961 C 79.994 130.612,80.963 130.098,81.574 129.818 C 82.185 129.539,82.852 129.123,83.056 128.895 C 83.259 128.666,83.756 128.311,84.158 128.105 C 85.089 127.630,88.833 123.983,89.444 122.956 C 89.699 122.528,90.173 121.871,90.497 121.497 C 90.821 121.123,91.289 120.278,91.537 119.619 C 91.785 118.960,92.242 117.917,92.553 117.300 C 94.466 113.511,94.479 101.879,92.575 98.772 C 92.380 98.454,91.970 97.586,91.664 96.845 C 91.358 96.104,90.796 95.126,90.415 94.672 C 90.034 94.217,89.472 93.522,89.167 93.127 C 88.390 92.123,85.261 89.708,84.259 89.339 C 83.044 88.892,79.977 87.142,79.479 86.612 L 79.051 86.155 79.664 85.787 C 80.002 85.584,80.694 85.269,81.204 85.086 C 81.713 84.903,82.546 84.444,83.056 84.065 C 83.565 83.687,84.231 83.250,84.537 83.096 C 84.843 82.941,85.634 82.234,86.296 81.525 C 90.192 77.353,91.500 74.368,92.062 68.366 C 92.415 64.597,91.681 58.749,90.661 57.209 C 90.419 56.843,89.930 55.968,89.574 55.263 C 88.465 53.069,85.406 50.019,83.205 48.915 C 82.575 48.598,81.658 48.084,81.168 47.773 C 80.679 47.462,79.569 46.992,78.704 46.729 C 77.838 46.466,76.755 46.062,76.296 45.831 C 75.319 45.339,72.514 44.753,69.259 44.359 C 67.986 44.205,65.778 43.896,64.352 43.673 C 61.743 43.264,26.983 42.941,25.000 43.306 M59.091 62.242 C 59.947 62.355,60.898 62.592,61.204 62.769 C 61.509 62.946,62.051 63.201,62.407 63.335 C 65.969 64.677,67.511 68.003,66.468 72.090 C 65.796 74.720,64.796 75.849,61.911 77.232 C 59.523 78.377,58.647 78.515,53.760 78.517 C 48.177 78.519,48.527 79.071,48.527 70.278 C 48.527 61.464,48.173 62.037,53.614 62.037 C 55.770 62.037,58.234 62.129,59.091 62.242 M148.942 66.489 C 148.207 66.581,146.956 66.821,146.163 67.024 C 145.369 67.226,143.887 67.525,142.869 67.687 C 139.989 68.146,138.864 68.449,137.483 69.136 C 136.779 69.486,135.704 69.912,135.093 70.084 C 134.481 70.256,133.440 70.752,132.778 71.185 C 132.116 71.619,131.282 72.090,130.926 72.231 C 130.569 72.373,129.944 72.792,129.537 73.163 C 129.130 73.534,128.569 73.955,128.290 74.098 C 127.501 74.505,123.537 78.340,123.046 79.172 C 122.803 79.583,122.343 80.166,122.022 80.469 C 121.701 80.771,121.293 81.352,121.115 81.759 C 120.937 82.167,120.496 82.853,120.134 83.286 C 119.772 83.718,119.333 84.468,119.157 84.952 C 118.835 85.841,118.304 86.986,117.504 88.519 C 117.265 88.977,116.972 89.852,116.854 90.463 C 116.735 91.074,116.310 92.561,115.908 93.766 C 113.804 100.076,113.705 119.609,115.754 124.239 C 115.959 124.702,116.379 126.084,116.688 127.309 C 117.042 128.716,117.509 130.015,117.954 130.833 C 118.342 131.546,118.804 132.575,118.980 133.119 C 119.156 133.663,119.529 134.371,119.809 134.693 C 120.089 135.015,120.630 135.858,121.012 136.568 C 121.393 137.278,122.030 138.174,122.427 138.559 C 122.824 138.944,123.148 139.345,123.148 139.450 C 123.148 139.617,124.886 141.380,127.315 143.678 C 127.722 144.064,128.511 144.654,129.067 144.990 C 129.623 145.325,130.373 145.846,130.733 146.147 C 131.094 146.447,131.964 146.935,132.668 147.231 C 133.371 147.526,134.124 147.934,134.340 148.137 C 134.769 148.540,135.748 148.924,137.487 149.369 C 138.105 149.528,139.240 149.940,140.009 150.285 C 144.931 152.495,164.803 152.514,169.486 150.313 C 170.023 150.060,171.329 149.596,172.387 149.281 C 173.445 148.965,174.570 148.540,174.887 148.335 C 175.204 148.131,176.213 147.599,177.130 147.154 C 178.046 146.710,178.963 146.159,179.167 145.931 C 179.370 145.703,179.843 145.360,180.216 145.170 C 181.919 144.300,186.385 139.825,187.592 137.779 C 187.904 137.250,188.372 136.596,188.633 136.325 C 188.894 136.055,189.387 135.184,189.729 134.391 C 190.070 133.597,190.548 132.712,190.791 132.424 C 191.045 132.123,191.450 131.122,191.745 130.070 C 192.027 129.064,192.449 127.907,192.683 127.500 C 193.285 126.454,193.443 125.758,194.161 120.989 C 194.511 118.662,194.902 116.218,195.029 115.556 C 195.453 113.353,195.339 104.207,194.857 101.759 C 194.637 100.639,194.282 98.472,194.068 96.944 C 193.586 93.492,193.238 91.943,192.767 91.145 C 192.566 90.804,192.157 89.700,191.857 88.691 C 191.271 86.720,191.098 86.323,190.448 85.463 C 190.217 85.157,189.857 84.449,189.647 83.889 C 189.438 83.329,188.924 82.456,188.505 81.950 C 188.086 81.444,187.579 80.706,187.377 80.311 C 187.044 79.658,186.563 79.097,184.630 77.111 C 183.355 75.801,182.119 74.682,181.481 74.260 C 181.125 74.024,180.542 73.557,180.185 73.221 C 179.829 72.886,179.037 72.385,178.426 72.107 C 177.815 71.830,177.021 71.368,176.662 71.081 C 176.303 70.795,175.261 70.309,174.347 70.002 C 173.433 69.695,172.185 69.196,171.574 68.893 C 170.802 68.511,169.671 68.201,167.870 67.878 C 166.444 67.622,164.278 67.195,163.056 66.928 C 160.609 66.393,151.888 66.122,148.942 66.489 M331.667 66.477 C 331.005 66.561,329.713 66.804,328.796 67.016 C 327.880 67.228,326.130 67.573,324.907 67.783 C 322.035 68.276,321.363 68.457,320.460 68.979 C 320.051 69.216,318.904 69.673,317.912 69.996 C 316.919 70.319,315.860 70.791,315.558 71.045 C 315.256 71.299,314.442 71.783,313.749 72.120 C 313.057 72.457,312.371 72.877,312.225 73.053 C 312.079 73.228,311.484 73.695,310.904 74.089 C 308.909 75.444,304.757 79.839,303.931 81.471 C 303.697 81.933,303.265 82.561,302.970 82.868 C 302.675 83.175,302.176 84.081,301.859 84.882 C 301.543 85.682,301.091 86.599,300.854 86.919 C 300.331 87.627,300.277 87.769,299.631 90.093 C 299.348 91.111,298.890 92.479,298.613 93.132 C 297.286 96.258,296.524 107.654,297.132 115.280 C 297.627 121.486,298.004 123.930,298.723 125.586 C 299.018 126.265,299.389 127.348,299.549 127.994 C 300.056 130.046,300.388 130.916,301.036 131.877 C 301.383 132.393,301.667 132.911,301.668 133.028 C 301.672 133.452,302.613 135.252,303.152 135.866 C 303.456 136.212,303.913 136.907,304.168 137.411 C 304.424 137.915,304.844 138.466,305.103 138.635 C 305.363 138.805,305.699 139.185,305.852 139.480 C 306.004 139.775,306.854 140.718,307.740 141.577 C 308.627 142.435,309.644 143.422,310.000 143.771 C 310.356 144.119,311.106 144.671,311.667 144.997 C 312.227 145.323,312.894 145.787,313.149 146.027 C 313.404 146.267,314.279 146.771,315.093 147.147 C 315.908 147.523,316.824 148.019,317.130 148.248 C 317.619 148.616,320.428 149.630,320.958 149.630 C 321.068 149.630,321.797 149.918,322.579 150.271 C 327.429 152.462,346.898 152.545,351.793 150.396 C 352.488 150.091,353.855 149.620,354.831 149.349 C 355.807 149.079,356.932 148.658,357.331 148.414 C 357.729 148.170,358.764 147.631,359.630 147.215 C 360.495 146.799,361.454 146.228,361.759 145.945 C 362.065 145.662,362.705 145.208,363.181 144.937 C 363.657 144.666,364.199 144.255,364.385 144.023 C 364.570 143.791,365.056 143.356,365.463 143.057 C 366.138 142.562,367.090 141.560,369.332 138.981 C 369.776 138.472,370.306 137.722,370.512 137.315 C 370.718 136.907,371.071 136.407,371.296 136.204 C 371.769 135.777,372.243 134.897,372.792 133.432 C 373.004 132.865,373.364 132.174,373.592 131.895 C 374.083 131.296,374.324 130.697,374.732 129.074 C 374.898 128.412,375.321 127.135,375.672 126.236 C 376.504 124.106,377.152 119.687,377.659 112.685 C 378.078 106.899,376.926 94.730,375.738 92.402 C 375.549 92.032,375.176 90.945,374.908 89.985 C 374.266 87.691,374.093 87.237,373.608 86.574 C 373.384 86.269,372.960 85.401,372.665 84.646 C 372.371 83.891,371.908 83.036,371.637 82.746 C 371.366 82.456,370.875 81.740,370.546 81.156 C 369.594 79.463,365.978 75.563,364.275 74.392 C 363.816 74.076,363.136 73.542,362.763 73.206 C 362.391 72.869,361.638 72.394,361.089 72.150 C 360.541 71.907,359.773 71.451,359.383 71.139 C 358.966 70.806,357.933 70.331,356.886 69.990 C 355.903 69.671,354.764 69.216,354.355 68.979 C 353.443 68.451,352.833 68.290,349.537 67.700 C 348.111 67.445,346.153 67.058,345.185 66.840 C 343.243 66.403,334.159 66.159,331.667 66.477 M163.470 68.036 C 167.932 68.573,169.633 68.919,170.363 69.439 C 170.642 69.638,171.570 70.006,172.426 70.257 C 174.832 70.964,175.243 71.129,175.741 71.588 C 175.995 71.822,176.775 72.269,177.472 72.581 C 178.170 72.894,179.128 73.492,179.602 73.911 C 180.075 74.331,180.798 74.838,181.208 75.038 C 181.618 75.239,182.139 75.687,182.366 76.033 C 182.593 76.379,183.093 76.861,183.477 77.103 C 183.861 77.346,184.407 77.912,184.692 78.362 C 184.976 78.811,185.437 79.333,185.716 79.521 C 185.996 79.708,186.489 80.372,186.813 80.996 C 187.138 81.619,187.732 82.488,188.133 82.926 C 188.535 83.364,188.921 83.989,188.992 84.315 C 189.143 85.016,189.911 86.590,190.184 86.759 C 190.483 86.943,190.884 88.029,191.300 89.782 C 191.510 90.666,191.925 91.889,192.222 92.500 C 194.615 97.419,194.638 120.849,192.254 125.890 C 191.953 126.526,191.484 127.946,191.211 129.046 C 190.847 130.512,190.573 131.212,190.187 131.665 C 189.897 132.005,189.393 132.971,189.068 133.812 C 188.719 134.715,188.252 135.555,187.927 135.865 C 187.625 136.153,187.262 136.662,187.122 136.995 C 186.882 137.565,185.670 139.054,183.981 140.851 C 182.908 141.994,179.777 144.630,179.493 144.630 C 179.360 144.630,178.899 144.947,178.468 145.335 C 178.032 145.729,177.029 146.311,176.204 146.650 C 175.389 146.984,174.472 147.445,174.167 147.675 C 173.514 148.164,172.297 148.584,170.370 148.985 C 169.606 149.144,168.481 149.513,167.870 149.806 C 164.154 151.586,144.832 151.507,141.249 149.697 C 140.764 149.452,139.639 149.083,138.749 148.877 C 136.752 148.415,136.185 148.203,135.414 147.626 C 135.082 147.378,134.248 146.972,133.562 146.724 C 132.876 146.476,131.856 145.915,131.296 145.477 C 130.736 145.040,129.903 144.493,129.444 144.262 C 128.986 144.032,128.379 143.565,128.095 143.226 C 127.811 142.886,127.249 142.423,126.847 142.197 C 126.444 141.971,126.067 141.634,126.008 141.448 C 125.949 141.263,125.448 140.720,124.895 140.242 C 124.342 139.765,123.889 139.256,123.889 139.113 C 123.889 138.969,123.517 138.464,123.062 137.991 C 122.607 137.517,121.930 136.546,121.558 135.833 C 121.186 135.120,120.655 134.279,120.379 133.964 C 120.090 133.634,119.665 132.714,119.380 131.799 C 119.107 130.924,118.672 129.956,118.412 129.647 C 117.857 128.987,117.732 128.592,117.143 125.648 C 116.898 124.425,116.487 122.865,116.230 122.182 C 114.607 117.869,114.655 99.776,116.300 96.053 C 116.488 95.627,116.861 94.172,117.129 92.819 C 117.623 90.322,117.818 89.747,118.616 88.426 C 118.862 88.019,119.229 87.144,119.430 86.481 C 119.645 85.778,120.138 84.816,120.615 84.167 C 121.065 83.556,121.535 82.740,121.659 82.354 C 121.783 81.969,122.132 81.471,122.434 81.247 C 122.736 81.024,123.222 80.464,123.515 80.004 C 124.435 78.553,128.115 74.988,129.131 74.564 C 129.487 74.415,129.968 74.037,130.199 73.725 C 130.430 73.412,130.918 73.059,131.282 72.942 C 132.233 72.635,133.318 72.064,134.070 71.477 C 134.472 71.164,135.506 70.741,136.759 70.378 C 137.880 70.053,139.046 69.634,139.352 69.447 C 140.467 68.764,143.046 68.339,151.019 67.522 C 153.076 67.311,159.735 67.586,163.470 68.036 M344.404 67.873 C 349.901 68.455,351.407 68.732,352.842 69.428 C 353.469 69.732,354.648 70.161,355.463 70.382 C 357.130 70.835,357.468 70.988,358.838 71.910 C 359.370 72.268,360.052 72.615,360.353 72.681 C 360.654 72.748,361.261 73.115,361.700 73.497 C 362.140 73.879,362.917 74.471,363.426 74.813 C 364.219 75.344,365.276 76.285,366.863 77.870 C 367.760 78.766,369.301 80.723,369.769 81.559 C 370.049 82.060,370.578 82.810,370.946 83.226 C 371.369 83.704,371.766 84.457,372.029 85.278 C 372.257 85.991,372.729 87.001,373.079 87.522 C 373.515 88.172,373.835 88.988,374.094 90.115 C 374.303 91.019,374.681 92.384,374.935 93.148 C 376.265 97.153,376.478 98.913,376.616 106.985 C 376.765 115.780,376.280 122.026,375.278 124.217 C 375.033 124.754,374.616 126.153,374.353 127.325 C 373.827 129.674,373.641 130.188,373.015 131.036 C 372.783 131.351,372.435 132.067,372.242 132.626 C 371.757 134.036,371.346 134.795,370.642 135.581 C 370.310 135.952,369.984 136.502,369.918 136.803 C 369.850 137.114,369.401 137.732,368.880 138.231 C 368.376 138.714,367.963 139.189,367.963 139.286 C 367.963 139.383,367.192 140.207,366.250 141.117 C 365.308 142.027,364.238 143.066,363.872 143.425 C 363.507 143.785,362.798 144.277,362.298 144.518 C 361.798 144.760,361.222 145.146,361.019 145.375 C 360.654 145.786,358.630 146.851,358.213 146.852 C 358.096 146.852,357.578 147.136,357.063 147.483 C 356.039 148.172,355.090 148.516,352.963 148.970 C 352.199 149.133,351.217 149.470,350.780 149.719 C 347.531 151.571,327.561 151.582,323.972 149.734 C 323.468 149.474,322.472 149.127,321.759 148.963 C 319.643 148.476,318.212 147.970,317.867 147.589 C 317.688 147.391,317.088 147.060,316.534 146.853 C 315.127 146.326,314.450 145.960,313.737 145.339 C 313.399 145.044,312.713 144.606,312.213 144.364 C 311.713 144.123,311.084 143.664,310.815 143.345 C 310.546 143.026,310.085 142.639,309.789 142.487 C 309.494 142.334,309.002 141.864,308.697 141.443 C 308.392 141.022,307.897 140.529,307.597 140.346 C 307.297 140.164,306.885 139.687,306.681 139.288 C 306.477 138.888,305.980 138.299,305.576 137.979 C 305.137 137.631,304.794 137.177,304.721 136.848 C 304.655 136.545,304.221 135.782,303.758 135.153 C 302.898 133.985,302.236 132.721,302.223 132.222 C 302.219 132.069,301.859 131.351,301.422 130.625 C 300.798 129.588,300.541 128.888,300.218 127.349 C 299.992 126.273,299.562 124.814,299.261 124.108 C 297.486 119.937,297.318 99.375,299.022 94.907 C 299.598 93.398,300.161 91.534,300.457 90.161 C 300.653 89.252,300.952 88.489,301.295 88.023 C 301.588 87.624,302.084 86.597,302.397 85.740 C 302.714 84.872,303.202 83.932,303.500 83.619 C 303.794 83.309,304.200 82.707,304.402 82.282 C 305.130 80.745,309.718 75.857,311.574 74.641 C 312.185 74.240,312.876 73.704,313.109 73.450 C 313.343 73.196,313.926 72.857,314.406 72.697 C 314.885 72.538,315.768 72.074,316.368 71.666 C 316.967 71.259,317.801 70.833,318.220 70.719 C 320.027 70.228,321.427 69.746,321.944 69.438 C 323.102 68.748,325.270 68.392,333.519 67.534 C 335.763 67.301,340.350 67.443,344.404 67.873 M151.481 84.818 C 149.572 85.085,148.564 85.374,147.850 85.859 C 147.484 86.107,146.623 86.593,145.937 86.939 C 145.250 87.285,144.548 87.782,144.377 88.043 C 144.205 88.305,143.741 88.733,143.346 88.995 C 142.950 89.257,142.519 89.731,142.387 90.049 C 142.255 90.367,141.792 91.027,141.358 91.516 C 140.747 92.204,140.455 92.773,140.070 94.027 C 139.796 94.919,139.373 95.995,139.130 96.420 C 137.132 99.899,137.079 118.445,139.057 121.919 C 139.354 122.442,139.783 123.510,140.009 124.293 C 140.289 125.263,140.638 125.979,141.107 126.547 C 141.486 127.004,142.053 127.781,142.369 128.273 C 142.851 129.023,144.511 130.582,145.966 131.652 C 146.314 131.908,149.522 133.069,151.389 133.614 C 152.625 133.975,156.632 133.982,157.876 133.625 C 161.085 132.705,163.684 131.695,163.947 131.266 C 164.068 131.068,164.554 130.667,165.028 130.374 C 165.501 130.081,166.043 129.614,166.231 129.335 C 166.420 129.057,166.881 128.531,167.256 128.165 C 167.632 127.799,168.236 126.875,168.600 126.111 C 168.964 125.347,169.479 124.330,169.744 123.851 C 170.093 123.221,170.348 122.245,170.664 120.332 C 170.904 118.876,171.290 116.977,171.522 116.111 C 172.152 113.761,172.164 104.549,171.539 102.407 C 171.317 101.644,170.922 99.739,170.663 98.175 C 170.312 96.060,170.073 95.134,169.729 94.563 C 169.475 94.142,169.051 93.338,168.786 92.778 C 168.521 92.218,168.219 91.583,168.116 91.368 C 167.653 90.405,164.536 87.347,163.525 86.864 C 162.961 86.595,162.139 86.133,161.698 85.838 C 160.299 84.902,154.801 84.353,151.481 84.818 M333.519 84.898 C 331.555 85.183,330.824 85.416,330.276 85.929 C 330.071 86.121,329.444 86.481,328.882 86.729 C 327.857 87.183,325.000 89.713,325.000 90.167 C 325.000 90.287,324.680 90.699,324.288 91.083 C 323.892 91.471,323.431 92.186,323.247 92.696 C 323.066 93.199,322.558 94.361,322.119 95.278 C 321.249 97.090,321.160 97.514,320.528 102.870 C 319.692 109.962,320.559 121.131,322.108 123.209 C 322.349 123.532,322.732 124.367,322.960 125.064 C 323.239 125.914,323.630 126.618,324.150 127.204 C 324.577 127.684,325.113 128.379,325.341 128.749 C 325.570 129.119,326.190 129.732,326.721 130.111 C 327.251 130.491,327.795 130.955,327.929 131.144 C 328.261 131.611,329.300 132.115,330.741 132.508 C 331.403 132.689,332.236 132.978,332.593 133.150 C 334.232 133.944,338.422 134.191,340.556 133.620 C 343.949 132.711,346.122 131.796,346.944 130.929 C 347.250 130.607,347.803 130.173,348.173 129.965 C 348.543 129.756,349.017 129.283,349.226 128.913 C 349.436 128.543,349.899 127.968,350.255 127.635 C 350.693 127.225,351.091 126.537,351.487 125.506 C 351.809 124.667,352.186 123.853,352.325 123.697 C 353.044 122.890,353.611 119.964,354.174 114.167 C 354.824 107.466,353.766 96.419,352.321 94.822 C 352.179 94.665,351.809 93.876,351.498 93.067 C 351.186 92.259,350.694 91.342,350.402 91.030 C 350.111 90.718,349.687 90.152,349.460 89.772 C 349.234 89.392,348.783 88.893,348.459 88.663 C 348.135 88.434,347.685 88.027,347.458 87.759 C 347.231 87.491,346.610 87.084,346.078 86.855 C 345.546 86.626,344.810 86.198,344.443 85.902 C 343.152 84.865,337.386 84.335,333.519 84.898 M158.981 85.739 C 159.389 85.854,160.347 86.247,161.111 86.610 C 161.875 86.974,162.750 87.388,163.056 87.530 C 164.391 88.149,167.649 91.786,167.974 93.020 C 168.087 93.447,168.463 94.308,168.810 94.934 C 171.497 99.780,171.496 118.603,168.808 123.570 C 168.465 124.204,167.997 125.247,167.768 125.888 C 167.539 126.529,167.198 127.136,167.011 127.236 C 166.823 127.337,166.334 127.874,165.923 128.430 C 165.512 128.987,164.865 129.601,164.486 129.796 C 164.107 129.990,163.595 130.365,163.349 130.628 C 162.567 131.466,159.465 132.341,155.741 132.775 C 154.257 132.948,151.671 132.612,148.775 131.870 C 146.766 131.355,143.956 129.207,142.650 127.187 C 142.207 126.503,141.762 125.893,141.661 125.830 C 141.344 125.634,140.816 124.406,140.468 123.056 C 140.285 122.343,139.944 121.343,139.711 120.833 C 137.976 117.037,137.864 101.648,139.546 98.056 C 139.784 97.546,140.161 96.463,140.382 95.648 C 140.823 94.029,141.465 92.620,141.944 92.223 C 142.112 92.083,142.420 91.630,142.628 91.216 C 142.973 90.528,145.643 87.788,145.974 87.781 C 146.052 87.779,146.979 87.358,148.034 86.845 C 150.986 85.410,156.024 84.902,158.981 85.739 M340.863 85.648 C 341.731 85.814,342.910 86.223,343.796 86.667 C 344.611 87.074,345.378 87.407,345.500 87.407 C 345.834 87.407,348.697 90.006,348.993 90.577 C 349.134 90.851,349.525 91.366,349.860 91.722 C 350.257 92.143,350.621 92.844,350.902 93.731 C 351.139 94.480,351.526 95.444,351.761 95.874 C 353.951 99.869,354.005 117.707,351.841 122.424 C 351.439 123.299,351.111 124.114,351.111 124.234 C 351.111 124.718,350.014 126.831,349.667 127.017 C 349.462 127.127,349.034 127.640,348.716 128.157 C 348.398 128.674,347.877 129.238,347.560 129.410 C 347.242 129.582,346.596 130.058,346.123 130.469 C 344.101 132.226,338.060 133.291,334.440 132.529 C 330.400 131.679,329.642 131.408,328.477 130.396 C 328.144 130.106,327.518 129.649,327.087 129.379 C 326.656 129.110,326.141 128.577,325.942 128.195 C 325.742 127.813,325.198 127.042,324.733 126.481 C 324.129 125.755,323.750 125.042,323.412 123.996 C 323.150 123.189,322.744 122.147,322.508 121.681 C 320.625 117.960,320.674 98.886,322.571 96.600 C 322.679 96.470,323.067 95.495,323.435 94.432 C 323.902 93.082,324.288 92.305,324.717 91.852 C 325.054 91.495,325.467 90.931,325.634 90.598 C 325.802 90.265,326.264 89.758,326.661 89.470 C 327.057 89.183,327.599 88.689,327.865 88.373 C 328.135 88.053,328.775 87.639,329.313 87.437 C 329.844 87.239,330.766 86.808,331.364 86.480 C 333.280 85.427,337.691 85.041,340.863 85.648 M58.426 96.579 C 59.495 96.678,62.781 97.598,64.009 98.141 C 68.902 100.306,70.126 108.604,66.149 112.653 C 63.735 115.112,62.618 115.402,55.167 115.511 L 49.686 115.592 49.102 114.883 L 48.519 114.175 48.519 106.362 C 48.519 95.591,48.178 96.235,53.796 96.390 C 55.833 96.446,57.917 96.531,58.426 96.579 " stroke="none" fill="#004aad" fill-rule="evenodd"></path><path id="path2" d="M151.019 67.522 C 143.046 68.339,140.467 68.764,139.352 69.447 C 139.046 69.634,137.880 70.053,136.759 70.378 C 135.506 70.741,134.472 71.164,134.070 71.477 C 133.318 72.064,132.233 72.635,131.282 72.942 C 130.918 73.059,130.430 73.412,130.199 73.725 C 129.968 74.037,129.487 74.415,129.131 74.564 C 128.115 74.988,124.435 78.553,123.515 80.004 C 123.222 80.464,122.736 81.024,122.434 81.247 C 122.132 81.471,121.783 81.969,121.659 82.354 C 121.535 82.740,121.065 83.556,120.615 84.167 C 120.138 84.816,119.645 85.778,119.430 86.481 C 119.229 87.144,118.862 88.019,118.616 88.426 C 117.818 89.747,117.623 90.322,117.129 92.819 C 116.861 94.172,116.488 95.627,116.300 96.053 C 114.655 99.776,114.607 117.869,116.230 122.182 C 116.487 122.865,116.898 124.425,117.143 125.648 C 117.732 128.592,117.857 128.987,118.412 129.647 C 118.672 129.956,119.107 130.924,119.380 131.799 C 119.665 132.714,120.090 133.634,120.379 133.964 C 120.655 134.279,121.186 135.120,121.558 135.833 C 121.930 136.546,122.607 137.517,123.062 137.991 C 123.517 138.464,123.889 138.969,123.889 139.113 C 123.889 139.256,124.342 139.765,124.895 140.242 C 125.448 140.720,125.949 141.263,126.008 141.448 C 126.067 141.634,126.444 141.971,126.847 142.197 C 127.249 142.423,127.811 142.886,128.095 143.226 C 128.379 143.565,128.986 144.032,129.444 144.262 C 129.903 144.493,130.736 145.040,131.296 145.477 C 131.856 145.915,132.876 146.476,133.562 146.724 C 134.248 146.972,135.082 147.378,135.414 147.626 C 136.185 148.203,136.752 148.415,138.749 148.877 C 139.639 149.083,140.764 149.452,141.249 149.697 C 144.832 151.507,164.154 151.586,167.870 149.806 C 168.481 149.513,169.606 149.144,170.370 148.985 C 172.297 148.584,173.514 148.164,174.167 147.675 C 174.472 147.445,175.389 146.984,176.204 146.650 C 177.029 146.311,178.032 145.729,178.468 145.335 C 178.899 144.947,179.360 144.630,179.493 144.630 C 179.777 144.630,182.908 141.994,183.981 140.851 C 185.670 139.054,186.882 137.565,187.122 136.995 C 187.262 136.662,187.625 136.153,187.927 135.865 C 188.252 135.555,188.719 134.715,189.068 133.812 C 189.393 132.971,189.897 132.005,190.187 131.665 C 190.573 131.212,190.847 130.512,191.211 129.046 C 191.484 127.946,191.953 126.526,192.254 125.890 C 194.638 120.849,194.615 97.419,192.222 92.500 C 191.925 91.889,191.510 90.666,191.300 89.782 C 190.884 88.029,190.483 86.943,190.184 86.759 C 189.911 86.590,189.143 85.016,188.992 84.315 C 188.921 83.989,188.535 83.364,188.133 82.926 C 187.732 82.488,187.138 81.619,186.813 80.996 C 186.489 80.372,185.996 79.708,185.716 79.521 C 185.437 79.333,184.976 78.811,184.692 78.362 C 184.407 77.912,183.861 77.346,183.477 77.103 C 183.093 76.861,182.593 76.379,182.366 76.033 C 182.139 75.687,181.618 75.239,181.208 75.038 C 180.798 74.838,180.075 74.331,179.602 73.911 C 179.128 73.492,178.170 72.894,177.472 72.581 C 176.775 72.269,175.995 71.822,175.741 71.588 C 175.243 71.129,174.832 70.964,172.426 70.257 C 171.570 70.006,170.642 69.638,170.363 69.439 C 168.808 68.332,155.748 67.038,151.019 67.522 M333.519 67.534 C 325.270 68.392,323.102 68.748,321.944 69.438 C 321.427 69.746,320.027 70.228,318.220 70.719 C 317.801 70.833,316.967 71.259,316.368 71.666 C 315.768 72.074,314.885 72.538,314.406 72.697 C 313.926 72.857,313.343 73.196,313.109 73.450 C 312.876 73.704,312.185 74.240,311.574 74.641 C 309.718 75.857,305.130 80.745,304.402 82.282 C 304.200 82.707,303.794 83.309,303.500 83.619 C 303.202 83.932,302.714 84.872,302.397 85.740 C 302.084 86.597,301.588 87.624,301.295 88.023 C 300.952 88.489,300.653 89.252,300.457 90.161 C 300.161 91.534,299.598 93.398,299.022 94.907 C 297.318 99.375,297.486 119.937,299.261 124.108 C 299.562 124.814,299.992 126.273,300.218 127.349 C 300.541 128.888,300.798 129.588,301.422 130.625 C 301.859 131.351,302.219 132.069,302.223 132.222 C 302.236 132.721,302.898 133.985,303.758 135.153 C 304.221 135.782,304.655 136.545,304.721 136.848 C 304.794 137.177,305.137 137.631,305.576 137.979 C 305.980 138.299,306.477 138.888,306.681 139.288 C 306.885 139.687,307.297 140.164,307.597 140.346 C 307.897 140.529,308.392 141.022,308.697 141.443 C 309.002 141.864,309.494 142.334,309.789 142.487 C 310.085 142.639,310.546 143.026,310.815 143.345 C 311.084 143.664,311.713 144.123,312.213 144.364 C 312.713 144.606,313.399 145.044,313.737 145.339 C 314.450 145.960,315.127 146.326,316.534 146.853 C 317.088 147.060,317.688 147.391,317.867 147.589 C 318.212 147.970,319.643 148.476,321.759 148.963 C 322.472 149.127,323.468 149.474,323.972 149.734 C 327.561 151.582,347.531 151.571,350.780 149.719 C 351.217 149.470,352.199 149.133,352.963 148.970 C 355.090 148.516,356.039 148.172,357.063 147.483 C 357.578 147.136,358.096 146.852,358.213 146.852 C 358.630 146.851,360.654 145.786,361.019 145.375 C 361.222 145.146,361.798 144.760,362.298 144.518 C 362.798 144.277,363.507 143.785,363.872 143.425 C 364.238 143.066,365.308 142.027,366.250 141.117 C 367.192 140.207,367.963 139.383,367.963 139.286 C 367.963 139.189,368.376 138.714,368.880 138.231 C 369.401 137.732,369.850 137.114,369.918 136.803 C 369.984 136.502,370.310 135.952,370.642 135.581 C 371.346 134.795,371.757 134.036,372.242 132.626 C 372.435 132.067,372.783 131.351,373.015 131.036 C 373.641 130.188,373.827 129.674,374.353 127.325 C 374.616 126.153,375.033 124.754,375.278 124.217 C 376.280 122.026,376.765 115.780,376.616 106.985 C 376.478 98.913,376.265 97.153,374.935 93.148 C 374.681 92.384,374.303 91.019,374.094 90.115 C 373.835 88.988,373.515 88.172,373.079 87.522 C 372.729 87.001,372.257 85.991,372.029 85.278 C 371.766 84.457,371.369 83.704,370.946 83.226 C 370.578 82.810,370.049 82.060,369.769 81.559 C 369.301 80.723,367.760 78.766,366.863 77.870 C 365.276 76.285,364.219 75.344,363.426 74.813 C 362.917 74.471,362.140 73.879,361.700 73.497 C 361.261 73.115,360.654 72.748,360.353 72.681 C 360.052 72.615,359.370 72.268,358.838 71.910 C 357.468 70.988,357.130 70.835,355.463 70.382 C 354.648 70.161,353.469 69.732,352.842 69.428 C 350.256 68.174,338.470 67.019,333.519 67.534 M159.754 85.058 C 160.382 85.192,161.257 85.543,161.698 85.838 C 162.139 86.133,162.961 86.595,163.525 86.864 C 164.536 87.347,167.653 90.405,168.116 91.368 C 168.219 91.583,168.521 92.218,168.786 92.778 C 169.051 93.338,169.475 94.142,169.729 94.563 C 170.073 95.134,170.312 96.060,170.663 98.175 C 170.922 99.739,171.317 101.644,171.539 102.407 C 172.164 104.549,172.152 113.761,171.522 116.111 C 171.290 116.977,170.904 118.876,170.664 120.332 C 170.348 122.245,170.093 123.221,169.744 123.851 C 169.479 124.330,168.964 125.347,168.600 126.111 C 168.236 126.875,167.632 127.799,167.256 128.165 C 166.881 128.531,166.420 129.057,166.231 129.335 C 166.043 129.614,165.501 130.081,165.028 130.374 C 164.554 130.667,164.068 131.068,163.947 131.266 C 163.684 131.695,161.085 132.705,157.876 133.625 C 156.632 133.982,152.625 133.975,151.389 133.614 C 149.522 133.069,146.314 131.908,145.966 131.652 C 144.511 130.582,142.851 129.023,142.369 128.273 C 142.053 127.781,141.486 127.004,141.107 126.547 C 140.638 125.979,140.289 125.263,140.009 124.293 C 139.783 123.510,139.354 122.442,139.057 121.919 C 137.079 118.445,137.132 99.899,139.130 96.420 C 139.373 95.995,139.796 94.919,140.070 94.027 C 140.455 92.773,140.747 92.204,141.358 91.516 C 141.792 91.027,142.255 90.367,142.387 90.049 C 142.519 89.731,142.950 89.257,143.346 88.995 C 143.741 88.733,144.205 88.305,144.377 88.043 C 144.548 87.782,145.250 87.285,145.937 86.939 C 146.623 86.593,147.484 86.107,147.850 85.859 C 149.511 84.732,156.136 84.286,159.754 85.058 M342.397 85.087 C 343.355 85.280,343.978 85.529,344.443 85.902 C 344.810 86.198,345.546 86.626,346.078 86.855 C 346.610 87.084,347.231 87.491,347.458 87.759 C 347.685 88.027,348.135 88.434,348.459 88.663 C 348.783 88.893,349.234 89.392,349.460 89.772 C 349.687 90.152,350.111 90.718,350.402 91.030 C 350.694 91.342,351.186 92.259,351.498 93.067 C 351.809 93.876,352.179 94.665,352.321 94.822 C 353.766 96.419,354.824 107.466,354.174 114.167 C 353.611 119.964,353.044 122.890,352.325 123.697 C 352.186 123.853,351.809 124.667,351.487 125.506 C 351.091 126.537,350.693 127.225,350.255 127.635 C 349.899 127.968,349.436 128.543,349.226 128.913 C 349.017 129.283,348.543 129.756,348.173 129.965 C 347.803 130.173,347.250 130.607,346.944 130.929 C 346.122 131.796,343.949 132.711,340.556 133.620 C 338.422 134.191,334.232 133.944,332.593 133.150 C 332.236 132.978,331.403 132.689,330.741 132.508 C 329.300 132.115,328.261 131.611,327.929 131.144 C 327.795 130.955,327.251 130.491,326.721 130.111 C 326.190 129.732,325.570 129.119,325.341 128.749 C 325.113 128.379,324.577 127.684,324.150 127.204 C 323.630 126.618,323.239 125.914,322.960 125.064 C 322.732 124.367,322.349 123.532,322.108 123.209 C 320.559 121.131,319.692 109.962,320.528 102.870 C 321.160 97.514,321.249 97.090,322.119 95.278 C 322.558 94.361,323.066 93.199,323.247 92.696 C 323.431 92.186,323.892 91.471,324.288 91.083 C 324.680 90.699,325.000 90.287,325.000 90.167 C 325.000 89.713,327.857 87.183,328.882 86.729 C 329.444 86.481,330.071 86.121,330.276 85.929 C 331.542 84.744,338.358 84.270,342.397 85.087 " stroke="none" fill="#0b0b0b" fill-rule="evenodd"></path></g></svg> \ No newline at end of file diff --git a/src/components/LoginForm.vue b/src/components/LoginForm.vue index bacf064c42dd00e267ecc5993084fbd99dd70acc..4f8b255939253b9470ee2170e24759f931c0d5fa 100644 --- a/src/components/LoginForm.vue +++ b/src/components/LoginForm.vue @@ -1,92 +1,93 @@ <template> - <div class="loginForm" > - - - <v-img - :src="require('../assets/logo3.svg')" - class="image" - contain - /> - <form @submit.prevent="onSubmit"> - - <!-- - <div class="inputFields"> - <br><label class="label">E-post</label><br> - <input class="loginInputs" type="text" v-model="v$.user.email.$model" /> - - <br><label class="label"><br>Passord</label><br> - <input class="loginInputs" type="password" v-model="v$.user.password.$model" /> - <br><a href="url" id="forgottenPasswordLink">Glemt passord</a> - </div> - - - <br><br> - <div class="buttonLink"> - <button class="loginButton" type="submit" @click="loginClicked">LOGG INN</button> - <br><a id="newUserLink" href="url">Ny bruker</a> - <p id="messageUser">{{ message }}</p> - </div> --> - - - - - <div class="inputFields"> - <div :class="{ error: v$.user.email.$errors.length }"> - <br><label class="label" id="emailLabelId">E-post </label><br> - <input class="loginInputs" type="email" v-model="v$.user.email.$model"> - - <!-- error message --> - <div class="input-errors" v-for="(error, index) of v$.user.email.$errors" :key="index"> - <div class="error-msg">{{ error.$message }}</div> - </div> - </div> - - <!-- password --> - <div :class="{ error: v$.user.password.$errors.length }"> - <br><label class="label" id="passwordLabelId">Passord </label><br> - <input class="loginInputs" type="password" v-model="v$.user.password.$model"> - - <!-- error message --> - <div class="input-errors" v-for="(error, index) of v$.user.password.$errors" :key="index"> - <div class="error-msg">{{ error.$message }}</div> - </div> - - <!-- Link to forgot password page will be added here --> - <br><a href="url" id="forgottenPasswordLink">Glemt passord</a> + <div> + <v-col + align="center" + justify="space-around" + > + <v-img + max-width="45%" + :src="require('../assets/logo3.svg')" + align="center" + ></v-img> + </v-col> + + <v-form + ref="form" + v-model="valid" + lazy-validation + > + <v-col> + <v-text-field + v-model="user.email" + :rules="emailRules" + label="E-mail" + required + ></v-text-field> + </v-col> + + + <v-col + align="right" + > + <v-text-field + v-model="user.password" + :append-icon="showPassword ? 'mdi-eye' : 'mdi-eye-off'" + :rules="[rules.required, rules.min]" + :type="showPassword ? 'text' : 'password'" + name="input-10-1" + label="Password" + counter + @click:append="showPassword = !showPassword" + ></v-text-field> + + <div class="text-decoration-underline mt-n4 mr-10"> + Glemt passord </div> - - </div> - - <div class="buttonLink"> - <!-- Submit Button --> - <div class="buttons-w"> - <br><br><button :disabled="v$.user.$invalid" v-on:click="loginClicked" class="loginButton">Logg inn</button> - - <!-- Link to register new user page will be added here --> - <br><a id="newUserLink" href="url">Ny bruker</a> - - <p id="messageUser">{{ message }}</p> + </v-col> + + + + <v-col + align="center" + justify="space-around" + > + <v-btn + :disabled="!valid" + color="success" + class="mb-4 mt-4" + width="50%" + height="40px" + @click="loginClicked" + > + Logg inn + </v-btn> + + <div> + <a + href="/" + class="text-decoration-none" + >Ny bruker</a> </div> + </v-col> - </div> - - - - - </form> + </v-form> </div> + </template> <script> -import useVuelidate from '@vuelidate/core' -import { required, email, minLength, helpers } from '@vuelidate/validators' +import useVuelidate from "@vuelidate/core"; +import { required, email, minLength, helpers } from "@vuelidate/validators"; +import { doLogin } from "@/utils/apiutil"; +import { mapState } from "vuex"; + export default { name: "LoginForm.vue", - setup () { - return { v$: useVuelidate() } + setup() { + return { v$: useVuelidate() }; }, validations() { @@ -99,93 +100,63 @@ export default { password: { required, min: helpers.withMessage( - ({$params}) => `Passordet må inneholde minst ${$params.min} tegn`, - minLength(8) - ) + ({ $params }) => `Passordet må inneholde minst ${$params.min} tegn`, + minLength(8) + ), }, }, - } + }; }, - data(){ - return{ - message: '', + computed: mapState({ + token: (state) => state.user.token, + }), + + data() { + return { + message: "", user: { - email: '', - password: '' - } - } + email: "", + password: "", + }, + + showPassword: false, + valid : true, + emailRules: [ + v => !!v || 'E-mail is required', + v => /.+@.+\..+/.test(v) || 'E-mail must be valid', + ], + rules: { + required: value => !!value || 'Required.', + min: v => v.length >= 8 || 'Min 8 characters', + }, + }; }, methods: { - loginClicked: function (){ + async loginClicked() { console.log(this.user.email + " " + this.user.password); + this.showError = true; + const loginRequest = { + email: this.user.email, + password: this.user.password, + }; + const loginResponse = await doLogin(loginRequest); + + if (loginResponse === "Failed login") { + this.message = "kunne ikke logge inn"; + this.$store.commit('logout'); + return; + } + + this.$store.commit("saveToken", loginResponse); + console.log(loginResponse); }, - }, -} + validate () { + this.$refs.form.validate() + }, + }, +}; </script> - -<style scoped> -.loginForm{ - background-color: white; - border-radius: 10px; - margin: auto; - width: 80%; - margin-top: 20%; - justify-content: center; - padding: 10px; - font-size: 18px; -} -.label{ - float: left; - margin-left: 5%; -} -.loginInputs{ - background-color: #C4C4C4; - border-radius: 5px; - width: 90%; - height: 40px; - padding: 5px; -} -.loginButton{ - width: 55%; - height: 50px; - background-color: #1071B8; - color: white; - border-radius: 10px; - justify-content: center; - text-align: center; - margin: auto; - font-size: 25px; - margin-bottom: 20px; -} -.buttonLink{ - margin: auto; - text-align: center; - margin-bottom: 40px; -} -.image{ - width: 45%; - margin: auto; - margin-top: 20px; -} -#forgottenPasswordLink{ - float: right; - margin:10px 5% 0 0; -} - -#newUserLink{ - text-decoration: none; - margin-bottom: 40px; -} -.inputFields{ - margin: auto; - text-align: center; -} - -.input-errors{ - color: red; -} -</style> diff --git a/src/router/index.js b/src/router/index.js index 6772a927160ed46c2df96bade0eadcd972de60d6..60092e1c5e803da4eabd0b318bfc3eb2460e25c9 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -5,7 +5,7 @@ import LoginView from "../views/LoginView.vue"; const routes = [ { - path: "/", + path: "/endre", //Endre før push name: "home", component: HomeView, }, diff --git a/src/store/index.js b/src/store/index.js index 100073ad5a71063ff0ac3f223887fcb38d972d8f..7ec639584150c89a76788eb6b47a6b04fd5bc7de 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -1,9 +1,14 @@ import { createStore } from "vuex"; +import user from "./modules/user"; +import createPersistedState from "vuex-persistedstate"; export default createStore({ state: {}, getters: {}, mutations: {}, actions: {}, - modules: {}, + modules: { + user, + }, + plugins: [createPersistedState()], }); diff --git a/src/store/modules/user.js b/src/store/modules/user.js new file mode 100644 index 0000000000000000000000000000000000000000..c4ce2e515e6d57453551ba3c6d80e6376441ab6b --- /dev/null +++ b/src/store/modules/user.js @@ -0,0 +1,17 @@ +const state = { + token: null, +}; + +const mutations = { + logout(state) { + state.token = null; + }, + saveToken(state, token) { + state.token = token; + }, +}; + +export default { + state, + mutations, +}; diff --git a/src/utils/apiutil.js b/src/utils/apiutil.js new file mode 100644 index 0000000000000000000000000000000000000000..15809ca5993e2d95edf6e771e1eaef3892b35cbb --- /dev/null +++ b/src/utils/apiutil.js @@ -0,0 +1,9 @@ +import axios from "axios"; + +export function doLogin(loginRequest) { + return axios + .post(`http://localhost:8080/api/login/authentication`, loginRequest) + .then((response) => { + return response.data; + }); +} diff --git a/src/views/LoginView.vue b/src/views/LoginView.vue index ae5b1c4a6d99ec9a47ce6d9644d972a6fa4c8b91..56cb6978b81d311fc9fed8d3ee6b3da12cda3581 100644 --- a/src/views/LoginView.vue +++ b/src/views/LoginView.vue @@ -1,25 +1,23 @@ -<template> - <div class="loginPage"> - <LoginForm></LoginForm> - </div> -</template> - -<script> -import LoginForm from "@/components/LoginForm"; -export default { - name: "LoginView.vue", - components: { - LoginForm, - } -} -</script> - -<style scoped> - -.loginPage{ - - background-color: white; - height: 100%; - overflow: auto; -} -</style> +<template> + <div class="loginPage"> + <LoginForm></LoginForm> + </div> +</template> + +<script> +import LoginForm from "@/components/LoginForm"; +export default { + name: "LoginView.vue", + components: { + LoginForm, + }, +}; +</script> + +<style scoped> +.loginPage { + background-color: white; + height: 100%; + overflow: auto; +} +</style>