From 0bd8cb9bf0b93ed18418d3cdd60815ff5dc8769f Mon Sep 17 00:00:00 2001 From: Sendou Date: Sun, 23 Feb 2020 00:28:06 +0200 Subject: [PATCH] team milestone --- frontend-react/package-lock.json | 429 ++++++++++-------- frontend-react/package.json | 15 +- frontend-react/src/assets/first_place.png | Bin 0 -> 3303 bytes frontend-react/src/assets/imageImports.ts | 6 + frontend-react/src/assets/second_place.png | Bin 0 -> 3848 bytes frontend-react/src/assets/third_place.png | Bin 0 -> 4215 bytes .../src/components/team/AddResultModal.tsx | 1 + .../src/components/team/PlacementInput.tsx | 11 +- .../src/components/team/Results.tsx | 48 +- .../src/components/team/TeamPage.tsx | 4 +- graphql-schemas/team.js | 4 +- mongoose-models/team.js | 2 +- package-lock.json | 241 +++++----- package.json | 9 +- 14 files changed, 423 insertions(+), 347 deletions(-) create mode 100644 frontend-react/src/assets/first_place.png create mode 100644 frontend-react/src/assets/second_place.png create mode 100644 frontend-react/src/assets/third_place.png diff --git a/frontend-react/package-lock.json b/frontend-react/package-lock.json index 8026f6b20..44d0c02a1 100644 --- a/frontend-react/package-lock.json +++ b/frontend-react/package-lock.json @@ -1000,15 +1000,6 @@ "regenerator-runtime": "^0.13.2" } }, - "@babel/runtime-corejs3": { - "version": "7.8.4", - "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.8.4.tgz", - "integrity": "sha512-+wpLqy5+fbQhvbllvlJEVRIpYj+COUWnnsm+I4jZlA8Lo7/MJmBhGTCHyk1/RWfOqBRJ2MbadddG6QltTKTlrg==", - "requires": { - "core-js-pure": "^3.0.0", - "regenerator-runtime": "^0.13.2" - } - }, "@babel/template": { "version": "7.8.3", "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.8.3.tgz", @@ -1069,9 +1060,9 @@ } }, "@cnakazawa/watch": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/@cnakazawa/watch/-/watch-1.0.3.tgz", - "integrity": "sha512-r5160ogAvGyHsal38Kux7YYtodEKOj89RGb28ht1jh3SJb08VwRwAKKJL0bGb04Zd/3r9FL3BFIc3bBidYffCA==", + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/@cnakazawa/watch/-/watch-1.0.4.tgz", + "integrity": "sha512-v9kIhKwjeZThiWrLmj0y17CWoyddASLj9O2yvbZkbvw/N3rWOYy9zkV66ursAoVr0mV15bL8g0c4QZUE6cdDoQ==", "requires": { "exec-sh": "^0.3.2", "minimist": "^1.2.0" @@ -1230,6 +1221,11 @@ "@hapi/hoek": "^8.3.0" } }, + "@icons/material": { + "version": "0.2.4", + "resolved": "https://registry.npmjs.org/@icons/material/-/material-0.2.4.tgz", + "integrity": "sha512-QPcGmICAPbGLGb6F/yNf/KzKqvFx8z5qx3D1yFqVAjoFmXK35EgyW+cJ57Te3CNsmzblwtzakLGFqHPqrfb4Tw==" + }, "@jest/console": { "version": "24.9.0", "resolved": "https://registry.npmjs.org/@jest/console/-/console-24.9.0.tgz", @@ -1470,6 +1466,11 @@ "resolved": "https://registry.npmjs.org/@reach/visually-hidden/-/visually-hidden-0.1.4.tgz", "integrity": "sha512-QHbzXjflSlCvDd6vJwdwx16mSB+vUCCQMiU/wK/CgVNPibtpEiIbisyxkpZc55DyDFNUIqP91rSUsNae+ogGDQ==" }, + "@rehooks/local-storage": { + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/@rehooks/local-storage/-/local-storage-2.2.2.tgz", + "integrity": "sha512-tBhDB4qkJwXE6Gl/pu9E5qsRMqyhEQc95v1PnxQ5TgxS5LdMWXRxD4VO0Vl3TTJS4BTDzZ7NQ+j23lIT547Tzw==" + }, "@sendou/react-sketch": { "version": "0.5.2", "resolved": "https://registry.npmjs.org/@sendou/react-sketch/-/react-sketch-0.5.2.tgz", @@ -1902,14 +1903,14 @@ } }, "@testing-library/user-event": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/@testing-library/user-event/-/user-event-8.1.0.tgz", - "integrity": "sha512-42VHeLj4877FYIlehDQEP24rmixcfkRpPSil8icNKFJfU4pNArI0EPaKCoAaDr/p6NThW+QHFRiwws80PUNFtg==" + "version": "8.1.3", + "resolved": "https://registry.npmjs.org/@testing-library/user-event/-/user-event-8.1.3.tgz", + "integrity": "sha512-l8IX2Zs6cLZgwJNmBJaJT2yvstwiNi8kKyO+USrZWJV6DSyUlrWfgWSSic8YLiOHLWUNRLJBOPN43nxTKHXKfg==" }, "@types/babel__core": { - "version": "7.1.3", - "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.3.tgz", - "integrity": "sha512-8fBo0UR2CcwWxeX7WIIgJ7lXjasFxoYgRnFHUj+hRvKkpiBJbxhdAPTCY6/ZKM0uxANFVzt4yObSLuTiTnazDA==", + "version": "7.1.4", + "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.4.tgz", + "integrity": "sha512-c/5MuRz5HM4aizqL5ViYfW4iEnmfPcfbH4Xa6GgLT21dMc1NGeNnuS6egHheOmP+kCJ9CAzC4pv4SDCWTnRkbg==", "requires": { "@babel/parser": "^7.1.0", "@babel/types": "^7.0.0", @@ -1996,9 +1997,9 @@ } }, "@types/jest": { - "version": "25.1.2", - "resolved": "https://registry.npmjs.org/@types/jest/-/jest-25.1.2.tgz", - "integrity": "sha512-EsPIgEsonlXmYV7GzUqcvORsSS9Gqxw/OvkGwHfAdpjduNRxMlhsav0O5Kb0zijc/eXSO/uW6SJt9nwull8AUQ==", + "version": "25.1.3", + "resolved": "https://registry.npmjs.org/@types/jest/-/jest-25.1.3.tgz", + "integrity": "sha512-jqargqzyJWgWAJCXX96LBGR/Ei7wQcZBvRv0PLEu9ZByMfcs23keUJrKv9FMR6YZf9YCbfqDqgmY+JUBsnqhrg==", "requires": { "jest-diff": "^25.1.0", "pretty-format": "^25.1.0" @@ -2112,9 +2113,9 @@ "integrity": "sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==" }, "@types/node": { - "version": "13.7.1", - "resolved": "https://registry.npmjs.org/@types/node/-/node-13.7.1.tgz", - "integrity": "sha512-Zq8gcQGmn4txQEJeiXo/KiLpon8TzAl0kmKH4zdWctPj05nWwp1ClMdAVEloqrQKfaC48PNLdgN/aVaLqUrluA==" + "version": "13.7.4", + "resolved": "https://registry.npmjs.org/@types/node/-/node-13.7.4.tgz", + "integrity": "sha512-oVeL12C6gQS/GAExndigSaLxTrKpQPxewx9bOcwfvJiJge4rr7wNaph4J+ns5hrmIV2as5qxqN8YKthn9qh0jw==" }, "@types/parse-json": { "version": "4.0.0", @@ -2141,14 +2142,22 @@ } }, "@types/react": { - "version": "16.9.19", - "resolved": "https://registry.npmjs.org/@types/react/-/react-16.9.19.tgz", - "integrity": "sha512-LJV97//H+zqKWMms0kvxaKYJDG05U2TtQB3chRLF8MPNs+MQh/H1aGlyDUxjaHvu08EAGerdX2z4LTBc7ns77A==", + "version": "16.9.21", + "resolved": "https://registry.npmjs.org/@types/react/-/react-16.9.21.tgz", + "integrity": "sha512-xpmenCMeBwJRct8vmIfczlgdOXWIWASoOM857kxKfHlVQvDltRh7IFRVfGws79iO2jkNPXOeWREyKoClzhBaQA==", "requires": { "@types/prop-types": "*", "csstype": "^2.2.0" } }, + "@types/react-color": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/@types/react-color/-/react-color-3.0.1.tgz", + "integrity": "sha512-J6mYm43Sid9y+OjZ7NDfJ2VVkeeuTPNVImNFITgQNXodHteKfl/t/5pAR5Z9buodZ2tCctsZjgiMlQOpfntakw==", + "requires": { + "@types/react": "*" + } + }, "@types/react-datepicker": { "version": "2.11.0", "resolved": "https://registry.npmjs.org/@types/react-datepicker/-/react-datepicker-2.11.0.tgz", @@ -2256,11 +2265,11 @@ "integrity": "sha512-te5lMAWii1uEJ4FwLjzdlbw3+n0FZNOvFXHxQDKeT0dilh7HOzdMzV2TrJVUzq8ep7J4Na8OUYPRLSQkJHAlrg==" }, "@typescript-eslint/eslint-plugin": { - "version": "2.18.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.18.0.tgz", - "integrity": "sha512-kuO8WQjV+RCZvAXVRJfXWiJ8iYEtfHlKgcqqqXg9uUkIolEHuUaMmm8/lcO4xwCOtaw6mY0gStn2Lg4/eUXXYQ==", + "version": "2.19.2", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.19.2.tgz", + "integrity": "sha512-HX2qOq2GOV04HNrmKnTpSIpHjfl7iwdXe3u/Nvt+/cpmdvzYvY0NHSiTkYN257jHnq4OM/yo+OsFgati+7LqJA==", "requires": { - "@typescript-eslint/experimental-utils": "2.18.0", + "@typescript-eslint/experimental-utils": "2.19.2", "eslint-utils": "^1.4.3", "functional-red-black-tree": "^1.0.1", "regexpp": "^3.0.0", @@ -2268,30 +2277,30 @@ } }, "@typescript-eslint/experimental-utils": { - "version": "2.18.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-2.18.0.tgz", - "integrity": "sha512-J6MopKPHuJYmQUkANLip7g9I82ZLe1naCbxZZW3O2sIxTiq/9YYoOELEKY7oPg0hJ0V/AQ225h2z0Yp+RRMXhw==", + "version": "2.19.2", + "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-2.19.2.tgz", + "integrity": "sha512-B88QuwT1wMJR750YvTJBNjMZwmiPpbmKYLm1yI7PCc3x0NariqPwqaPsoJRwU9DmUi0cd9dkhz1IqEnwfD+P1A==", "requires": { "@types/json-schema": "^7.0.3", - "@typescript-eslint/typescript-estree": "2.18.0", + "@typescript-eslint/typescript-estree": "2.19.2", "eslint-scope": "^5.0.0" } }, "@typescript-eslint/parser": { - "version": "2.18.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-2.18.0.tgz", - "integrity": "sha512-SJJPxFMEYEWkM6pGfcnjLU+NJIPo+Ko1QrCBL+i0+zV30ggLD90huEmMMhKLHBpESWy9lVEeWlQibweNQzyc+A==", + "version": "2.19.2", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-2.19.2.tgz", + "integrity": "sha512-8uwnYGKqX9wWHGPGdLB9sk9+12sjcdqEEYKGgbS8A0IvYX59h01o8os5qXUHMq2na8vpDRaV0suTLM7S8wraTA==", "requires": { "@types/eslint-visitor-keys": "^1.0.0", - "@typescript-eslint/experimental-utils": "2.18.0", - "@typescript-eslint/typescript-estree": "2.18.0", + "@typescript-eslint/experimental-utils": "2.19.2", + "@typescript-eslint/typescript-estree": "2.19.2", "eslint-visitor-keys": "^1.1.0" } }, "@typescript-eslint/typescript-estree": { - "version": "2.18.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-2.18.0.tgz", - "integrity": "sha512-gVHylf7FDb8VSi2ypFuEL3hOtoC4HkZZ5dOjXvVjoyKdRrvXAOPSzpNRnKMfaUUEiSLP8UF9j9X9EDLxC0lfZg==", + "version": "2.19.2", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-2.19.2.tgz", + "integrity": "sha512-Xu/qa0MDk6upQWqE4Qy2X16Xg8Vi32tQS2PR0AvnT/ZYS4YGDvtn2MStOh5y8Zy2mg4NuL06KUHlvCh95j9C6Q==", "requires": { "debug": "^4.1.1", "eslint-visitor-keys": "^1.1.0", @@ -2999,13 +3008,9 @@ "integrity": "sha512-wMHVg2EOHaMRxbzgFJ9gtjOOCrI80OHLG14rxi28XwOW8ux6IiEbRCGGGqCtdAIg4FQCbW20k9RsT4y3gJlFug==" }, "axobject-query": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-2.1.1.tgz", - "integrity": "sha512-lF98xa/yvy6j3fBHAgQXIYl+J4eZadOSqsPojemUqClzNbBV38wWGpUbQbVEyf4eUF5yF7eHmGgGA2JiHyjeqw==", - "requires": { - "@babel/runtime": "^7.7.4", - "@babel/runtime-corejs3": "^7.7.4" - } + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-2.1.2.tgz", + "integrity": "sha512-ICt34ZmrVt8UQnvPl6TVyDTkmhXmAyAT4Jh5ugfGUX4MOrZ+U/ZY6/sdylRw3qGNr9Ub5AJsaHeDMzNLehRdOQ==" }, "babel-code-frame": { "version": "6.26.0", @@ -3663,13 +3668,13 @@ } }, "browserslist": { - "version": "4.8.6", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.8.6.tgz", - "integrity": "sha512-ZHao85gf0eZ0ESxLfCp73GG9O/VTytYDIkIiZDlURppLTI9wErSM/5yAKEq6rcUdxBLjMELmrYUJGg5sxGKMHg==", + "version": "4.8.7", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.8.7.tgz", + "integrity": "sha512-gFOnZNYBHrEyUML0xr5NJ6edFaaKbTFX9S9kQHlYfCP0Rit/boRIz4G+Avq6/4haEKJXdGGUnoolx+5MWW2BoA==", "requires": { - "caniuse-lite": "^1.0.30001023", - "electron-to-chromium": "^1.3.341", - "node-releases": "^1.1.47" + "caniuse-lite": "^1.0.30001027", + "electron-to-chromium": "^1.3.349", + "node-releases": "^1.1.49" } }, "bser": { @@ -3834,9 +3839,9 @@ } }, "caniuse-lite": { - "version": "1.0.30001023", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001023.tgz", - "integrity": "sha512-C5TDMiYG11EOhVOA62W1p3UsJ2z4DsHtMBQtjzp3ZsUglcQn62WOUgW0y795c7A5uZ+GCEIvzkMatLIlAsbNTA==" + "version": "1.0.30001027", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001027.tgz", + "integrity": "sha512-7xvKeErvXZFtUItTHgNtLgS9RJpVnwBlWX8jSo/BO8VsF6deszemZSkJJJA1KOKrXuzZH4WALpAJdq5EyfgMLg==" }, "capture-exit": { "version": "2.0.0", @@ -3932,9 +3937,9 @@ } }, "chownr": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.3.tgz", - "integrity": "sha512-i70fVHhmV3DtTl6nqvZOnIjbY0Pe4kAUjwHj8z0zAdgBtYrJyYwLKCCuRBQ5ppkyL0AkN7HKRnETdmdp1zqNXw==" + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz", + "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==" }, "chrome-trace-event": { "version": "1.0.2", @@ -4334,11 +4339,6 @@ } } }, - "core-js-pure": { - "version": "3.6.4", - "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.6.4.tgz", - "integrity": "sha512-epIhRLkXdgv32xIUFaaAry2wdxZYBi6bgM7cB136dzzXXa+dFyRLTZeLUJxnd8ShrmyVXBub63n2NHo2JAt8Cw==" - }, "core-util-is": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", @@ -5076,11 +5076,11 @@ } }, "dot-prop": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-4.2.0.tgz", - "integrity": "sha512-tUMXrxlExSW6U2EXiiKGSBVdYgtV8qlHL+C10TsW4PURY/ic+eaysnSkwB4kA/mBlCyy/IKDJ+Lc3wbWeaXtuQ==", + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.2.0.tgz", + "integrity": "sha512-uEUyaDKoSQ1M4Oq8l45hSE26SnTxL6snNnqvK/VWx5wJhmff5z0FUVJDKDanor/6w3kzE3i7XZOk+7wC0EXr1A==", "requires": { - "is-obj": "^1.0.0" + "is-obj": "^2.0.0" } }, "dotenv": { @@ -5148,9 +5148,9 @@ "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=" }, "electron-to-chromium": { - "version": "1.3.344", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.344.tgz", - "integrity": "sha512-tvbx2Wl8WBR+ym3u492D0L6/jH+8NoQXqe46+QhbWH3voVPauGuZYeb1QAXYoOAWuiP2dbSvlBx0kQ1F3hu/Mw==" + "version": "1.3.351", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.351.tgz", + "integrity": "sha512-L8zhV8k7Znp2q3wWXYDzCyfTBeGauEX0rX/FtgmnDgmvHRqwu9NVN614wOkXx9sDZmJZpNMBaEFMXTu/vbr+Kg==" }, "elliptic": { "version": "6.5.2", @@ -5331,9 +5331,9 @@ "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=" }, "escodegen": { - "version": "1.13.0", - "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.13.0.tgz", - "integrity": "sha512-eYk2dCkxR07DsHA/X2hRBj0CFAZeri/LyDMc0C8JT1Hqi6JnVpMhJ7XFITbb0+yZS3lVkaPL2oCkZ3AVmeVbMw==", + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.14.1.tgz", + "integrity": "sha512-Bmt7NcRySdIfNPfU2ZoXDrrXsG9ZjvDxcAlMfDUgRBjLOWTuIACXPBFJH7Z+cLb40JeQco5toikyc9t9P8E9SQ==", "requires": { "esprima": "^4.0.1", "estraverse": "^4.2.0", @@ -5454,9 +5454,9 @@ "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" }, "resolve": { - "version": "1.15.0", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.15.0.tgz", - "integrity": "sha512-+hTmAldEGE80U2wJJDC1lebb5jWqvTYAfm3YZ1ckk1gBr0MnCqUKlwK1e+anaFljIl+F5tR5IoZcm4ZDA1zMQw==", + "version": "1.15.1", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.15.1.tgz", + "integrity": "sha512-84oo6ZTtoTUpjgNEr5SJyzQhzL72gaRodsSfyxC/AXRvwu0Yse9H8eF9IpGo7b8YetZhlI6v7ZQ6bKBFV/6S7w==", "requires": { "path-parse": "^1.0.6" } @@ -5733,9 +5733,9 @@ } }, "resolve": { - "version": "1.15.0", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.15.0.tgz", - "integrity": "sha512-+hTmAldEGE80U2wJJDC1lebb5jWqvTYAfm3YZ1ckk1gBr0MnCqUKlwK1e+anaFljIl+F5tR5IoZcm4ZDA1zMQw==", + "version": "1.15.1", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.15.1.tgz", + "integrity": "sha512-84oo6ZTtoTUpjgNEr5SJyzQhzL72gaRodsSfyxC/AXRvwu0Yse9H8eF9IpGo7b8YetZhlI6v7ZQ6bKBFV/6S7w==", "requires": { "path-parse": "^1.0.6" } @@ -5785,9 +5785,9 @@ "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==" }, "esquery": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.0.1.tgz", - "integrity": "sha512-SmiyZ5zIWH9VM+SRUReLS5Q8a7GxtRdxEBVZpm98rJM7Sb+A9DVCndXfkeFUd3byderg+EbDkfnevfCwynWaNA==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.1.0.tgz", + "integrity": "sha512-MxYW9xKmROWF672KqjO75sszsA8Mxhw06YFeS5VHlB98KDHbOSurm3ArsjO60Eaf3QmGMCP1yn+0JQkNLo/97Q==", "requires": { "estraverse": "^4.0.0" } @@ -7004,9 +7004,9 @@ "integrity": "sha512-a4u9BeERWGu/S8JiWEAQcdrg9v4QArtP9keViQjGMdff20fBdd8waotXaNmODqBe6uZ3Nafi7K/ho4gCQHV3Ig==" }, "html-minifier-terser": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/html-minifier-terser/-/html-minifier-terser-5.0.2.tgz", - "integrity": "sha512-VAaitmbBuHaPKv9bj47XKypRhgDxT/cDLvsPiiF7w+omrN3K0eQhpigV9Z1ilrmHa9e0rOYcD6R/+LCDADGcnQ==", + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/html-minifier-terser/-/html-minifier-terser-5.0.3.tgz", + "integrity": "sha512-It4No3H1V3Dhd/O0MePFdo0oX/M6u6YZTMw4My/010mT6vxdbqge7+0RoxGAmeSbKok6gjYZoP0p4rpZ2+J2yw==", "requires": { "camel-case": "^3.0.0", "clean-css": "^4.2.1", @@ -7018,9 +7018,9 @@ }, "dependencies": { "commander": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-4.1.0.tgz", - "integrity": "sha512-NIQrwvv9V39FHgGFm36+U9SMQzbiHvU79k+iADraJTpmrFFfx7Ds0IvDoAdZsDrknlkRk14OYoWXb57uTh7/sw==" + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz", + "integrity": "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==" } } }, @@ -7409,6 +7409,11 @@ "resolved": "https://registry.npmjs.org/is-directory/-/is-directory-0.3.1.tgz", "integrity": "sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE=" }, + "is-docker": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.0.0.tgz", + "integrity": "sha512-pJEdRugimx4fBMra5z2/5iRdZ63OhYV0vr0Dwm5+xtW4D1FvRkB8hamMIhnWfyJeDdyr/aa7BDyNbtG38VxgoQ==" + }, "is-extendable": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz", @@ -7451,9 +7456,9 @@ } }, "is-obj": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz", - "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=" + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz", + "integrity": "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==" }, "is-path-cwd": { "version": "2.2.0", @@ -9019,9 +9024,9 @@ "integrity": "sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=" }, "loglevel": { - "version": "1.6.6", - "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.6.6.tgz", - "integrity": "sha512-Sgr5lbboAUBo3eXCSPL4/KoVz3ROKquOjcctxmHIt+vol2DrqTQe3SwkKKuYhEiWB5kYa13YyopJ69deJ1irzQ==" + "version": "1.6.7", + "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.6.7.tgz", + "integrity": "sha512-cY2eLFrQSAfVPhCgH1s7JI73tMbg9YC3v3+ZHVW67sBS7UxWzNEk/ZBbSfLykBWHp33dqqtOv82gjhKEi81T/A==" }, "loose-envify": { "version": "1.4.0", @@ -9120,6 +9125,11 @@ "object-visit": "^1.0.0" } }, + "material-colors": { + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/material-colors/-/material-colors-1.2.6.tgz", + "integrity": "sha512-6qE4B9deFBIa9YSpOc9O0Sgc43zTeVYbgDT5veRKSlB2+ZuHNoVVxA1L/ckMUayV9Ay9y7Z/SZCLcGteW9i7bg==" + }, "md5.js": { "version": "1.3.5", "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz", @@ -9792,9 +9802,9 @@ } }, "node-releases": { - "version": "1.1.47", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.47.tgz", - "integrity": "sha512-k4xjVPx5FpwBUj0Gw7uvFOTF4Ep8Hok1I6qjwL3pLfwe7Y0REQSAqOwwv9TWBCUtMHxcXfY4PgRLRozcChvTcA==", + "version": "1.1.49", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.49.tgz", + "integrity": "sha512-xH8t0LS0disN0mtRCh+eByxFPie+msJUBL/lJDBuap53QGiYPa9joh83K4pCZgWJ+2L4b9h88vCVdXQ60NO2bg==", "requires": { "semver": "^6.3.0" } @@ -10006,9 +10016,9 @@ } }, "object-hash": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-2.0.1.tgz", - "integrity": "sha512-HgcGMooY4JC2PBt9sdUdJ6PMzpin+YtY3r/7wg0uTifP+HJWW8rammseSEHuyt0UeShI183UGssCJqm1bJR7QA==" + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-2.0.2.tgz", + "integrity": "sha512-b+2AKjAf6uQlxxv8ChHdM+VT4eeX+ZSwv+pk2xIXZWbo+yxn4/En1iC+GHe/OFYa9on0AhFF2PvuAcFHoiiHaA==" }, "object-inspect": { "version": "1.7.0", @@ -10134,11 +10144,19 @@ } }, "open": { - "version": "6.4.0", - "resolved": "https://registry.npmjs.org/open/-/open-6.4.0.tgz", - "integrity": "sha512-IFenVPgF70fSm1keSd2iDBIDIBZkroLeuffXq+wKTzTJlBpesFWojV9lb8mzOfaAzM1sr7HQHuO0vtV0zYekGg==", + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/open/-/open-7.0.2.tgz", + "integrity": "sha512-70E/pFTPr7nZ9nLDPNTcj3IVqnNvKuP4VsBmoKV9YGTnChe0mlS3C4qM7qKarhZ8rGaHKLfo+vBTHXDp6ZSyLQ==", "requires": { - "is-wsl": "^1.1.0" + "is-docker": "^2.0.0", + "is-wsl": "^2.1.1" + }, + "dependencies": { + "is-wsl": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.1.1.tgz", + "integrity": "sha512-umZHcSrwlDHo2TGMXv0DZ8dIUGunZ2Iv68YZnrmCiBPkZ4aaOhtv7pXJKeki9k3qJ3RJr0cDyitcl5wEH3AYog==" + } } }, "opn": { @@ -10964,11 +10982,11 @@ }, "dependencies": { "postcss-selector-parser": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.1.tgz", - "integrity": "sha1-T4dfSvsMllc9XPTXQBGu4lCn6GU=", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz", + "integrity": "sha512-h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA==", "requires": { - "dot-prop": "^4.1.1", + "dot-prop": "^5.2.0", "indexes-of": "^1.0.1", "uniq": "^1.0.1" } @@ -11041,11 +11059,11 @@ }, "dependencies": { "postcss-selector-parser": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.1.tgz", - "integrity": "sha1-T4dfSvsMllc9XPTXQBGu4lCn6GU=", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz", + "integrity": "sha512-h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA==", "requires": { - "dot-prop": "^4.1.1", + "dot-prop": "^5.2.0", "indexes-of": "^1.0.1", "uniq": "^1.0.1" } @@ -11573,12 +11591,12 @@ "integrity": "sha1-mEcocL8igTL8vdhoEputEsPAKeM=" }, "prompts": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.3.0.tgz", - "integrity": "sha512-NfbbPPg/74fT7wk2XYQ7hAIp9zJyZp5Fu19iRbORqqy1BhtrkZ0fPafBU+7bmn8ie69DpT0R6QpJIN2oisYjJg==", + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.3.1.tgz", + "integrity": "sha512-qIP2lQyCwYbdzcqHIUi2HAxiWixhoM9OdLCWf8txXsapC/X9YdsCoeyRIXE/GP+Q0J37Q7+XN/MFqbUa7IzXNA==", "requires": { "kleur": "^3.0.3", - "sisteransi": "^1.0.3" + "sisteransi": "^1.0.4" } }, "prop-types": { @@ -11785,6 +11803,19 @@ "@babel/runtime": "^7.0.0" } }, + "react-color": { + "version": "2.18.0", + "resolved": "https://registry.npmjs.org/react-color/-/react-color-2.18.0.tgz", + "integrity": "sha512-FyVeU1kQiSokWc8NPz22azl1ezLpJdUyTbWL0LPUpcuuYDrZ/Y1veOk9rRK5B3pMlyDGvTk4f4KJhlkIQNRjEA==", + "requires": { + "@icons/material": "^0.2.4", + "lodash": "^4.17.11", + "material-colors": "^1.2.1", + "prop-types": "^15.5.10", + "reactcss": "^1.2.0", + "tinycolor2": "^1.4.1" + } + }, "react-datepicker": { "version": "2.12.1", "resolved": "https://registry.npmjs.org/react-datepicker/-/react-datepicker-2.12.1.tgz", @@ -11798,14 +11829,14 @@ } }, "react-dev-utils": { - "version": "10.1.0", - "resolved": "https://registry.npmjs.org/react-dev-utils/-/react-dev-utils-10.1.0.tgz", - "integrity": "sha512-KmZChqxY6l+ed28IHetGrY8J9yZSvzlAHyFXduEIhQ42EBGtqftlbqQZ+dDTaC7CwNW2tuXN+66bRKE5h2HgrQ==", + "version": "10.2.0", + "resolved": "https://registry.npmjs.org/react-dev-utils/-/react-dev-utils-10.2.0.tgz", + "integrity": "sha512-MwrvQW2TFjLblhqpDNeqCXHBkz3G5vc7k4wntgutAJZX4ia3o07eGKo6uYGhUOeJ0hfOxcpJFNFk7+4XCc1S8g==", "requires": { "@babel/code-frame": "7.8.3", "address": "1.1.2", "browserslist": "4.8.6", - "chalk": "3.0.0", + "chalk": "2.4.2", "cross-spawn": "7.0.1", "detect-port-alt": "1.1.6", "escape-string-regexp": "2.0.0", @@ -11819,46 +11850,25 @@ "inquirer": "7.0.4", "is-root": "2.1.0", "loader-utils": "1.2.3", - "open": "^6.4.0", + "open": "^7.0.2", "pkg-up": "3.1.0", - "react-error-overlay": "^6.0.5", + "react-error-overlay": "^6.0.6", "recursive-readdir": "2.2.2", "shell-quote": "1.7.2", "strip-ansi": "6.0.0", "text-table": "0.2.0" }, "dependencies": { - "ansi-styles": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", - "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", + "browserslist": { + "version": "4.8.6", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.8.6.tgz", + "integrity": "sha512-ZHao85gf0eZ0ESxLfCp73GG9O/VTytYDIkIiZDlURppLTI9wErSM/5yAKEq6rcUdxBLjMELmrYUJGg5sxGKMHg==", "requires": { - "@types/color-name": "^1.1.1", - "color-convert": "^2.0.1" + "caniuse-lite": "^1.0.30001023", + "electron-to-chromium": "^1.3.341", + "node-releases": "^1.1.47" } }, - "chalk": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", - "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==", - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" - }, "cross-spawn": { "version": "7.0.1", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.1.tgz", @@ -11883,11 +11893,6 @@ "path-exists": "^4.0.0" } }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==" - }, "locate-path": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", @@ -11935,14 +11940,6 @@ "ansi-regex": "^5.0.0" } }, - "supports-color": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz", - "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==", - "requires": { - "has-flag": "^4.0.0" - } - }, "which": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", @@ -11974,9 +11971,9 @@ } }, "react-error-overlay": { - "version": "6.0.5", - "resolved": "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-6.0.5.tgz", - "integrity": "sha512-+DMR2k5c6BqMDSMF8hLH0vYKtKTeikiFW+fj0LClN+XZg4N9b8QUAdHC62CGWNLTi/gnuuemNcNcTFrCvK1f+A==" + "version": "6.0.6", + "resolved": "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-6.0.6.tgz", + "integrity": "sha512-Yzpno3enVzSrSCnnljmr4b/2KUQSMZaPuqmS26t9k4nW7uwJk6STWmH9heNjPuvqUTO3jOSPkHoKgO4+Dw7uIw==" }, "react-fast-compare": { "version": "2.0.4", @@ -12070,9 +12067,9 @@ } }, "react-scripts": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/react-scripts/-/react-scripts-3.3.1.tgz", - "integrity": "sha512-DHvc+/QN0IsLvmnPQqd+H70ol+gdFD3p/SS2tX8M6z1ysjtRGvOwLWy72co1nphYGpq1NqV/Ti5dviU8SCAXpA==", + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/react-scripts/-/react-scripts-3.4.0.tgz", + "integrity": "sha512-pBqaAroFoHnFAkuX+uSK9Th1uEh2GYdGY2IG1I9/7HmuEf+ls3lLCk1p2GFYRSrLMz6ieQR/SyN6TLIGK3hKRg==", "requires": { "@babel/core": "7.8.4", "@svgr/webpack": "4.3.3", @@ -12114,17 +12111,17 @@ "postcss-preset-env": "6.7.0", "postcss-safe-parser": "4.0.1", "react-app-polyfill": "^1.0.6", - "react-dev-utils": "^10.1.0", + "react-dev-utils": "^10.2.0", "resolve": "1.15.0", "resolve-url-loader": "3.1.1", "sass-loader": "8.0.2", "semver": "6.3.0", - "style-loader": "1.1.3", + "style-loader": "0.23.1", "terser-webpack-plugin": "2.3.4", "ts-pnp": "1.1.5", "url-loader": "2.3.0", "webpack": "4.41.5", - "webpack-dev-server": "3.10.1", + "webpack-dev-server": "3.10.2", "webpack-manifest-plugin": "2.2.0", "workbox-webpack-plugin": "4.3.1" }, @@ -12179,6 +12176,14 @@ "resolved": "https://registry.npmjs.org/react-tweet-embed/-/react-tweet-embed-1.2.2.tgz", "integrity": "sha512-Y932BlSaJsDUsKDucC2opzzd+uhc0YNhrlTa/4Beb2be1od+AjLGo6Fhuo2wPT0D+fF4VTXOyoZyA8Yc88RdYA==" }, + "reactcss": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/reactcss/-/reactcss-1.2.3.tgz", + "integrity": "sha512-KiwVUcFu1RErkI97ywr8nvx8dNOpT03rbnma0SSalTYjkrPYaEajR4a/MRt6DZ46K6arDRbWMNHF+xH7G7n/8A==", + "requires": { + "lodash": "^4.0.1" + } + }, "read-pkg": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz", @@ -12199,9 +12204,9 @@ } }, "readable-stream": { - "version": "3.5.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.5.0.tgz", - "integrity": "sha512-gSz026xs2LfxBPudDuI41V1lka8cxg64E66SGe78zJlsUofOg/yqwezdIcdfwik6B4h8LFmWPA9ef9X3FiNFLA==", + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", + "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", "requires": { "inherits": "^2.0.3", "string_decoder": "^1.1.1", @@ -12314,9 +12319,9 @@ "integrity": "sha512-5qxzGZjDs9w4tzT3TPhCJqWdCc3RLYwy9J2NB0nm5Lz+S273lvWcpjaTGHsT1dc6Hhfq41uSEOw8wBmxrKOuyg==" }, "regjsparser": { - "version": "0.6.2", - "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.2.tgz", - "integrity": "sha512-E9ghzUtoLwDekPT0DYCp+c4h+bvuUpe6rRHCTYn6eGoqj1LgKXxT6I0Il4WbjhQkOghzi/V+y03bPKvbllL93Q==", + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.3.tgz", + "integrity": "sha512-8uZvYbnfAtEm9Ab8NTb3hdLwL4g/LQzEYP7Xs27T96abJCCE2d6r3cPZPQEsLKy0vRSGVNG+/zVGtLr86HQduA==", "requires": { "jsesc": "~0.5.0" }, @@ -13798,6 +13803,13 @@ "get-own-enumerable-property-symbols": "^3.0.0", "is-obj": "^1.0.1", "is-regexp": "^1.0.0" + }, + "dependencies": { + "is-obj": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz", + "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=" + } } }, "strip-ansi": { @@ -13848,12 +13860,24 @@ "integrity": "sha512-VTyMAUfdm047mwKl+u79WIdrZxtFtn+nBxHeb844XBQ9uMNTuTHdx2hc5RiAJYqwTj3wc/xe5HLSdJSkJ+WfZw==" }, "style-loader": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-1.1.3.tgz", - "integrity": "sha512-rlkH7X/22yuwFYK357fMN/BxYOorfnfq0eD7+vqlemSK4wEcejFF1dg4zxP0euBW8NrYx2WZzZ8PPFevr7D+Kw==", + "version": "0.23.1", + "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-0.23.1.tgz", + "integrity": "sha512-XK+uv9kWwhZMZ1y7mysB+zoihsEj4wneFWAS5qoiLwzW0WzSqMrrsIy+a3zkQJq0ipFtBpX5W3MqyRIBF/WFGg==", "requires": { - "loader-utils": "^1.2.3", - "schema-utils": "^2.6.4" + "loader-utils": "^1.1.0", + "schema-utils": "^1.0.0" + }, + "dependencies": { + "schema-utils": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz", + "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==", + "requires": { + "ajv": "^6.1.0", + "ajv-errors": "^1.0.0", + "ajv-keywords": "^3.1.0" + } + } } }, "styled-system": { @@ -13887,11 +13911,11 @@ }, "dependencies": { "postcss-selector-parser": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.1.tgz", - "integrity": "sha1-T4dfSvsMllc9XPTXQBGu4lCn6GU=", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz", + "integrity": "sha512-h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA==", "requires": { - "dot-prop": "^4.1.1", + "dot-prop": "^5.2.0", "indexes-of": "^1.0.1", "uniq": "^1.0.1" } @@ -14064,9 +14088,9 @@ } }, "make-dir": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.0.0.tgz", - "integrity": "sha512-grNJDhb8b1Jm1qeqW5R/O63wUo4UXo2v2HMic6YT9i/HBlF93S8jkMgH7yugvY9ABDShH4VZMn8I+U8+fCNegw==", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.0.2.tgz", + "integrity": "sha512-rYKABKutXa6vXTXhoV18cBE7PaewPXHe/Bdq4v+ZLMhxbWApkFFplT0LcbMW+6BbjnQXzZ/sAvSE/JdguApG5w==", "requires": { "semver": "^6.0.0" } @@ -14189,6 +14213,11 @@ "resolved": "https://registry.npmjs.org/timsort/-/timsort-0.3.0.tgz", "integrity": "sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q=" }, + "tinycolor2": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/tinycolor2/-/tinycolor2-1.4.1.tgz", + "integrity": "sha1-9PrTM0R7wLB9TcjpIJ2POaisd+g=" + }, "tmp": { "version": "0.0.33", "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", @@ -14367,9 +14396,9 @@ "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=" }, "typescript": { - "version": "3.7.5", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.7.5.tgz", - "integrity": "sha512-/P5lkRXkWHNAbcJIiHPfRoKqyd7bsyCma1hZNUGfn20qm64T6ZBlrzprymeu918H+mB/0rIg2gGK/BXkhhYgBw==" + "version": "3.8.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.8.2.tgz", + "integrity": "sha512-EgOVgL/4xfVrCMbhYKUQTdF37SQn4Iw73H5BgCrF1Abdun7Kwy/QZsE/ssAy0y4LxBbvua3PIbFsbRczWWnDdQ==" }, "unicode-canonical-property-names-ecmascript": { "version": "1.0.4", @@ -15424,9 +15453,9 @@ } }, "webpack-dev-server": { - "version": "3.10.1", - "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.10.1.tgz", - "integrity": "sha512-AGG4+XrrXn4rbZUueyNrQgO4KGnol+0wm3MPdqGLmmA+NofZl3blZQKxZ9BND6RDNuvAK9OMYClhjOSnxpWRoA==", + "version": "3.10.2", + "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.10.2.tgz", + "integrity": "sha512-pxZKPYb+n77UN8u9YxXT4IaIrGcNtijh/mi8TXbErHmczw0DtPnMTTjHj+eNjkqLOaAZM/qD7V59j/qJsEiaZA==", "requires": { "ansi-html": "0.0.7", "bonjour": "^3.5.0", diff --git a/frontend-react/package.json b/frontend-react/package.json index b3b03a4d8..60a8a1d63 100644 --- a/frontend-react/package.json +++ b/frontend-react/package.json @@ -8,14 +8,16 @@ "@emotion/core": "^10.0.27", "@emotion/styled": "^10.0.27", "@reach/router": "^1.3.1", + "@rehooks/local-storage": "^2.2.2", "@sendou/react-sketch": "^0.5.2", "@testing-library/jest-dom": "^5.1.1", "@testing-library/react": "^9.4.0", - "@testing-library/user-event": "^8.1.0", - "@types/jest": "^25.1.2", - "@types/node": "^13.7.1", + "@testing-library/user-event": "^8.1.3", + "@types/jest": "^25.1.3", + "@types/node": "^13.7.4", "@types/reach__router": "^1.3.0", - "@types/react": "^16.9.19", + "@types/react": "^16.9.21", + "@types/react-color": "^3.0.1", "@types/react-datepicker": "^2.11.0", "@types/react-dom": "^16.9.5", "@types/react-infinite-scroller": "^1.2.1", @@ -26,6 +28,7 @@ "jstz": "^2.1.1", "node-sass": "^4.13.1", "react": "^16.12.0", + "react-color": "^2.18.0", "react-datepicker": "^2.12.1", "react-dom": "^16.12.0", "react-draggable": "^4.2.0", @@ -33,10 +36,10 @@ "react-hotkeys-hook": "^1.5.4", "react-icons": "^3.9.0", "react-infinite-scroller": "^1.2.4", - "react-scripts": "^3.3.1", + "react-scripts": "^3.4.0", "react-select": "^3.0.8", "react-tweet-embed": "^1.2.2", - "typescript": "^3.7.5" + "typescript": "^3.8.2" }, "scripts": { "start": "react-scripts start", diff --git a/frontend-react/src/assets/first_place.png b/frontend-react/src/assets/first_place.png new file mode 100644 index 0000000000000000000000000000000000000000..a928fb52ff053849f64c7811a422198975d00194 GIT binary patch literal 3303 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 literal 0 HcmV?d00001 diff --git a/frontend-react/src/assets/third_place.png b/frontend-react/src/assets/third_place.png new file mode 100644 index 0000000000000000000000000000000000000000..a24fa86a00ec338149a8dc7383e1150996a0a094 GIT binary patch literal 4215 zcmV--5Qy)IP)004R>004l5008;`004mK004C`008P>0026e000+ooVrmw00007 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 N002ovPDHLkV1ki|{MG;f literal 0 HcmV?d00001 diff --git a/frontend-react/src/components/team/AddResultModal.tsx b/frontend-react/src/components/team/AddResultModal.tsx index 1d55680bf..421ddfbd6 100644 --- a/frontend-react/src/components/team/AddResultModal.tsx +++ b/frontend-react/src/components/team/AddResultModal.tsx @@ -66,6 +66,7 @@ const AddResultModal: React.FC = ({ closeModal }) => { }, [result]) const handleChange = (newValueObject: Partial) => { + console.log("newValue", newValueObject) setResult({ ...result, ...newValueObject }) } diff --git a/frontend-react/src/components/team/PlacementInput.tsx b/frontend-react/src/components/team/PlacementInput.tsx index 3fa9a072e..f6976a8f1 100644 --- a/frontend-react/src/components/team/PlacementInput.tsx +++ b/frontend-react/src/components/team/PlacementInput.tsx @@ -1,4 +1,4 @@ -import React, { useContext } from "react" +import React, { useContext, ReactText } from "react" import Label from "../elements/Label" import { NumberInput, @@ -19,7 +19,14 @@ const PlacementInput: React.FC = ({ value, onChange }) => { return ( <> - + onChange(value as number)} + > diff --git a/frontend-react/src/components/team/Results.tsx b/frontend-react/src/components/team/Results.tsx index 9f07889b4..9f076c9d1 100644 --- a/frontend-react/src/components/team/Results.tsx +++ b/frontend-react/src/components/team/Results.tsx @@ -1,14 +1,22 @@ -import React from "react" +import React, { useContext } from "react" import Button from "../elements/Button" import { useState } from "react" import AddResultModal from "./AddResultModal" +import Box from "../elements/Box" +import { TournamentResult } from "../../types" +import { medalEmoji } from "../../assets/imageImports" +import MyThemeContext from "../../themeContext" interface ResultsProps { + results: TournamentResult[] canAddResults: boolean } -const Results: React.FC = ({ canAddResults }) => { +const Results: React.FC = ({ results, canAddResults }) => { const [showModal, setShowModal] = useState(false) + const { grayWithShade } = useContext(MyThemeContext) + + console.log("results", results) return ( <> {showModal && setShowModal(false)} />} @@ -17,6 +25,42 @@ const Results: React.FC = ({ canAddResults }) => { Add tournament result )} + + {results.map(result => { + return ( + + {result.placement < 4 ? ( + + + + ) : ( + + {result.placement} + + )}{" "} + + {result.tournament_name} + + + {new Date(parseInt(result.date)).toLocaleDateString()} + {" "} + + ) + })} + ) } diff --git a/frontend-react/src/components/team/TeamPage.tsx b/frontend-react/src/components/team/TeamPage.tsx index 70ea333ff..c8e62a61d 100644 --- a/frontend-react/src/components/team/TeamPage.tsx +++ b/frontend-react/src/components/team/TeamPage.tsx @@ -44,7 +44,6 @@ const TeamPage: React.FC = ({ name }) => { const team = data.searchForTeam const user = userData.user - console.log("team", team) return ( <> @@ -61,6 +60,9 @@ const TeamPage: React.FC = ({ name }) => { parseInt(b.date) - parseInt(a.date) + )} canAddResults={ team.captain_discord_id === user?.discord_id && team.tournament_results.length < 100 diff --git a/graphql-schemas/team.js b/graphql-schemas/team.js index 2b4b11237..f40803189 100644 --- a/graphql-schemas/team.js +++ b/graphql-schemas/team.js @@ -45,7 +45,7 @@ const resolvers = { Query: { teams: (root, args) => Team.find({}), searchForTeam: (root, { name }) => { - const name_regex = `^${name.replace("_", " ")}$` + const name_regex = `^${name.replace("-", " ")}$` return Team.findOne({ name: { $regex: new RegExp(name_regex, "i") }, }).populate("member_users") @@ -120,7 +120,7 @@ const resolvers = { date: args.date, tournament_name: args.tournament_name, placement: args.placement, - tweet_id: args.tweet_id ? args.tweet_id : undefined, + tweet_id: args.tweet_id, }) await team.save() return true diff --git a/mongoose-models/team.js b/mongoose-models/team.js index baa8b5e9b..a67ef7030 100644 --- a/mongoose-models/team.js +++ b/mongoose-models/team.js @@ -12,7 +12,7 @@ const teamSchema = new mongoose.Schema({ tournament_results: [ { date: Date, - tweet_url: String, + tweet_id: String, tournament_name: String, placement: Number, }, diff --git a/package-lock.json b/package-lock.json index fef9e8477..52137b5a8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -25,9 +25,9 @@ }, "dependencies": { "@types/node": { - "version": "10.17.14", - "resolved": "https://registry.npmjs.org/@types/node/-/node-10.17.14.tgz", - "integrity": "sha512-G0UmX5uKEmW+ZAhmZ6PLTQ5eu/VPaT+d/tdLd5IFsKRPcbe6lPxocBtcYBFSaLaCW8O60AX90e91Nsp8lVHCNw==" + "version": "10.17.15", + "resolved": "https://registry.npmjs.org/@types/node/-/node-10.17.15.tgz", + "integrity": "sha512-daFGV9GSs6USfPgxceDA8nlSe48XrVCJfDeYm7eokxq/ye7iuOH87hKXgMtEAVLFapkczbZsx868PMDT1Y0a6A==" } } }, @@ -44,11 +44,6 @@ "resolved": "https://registry.npmjs.org/@apollographql/graphql-playground-html/-/graphql-playground-html-1.6.24.tgz", "integrity": "sha512-8GqG48m1XqyXh4mIZrtB5xOhUwSsh1WsrrsaZQOEYYql3YN9DEu9OOSg0ILzXHZo/h2Q74777YE4YzlArQzQEQ==" }, - "@icons/material": { - "version": "0.2.4", - "resolved": "https://registry.npmjs.org/@icons/material/-/material-0.2.4.tgz", - "integrity": "sha512-QPcGmICAPbGLGb6F/yNf/KzKqvFx8z5qx3D1yFqVAjoFmXK35EgyW+cJ57Te3CNsmzblwtzakLGFqHPqrfb4Tw==" - }, "@protobufjs/aspromise": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/@protobufjs/aspromise/-/aspromise-1.1.2.tgz", @@ -103,11 +98,6 @@ "resolved": "https://registry.npmjs.org/@protobufjs/utf8/-/utf8-1.1.0.tgz", "integrity": "sha1-p3c2C1s5oaLlEG+OhY8v0tBgxXA=" }, - "@rehooks/local-storage": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/@rehooks/local-storage/-/local-storage-2.1.1.tgz", - "integrity": "sha512-w+7kwnFn3tdRreDG+Pi610eqozTyuJnmYIqwa0GojNpoLMjnYDSCF02eyWQOkVPUj1UHf+Zeqnjg+jzqg3OcuQ==" - }, "@types/accepts": { "version": "1.3.5", "resolved": "https://registry.npmjs.org/@types/accepts/-/accepts-1.3.5.tgz", @@ -117,9 +107,9 @@ } }, "@types/body-parser": { - "version": "1.17.1", - "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.17.1.tgz", - "integrity": "sha512-RoX2EZjMiFMjZh9lmYrwgoP9RTpAjSHiJxdp4oidAQVO02T7HER3xj9UKue5534ULWeqVEkujhWcyvUce+d68w==", + "version": "1.19.0", + "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.0.tgz", + "integrity": "sha512-W98JrE0j2K78swW4ukqMleo8R7h/pFETjM2DQ90MF6XK2i4LO4W3gQ71Lt4w3bfm2EvVSyWHplECvB5sK22yFQ==", "requires": { "@types/connect": "*", "@types/node": "*" @@ -201,9 +191,9 @@ "integrity": "sha512-GJhpTepz2udxGexqos8wgaBx4I/zWIDPh/KOGEwAqtuGDkOUJu5eFvwmdBX4AmB8Odsr+9pHCQqiAqDL/yKMKw==" }, "@types/koa": { - "version": "2.11.0", - "resolved": "https://registry.npmjs.org/@types/koa/-/koa-2.11.0.tgz", - "integrity": "sha512-Hgx/1/rVlJvqYBrdeCsS7PDiR2qbxlMt1RnmNWD4Uxi5FF9nwkYqIldo7urjc+dfNpk+2NRGcnAYd4L5xEhCcQ==", + "version": "2.11.1", + "resolved": "https://registry.npmjs.org/@types/koa/-/koa-2.11.1.tgz", + "integrity": "sha512-/kqQs+8Qd9GL0cdl39HEhK91k7xq6+Zci76RUdqtTLj1Mg1aVG7zwJm3snkeyFUeAvY8noY27eMXgqg1wHZgwA==", "requires": { "@types/accepts": "*", "@types/cookies": "*", @@ -232,9 +222,9 @@ "integrity": "sha512-FwI9gX75FgVBJ7ywgnq/P7tw+/o1GUbtP0KzbtusLigAOgIgNISRK0ZPl4qertvXSIE8YbsVJueQ90cDt9YYyw==" }, "@types/node": { - "version": "13.7.0", - "resolved": "https://registry.npmjs.org/@types/node/-/node-13.7.0.tgz", - "integrity": "sha512-GnZbirvmqZUzMgkFn70c74OQpTTUcCzlhQliTzYjQMqg+hVKcDnxdL19Ne3UdYzdMA/+W3eb646FWn/ZaT1NfQ==" + "version": "13.7.1", + "resolved": "https://registry.npmjs.org/@types/node/-/node-13.7.1.tgz", + "integrity": "sha512-Zq8gcQGmn4txQEJeiXo/KiLpon8TzAl0kmKH4zdWctPj05nWwp1ClMdAVEloqrQKfaC48PNLdgN/aVaLqUrluA==" }, "@types/node-fetch": { "version": "2.5.4", @@ -244,33 +234,11 @@ "@types/node": "*" } }, - "@types/prop-types": { - "version": "15.7.3", - "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.3.tgz", - "integrity": "sha512-KfRL3PuHmqQLOG+2tGpRO26Ctg+Cq1E01D2DMriKEATHgWLfeNDmq9e29Q9WIky0dQ3NPkd1mzYH8Lm936Z9qw==" - }, "@types/range-parser": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.3.tgz", "integrity": "sha512-ewFXqrQHlFsgc09MK5jP5iR7vumV/BYayNC6PgJO2LPe8vrnNFyjQjSppfEngITi0qvfKtzFvgKymGheFM9UOA==" }, - "@types/react": { - "version": "16.9.17", - "resolved": "https://registry.npmjs.org/@types/react/-/react-16.9.17.tgz", - "integrity": "sha512-UP27In4fp4sWF5JgyV6pwVPAQM83Fj76JOcg02X5BZcpSu5Wx+fP9RMqc2v0ssBoQIFvD5JdKY41gjJJKmw6Bg==", - "requires": { - "@types/prop-types": "*", - "csstype": "^2.2.0" - } - }, - "@types/react-color": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/@types/react-color/-/react-color-3.0.1.tgz", - "integrity": "sha512-J6mYm43Sid9y+OjZ7NDfJ2VVkeeuTPNVImNFITgQNXodHteKfl/t/5pAR5Z9buodZ2tCctsZjgiMlQOpfntakw==", - "requires": { - "@types/react": "*" - } - }, "@types/serve-static": { "version": "1.13.3", "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.3.tgz", @@ -364,9 +332,9 @@ } }, "apollo-engine-reporting": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/apollo-engine-reporting/-/apollo-engine-reporting-1.5.0.tgz", - "integrity": "sha512-Pe2DelijZ2QHqkqv8E97iOb32l+FIMT2nxpQsuH+nWi+96cCFJJJHjm3RLAPEUuvGOgW9dFYQP3J91EyC5O0tQ==", + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/apollo-engine-reporting/-/apollo-engine-reporting-1.6.0.tgz", + "integrity": "sha512-prA17Tp/WYBJdCd4ey1CnGX8d4Xis1n9PsFmT7x8PV/oNpxG21/x3yNw5kPBZuKAoKz8yEggYtHhkYie1ZBjPQ==", "requires": { "apollo-engine-reporting-protobuf": "^0.4.4", "apollo-graphql": "^0.4.0", @@ -418,12 +386,12 @@ } }, "apollo-server": { - "version": "2.10.0", - "resolved": "https://registry.npmjs.org/apollo-server/-/apollo-server-2.10.0.tgz", - "integrity": "sha512-ITXkklSgrNfohFh4juvHWrtLz/82iw9CkBUW+G5T8NxHaqxm1Lpus1Ck2VsXmCgNplYi6mODRjUl087qdlU2Rw==", + "version": "2.10.1", + "resolved": "https://registry.npmjs.org/apollo-server/-/apollo-server-2.10.1.tgz", + "integrity": "sha512-YZrujwOPCr5zqpoMfG/NB0dwOISLqzArChBre3o9xwGYXS5DQwfFDiSLTXBYhT9JSYIkDPZ8SJKeEWS961Pavw==", "requires": { - "apollo-server-core": "^2.10.0", - "apollo-server-express": "^2.10.0", + "apollo-server-core": "^2.10.1", + "apollo-server-express": "^2.10.1", "express": "^4.0.0", "graphql-subscriptions": "^1.0.0", "graphql-tools": "^4.0.0" @@ -438,9 +406,9 @@ } }, "apollo-server-core": { - "version": "2.10.0", - "resolved": "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-2.10.0.tgz", - "integrity": "sha512-x/UK6XvU307W8D/pzTclU04JIjRarcbg5mFPe0nVmO4OTc26uQgKi1WlZkcewXsAUnn+nDwKVn2c2G3dHEgXzQ==", + "version": "2.10.1", + "resolved": "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-2.10.1.tgz", + "integrity": "sha512-BVITSJRMnj+CWFkjt7FMcaoqg/Ni9gfyVE9iu8bUc1IebBfFDcQj652Iolr7dTqyUziN2jbf0wfcybKYJLQHQQ==", "requires": { "@apollographql/apollo-tools": "^0.4.3", "@apollographql/graphql-playground-html": "1.6.24", @@ -448,7 +416,7 @@ "@types/ws": "^6.0.0", "apollo-cache-control": "^0.8.11", "apollo-datasource": "^0.7.0", - "apollo-engine-reporting": "^1.5.0", + "apollo-engine-reporting": "^1.6.0", "apollo-server-caching": "^0.5.1", "apollo-server-env": "^2.4.3", "apollo-server-errors": "^2.3.4", @@ -480,9 +448,9 @@ "integrity": "sha512-Y0PKQvkrb2Kd18d1NPlHdSqmlr8TgqJ7JQcNIfhNDgdb45CnqZlxL1abuIRhr8tiw8OhVOcFxz2KyglBi8TKdA==" }, "apollo-server-express": { - "version": "2.10.0", - "resolved": "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-2.10.0.tgz", - "integrity": "sha512-adDQts4QmkX2ENU7JibV1EwRl3ESnpnpImXIMvg8Cm7kX2wSbzwm8LecQNujwWJtkAPTCEAcnPBDyKwWjTQ6/g==", + "version": "2.10.1", + "resolved": "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-2.10.1.tgz", + "integrity": "sha512-NkuWGBOCTiju/aDjfvDImm+4yzfrM0dwiRxu9fKwwh2h1oYBUKJNqjQ1mzJRi0ks6Sn1egwl/fQkTBTkWwGx7Q==", "requires": { "@apollographql/graphql-playground-html": "1.6.24", "@types/accepts": "^1.3.5", @@ -490,7 +458,7 @@ "@types/cors": "^2.8.4", "@types/express": "4.17.2", "accepts": "^1.3.5", - "apollo-server-core": "^2.10.0", + "apollo-server-core": "^2.10.1", "apollo-server-types": "^0.2.10", "body-parser": "^1.18.3", "cors": "^2.8.4", @@ -500,6 +468,17 @@ "parseurl": "^1.3.2", "subscriptions-transport-ws": "^0.9.16", "type-is": "^1.6.16" + }, + "dependencies": { + "@types/body-parser": { + "version": "1.17.1", + "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.17.1.tgz", + "integrity": "sha512-RoX2EZjMiFMjZh9lmYrwgoP9RTpAjSHiJxdp4oidAQVO02T7HER3xj9UKue5534ULWeqVEkujhWcyvUce+d68w==", + "requires": { + "@types/connect": "*", + "@types/node": "*" + } + } } }, "apollo-server-plugin-base": { @@ -588,6 +567,15 @@ "integrity": "sha512-Phlt0plgpIIBOGTT/ehfFnbNlfsDEiqmzE2KRXoX1bLIlir4X/MR+zSyBEkL05ffWgnRSf/DXv+WrUAVr93/ow==", "dev": true }, + "bl": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/bl/-/bl-2.2.0.tgz", + "integrity": "sha512-wbgvOpqopSr7uq6fJrLH8EsvYMJf9gzfo2jCsL2eTy75qXPukA4pCgHamOQkZtY5vmfVtjB+P3LNlMHW5CEZXA==", + "requires": { + "readable-stream": "^2.3.5", + "safe-buffer": "^5.1.1" + } + }, "bluebird": { "version": "3.5.1", "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz", @@ -815,6 +803,11 @@ "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.4.tgz", "integrity": "sha512-4paDGScNgZP2IXXilaffL9X7968RuvwlkK3xWtZRVqgd8SYNiVKRJvkFd1aqqEuPfN7E68ZHEp9hDj6lHj4Hyw==" }, + "core-util-is": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", + "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=" + }, "cors": { "version": "2.8.5", "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz", @@ -920,11 +913,6 @@ "integrity": "sha1-ojD2T1aDEOFJgAmUB5DsmVRbyn4=", "dev": true }, - "csstype": { - "version": "2.6.8", - "resolved": "https://registry.npmjs.org/csstype/-/csstype-2.6.8.tgz", - "integrity": "sha512-msVS9qTuMT5zwAGCVm4mxfrZ18BNc6Csd0oJAtiFMZ1FAx1CCvy2+5MDmYoix63LM/6NDbNtodCiGYGmFgO0dA==" - }, "debug": { "version": "2.6.9", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", @@ -947,6 +935,11 @@ "object-keys": "^1.0.12" } }, + "denque": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/denque/-/denque-1.4.1.tgz", + "integrity": "sha512-OfzPuSZKGcgr96rf1oODnfjqBFmr1DVoc/TrItj3Ohe0Ah1C5WX5Baquw/9U9KovnQ88EqmJbD66rKYUQYN1tQ==" + }, "depd": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz", @@ -1499,6 +1492,11 @@ "has-symbols": "^1.0.1" } }, + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" + }, "isexe": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", @@ -1510,11 +1508,6 @@ "resolved": "https://registry.npmjs.org/iterall/-/iterall-1.2.2.tgz", "integrity": "sha512-yynBb1g+RFUPY64fTrFv7nsjRrENBQJaX2UL+2Szc9REFrSNm1rpSXHGzhmAy7a9uv3vlvgBlXnf9RqmPH1/DA==" }, - "js-tokens": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", - "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==" - }, "kareem": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/kareem/-/kareem-2.3.1.tgz", @@ -1554,14 +1547,6 @@ "resolved": "https://registry.npmjs.org/long/-/long-4.0.0.tgz", "integrity": "sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA==" }, - "loose-envify": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz", - "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==", - "requires": { - "js-tokens": "^3.0.0 || ^4.0.0" - } - }, "lowercase-keys": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz", @@ -1585,11 +1570,6 @@ "pify": "^3.0.0" } }, - "material-colors": { - "version": "1.2.6", - "resolved": "https://registry.npmjs.org/material-colors/-/material-colors-1.2.6.tgz", - "integrity": "sha512-6qE4B9deFBIa9YSpOc9O0Sgc43zTeVYbgDT5veRKSlB2+ZuHNoVVxA1L/ckMUayV9Ay9y7Z/SZCLcGteW9i7bg==" - }, "media-typer": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", @@ -1656,13 +1636,13 @@ } }, "mongoose": { - "version": "5.8.12", - "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-5.8.12.tgz", - "integrity": "sha512-PM6Ks4kIcsLiHcqskVaLj5vDE9l2PoW5foecIuUb5vIG22Gf2yCps31+U3I7Rw8UPnrnbmZvvrRgkHmZR2/Kbw==", + "version": "5.9.1", + "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-5.9.1.tgz", + "integrity": "sha512-qgS31/nZ63vpr8yBg6w8vaV8ITxwrF2ioNW5AakXmqvVBaOsI0xpDd5QBowESy2InDTk+iDaN5SNgSxGG6GntQ==", "requires": { "bson": "~1.1.1", "kareem": "2.3.1", - "mongodb": "3.4.1", + "mongodb": "3.5.3", "mongoose-legacy-pluralize": "1.0.2", "mpath": "0.6.0", "mquery": "3.2.2", @@ -1674,11 +1654,13 @@ }, "dependencies": { "mongodb": { - "version": "3.4.1", - "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-3.4.1.tgz", - "integrity": "sha512-juqt5/Z42J4DcE7tG7UdVaTKmUC6zinF4yioPfpeOSNBieWSK6qCY+0tfGQcHLKrauWPDdMZVROHJOa8q2pWsA==", + "version": "3.5.3", + "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-3.5.3.tgz", + "integrity": "sha512-II7P7A3XUdPiXRgcN96qIoRa1oesM6qLNZkzfPluNZjVkgQk3jnQwOT6/uDk4USRDTTLjNFw2vwfmbRGTA7msg==", "requires": { + "bl": "^2.2.0", "bson": "^1.1.1", + "denque": "^1.4.1", "require_optional": "^1.0.1", "safe-buffer": "^5.1.2", "saslprep": "^1.0.0" @@ -1971,15 +1953,10 @@ "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=", "dev": true }, - "prop-types": { - "version": "15.7.2", - "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.7.2.tgz", - "integrity": "sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==", - "requires": { - "loose-envify": "^1.4.0", - "object-assign": "^4.1.1", - "react-is": "^16.8.1" - } + "process-nextick-args": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", + "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==" }, "proxy-addr": { "version": "2.0.5", @@ -2059,30 +2036,25 @@ "strip-json-comments": "~2.0.1" } }, - "react-color": { - "version": "2.18.0", - "resolved": "https://registry.npmjs.org/react-color/-/react-color-2.18.0.tgz", - "integrity": "sha512-FyVeU1kQiSokWc8NPz22azl1ezLpJdUyTbWL0LPUpcuuYDrZ/Y1veOk9rRK5B3pMlyDGvTk4f4KJhlkIQNRjEA==", + "readable-stream": { + "version": "2.3.7", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", + "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", "requires": { - "@icons/material": "^0.2.4", - "lodash": "^4.17.11", - "material-colors": "^1.2.1", - "prop-types": "^15.5.10", - "reactcss": "^1.2.0", - "tinycolor2": "^1.4.1" - } - }, - "react-is": { - "version": "16.12.0", - "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.12.0.tgz", - "integrity": "sha512-rPCkf/mWBtKc97aLL9/txD8DZdemK0vkA3JMLShjlJB3Pj3s+lpf1KaBzMfQrAmhMQB0n1cU/SUGgKKBCe837Q==" - }, - "reactcss": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/reactcss/-/reactcss-1.2.3.tgz", - "integrity": "sha512-KiwVUcFu1RErkI97ywr8nvx8dNOpT03rbnma0SSalTYjkrPYaEajR4a/MRt6DZ46K6arDRbWMNHF+xH7G7n/8A==", - "requires": { - "lodash": "^4.0.1" + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + }, + "dependencies": { + "safe-buffer": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" + } } }, "readdirp": { @@ -2305,6 +2277,21 @@ "function-bind": "^1.1.1" } }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "requires": { + "safe-buffer": "~5.1.0" + }, + "dependencies": { + "safe-buffer": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" + } + } + }, "strip-ansi": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", @@ -2377,11 +2364,6 @@ "integrity": "sha1-8y6srFoXW+ol1/q1Zas+2HQe9W8=", "dev": true }, - "tinycolor2": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/tinycolor2/-/tinycolor2-1.4.1.tgz", - "integrity": "sha1-9PrTM0R7wLB9TcjpIJ2POaisd+g=" - }, "to-regex-range": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", @@ -2496,6 +2478,11 @@ "prepend-http": "^1.0.1" } }, + "util-deprecate": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", + "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" + }, "util.promisify": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.1.tgz", diff --git a/package.json b/package.json index cf3d07e2b..368a0bb5d 100644 --- a/package.json +++ b/package.json @@ -14,10 +14,8 @@ "author": "Sendou", "license": "ISC", "dependencies": { - "@rehooks/local-storage": "^2.1.1", - "@types/react-color": "^3.0.1", - "apollo-server": "^2.10.0", - "apollo-server-express": "^2.10.0", + "apollo-server": "^2.10.1", + "apollo-server-express": "^2.10.1", "axios": "^0.19.2", "btoa": "^1.2.1", "connect-mongo": "^3.2.0", @@ -26,12 +24,11 @@ "express-session": "^1.17.0", "graphql": "^14.6.0", "lodash": "^4.17.15", - "mongoose": "^5.8.12", + "mongoose": "^5.9.1", "mongoose-unique-validator": "^2.0.3", "node-fetch": "^2.6.0", "passport": "^0.4.1", "passport-discord": "^0.1.3", - "react-color": "^2.18.0", "webhook-discord": "^3.5.1" }, "devDependencies": {