diff options
-rw-r--r-- | .eslintrc | 3 | ||||
-rw-r--r-- | package-lock.json | 479 | ||||
-rw-r--r-- | package.json | 23 | ||||
-rw-r--r-- | packages/typings/package.json | 22 | ||||
-rw-r--r-- | packages/typings/types/mobx-react-form.d.ts | 1 | ||||
-rw-r--r-- | packages/typings/types/react-html-attributes.d.ts | 1 | ||||
-rw-r--r-- | packages/typings/types/react-jss.d.ts | 1 | ||||
-rw-r--r-- | packages/typings/types/react-loader.d.ts | 45 | ||||
-rw-r--r-- | src/app.js | 13 | ||||
-rw-r--r-- | src/styles/fonts.scss | 13 | ||||
-rw-r--r-- | src/styles/main.scss | 6 |
11 files changed, 197 insertions, 410 deletions
@@ -95,7 +95,7 @@ | |||
95 | }, | 95 | }, |
96 | "rules": { | 96 | "rules": { |
97 | // eslint | 97 | // eslint |
98 | "prefer-destructuring": 1, | 98 | "arrow-parens": 0, |
99 | "class-methods-use-this": 1, | 99 | "class-methods-use-this": 1, |
100 | "consistent-return": 1, | 100 | "consistent-return": 1, |
101 | "max-len": 0, | 101 | "max-len": 0, |
@@ -103,6 +103,7 @@ | |||
103 | "no-restricted-syntax": 0, | 103 | "no-restricted-syntax": 0, |
104 | "no-underscore-dangle": 0, | 104 | "no-underscore-dangle": 0, |
105 | "operator-linebreak": 0, | 105 | "operator-linebreak": 0, |
106 | "prefer-destructuring": 1, | ||
106 | // eslint-plugin-import | 107 | // eslint-plugin-import |
107 | "import/extensions": 1, | 108 | "import/extensions": 1, |
108 | "import/prefer-default-export": 0, | 109 | "import/prefer-default-export": 0, |
diff --git a/package-lock.json b/package-lock.json index cb80ba47a..8bd8ca1dc 100644 --- a/package-lock.json +++ b/package-lock.json | |||
@@ -85,6 +85,13 @@ | |||
85 | "ms": "^2.1.1", | 85 | "ms": "^2.1.1", |
86 | "resetable": "^1.0.3", | 86 | "resetable": "^1.0.3", |
87 | "uuid": "^3.3.2" | 87 | "uuid": "^3.3.2" |
88 | }, | ||
89 | "dependencies": { | ||
90 | "uuid": { | ||
91 | "version": "3.4.0", | ||
92 | "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", | ||
93 | "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==" | ||
94 | } | ||
88 | } | 95 | } |
89 | }, | 96 | }, |
90 | "@adonisjs/bodyparser": { | 97 | "@adonisjs/bodyparser": { |
@@ -379,6 +386,11 @@ | |||
379 | "jsonfile": "^4.0.0", | 386 | "jsonfile": "^4.0.0", |
380 | "universalify": "^0.1.0" | 387 | "universalify": "^0.1.0" |
381 | } | 388 | } |
389 | }, | ||
390 | "uuid": { | ||
391 | "version": "3.4.0", | ||
392 | "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", | ||
393 | "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==" | ||
382 | } | 394 | } |
383 | } | 395 | } |
384 | }, | 396 | }, |
@@ -393,6 +405,13 @@ | |||
393 | "node-csp": "^1.0.1", | 405 | "node-csp": "^1.0.1", |
394 | "node-guard": "^1.0.0", | 406 | "node-guard": "^1.0.0", |
395 | "uuid": "^3.3.2" | 407 | "uuid": "^3.3.2" |
408 | }, | ||
409 | "dependencies": { | ||
410 | "uuid": { | ||
411 | "version": "3.4.0", | ||
412 | "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", | ||
413 | "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==" | ||
414 | } | ||
396 | } | 415 | } |
397 | }, | 416 | }, |
398 | "@adonisjs/validator": { | 417 | "@adonisjs/validator": { |
@@ -2839,15 +2858,6 @@ | |||
2839 | } | 2858 | } |
2840 | } | 2859 | } |
2841 | }, | 2860 | }, |
2842 | "@babel/polyfill": { | ||
2843 | "version": "7.7.0", | ||
2844 | "resolved": "https://registry.npmjs.org/@babel/polyfill/-/polyfill-7.7.0.tgz", | ||
2845 | "integrity": "sha512-/TS23MVvo34dFmf8mwCisCbWGrfhbiWZSwBo6HkADTBhUa2Q/jWltyY/tpofz/b6/RIhqaqQcquptCirqIhOaQ==", | ||
2846 | "requires": { | ||
2847 | "core-js": "^2.6.5", | ||
2848 | "regenerator-runtime": "^0.13.2" | ||
2849 | } | ||
2850 | }, | ||
2851 | "@babel/preset-env": { | 2861 | "@babel/preset-env": { |
2852 | "version": "7.14.8", | 2862 | "version": "7.14.8", |
2853 | "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.14.8.tgz", | 2863 | "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.14.8.tgz", |
@@ -7268,6 +7278,11 @@ | |||
7268 | } | 7278 | } |
7269 | } | 7279 | } |
7270 | }, | 7280 | }, |
7281 | "@mdi/font": { | ||
7282 | "version": "5.9.55", | ||
7283 | "resolved": "https://registry.npmjs.org/@mdi/font/-/font-5.9.55.tgz", | ||
7284 | "integrity": "sha512-jswRF6q3eq8NWpWiqct6q+6Fg/I7nUhrxYJfiEM8JJpap0wVJLQdbKtyS65GdlK7S7Ytnx3TTi/bmw+tBhkGmg==" | ||
7285 | }, | ||
7271 | "@mdi/js": { | 7286 | "@mdi/js": { |
7272 | "version": "4.6.95", | 7287 | "version": "4.6.95", |
7273 | "resolved": "https://registry.npmjs.org/@mdi/js/-/js-4.6.95.tgz", | 7288 | "resolved": "https://registry.npmjs.org/@mdi/js/-/js-4.6.95.tgz", |
@@ -7323,6 +7338,17 @@ | |||
7323 | "version": "file:packages/theme", | 7338 | "version": "file:packages/theme", |
7324 | "requires": { | 7339 | "requires": { |
7325 | "color": "3.1.2" | 7340 | "color": "3.1.2" |
7341 | }, | ||
7342 | "dependencies": { | ||
7343 | "color": { | ||
7344 | "version": "3.1.2", | ||
7345 | "resolved": "https://registry.npmjs.org/color/-/color-3.1.2.tgz", | ||
7346 | "integrity": "sha512-vXTJhHebByxZn3lDvDJYw4lR5+uB3vuoHsuYA5AKuxRVn5wzzIfQKGLBmgdVRHKTJYeK5rvJcHnrd0Li49CFpg==", | ||
7347 | "requires": { | ||
7348 | "color-convert": "^1.9.1", | ||
7349 | "color-string": "^1.5.2" | ||
7350 | } | ||
7351 | } | ||
7326 | } | 7352 | } |
7327 | }, | 7353 | }, |
7328 | "@meetfranz/ui": { | 7354 | "@meetfranz/ui": { |
@@ -7662,6 +7688,14 @@ | |||
7662 | "tough-cookie": "~2.5.0", | 7688 | "tough-cookie": "~2.5.0", |
7663 | "tunnel-agent": "^0.6.0", | 7689 | "tunnel-agent": "^0.6.0", |
7664 | "uuid": "^3.3.2" | 7690 | "uuid": "^3.3.2" |
7691 | }, | ||
7692 | "dependencies": { | ||
7693 | "uuid": { | ||
7694 | "version": "3.4.0", | ||
7695 | "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", | ||
7696 | "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==", | ||
7697 | "dev": true | ||
7698 | } | ||
7665 | } | 7699 | } |
7666 | }, | 7700 | }, |
7667 | "rimraf": { | 7701 | "rimraf": { |
@@ -8142,9 +8176,9 @@ | |||
8142 | "dev": true | 8176 | "dev": true |
8143 | }, | 8177 | }, |
8144 | "@types/fs-extra": { | 8178 | "@types/fs-extra": { |
8145 | "version": "7.0.0", | 8179 | "version": "9.0.12", |
8146 | "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-7.0.0.tgz", | 8180 | "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-9.0.12.tgz", |
8147 | "integrity": "sha512-ndoMMbGyuToTy4qB6Lex/inR98nPiNHacsgMPvy+zqMLgSxbt8VtWpDArpGp69h1fEDQHn1KB+9DWD++wgbwYA==", | 8181 | "integrity": "sha512-I+bsBr67CurCGnSenZZ7v94gd3tc3+Aj2taxMT4yu4ABLuOgOjeFxX3dokG24ztSRg5tnT00sL8BszO7gSMoIw==", |
8148 | "dev": true, | 8182 | "dev": true, |
8149 | "requires": { | 8183 | "requires": { |
8150 | "@types/node": "*" | 8184 | "@types/node": "*" |
@@ -8252,9 +8286,9 @@ | |||
8252 | "dev": true | 8286 | "dev": true |
8253 | }, | 8287 | }, |
8254 | "@types/node": { | 8288 | "@types/node": { |
8255 | "version": "12.20.13", | 8289 | "version": "14.17.6", |
8256 | "resolved": "https://registry.npmjs.org/@types/node/-/node-12.20.13.tgz", | 8290 | "resolved": "https://registry.npmjs.org/@types/node/-/node-14.17.6.tgz", |
8257 | "integrity": "sha512-1x8W5OpxPq+T85OUsHRP6BqXeosKmeXRtjoF39STcdf/UWLqUsoehstZKOi0CunhVqHG17AyZgpj20eRVooK6A==", | 8291 | "integrity": "sha512-iBxsxU7eswQDGhlr3AiamBxOssaYxbM+NKXVil8jg9yFXvrfEFbDumLD/2dMTB+zYyg7w+Xjt8yuxfdbUHAtcQ==", |
8258 | "dev": true | 8292 | "dev": true |
8259 | }, | 8293 | }, |
8260 | "@types/normalize-package-data": { | 8294 | "@types/normalize-package-data": { |
@@ -10571,132 +10605,6 @@ | |||
10571 | } | 10605 | } |
10572 | } | 10606 | } |
10573 | }, | 10607 | }, |
10574 | "babel-loader": { | ||
10575 | "version": "8.2.2", | ||
10576 | "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.2.2.tgz", | ||
10577 | "integrity": "sha512-JvTd0/D889PQBtUXJ2PXaKU/pjZDMtHA9V2ecm+eNRmmBCMR09a+fmpGTNwnJtFmFl5Ei7Vy47LjBb+L0wQ99g==", | ||
10578 | "dev": true, | ||
10579 | "requires": { | ||
10580 | "find-cache-dir": "^3.3.1", | ||
10581 | "loader-utils": "^1.4.0", | ||
10582 | "make-dir": "^3.1.0", | ||
10583 | "schema-utils": "^2.6.5" | ||
10584 | }, | ||
10585 | "dependencies": { | ||
10586 | "emojis-list": { | ||
10587 | "version": "3.0.0", | ||
10588 | "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz", | ||
10589 | "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==", | ||
10590 | "dev": true | ||
10591 | }, | ||
10592 | "find-cache-dir": { | ||
10593 | "version": "3.3.1", | ||
10594 | "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.1.tgz", | ||
10595 | "integrity": "sha512-t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ==", | ||
10596 | "dev": true, | ||
10597 | "requires": { | ||
10598 | "commondir": "^1.0.1", | ||
10599 | "make-dir": "^3.0.2", | ||
10600 | "pkg-dir": "^4.1.0" | ||
10601 | } | ||
10602 | }, | ||
10603 | "find-up": { | ||
10604 | "version": "4.1.0", | ||
10605 | "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", | ||
10606 | "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", | ||
10607 | "dev": true, | ||
10608 | "requires": { | ||
10609 | "locate-path": "^5.0.0", | ||
10610 | "path-exists": "^4.0.0" | ||
10611 | } | ||
10612 | }, | ||
10613 | "json5": { | ||
10614 | "version": "1.0.1", | ||
10615 | "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz", | ||
10616 | "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==", | ||
10617 | "dev": true, | ||
10618 | "requires": { | ||
10619 | "minimist": "^1.2.0" | ||
10620 | } | ||
10621 | }, | ||
10622 | "loader-utils": { | ||
10623 | "version": "1.4.0", | ||
10624 | "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz", | ||
10625 | "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==", | ||
10626 | "dev": true, | ||
10627 | "requires": { | ||
10628 | "big.js": "^5.2.2", | ||
10629 | "emojis-list": "^3.0.0", | ||
10630 | "json5": "^1.0.1" | ||
10631 | } | ||
10632 | }, | ||
10633 | "locate-path": { | ||
10634 | "version": "5.0.0", | ||
10635 | "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", | ||
10636 | "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", | ||
10637 | "dev": true, | ||
10638 | "requires": { | ||
10639 | "p-locate": "^4.1.0" | ||
10640 | } | ||
10641 | }, | ||
10642 | "make-dir": { | ||
10643 | "version": "3.1.0", | ||
10644 | "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", | ||
10645 | "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==", | ||
10646 | "dev": true, | ||
10647 | "requires": { | ||
10648 | "semver": "^6.0.0" | ||
10649 | } | ||
10650 | }, | ||
10651 | "minimist": { | ||
10652 | "version": "1.2.5", | ||
10653 | "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", | ||
10654 | "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", | ||
10655 | "dev": true | ||
10656 | }, | ||
10657 | "p-locate": { | ||
10658 | "version": "4.1.0", | ||
10659 | "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", | ||
10660 | "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", | ||
10661 | "dev": true, | ||
10662 | "requires": { | ||
10663 | "p-limit": "^2.2.0" | ||
10664 | } | ||
10665 | }, | ||
10666 | "path-exists": { | ||
10667 | "version": "4.0.0", | ||
10668 | "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", | ||
10669 | "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", | ||
10670 | "dev": true | ||
10671 | }, | ||
10672 | "pkg-dir": { | ||
10673 | "version": "4.2.0", | ||
10674 | "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz", | ||
10675 | "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==", | ||
10676 | "dev": true, | ||
10677 | "requires": { | ||
10678 | "find-up": "^4.0.0" | ||
10679 | } | ||
10680 | }, | ||
10681 | "schema-utils": { | ||
10682 | "version": "2.7.1", | ||
10683 | "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.1.tgz", | ||
10684 | "integrity": "sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==", | ||
10685 | "dev": true, | ||
10686 | "requires": { | ||
10687 | "@types/json-schema": "^7.0.5", | ||
10688 | "ajv": "^6.12.4", | ||
10689 | "ajv-keywords": "^3.5.2" | ||
10690 | } | ||
10691 | }, | ||
10692 | "semver": { | ||
10693 | "version": "6.3.0", | ||
10694 | "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", | ||
10695 | "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", | ||
10696 | "dev": true | ||
10697 | } | ||
10698 | } | ||
10699 | }, | ||
10700 | "babel-plugin-dynamic-import-node": { | 10608 | "babel-plugin-dynamic-import-node": { |
10701 | "version": "2.3.3", | 10609 | "version": "2.3.3", |
10702 | "resolved": "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz", | 10610 | "resolved": "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz", |
@@ -10985,53 +10893,6 @@ | |||
10985 | "file-uri-to-path": "1.0.0" | 10893 | "file-uri-to-path": "1.0.0" |
10986 | } | 10894 | } |
10987 | }, | 10895 | }, |
10988 | "bl": { | ||
10989 | "version": "1.2.2", | ||
10990 | "resolved": "https://registry.npmjs.org/bl/-/bl-1.2.2.tgz", | ||
10991 | "integrity": "sha512-e8tQYnZodmebYDWGH7KMRvtzKXaJHx3BbilrgZCfvyLUYdKpK1t5PSPmpkny/SgiTSCnjfLW7v5rlONXVFkQEA==", | ||
10992 | "requires": { | ||
10993 | "readable-stream": "^2.3.5", | ||
10994 | "safe-buffer": "^5.1.1" | ||
10995 | }, | ||
10996 | "dependencies": { | ||
10997 | "readable-stream": { | ||
10998 | "version": "2.3.6", | ||
10999 | "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", | ||
11000 | "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", | ||
11001 | "requires": { | ||
11002 | "core-util-is": "~1.0.0", | ||
11003 | "inherits": "~2.0.3", | ||
11004 | "isarray": "~1.0.0", | ||
11005 | "process-nextick-args": "~2.0.0", | ||
11006 | "safe-buffer": "~5.1.1", | ||
11007 | "string_decoder": "~1.1.1", | ||
11008 | "util-deprecate": "~1.0.1" | ||
11009 | }, | ||
11010 | "dependencies": { | ||
11011 | "safe-buffer": { | ||
11012 | "version": "5.1.2", | ||
11013 | "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", | ||
11014 | "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" | ||
11015 | } | ||
11016 | } | ||
11017 | }, | ||
11018 | "string_decoder": { | ||
11019 | "version": "1.1.1", | ||
11020 | "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", | ||
11021 | "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", | ||
11022 | "requires": { | ||
11023 | "safe-buffer": "~5.1.0" | ||
11024 | }, | ||
11025 | "dependencies": { | ||
11026 | "safe-buffer": { | ||
11027 | "version": "5.1.2", | ||
11028 | "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", | ||
11029 | "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" | ||
11030 | } | ||
11031 | } | ||
11032 | } | ||
11033 | } | ||
11034 | }, | ||
11035 | "block-stream": { | 10896 | "block-stream": { |
11036 | "version": "0.0.9", | 10897 | "version": "0.0.9", |
11037 | "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz", | 10898 | "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz", |
@@ -11471,11 +11332,6 @@ | |||
11471 | "resolved": "https://registry.npmjs.org/bson/-/bson-1.1.1.tgz", | 11332 | "resolved": "https://registry.npmjs.org/bson/-/bson-1.1.1.tgz", |
11472 | "integrity": "sha512-jCGVYLoYMHDkOsbwJZBCqwMHyH4c+wzgI9hG7Z6SZJRXWr+x58pdIbm2i9a/jFGCkRJqRUr8eoI7lDWa0hTkxg==" | 11333 | "integrity": "sha512-jCGVYLoYMHDkOsbwJZBCqwMHyH4c+wzgI9hG7Z6SZJRXWr+x58pdIbm2i9a/jFGCkRJqRUr8eoI7lDWa0hTkxg==" |
11473 | }, | 11334 | }, |
11474 | "btoa": { | ||
11475 | "version": "1.2.1", | ||
11476 | "resolved": "https://registry.npmjs.org/btoa/-/btoa-1.2.1.tgz", | ||
11477 | "integrity": "sha512-SB4/MIGlsiVkMcHmT+pSmIPoNDoHg+7cMzmt3Uxt628MTz2487DKSqK/fuhFBrkuqrYv5UCEnACpF4dTFNKc/g==" | ||
11478 | }, | ||
11479 | "buffer": { | 11335 | "buffer": { |
11480 | "version": "4.9.2", | 11336 | "version": "4.9.2", |
11481 | "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.2.tgz", | 11337 | "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.2.tgz", |
@@ -11491,6 +11347,7 @@ | |||
11491 | "version": "1.2.0", | 11347 | "version": "1.2.0", |
11492 | "resolved": "https://registry.npmjs.org/buffer-alloc/-/buffer-alloc-1.2.0.tgz", | 11348 | "resolved": "https://registry.npmjs.org/buffer-alloc/-/buffer-alloc-1.2.0.tgz", |
11493 | "integrity": "sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==", | 11349 | "integrity": "sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==", |
11350 | "dev": true, | ||
11494 | "requires": { | 11351 | "requires": { |
11495 | "buffer-alloc-unsafe": "^1.1.0", | 11352 | "buffer-alloc-unsafe": "^1.1.0", |
11496 | "buffer-fill": "^1.0.0" | 11353 | "buffer-fill": "^1.0.0" |
@@ -11499,7 +11356,8 @@ | |||
11499 | "buffer-alloc-unsafe": { | 11356 | "buffer-alloc-unsafe": { |
11500 | "version": "1.1.0", | 11357 | "version": "1.1.0", |
11501 | "resolved": "https://registry.npmjs.org/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz", | 11358 | "resolved": "https://registry.npmjs.org/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz", |
11502 | "integrity": "sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==" | 11359 | "integrity": "sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==", |
11360 | "dev": true | ||
11503 | }, | 11361 | }, |
11504 | "buffer-crc32": { | 11362 | "buffer-crc32": { |
11505 | "version": "0.2.13", | 11363 | "version": "0.2.13", |
@@ -11521,7 +11379,8 @@ | |||
11521 | "buffer-fill": { | 11379 | "buffer-fill": { |
11522 | "version": "1.0.0", | 11380 | "version": "1.0.0", |
11523 | "resolved": "https://registry.npmjs.org/buffer-fill/-/buffer-fill-1.0.0.tgz", | 11381 | "resolved": "https://registry.npmjs.org/buffer-fill/-/buffer-fill-1.0.0.tgz", |
11524 | "integrity": "sha1-+PeLdniYiO858gXNY39o5wISKyw=" | 11382 | "integrity": "sha1-+PeLdniYiO858gXNY39o5wISKyw=", |
11383 | "dev": true | ||
11525 | }, | 11384 | }, |
11526 | "buffer-from": { | 11385 | "buffer-from": { |
11527 | "version": "1.1.1", | 11386 | "version": "1.1.1", |
@@ -12320,12 +12179,36 @@ | |||
12320 | } | 12179 | } |
12321 | }, | 12180 | }, |
12322 | "color": { | 12181 | "color": { |
12323 | "version": "3.1.2", | 12182 | "version": "4.0.0", |
12324 | "resolved": "https://registry.npmjs.org/color/-/color-3.1.2.tgz", | 12183 | "resolved": "https://registry.npmjs.org/color/-/color-4.0.0.tgz", |
12325 | "integrity": "sha512-vXTJhHebByxZn3lDvDJYw4lR5+uB3vuoHsuYA5AKuxRVn5wzzIfQKGLBmgdVRHKTJYeK5rvJcHnrd0Li49CFpg==", | 12184 | "integrity": "sha512-aVUOa5aYWJSimvei14J5rdxLeljG0EB/uXTovVaaSokW+D4MsAz3MrKsRNaKqPa2KL7Wfvh7PZyIIaaX4lYdzQ==", |
12326 | "requires": { | 12185 | "requires": { |
12327 | "color-convert": "^1.9.1", | 12186 | "color-convert": "^2.0.1", |
12328 | "color-string": "^1.5.2" | 12187 | "color-string": "^1.6.0" |
12188 | }, | ||
12189 | "dependencies": { | ||
12190 | "color-convert": { | ||
12191 | "version": "2.0.1", | ||
12192 | "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", | ||
12193 | "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", | ||
12194 | "requires": { | ||
12195 | "color-name": "~1.1.4" | ||
12196 | } | ||
12197 | }, | ||
12198 | "color-name": { | ||
12199 | "version": "1.1.4", | ||
12200 | "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", | ||
12201 | "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" | ||
12202 | }, | ||
12203 | "color-string": { | ||
12204 | "version": "1.6.0", | ||
12205 | "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.6.0.tgz", | ||
12206 | "integrity": "sha512-c/hGS+kRWJutUBEngKKmk4iH3sD59MBkoxVapS/0wgpCz2u7XsNloxknyvBhzwEs1IbV36D9PwqLPJ2DTu3vMA==", | ||
12207 | "requires": { | ||
12208 | "color-name": "^1.0.0", | ||
12209 | "simple-swizzle": "^0.2.2" | ||
12210 | } | ||
12211 | } | ||
12329 | } | 12212 | } |
12330 | }, | 12213 | }, |
12331 | "color-convert": { | 12214 | "color-convert": { |
@@ -14087,6 +13970,11 @@ | |||
14087 | } | 13970 | } |
14088 | } | 13971 | } |
14089 | }, | 13972 | }, |
13973 | "csstype": { | ||
13974 | "version": "3.0.8", | ||
13975 | "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.0.8.tgz", | ||
13976 | "integrity": "sha512-jXKhWqXPmlUeoQnF/EhTtTl4C9SnrxSH/jZUih3jmO6lBKr99rP3/+FmrMj4EFpOXzMtXHAZkd3x0E6h6Fgflw==" | ||
13977 | }, | ||
14090 | "currently-unhandled": { | 13978 | "currently-unhandled": { |
14091 | "version": "0.4.1", | 13979 | "version": "0.4.1", |
14092 | "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz", | 13980 | "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz", |
@@ -14191,11 +14079,18 @@ | |||
14191 | } | 14079 | } |
14192 | }, | 14080 | }, |
14193 | "debug": { | 14081 | "debug": { |
14194 | "version": "4.1.1", | 14082 | "version": "4.3.2", |
14195 | "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", | 14083 | "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz", |
14196 | "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", | 14084 | "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==", |
14197 | "requires": { | 14085 | "requires": { |
14198 | "ms": "^2.1.1" | 14086 | "ms": "2.1.2" |
14087 | }, | ||
14088 | "dependencies": { | ||
14089 | "ms": { | ||
14090 | "version": "2.1.2", | ||
14091 | "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", | ||
14092 | "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" | ||
14093 | } | ||
14199 | } | 14094 | } |
14200 | }, | 14095 | }, |
14201 | "debuglog": { | 14096 | "debuglog": { |
@@ -15835,6 +15730,14 @@ | |||
15835 | "tough-cookie": "~2.5.0", | 15730 | "tough-cookie": "~2.5.0", |
15836 | "tunnel-agent": "^0.6.0", | 15731 | "tunnel-agent": "^0.6.0", |
15837 | "uuid": "^3.3.2" | 15732 | "uuid": "^3.3.2" |
15733 | }, | ||
15734 | "dependencies": { | ||
15735 | "uuid": { | ||
15736 | "version": "3.4.0", | ||
15737 | "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", | ||
15738 | "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==", | ||
15739 | "dev": true | ||
15740 | } | ||
15838 | } | 15741 | } |
15839 | }, | 15742 | }, |
15840 | "responselike": { | 15743 | "responselike": { |
@@ -18449,11 +18352,6 @@ | |||
18449 | } | 18352 | } |
18450 | } | 18353 | } |
18451 | }, | 18354 | }, |
18452 | "fs-constants": { | ||
18453 | "version": "1.0.0", | ||
18454 | "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz", | ||
18455 | "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==" | ||
18456 | }, | ||
18457 | "fs-extra": { | 18355 | "fs-extra": { |
18458 | "version": "10.0.0", | 18356 | "version": "10.0.0", |
18459 | "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.0.tgz", | 18357 | "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.0.tgz", |
@@ -24885,13 +24783,15 @@ | |||
24885 | } | 24783 | } |
24886 | }, | 24784 | }, |
24887 | "jss": { | 24785 | "jss": { |
24888 | "version": "9.8.7", | 24786 | "version": "10.7.1", |
24889 | "resolved": "https://registry.npmjs.org/jss/-/jss-9.8.7.tgz", | 24787 | "resolved": "https://registry.npmjs.org/jss/-/jss-10.7.1.tgz", |
24890 | "integrity": "sha512-awj3XRZYxbrmmrx9LUSj5pXSUfm12m8xzi/VKeqI1ZwWBtQ0kVPTs3vYs32t4rFw83CgFDukA8wKzOE9sMQnoQ==", | 24788 | "integrity": "sha512-5QN8JSVZR6cxpZNeGfzIjqPEP+ZJwJJfZbXmeABNdxiExyO+eJJDy6WDtqTf8SDKnbL5kZllEpAP71E/Lt7PXg==", |
24789 | "dev": true, | ||
24891 | "requires": { | 24790 | "requires": { |
24791 | "@babel/runtime": "^7.3.1", | ||
24792 | "csstype": "^3.0.2", | ||
24892 | "is-in-browser": "^1.1.3", | 24793 | "is-in-browser": "^1.1.3", |
24893 | "symbol-observable": "^1.1.0", | 24794 | "tiny-warning": "^1.0.2" |
24894 | "warning": "^3.0.0" | ||
24895 | } | 24795 | } |
24896 | }, | 24796 | }, |
24897 | "jss-camel-case": { | 24797 | "jss-camel-case": { |
@@ -25150,6 +25050,11 @@ | |||
25150 | "version": "2.0.0", | 25050 | "version": "2.0.0", |
25151 | "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", | 25051 | "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", |
25152 | "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" | 25052 | "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" |
25053 | }, | ||
25054 | "uuid": { | ||
25055 | "version": "3.4.0", | ||
25056 | "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", | ||
25057 | "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==" | ||
25153 | } | 25058 | } |
25154 | } | 25059 | } |
25155 | }, | 25060 | }, |
@@ -26311,11 +26216,6 @@ | |||
26311 | "safe-buffer": "^5.1.2" | 26216 | "safe-buffer": "^5.1.2" |
26312 | } | 26217 | } |
26313 | }, | 26218 | }, |
26314 | "mdi": { | ||
26315 | "version": "1.9.33", | ||
26316 | "resolved": "https://registry.npmjs.org/mdi/-/mdi-1.9.33.tgz", | ||
26317 | "integrity": "sha1-PK9tlfxrgAYzYwvWK6DPH73msuI=" | ||
26318 | }, | ||
26319 | "mdn-data": { | 26219 | "mdn-data": { |
26320 | "version": "2.0.14", | 26220 | "version": "2.0.14", |
26321 | "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz", | 26221 | "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz", |
@@ -26701,9 +26601,9 @@ | |||
26701 | } | 26601 | } |
26702 | }, | 26602 | }, |
26703 | "minimist": { | 26603 | "minimist": { |
26704 | "version": "0.0.8", | 26604 | "version": "1.2.5", |
26705 | "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", | 26605 | "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", |
26706 | "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=" | 26606 | "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==" |
26707 | }, | 26607 | }, |
26708 | "minimist-options": { | 26608 | "minimist-options": { |
26709 | "version": "4.1.0", | 26609 | "version": "4.1.0", |
@@ -27012,6 +26912,13 @@ | |||
27012 | "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", | 26912 | "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", |
27013 | "requires": { | 26913 | "requires": { |
27014 | "minimist": "0.0.8" | 26914 | "minimist": "0.0.8" |
26915 | }, | ||
26916 | "dependencies": { | ||
26917 | "minimist": { | ||
26918 | "version": "0.0.8", | ||
26919 | "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", | ||
26920 | "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=" | ||
26921 | } | ||
27015 | } | 26922 | } |
27016 | }, | 26923 | }, |
27017 | "mkdirp-infer-owner": { | 26924 | "mkdirp-infer-owner": { |
@@ -27756,7 +27663,8 @@ | |||
27756 | "node-fetch": { | 27663 | "node-fetch": { |
27757 | "version": "2.6.1", | 27664 | "version": "2.6.1", |
27758 | "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz", | 27665 | "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz", |
27759 | "integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==" | 27666 | "integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==", |
27667 | "dev": true | ||
27760 | }, | 27668 | }, |
27761 | "node-forge": { | 27669 | "node-forge": { |
27762 | "version": "0.10.0", | 27670 | "version": "0.10.0", |
@@ -31123,6 +31031,16 @@ | |||
31123 | "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-2.5.5.tgz", | 31031 | "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-2.5.5.tgz", |
31124 | "integrity": "sha512-rqcy4pJo55FTTLWt+bU8ukscqHeE/e9KWvsOW2b/a3afxQZhwkQdT1rPPCJ0rYXdj4vNcasY8zHTH+jF/qStxw==" | 31032 | "integrity": "sha512-rqcy4pJo55FTTLWt+bU8ukscqHeE/e9KWvsOW2b/a3afxQZhwkQdT1rPPCJ0rYXdj4vNcasY8zHTH+jF/qStxw==" |
31125 | }, | 31033 | }, |
31034 | "jss": { | ||
31035 | "version": "9.8.7", | ||
31036 | "resolved": "https://registry.npmjs.org/jss/-/jss-9.8.7.tgz", | ||
31037 | "integrity": "sha512-awj3XRZYxbrmmrx9LUSj5pXSUfm12m8xzi/VKeqI1ZwWBtQ0kVPTs3vYs32t4rFw83CgFDukA8wKzOE9sMQnoQ==", | ||
31038 | "requires": { | ||
31039 | "is-in-browser": "^1.1.3", | ||
31040 | "symbol-observable": "^1.1.0", | ||
31041 | "warning": "^3.0.0" | ||
31042 | } | ||
31043 | }, | ||
31126 | "prop-types": { | 31044 | "prop-types": { |
31127 | "version": "15.7.2", | 31045 | "version": "15.7.2", |
31128 | "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.7.2.tgz", | 31046 | "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.7.2.tgz", |
@@ -31961,6 +31879,13 @@ | |||
31961 | "tough-cookie": "~2.4.3", | 31879 | "tough-cookie": "~2.4.3", |
31962 | "tunnel-agent": "^0.6.0", | 31880 | "tunnel-agent": "^0.6.0", |
31963 | "uuid": "^3.3.2" | 31881 | "uuid": "^3.3.2" |
31882 | }, | ||
31883 | "dependencies": { | ||
31884 | "uuid": { | ||
31885 | "version": "3.4.0", | ||
31886 | "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", | ||
31887 | "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==" | ||
31888 | } | ||
31964 | } | 31889 | } |
31965 | }, | 31890 | }, |
31966 | "require-all": { | 31891 | "require-all": { |
@@ -34035,79 +33960,6 @@ | |||
34035 | } | 33960 | } |
34036 | } | 33961 | } |
34037 | }, | 33962 | }, |
34038 | "tar-fs": { | ||
34039 | "version": "1.16.3", | ||
34040 | "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-1.16.3.tgz", | ||
34041 | "integrity": "sha512-NvCeXpYx7OsmOh8zIOP/ebG55zZmxLE0etfWRbWok+q2Qo8x/vOR/IJT1taADXPe+jsiu9axDb3X4B+iIgNlKw==", | ||
34042 | "requires": { | ||
34043 | "chownr": "^1.0.1", | ||
34044 | "mkdirp": "^0.5.1", | ||
34045 | "pump": "^1.0.0", | ||
34046 | "tar-stream": "^1.1.2" | ||
34047 | }, | ||
34048 | "dependencies": { | ||
34049 | "pump": { | ||
34050 | "version": "1.0.3", | ||
34051 | "resolved": "https://registry.npmjs.org/pump/-/pump-1.0.3.tgz", | ||
34052 | "integrity": "sha512-8k0JupWme55+9tCVE+FS5ULT3K6AbgqrGa58lTT49RpyfwwcGedHqaC5LlQNdEAumn/wFsu6aPwkuPMioy8kqw==", | ||
34053 | "requires": { | ||
34054 | "end-of-stream": "^1.1.0", | ||
34055 | "once": "^1.3.1" | ||
34056 | } | ||
34057 | } | ||
34058 | } | ||
34059 | }, | ||
34060 | "tar-stream": { | ||
34061 | "version": "1.6.2", | ||
34062 | "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-1.6.2.tgz", | ||
34063 | "integrity": "sha512-rzS0heiNf8Xn7/mpdSVVSMAWAoy9bfb1WOTYC78Z0UQKeKa/CWS8FOq0lKGNa8DWKAn9gxjCvMLYc5PGXYlK2A==", | ||
34064 | "requires": { | ||
34065 | "bl": "^1.0.0", | ||
34066 | "buffer-alloc": "^1.2.0", | ||
34067 | "end-of-stream": "^1.0.0", | ||
34068 | "fs-constants": "^1.0.0", | ||
34069 | "readable-stream": "^2.3.0", | ||
34070 | "to-buffer": "^1.1.1", | ||
34071 | "xtend": "^4.0.0" | ||
34072 | }, | ||
34073 | "dependencies": { | ||
34074 | "readable-stream": { | ||
34075 | "version": "2.3.6", | ||
34076 | "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", | ||
34077 | "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", | ||
34078 | "requires": { | ||
34079 | "core-util-is": "~1.0.0", | ||
34080 | "inherits": "~2.0.3", | ||
34081 | "isarray": "~1.0.0", | ||
34082 | "process-nextick-args": "~2.0.0", | ||
34083 | "safe-buffer": "~5.1.1", | ||
34084 | "string_decoder": "~1.1.1", | ||
34085 | "util-deprecate": "~1.0.1" | ||
34086 | } | ||
34087 | }, | ||
34088 | "safe-buffer": { | ||
34089 | "version": "5.1.2", | ||
34090 | "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", | ||
34091 | "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" | ||
34092 | }, | ||
34093 | "string_decoder": { | ||
34094 | "version": "1.1.1", | ||
34095 | "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", | ||
34096 | "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", | ||
34097 | "requires": { | ||
34098 | "safe-buffer": "~5.1.0" | ||
34099 | } | ||
34100 | } | ||
34101 | } | ||
34102 | }, | ||
34103 | "targz": { | ||
34104 | "version": "1.0.1", | ||
34105 | "resolved": "https://registry.npmjs.org/targz/-/targz-1.0.1.tgz", | ||
34106 | "integrity": "sha1-j3alI2lM3t+7XWCkB2/27uzFOY8=", | ||
34107 | "requires": { | ||
34108 | "tar-fs": "^1.8.1" | ||
34109 | } | ||
34110 | }, | ||
34111 | "tarn": { | 33963 | "tarn": { |
34112 | "version": "1.1.5", | 33964 | "version": "1.1.5", |
34113 | "resolved": "https://registry.npmjs.org/tarn/-/tarn-1.1.5.tgz", | 33965 | "resolved": "https://registry.npmjs.org/tarn/-/tarn-1.1.5.tgz", |
@@ -34162,6 +34014,12 @@ | |||
34162 | "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", | 34014 | "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", |
34163 | "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", | 34015 | "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", |
34164 | "dev": true | 34016 | "dev": true |
34017 | }, | ||
34018 | "uuid": { | ||
34019 | "version": "3.4.0", | ||
34020 | "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", | ||
34021 | "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==", | ||
34022 | "dev": true | ||
34165 | } | 34023 | } |
34166 | } | 34024 | } |
34167 | }, | 34025 | }, |
@@ -34180,6 +34038,12 @@ | |||
34180 | "resolved": "https://registry.npmjs.org/temp-dir/-/temp-dir-2.0.0.tgz", | 34038 | "resolved": "https://registry.npmjs.org/temp-dir/-/temp-dir-2.0.0.tgz", |
34181 | "integrity": "sha512-aoBAniQmmwtcKp/7BzsH8Cxzv8OL736p7v1ihGb5e9DJ9kTwGWHrQrVB5+lfVDzfGrdRzXch+ig7LHaY1JTOrg==", | 34039 | "integrity": "sha512-aoBAniQmmwtcKp/7BzsH8Cxzv8OL736p7v1ihGb5e9DJ9kTwGWHrQrVB5+lfVDzfGrdRzXch+ig7LHaY1JTOrg==", |
34182 | "dev": true | 34040 | "dev": true |
34041 | }, | ||
34042 | "uuid": { | ||
34043 | "version": "3.4.0", | ||
34044 | "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", | ||
34045 | "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==", | ||
34046 | "dev": true | ||
34183 | } | 34047 | } |
34184 | } | 34048 | } |
34185 | }, | 34049 | }, |
@@ -34475,6 +34339,12 @@ | |||
34475 | } | 34339 | } |
34476 | } | 34340 | } |
34477 | }, | 34341 | }, |
34342 | "tiny-warning": { | ||
34343 | "version": "1.0.3", | ||
34344 | "resolved": "https://registry.npmjs.org/tiny-warning/-/tiny-warning-1.0.3.tgz", | ||
34345 | "integrity": "sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==", | ||
34346 | "dev": true | ||
34347 | }, | ||
34478 | "tmp": { | 34348 | "tmp": { |
34479 | "version": "0.0.33", | 34349 | "version": "0.0.33", |
34480 | "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", | 34350 | "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", |
@@ -34534,11 +34404,6 @@ | |||
34534 | "integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=", | 34404 | "integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=", |
34535 | "dev": true | 34405 | "dev": true |
34536 | }, | 34406 | }, |
34537 | "to-buffer": { | ||
34538 | "version": "1.1.1", | ||
34539 | "resolved": "https://registry.npmjs.org/to-buffer/-/to-buffer-1.1.1.tgz", | ||
34540 | "integrity": "sha512-lx9B5iv7msuFYE3dytT+KE5tap+rNYw+K4jVkb9R/asAb+pbBSM17jtunHplhBe6RRJdZx3Pn2Jph24O32mOVg==" | ||
34541 | }, | ||
34542 | "to-fast-properties": { | 34407 | "to-fast-properties": { |
34543 | "version": "2.0.0", | 34408 | "version": "2.0.0", |
34544 | "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz", | 34409 | "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz", |
@@ -36337,15 +36202,15 @@ | |||
36337 | "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.4.tgz", | 36202 | "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.4.tgz", |
36338 | "integrity": "sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA==", | 36203 | "integrity": "sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA==", |
36339 | "dev": true | 36204 | "dev": true |
36205 | }, | ||
36206 | "uuid": { | ||
36207 | "version": "3.4.0", | ||
36208 | "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", | ||
36209 | "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==", | ||
36210 | "dev": true | ||
36340 | } | 36211 | } |
36341 | } | 36212 | } |
36342 | }, | 36213 | }, |
36343 | "webpack-node-externals": { | ||
36344 | "version": "1.7.2", | ||
36345 | "resolved": "https://registry.npmjs.org/webpack-node-externals/-/webpack-node-externals-1.7.2.tgz", | ||
36346 | "integrity": "sha512-ajerHZ+BJKeCLviLUUmnyd5B4RavLF76uv3cs6KNuO8W+HuQaEs0y0L7o40NQxdPy5w0pcv8Ew7yPUAQG0UdCg==", | ||
36347 | "dev": true | ||
36348 | }, | ||
36349 | "webpack-sources": { | 36214 | "webpack-sources": { |
36350 | "version": "1.4.3", | 36215 | "version": "1.4.3", |
36351 | "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz", | 36216 | "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz", |
diff --git a/package.json b/package.json index 6bc86ea6d..b488228da 100644 --- a/package.json +++ b/package.json | |||
@@ -60,9 +60,8 @@ | |||
60 | "@adonisjs/session": "1.0.29", | 60 | "@adonisjs/session": "1.0.29", |
61 | "@adonisjs/shield": "1.0.8", | 61 | "@adonisjs/shield": "1.0.8", |
62 | "@adonisjs/validator": "5.0.6", | 62 | "@adonisjs/validator": "5.0.6", |
63 | "@babel/polyfill": "7.7.0", | ||
64 | "@babel/runtime": "7.7.4", | ||
65 | "@electron/remote": "1.2.0", | 63 | "@electron/remote": "1.2.0", |
64 | "@mdi/font": "5.9.55", | ||
66 | "@mdi/js": "4.6.95", | 65 | "@mdi/js": "4.6.95", |
67 | "@meetfranz/electron-notification-state": "1.0.0", | 66 | "@meetfranz/electron-notification-state": "1.0.0", |
68 | "@meetfranz/forms": "file:packages/forms", | 67 | "@meetfranz/forms": "file:packages/forms", |
@@ -70,14 +69,15 @@ | |||
70 | "@meetfranz/ui": "file:packages/ui", | 69 | "@meetfranz/ui": "file:packages/ui", |
71 | "@sentry/electron": "2.5.1", | 70 | "@sentry/electron": "2.5.1", |
72 | "address-rfc2822": "2.1.0", | 71 | "address-rfc2822": "2.1.0", |
73 | "atob": "2.1.2", | ||
74 | "auto-launch": "5.0.5", | 72 | "auto-launch": "5.0.5", |
75 | "btoa": "1.2.1", | ||
76 | "classnames": "2.3.1", | 73 | "classnames": "2.3.1", |
77 | "cld": "2.7.0", | 74 | "cld": "2.7.0", |
75 | "color": "4.0.0", | ||
78 | "css": "2.2.4", | 76 | "css": "2.2.4", |
77 | "csstype": "3.0.8", | ||
79 | "darkreader": "4.9.34", | 78 | "darkreader": "4.9.34", |
80 | "dbus-next": "0.9.2", | 79 | "dbus-next": "0.9.2", |
80 | "debug": "4.3.2", | ||
81 | "du": "0.1.0", | 81 | "du": "0.1.0", |
82 | "electron-dl": "3.2.1", | 82 | "electron-dl": "3.2.1", |
83 | "electron-fetch": "1.7.3", | 83 | "electron-fetch": "1.7.3", |
@@ -95,8 +95,8 @@ | |||
95 | "lodash": "4.17.21", | 95 | "lodash": "4.17.21", |
96 | "macos-version": "5.2.1", | 96 | "macos-version": "5.2.1", |
97 | "marked": "0.7.0", | 97 | "marked": "0.7.0", |
98 | "mdi": "1.9.33", | ||
99 | "mime-types": "2.1.32", | 98 | "mime-types": "2.1.32", |
99 | "minimist": "1.2.5", | ||
100 | "mobx": "5.15.0", | 100 | "mobx": "5.15.0", |
101 | "mobx-localstorage": "1.2.0", | 101 | "mobx-localstorage": "1.2.0", |
102 | "mobx-react": "5.4.2", | 102 | "mobx-react": "5.4.2", |
@@ -104,7 +104,6 @@ | |||
104 | "mobx-react-router": "3.1.2", | 104 | "mobx-react-router": "3.1.2", |
105 | "moment": "2.29.1", | 105 | "moment": "2.29.1", |
106 | "ms": "2.1.3", | 106 | "ms": "2.1.3", |
107 | "node-fetch": "2.6.1", | ||
108 | "node-mac-permissions": "2.2.0", | 107 | "node-mac-permissions": "2.2.0", |
109 | "normalize-url": "6.1.0", | 108 | "normalize-url": "6.1.0", |
110 | "os-name": "4.0.0", | 109 | "os-name": "4.0.0", |
@@ -128,7 +127,6 @@ | |||
128 | "smoothscroll-polyfill": "0.4.4", | 127 | "smoothscroll-polyfill": "0.4.4", |
129 | "sqlite3": "5.0.2", | 128 | "sqlite3": "5.0.2", |
130 | "tar": "4.4.13", | 129 | "tar": "4.4.13", |
131 | "targz": "1.0.1", | ||
132 | "terser": "4.4.0", | 130 | "terser": "4.4.0", |
133 | "useragent-generator": "1.1.1-amkt-22079-finish.0", | 131 | "useragent-generator": "1.1.1-amkt-22079-finish.0", |
134 | "uuid": "3.3.3", | 132 | "uuid": "3.3.3", |
@@ -145,21 +143,19 @@ | |||
145 | "@babel/plugin-proposal-export-default-from": "7.14.5", | 143 | "@babel/plugin-proposal-export-default-from": "7.14.5", |
146 | "@babel/plugin-proposal-throw-expressions": "7.14.5", | 144 | "@babel/plugin-proposal-throw-expressions": "7.14.5", |
147 | "@babel/plugin-syntax-dynamic-import": "7.8.3", | 145 | "@babel/plugin-syntax-dynamic-import": "7.8.3", |
148 | "@babel/plugin-transform-regenerator": "7.14.5", | ||
149 | "@babel/preset-env": "7.14.8", | 146 | "@babel/preset-env": "7.14.8", |
150 | "@babel/preset-react": "7.14.5", | 147 | "@babel/preset-react": "7.14.5", |
151 | "@babel/register": "7.14.5", | 148 | "@babel/register": "7.14.5", |
152 | "@types/color": "3.0.2", | 149 | "@types/color": "3.0.2", |
153 | "@types/fs-extra": "7.0.0", | 150 | "@types/fs-extra": "9.0.12", |
154 | "@types/lodash": "4.14.171", | 151 | "@types/lodash": "4.14.171", |
155 | "@types/node": "12.20.13", | 152 | "@types/node": "14.17.6", |
156 | "@types/react": "16.14.6", | 153 | "@types/react": "16.14.6", |
157 | "@types/react-dom": "16.9.13", | 154 | "@types/react-dom": "16.9.13", |
158 | "@types/uuid": "3.4.9", | 155 | "@types/uuid": "3.4.9", |
159 | "@typescript-eslint/eslint-plugin": "4.28.5", | 156 | "@typescript-eslint/eslint-plugin": "4.28.5", |
160 | "@typescript-eslint/parser": "4.28.5", | 157 | "@typescript-eslint/parser": "4.28.5", |
161 | "all-contributors-cli": "6.20.0", | 158 | "all-contributors-cli": "6.20.0", |
162 | "babel-loader": "8.2.2", | ||
163 | "babel-plugin-react-intl": "3.5.1", | 159 | "babel-plugin-react-intl": "3.5.1", |
164 | "conventional-changelog-cli": "2.1.1", | 160 | "conventional-changelog-cli": "2.1.1", |
165 | "cross-env": "7.0.3", | 161 | "cross-env": "7.0.3", |
@@ -190,6 +186,7 @@ | |||
190 | "html-webpack-plugin": "4.5.2", | 186 | "html-webpack-plugin": "4.5.2", |
191 | "husky": "7.0.1", | 187 | "husky": "7.0.1", |
192 | "jest": "27.0.6", | 188 | "jest": "27.0.6", |
189 | "jss": "10.7.1", | ||
193 | "kebab-case": "1.0.1", | 190 | "kebab-case": "1.0.1", |
194 | "lerna": "4.0.0", | 191 | "lerna": "4.0.0", |
195 | "mobx-react-devtools": "6.1.1", | 192 | "mobx-react-devtools": "6.1.1", |
@@ -199,13 +196,11 @@ | |||
199 | "preval-build-info": "1.0.3", | 196 | "preval-build-info": "1.0.3", |
200 | "react-intl-translations-manager": "5.0.3", | 197 | "react-intl-translations-manager": "5.0.3", |
201 | "sass": "1.36.0", | 198 | "sass": "1.36.0", |
202 | "terser-webpack-plugin": "1.4.5", | ||
203 | "ts-loader": "5.4.5", | 199 | "ts-loader": "5.4.5", |
204 | "typescript": "3.9.10", | 200 | "typescript": "3.9.10", |
205 | "webpack": "4.46.0", | 201 | "webpack": "4.46.0", |
206 | "webpack-cli": "3.3.12", | 202 | "webpack-cli": "3.3.12", |
207 | "webpack-dev-server": "3.11.2", | 203 | "webpack-dev-server": "3.11.2" |
208 | "webpack-node-externals": "1.7.2" | ||
209 | }, | 204 | }, |
210 | "config": { | 205 | "config": { |
211 | "commitizen": { | 206 | "commitizen": { |
diff --git a/packages/typings/package.json b/packages/typings/package.json deleted file mode 100644 index 5da8389d6..000000000 --- a/packages/typings/package.json +++ /dev/null | |||
@@ -1,22 +0,0 @@ | |||
1 | { | ||
2 | "name": "@meetfranz/typings", | ||
3 | "version": "0.0.11", | ||
4 | "description": "TypeScript typings for internal and external projects", | ||
5 | "author": "Stefan Malzner <stefan@adlk.io>", | ||
6 | "homepage": "https://github.com/meetfranz/franz", | ||
7 | "license": "Apache-2.0", | ||
8 | "directories": { | ||
9 | "types": "types" | ||
10 | }, | ||
11 | "publishConfig": { | ||
12 | "access": "public" | ||
13 | }, | ||
14 | "repository": { | ||
15 | "type": "git", | ||
16 | "url": "git+https://github.com/meetfranz/franz.git" | ||
17 | }, | ||
18 | "bugs": { | ||
19 | "url": "https://github.com/meetfranz/franz/issues" | ||
20 | }, | ||
21 | "gitHead": "e9b9079dc921e85961954727a7b2a8eabe5b9798" | ||
22 | } | ||
diff --git a/packages/typings/types/mobx-react-form.d.ts b/packages/typings/types/mobx-react-form.d.ts deleted file mode 100644 index 4e19dc1c2..000000000 --- a/packages/typings/types/mobx-react-form.d.ts +++ /dev/null | |||
@@ -1 +0,0 @@ | |||
1 | declare module 'mobx-react-form'; | ||
diff --git a/packages/typings/types/react-html-attributes.d.ts b/packages/typings/types/react-html-attributes.d.ts deleted file mode 100644 index 6f8f20fe4..000000000 --- a/packages/typings/types/react-html-attributes.d.ts +++ /dev/null | |||
@@ -1 +0,0 @@ | |||
1 | declare module 'react-html-attributes'; | ||
diff --git a/packages/typings/types/react-jss.d.ts b/packages/typings/types/react-jss.d.ts deleted file mode 100644 index 9a77ddb87..000000000 --- a/packages/typings/types/react-jss.d.ts +++ /dev/null | |||
@@ -1 +0,0 @@ | |||
1 | declare module 'react-jss'; | ||
diff --git a/packages/typings/types/react-loader.d.ts b/packages/typings/types/react-loader.d.ts deleted file mode 100644 index 728e3dfa0..000000000 --- a/packages/typings/types/react-loader.d.ts +++ /dev/null | |||
@@ -1,45 +0,0 @@ | |||
1 | // Type definitions for react-loader 2.4 | ||
2 | // Project: https://github.com/quickleft/react-loader | ||
3 | // Definitions by: Sudarsan Balaji <https://github.com/artfuldev> | ||
4 | // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped | ||
5 | // TypeScript Version: 2.8 | ||
6 | |||
7 | import { Component } from 'react'; | ||
8 | |||
9 | interface LoaderOptions { | ||
10 | lines?: number; | ||
11 | length?: number; | ||
12 | width?: number; | ||
13 | radius?: number; | ||
14 | scale?: number; | ||
15 | corners?: number; | ||
16 | color?: string; | ||
17 | opacity?: number; | ||
18 | rotate?: number; | ||
19 | direction?: number; | ||
20 | speed?: number; | ||
21 | trail?: number; | ||
22 | fps?: number; | ||
23 | zIndex?: number; | ||
24 | top?: string; | ||
25 | left?: string; | ||
26 | shadow?: boolean; | ||
27 | hwaccel?: boolean; | ||
28 | position?: string; | ||
29 | loadedClassName?: string; | ||
30 | parentClassName?: string; | ||
31 | } | ||
32 | |||
33 | interface LoaderProps extends LoaderOptions { | ||
34 | loaded: boolean; | ||
35 | options?: LoaderOptions; | ||
36 | className?: string; | ||
37 | } | ||
38 | |||
39 | declare class ReactLoader extends Component<LoaderProps> { | ||
40 | } | ||
41 | |||
42 | declare namespace ReactLoader { | ||
43 | } | ||
44 | |||
45 | export = ReactLoader; | ||
diff --git a/src/app.js b/src/app.js index a2d60dbe4..39b50cb33 100644 --- a/src/app.js +++ b/src/app.js | |||
@@ -4,11 +4,8 @@ import React from 'react'; | |||
4 | import { render } from 'react-dom'; | 4 | import { render } from 'react-dom'; |
5 | import { Provider } from 'mobx-react'; | 5 | import { Provider } from 'mobx-react'; |
6 | import { syncHistoryWithStore, RouterStore } from 'mobx-react-router'; | 6 | import { syncHistoryWithStore, RouterStore } from 'mobx-react-router'; |
7 | import { | 7 | import { hashHistory } from 'react-router'; |
8 | hashHistory, | ||
9 | } from 'react-router'; | ||
10 | 8 | ||
11 | import '@babel/polyfill'; | ||
12 | import smoothScroll from 'smoothscroll-polyfill'; | 9 | import smoothScroll from 'smoothscroll-polyfill'; |
13 | 10 | ||
14 | import ServerApi from './api/server/ServerApi'; | 11 | import ServerApi from './api/server/ServerApi'; |
@@ -59,7 +56,7 @@ window.addEventListener('load', () => { | |||
59 | }); | 56 | }); |
60 | 57 | ||
61 | // Prevent drag and drop into window from redirecting | 58 | // Prevent drag and drop into window from redirecting |
62 | window.addEventListener('dragover', (event) => event.preventDefault()); | 59 | window.addEventListener('dragover', event => event.preventDefault()); |
63 | window.addEventListener('drop', (event) => event.preventDefault()); | 60 | window.addEventListener('drop', event => event.preventDefault()); |
64 | window.addEventListener('dragover', (event) => event.stopPropagation()); | 61 | window.addEventListener('dragover', event => event.stopPropagation()); |
65 | window.addEventListener('drop', (event) => event.stopPropagation()); | 62 | window.addEventListener('drop', event => event.stopPropagation()); |
diff --git a/src/styles/fonts.scss b/src/styles/fonts.scss index bd96ea867..432332b49 100644 --- a/src/styles/fonts.scss +++ b/src/styles/fonts.scss | |||
@@ -1,44 +1,43 @@ | |||
1 | @import './config.scss'; | 1 | @import './config.scss'; |
2 | // @import './node_modules/mdi/scss/materialdesignicons.scss'; | ||
3 | 2 | ||
4 | @font-face { | 3 | @font-face { |
5 | font-family: 'Open Sans'; | 4 | font-family: 'Open Sans'; |
6 | src: url('../assets/fonts/OpenSans-Light.ttf'); | 5 | src: url('../assets/fonts/OpenSans-Light.ttf'); |
7 | font-weight: 300; | 6 | font-weight: 300; |
8 | font-style: normal; | 7 | font-style: normal; |
9 | } | 8 | } |
10 | 9 | ||
11 | @font-face { | 10 | @font-face { |
12 | font-family: 'Open Sans'; | 11 | font-family: 'Open Sans'; |
13 | src: url('../assets/fonts/OpenSans-Regular.ttf'); | 12 | src: url('../assets/fonts/OpenSans-Regular.ttf'); |
14 | font-weight: normal; | 13 | font-weight: normal; |
15 | font-style: normal; | 14 | font-style: normal; |
16 | } | 15 | } |
17 | 16 | ||
18 | @font-face { | 17 | @font-face { |
19 | font-family: 'Open Sans'; | 18 | font-family: 'Open Sans'; |
20 | src: url('../assets/fonts/OpenSans-Bold.ttf'); | 19 | src: url('../assets/fonts/OpenSans-Bold.ttf'); |
21 | font-weight: bold; | 20 | font-weight: bold; |
22 | font-style: normal; | 21 | font-style: normal; |
23 | } | 22 | } |
24 | 23 | ||
25 | @font-face { | 24 | @font-face { |
26 | font-family: 'Open Sans'; | 25 | font-family: 'Open Sans'; |
27 | src: url('../assets/fonts/OpenSans-BoldItalic.ttf'); | 26 | src: url('../assets/fonts/OpenSans-BoldItalic.ttf'); |
28 | font-weight: bold; | 27 | font-weight: bold; |
29 | font-style: italic; | 28 | font-style: italic; |
30 | } | 29 | } |
31 | 30 | ||
32 | @font-face { | 31 | @font-face { |
33 | font-family: 'Open Sans'; | 32 | font-family: 'Open Sans'; |
34 | src: url('../assets/fonts/OpenSans-ExtraBold.ttf'); | 33 | src: url('../assets/fonts/OpenSans-ExtraBold.ttf'); |
35 | font-weight: 800; | 34 | font-weight: 800; |
36 | font-style: normal; | 35 | font-style: normal; |
37 | } | 36 | } |
38 | 37 | ||
39 | @font-face { | 38 | @font-face { |
40 | font-family: 'Open Sans'; | 39 | font-family: 'Open Sans'; |
41 | src: url('../assets/fonts/OpenSans-ExtraBoldItalic.ttf'); | 40 | src: url('../assets/fonts/OpenSans-ExtraBoldItalic.ttf'); |
42 | font-weight: 800; | 41 | font-weight: 800; |
43 | font-style: italic; | 42 | font-style: italic; |
44 | } | 43 | } |
diff --git a/src/styles/main.scss b/src/styles/main.scss index 6909d2051..4cc996785 100644 --- a/src/styles/main.scss +++ b/src/styles/main.scss | |||
@@ -1,9 +1,9 @@ | |||
1 | $mdi-font-path: '../node_modules/mdi/fonts'; | 1 | $mdi-font-path: '../node_modules/@mdi/font/fonts'; |
2 | @if $env == development { | 2 | @if $env == development { |
3 | $mdi-font-path: '../../node_modules/mdi/fonts'; | 3 | $mdi-font-path: '../../node_modules/@mdi/font/fonts'; |
4 | } | 4 | } |
5 | 5 | ||
6 | @import './node_modules/mdi/scss/materialdesignicons.scss'; | 6 | @import './node_modules/@mdi/font/scss/materialdesignicons.scss'; |
7 | @import './node_modules/electron-react-titlebar/assets/style'; | 7 | @import './node_modules/electron-react-titlebar/assets/style'; |
8 | 8 | ||
9 | // modules | 9 | // modules |