diff --git a/.gitignore b/.gitignore index fdb31ac..3f2288d 100644 --- a/.gitignore +++ b/.gitignore @@ -122,5 +122,4 @@ static/ elm-stuff/ -yarn.lock -backend/config.json \ No newline at end of file +yarn.lock \ No newline at end of file diff --git a/backend/.prettierrc.yaml b/backend/.prettierrc.yaml deleted file mode 100644 index ef5eace..0000000 --- a/backend/.prettierrc.yaml +++ /dev/null @@ -1,16 +0,0 @@ -arrowParens: 'always' -bracketSpacing: true -endOfLine: 'lf' -htmlWhitespaceSensitivity: 'css' -insertPragma: false -jsxBracketSameLine: true -jsxSingleQuote: true -printWidth: 120 -proseWrap: 'preserve' -quoteProps: 'consistent' -requirePragma: false -semi: true -singleQuote: true -tabWidth: 2 -trailingComma: 'none' -useTabs: false diff --git a/backend/config.json b/backend/config.json new file mode 100644 index 0000000..1623976 --- /dev/null +++ b/backend/config.json @@ -0,0 +1,9 @@ +{ + "secret": "TEST_SECRET", + "https": false, + "alter_db": true, + "port": 8080, + "db_url": "postgres://postgres:@127.0.0.1/todo", + "cert": "", + "cert_key": "" +} \ No newline at end of file diff --git a/backend/config.json.example b/backend/config.json.example deleted file mode 100644 index d3b00c5..0000000 --- a/backend/config.json.example +++ /dev/null @@ -1,13 +0,0 @@ -{ - "secret": "TEST_SECRET", - "https": true, - "alter_db": true, - "port": 8080, - "db_url": "postgres://postgres:@127.0.0.1/todo", - "cert": "", - "cert_key": "", - "mail_host": "", - "mail_port": 465, - "mail_username": "", - "mail_password": "" -} \ No newline at end of file diff --git a/backend/package.json b/backend/package.json index 2415daa..fd35f15 100644 --- a/backend/package.json +++ b/backend/package.json @@ -5,6 +5,9 @@ "main": "src/index.js", "scripts": { "who": "pwd", + "build": "cd frontend; elm make src/Main.elm --output=../static/elm.js", + "debug": "cd frontend; elm make src/Main.elm --debug --output=../static/elm.js", + "prod": "cd frontend; elm make src/Main.elm --optimize --output=../static/elm.js", "start": "node src/index.js" }, "repository": { @@ -17,12 +20,7 @@ "cookie-parser": "^1.4.5", "cors": "^2.8.5", "express": "^4.17.1", - "express-paginate": "^1.0.2", - "nodemailer": "^6.6.1", "pg": "^8.6.0", "sequelize": "^6.6.2" - }, - "devDependencies": { - "sequelize-cli": "^6.2.0" } } \ No newline at end of file diff --git a/backend/pnpm-lock.yaml b/backend/pnpm-lock.yaml index 5a124bf..1b8148f 100644 --- a/backend/pnpm-lock.yaml +++ b/backend/pnpm-lock.yaml @@ -1,81 +1,33 @@ -lockfileVersion: 5.3 - -specifiers: - cookie-parser: ^1.4.5 - cors: ^2.8.5 - express: ^4.17.1 - express-paginate: ^1.0.2 - nodemailer: ^6.6.1 - pg: ^8.6.0 - sequelize: ^6.6.2 - sequelize-cli: ^6.2.0 - dependencies: cookie-parser: 1.4.5 cors: 2.8.5 express: 4.17.1 - express-paginate: 1.0.2 - nodemailer: 6.6.1 pg: 8.6.0 sequelize: 6.6.2_pg@8.6.0 - -devDependencies: - sequelize-cli: 6.2.0 - +lockfileVersion: 5.2 packages: - /@types/node/15.12.1: - resolution: {integrity: sha512-zyxJM8I1c9q5sRMtVF+zdd13Jt6RU4r4qfhTd7lQubyThvLfx6yYekWSQjGCGV2Tkecgxnlpl/DNlb6Hg+dmEw==} dev: false - - /abbrev/1.1.1: - resolution: {integrity: sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==} - dev: true - + resolution: + integrity: sha512-zyxJM8I1c9q5sRMtVF+zdd13Jt6RU4r4qfhTd7lQubyThvLfx6yYekWSQjGCGV2Tkecgxnlpl/DNlb6Hg+dmEw== /accepts/1.3.7: - resolution: {integrity: sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==} - engines: {node: '>= 0.6'} dependencies: mime-types: 2.1.31 negotiator: 0.6.2 dev: false - - /ansi-regex/2.1.1: - resolution: {integrity: sha1-w7M6te42DYbg5ijwRorn7yfWVN8=} - engines: {node: '>=0.10.0'} - dev: true - - /ansi-regex/4.1.0: - resolution: {integrity: sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==} - engines: {node: '>=6'} - dev: true - - /ansi-styles/3.2.1: - resolution: {integrity: sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==} - engines: {node: '>=4'} - dependencies: - color-convert: 1.9.3 - dev: true - + engines: + node: '>= 0.6' + resolution: + integrity: sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA== /any-promise/1.3.0: - resolution: {integrity: sha1-q8av7tzqUugJzcA3au0845Y10X8=} dev: false - + resolution: + integrity: sha1-q8av7tzqUugJzcA3au0845Y10X8= /array-flatten/1.1.1: - resolution: {integrity: sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=} dev: false - - /balanced-match/1.0.2: - resolution: {integrity: sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==} - dev: true - - /bluebird/3.7.2: - resolution: {integrity: sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==} - dev: true - + resolution: + integrity: sha1-ml9pkFGx5wczKPKgCJaLZOopVdI= /body-parser/1.19.0: - resolution: {integrity: sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==} - engines: {node: '>= 0.8'} dependencies: bytes: 3.1.0 content-type: 1.0.4 @@ -88,243 +40,118 @@ packages: raw-body: 2.4.0 type-is: 1.6.18 dev: false - - /brace-expansion/1.1.11: - resolution: {integrity: sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==} - dependencies: - balanced-match: 1.0.2 - concat-map: 0.0.1 - dev: true - + engines: + node: '>= 0.8' + resolution: + integrity: sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw== /buffer-writer/2.0.0: - resolution: {integrity: sha512-a7ZpuTZU1TRtnwyCNW3I5dc0wWNC3VR9S++Ewyk2HHZdrO3CQJqSpd+95Us590V6AL7JqUAH2IwZ/398PmNFgw==} - engines: {node: '>=4'} dev: false - + engines: + node: '>=4' + resolution: + integrity: sha512-a7ZpuTZU1TRtnwyCNW3I5dc0wWNC3VR9S++Ewyk2HHZdrO3CQJqSpd+95Us590V6AL7JqUAH2IwZ/398PmNFgw== /bytes/3.1.0: - resolution: {integrity: sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==} - engines: {node: '>= 0.8'} dev: false - - /call-bind/1.0.2: - resolution: {integrity: sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==} - dependencies: - function-bind: 1.1.1 - get-intrinsic: 1.1.1 - dev: false - - /camelcase/5.3.1: - resolution: {integrity: sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==} - engines: {node: '>=6'} - dev: true - - /cli-color/1.4.0: - resolution: {integrity: sha512-xu6RvQqqrWEo6MPR1eixqGPywhYBHRs653F9jfXB2Hx4jdM/3WxiNE1vppRmxtMIfl16SFYTpYlrnqH/HsK/2w==} - dependencies: - ansi-regex: 2.1.1 - d: 1.0.1 - es5-ext: 0.10.53 - es6-iterator: 2.0.3 - memoizee: 0.4.15 - timers-ext: 0.1.7 - dev: true - - /cliui/5.0.0: - resolution: {integrity: sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==} - dependencies: - string-width: 3.1.0 - strip-ansi: 5.2.0 - wrap-ansi: 5.1.0 - dev: true - - /color-convert/1.9.3: - resolution: {integrity: sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==} - dependencies: - color-name: 1.1.3 - dev: true - - /color-name/1.1.3: - resolution: {integrity: sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=} - dev: true - - /commander/2.20.3: - resolution: {integrity: sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==} - dev: true - - /concat-map/0.0.1: - resolution: {integrity: sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=} - dev: true - - /config-chain/1.1.13: - resolution: {integrity: sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ==} - dependencies: - ini: 1.3.8 - proto-list: 1.2.4 - dev: true - + engines: + node: '>= 0.8' + resolution: + integrity: sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg== /content-disposition/0.5.3: - resolution: {integrity: sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==} - engines: {node: '>= 0.6'} dependencies: safe-buffer: 5.1.2 dev: false - + engines: + node: '>= 0.6' + resolution: + integrity: sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g== /content-type/1.0.4: - resolution: {integrity: sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==} - engines: {node: '>= 0.6'} dev: false - + engines: + node: '>= 0.6' + resolution: + integrity: sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA== /cookie-parser/1.4.5: - resolution: {integrity: sha512-f13bPUj/gG/5mDr+xLmSxxDsB9DQiTIfhJS/sqjrmfAWiAN+x2O4i/XguTL9yDZ+/IFDanJ+5x7hC4CXT9Tdzw==} - engines: {node: '>= 0.8.0'} dependencies: cookie: 0.4.0 cookie-signature: 1.0.6 dev: false - + engines: + node: '>= 0.8.0' + resolution: + integrity: sha512-f13bPUj/gG/5mDr+xLmSxxDsB9DQiTIfhJS/sqjrmfAWiAN+x2O4i/XguTL9yDZ+/IFDanJ+5x7hC4CXT9Tdzw== /cookie-signature/1.0.6: - resolution: {integrity: sha1-4wOogrNCzD7oylE6eZmXNNqzriw=} dev: false - + resolution: + integrity: sha1-4wOogrNCzD7oylE6eZmXNNqzriw= /cookie/0.4.0: - resolution: {integrity: sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==} - engines: {node: '>= 0.6'} dev: false - + engines: + node: '>= 0.6' + resolution: + integrity: sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg== /cors/2.8.5: - resolution: {integrity: sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==} - engines: {node: '>= 0.10'} dependencies: object-assign: 4.1.1 vary: 1.1.2 dev: false - - /d/1.0.1: - resolution: {integrity: sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==} - dependencies: - es5-ext: 0.10.53 - type: 1.2.0 - dev: true - + engines: + node: '>= 0.10' + resolution: + integrity: sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g== /debug/2.6.9: - resolution: {integrity: sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==} dependencies: ms: 2.0.0 dev: false - + resolution: + integrity: sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== /debug/4.3.1: - resolution: {integrity: sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==} - engines: {node: '>=6.0'} + dependencies: + ms: 2.1.2 + dev: false + engines: + node: '>=6.0' peerDependencies: supports-color: '*' peerDependenciesMeta: supports-color: optional: true - dependencies: - ms: 2.1.2 - dev: false - - /decamelize/1.2.0: - resolution: {integrity: sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=} - engines: {node: '>=0.10.0'} - dev: true - + resolution: + integrity: sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ== /depd/1.1.2: - resolution: {integrity: sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=} - engines: {node: '>= 0.6'} dev: false - + engines: + node: '>= 0.6' + resolution: + integrity: sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak= /destroy/1.0.4: - resolution: {integrity: sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=} dev: false - + resolution: + integrity: sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA= /dottie/2.0.2: - resolution: {integrity: sha512-fmrwR04lsniq/uSr8yikThDTrM7epXHBAAjH9TbeH3rEA8tdCO7mRzB9hdmdGyJCxF8KERo9CITcm3kGuoyMhg==} dev: false - - /editorconfig/0.15.3: - resolution: {integrity: sha512-M9wIMFx96vq0R4F+gRpY3o2exzb8hEj/n9S8unZtHSvYjibBp/iMufSzvmOcV/laG0ZtuTVGtiJggPOSW2r93g==} - hasBin: true - dependencies: - commander: 2.20.3 - lru-cache: 4.1.5 - semver: 5.7.1 - sigmund: 1.0.1 - dev: true - + resolution: + integrity: sha512-fmrwR04lsniq/uSr8yikThDTrM7epXHBAAjH9TbeH3rEA8tdCO7mRzB9hdmdGyJCxF8KERo9CITcm3kGuoyMhg== /ee-first/1.1.1: - resolution: {integrity: sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=} dev: false - - /emoji-regex/7.0.3: - resolution: {integrity: sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==} - dev: true - + resolution: + integrity: sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0= /encodeurl/1.0.2: - resolution: {integrity: sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=} - engines: {node: '>= 0.8'} dev: false - - /es5-ext/0.10.53: - resolution: {integrity: sha512-Xs2Stw6NiNHWypzRTY1MtaG/uJlwCk8kH81920ma8mvN8Xq1gsfhZvpkImLQArw8AHnv8MT2I45J3c0R8slE+Q==} - dependencies: - es6-iterator: 2.0.3 - es6-symbol: 3.1.3 - next-tick: 1.0.0 - dev: true - - /es6-iterator/2.0.3: - resolution: {integrity: sha1-p96IkUGgWpSwhUQDstCg+/qY87c=} - dependencies: - d: 1.0.1 - es5-ext: 0.10.53 - es6-symbol: 3.1.3 - dev: true - - /es6-symbol/3.1.3: - resolution: {integrity: sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==} - dependencies: - d: 1.0.1 - ext: 1.4.0 - dev: true - - /es6-weak-map/2.0.3: - resolution: {integrity: sha512-p5um32HOTO1kP+w7PRnB+5lQ43Z6muuMuIMffvDN8ZB4GcnjLBV6zGStpbASIMk4DCAvEaamhe2zhyCb/QXXsA==} - dependencies: - d: 1.0.1 - es5-ext: 0.10.53 - es6-iterator: 2.0.3 - es6-symbol: 3.1.3 - dev: true - + engines: + node: '>= 0.8' + resolution: + integrity: sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k= /escape-html/1.0.3: - resolution: {integrity: sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=} dev: false - + resolution: + integrity: sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg= /etag/1.8.1: - resolution: {integrity: sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=} - engines: {node: '>= 0.6'} dev: false - - /event-emitter/0.3.5: - resolution: {integrity: sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=} - dependencies: - d: 1.0.1 - es5-ext: 0.10.53 - dev: true - - /express-paginate/1.0.2: - resolution: {integrity: sha512-z0VTaLrsMe4PJFifjJCC4Q11cwrveSOejicYOgFi6RzqUMPd8kIlK95x/xq6g6k6urCI2Fd3gadj3AZ9AGqguw==} - dependencies: - lodash.assign: 4.2.0 - lodash.clone: 4.5.0 - lodash.isobject: 3.0.2 - qs: 6.10.1 - dev: false - + engines: + node: '>= 0.6' + resolution: + integrity: sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc= /express/4.17.1: - resolution: {integrity: sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==} - engines: {node: '>= 0.10.0'} dependencies: accepts: 1.3.7 array-flatten: 1.1.1 @@ -357,16 +184,11 @@ packages: utils-merge: 1.0.1 vary: 1.1.2 dev: false - - /ext/1.4.0: - resolution: {integrity: sha512-Key5NIsUxdqKg3vIsdw9dSuXpPCQ297y6wBjL30edxwPgt2E44WcWBZey/ZvUc6sERLTxKdyCu4gZFmUbk1Q7A==} - dependencies: - type: 2.5.0 - dev: true - + engines: + node: '>= 0.10.0' + resolution: + integrity: sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g== /finalhandler/1.1.2: - resolution: {integrity: sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==} - engines: {node: '>= 0.8'} dependencies: debug: 2.6.9 encodeurl: 1.0.2 @@ -376,82 +198,23 @@ packages: statuses: 1.5.0 unpipe: 1.0.0 dev: false - - /find-up/3.0.0: - resolution: {integrity: sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==} - engines: {node: '>=6'} - dependencies: - locate-path: 3.0.0 - dev: true - + engines: + node: '>= 0.8' + resolution: + integrity: sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA== /forwarded/0.2.0: - resolution: {integrity: sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==} - engines: {node: '>= 0.6'} dev: false - + engines: + node: '>= 0.6' + resolution: + integrity: sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow== /fresh/0.5.2: - resolution: {integrity: sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=} - engines: {node: '>= 0.6'} dev: false - - /fs-extra/7.0.1: - resolution: {integrity: sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==} - engines: {node: '>=6 <7 || >=8'} - dependencies: - graceful-fs: 4.2.6 - jsonfile: 4.0.0 - universalify: 0.1.2 - dev: true - - /fs.realpath/1.0.0: - resolution: {integrity: sha1-FQStJSMVjKpA20onh8sBQRmU6k8=} - dev: true - - /function-bind/1.1.1: - resolution: {integrity: sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==} - - /get-caller-file/2.0.5: - resolution: {integrity: sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==} - engines: {node: 6.* || 8.* || >= 10.*} - dev: true - - /get-intrinsic/1.1.1: - resolution: {integrity: sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==} - dependencies: - function-bind: 1.1.1 - has: 1.0.3 - has-symbols: 1.0.2 - dev: false - - /glob/7.1.7: - resolution: {integrity: sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==} - dependencies: - fs.realpath: 1.0.0 - inflight: 1.0.6 - inherits: 2.0.4 - minimatch: 3.0.4 - once: 1.4.0 - path-is-absolute: 1.0.1 - dev: true - - /graceful-fs/4.2.6: - resolution: {integrity: sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ==} - dev: true - - /has-symbols/1.0.2: - resolution: {integrity: sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==} - engines: {node: '>= 0.4'} - dev: false - - /has/1.0.3: - resolution: {integrity: sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==} - engines: {node: '>= 0.4.0'} - dependencies: - function-bind: 1.1.1 - + engines: + node: '>= 0.6' + resolution: + integrity: sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac= /http-errors/1.7.2: - resolution: {integrity: sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==} - engines: {node: '>= 0.6'} dependencies: depd: 1.1.2 inherits: 2.0.3 @@ -459,10 +222,11 @@ packages: statuses: 1.5.0 toidentifier: 1.0.0 dev: false - + engines: + node: '>= 0.6' + resolution: + integrity: sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg== /http-errors/1.7.3: - resolution: {integrity: sha512-ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw==} - engines: {node: '>= 0.6'} dependencies: depd: 1.1.2 inherits: 2.0.4 @@ -470,308 +234,166 @@ packages: statuses: 1.5.0 toidentifier: 1.0.0 dev: false - + engines: + node: '>= 0.6' + resolution: + integrity: sha512-ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw== /iconv-lite/0.4.24: - resolution: {integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==} - engines: {node: '>=0.10.0'} dependencies: safer-buffer: 2.1.2 dev: false - + engines: + node: '>=0.10.0' + resolution: + integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA== /inflection/1.12.0: - resolution: {integrity: sha1-ogCTVlbW9fa8TcdQLhrstwMihBY=} - engines: {'0': node >= 0.4.0} dev: false - - /inflight/1.0.6: - resolution: {integrity: sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=} - dependencies: - once: 1.4.0 - wrappy: 1.0.2 - dev: true - + engines: + '0': node >= 0.4.0 + resolution: + integrity: sha1-ogCTVlbW9fa8TcdQLhrstwMihBY= /inherits/2.0.3: - resolution: {integrity: sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=} dev: false - + resolution: + integrity: sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4= /inherits/2.0.4: - resolution: {integrity: sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==} - - /ini/1.3.8: - resolution: {integrity: sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==} - dev: true - + dev: false + resolution: + integrity: sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== /ipaddr.js/1.9.1: - resolution: {integrity: sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==} - engines: {node: '>= 0.10'} dev: false - - /is-core-module/2.4.0: - resolution: {integrity: sha512-6A2fkfq1rfeQZjxrZJGerpLCTHRNEBiSgnu0+obeJpEPZRUooHgsizvzv0ZjJwOz3iWIHdJtVWJ/tmPr3D21/A==} - dependencies: - has: 1.0.3 - dev: true - - /is-fullwidth-code-point/2.0.0: - resolution: {integrity: sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=} - engines: {node: '>=4'} - dev: true - - /is-promise/2.2.2: - resolution: {integrity: sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ==} - dev: true - - /js-beautify/1.14.0: - resolution: {integrity: sha512-yuck9KirNSCAwyNJbqW+BxJqJ0NLJ4PwBUzQQACl5O3qHMBXVkXb/rD0ilh/Lat/tn88zSZ+CAHOlk0DsY7GuQ==} - engines: {node: '>=10'} - hasBin: true - dependencies: - config-chain: 1.1.13 - editorconfig: 0.15.3 - glob: 7.1.7 - nopt: 5.0.0 - dev: true - - /jsonfile/4.0.0: - resolution: {integrity: sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=} - optionalDependencies: - graceful-fs: 4.2.6 - dev: true - - /locate-path/3.0.0: - resolution: {integrity: sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==} - engines: {node: '>=6'} - dependencies: - p-locate: 3.0.0 - path-exists: 3.0.0 - dev: true - - /lodash.assign/4.2.0: - resolution: {integrity: sha1-DZnzzNem0mHRm9rrkkUAXShYCOc=} - dev: false - - /lodash.clone/4.5.0: - resolution: {integrity: sha1-GVhwRQ9aExkkeN9Lw9I9LeoZB7Y=} - dev: false - - /lodash.isobject/3.0.2: - resolution: {integrity: sha1-PI+41bW/S/kK4G4U8qUwpO2TXh0=} - dev: false - + engines: + node: '>= 0.10' + resolution: + integrity: sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g== /lodash/4.17.21: - resolution: {integrity: sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==} - - /lru-cache/4.1.5: - resolution: {integrity: sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==} - dependencies: - pseudomap: 1.0.2 - yallist: 2.1.2 - dev: true - + dev: false + resolution: + integrity: sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== /lru-cache/6.0.0: - resolution: {integrity: sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==} - engines: {node: '>=10'} dependencies: yallist: 4.0.0 dev: false - - /lru-queue/0.1.0: - resolution: {integrity: sha1-Jzi9nw089PhEkMVzbEhpmsYyzaM=} - dependencies: - es5-ext: 0.10.53 - dev: true - + engines: + node: '>=10' + resolution: + integrity: sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA== /media-typer/0.3.0: - resolution: {integrity: sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=} - engines: {node: '>= 0.6'} dev: false - - /memoizee/0.4.15: - resolution: {integrity: sha512-UBWmJpLZd5STPm7PMUlOw/TSy972M+z8gcyQ5veOnSDRREz/0bmpyTfKt3/51DhEBqCZQn1udM/5flcSPYhkdQ==} - dependencies: - d: 1.0.1 - es5-ext: 0.10.53 - es6-weak-map: 2.0.3 - event-emitter: 0.3.5 - is-promise: 2.2.2 - lru-queue: 0.1.0 - next-tick: 1.1.0 - timers-ext: 0.1.7 - dev: true - + engines: + node: '>= 0.6' + resolution: + integrity: sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g= /merge-descriptors/1.0.1: - resolution: {integrity: sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=} dev: false - + resolution: + integrity: sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E= /methods/1.1.2: - resolution: {integrity: sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=} - engines: {node: '>= 0.6'} dev: false - + engines: + node: '>= 0.6' + resolution: + integrity: sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4= /mime-db/1.48.0: - resolution: {integrity: sha512-FM3QwxV+TnZYQ2aRqhlKBMHxk10lTbMt3bBkMAp54ddrNeVSfcQYOOKuGuy3Ddrm38I04If834fOUSq1yzslJQ==} - engines: {node: '>= 0.6'} dev: false - + engines: + node: '>= 0.6' + resolution: + integrity: sha512-FM3QwxV+TnZYQ2aRqhlKBMHxk10lTbMt3bBkMAp54ddrNeVSfcQYOOKuGuy3Ddrm38I04If834fOUSq1yzslJQ== /mime-types/2.1.31: - resolution: {integrity: sha512-XGZnNzm3QvgKxa8dpzyhFTHmpP3l5YNusmne07VUOXxou9CqUqYa/HBy124RqtVh/O2pECas/MOcsDgpilPOPg==} - engines: {node: '>= 0.6'} dependencies: mime-db: 1.48.0 dev: false - + engines: + node: '>= 0.6' + resolution: + integrity: sha512-XGZnNzm3QvgKxa8dpzyhFTHmpP3l5YNusmne07VUOXxou9CqUqYa/HBy124RqtVh/O2pECas/MOcsDgpilPOPg== /mime/1.6.0: - resolution: {integrity: sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==} - engines: {node: '>=4'} - hasBin: true dev: false - - /minimatch/3.0.4: - resolution: {integrity: sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==} - dependencies: - brace-expansion: 1.1.11 - dev: true - + engines: + node: '>=4' + hasBin: true + resolution: + integrity: sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg== /moment-timezone/0.5.33: - resolution: {integrity: sha512-PTc2vcT8K9J5/9rDEPe5czSIKgLoGsH8UNpA4qZTVw0Vd/Uz19geE9abbIOQKaAQFcnQ3v5YEXrbSc5BpshH+w==} dependencies: moment: 2.29.1 dev: false - + resolution: + integrity: sha512-PTc2vcT8K9J5/9rDEPe5czSIKgLoGsH8UNpA4qZTVw0Vd/Uz19geE9abbIOQKaAQFcnQ3v5YEXrbSc5BpshH+w== /moment/2.29.1: - resolution: {integrity: sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ==} dev: false - + resolution: + integrity: sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ== /ms/2.0.0: - resolution: {integrity: sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=} dev: false - + resolution: + integrity: sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g= /ms/2.1.1: - resolution: {integrity: sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==} dev: false - + resolution: + integrity: sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg== /ms/2.1.2: - resolution: {integrity: sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==} dev: false - + resolution: + integrity: sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== /negotiator/0.6.2: - resolution: {integrity: sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==} - engines: {node: '>= 0.6'} dev: false - - /next-tick/1.0.0: - resolution: {integrity: sha1-yobR/ogoFpsBICCOPchCS524NCw=} - dev: true - - /next-tick/1.1.0: - resolution: {integrity: sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==} - dev: true - - /nodemailer/6.6.1: - resolution: {integrity: sha512-1xzFN3gqv+/qJ6YRyxBxfTYstLNt0FCtZaFRvf4Sg9wxNGWbwFmGXVpfSi6ThGK6aRxAo+KjHtYSW8NvCsNSAg==} - engines: {node: '>=6.0.0'} - dev: false - - /nopt/5.0.0: - resolution: {integrity: sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==} - engines: {node: '>=6'} - hasBin: true - dependencies: - abbrev: 1.1.1 - dev: true - + engines: + node: '>= 0.6' + resolution: + integrity: sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw== /object-assign/4.1.1: - resolution: {integrity: sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=} - engines: {node: '>=0.10.0'} dev: false - - /object-inspect/1.10.3: - resolution: {integrity: sha512-e5mCJlSH7poANfC8z8S9s9S2IN5/4Zb3aZ33f5s8YqoazCFzNLloLU8r5VCG+G7WoqLvAAZoVMcy3tp/3X0Plw==} - dev: false - + engines: + node: '>=0.10.0' + resolution: + integrity: sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM= /on-finished/2.3.0: - resolution: {integrity: sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=} - engines: {node: '>= 0.8'} dependencies: ee-first: 1.1.1 dev: false - - /once/1.4.0: - resolution: {integrity: sha1-WDsap3WWHUsROsF9nFC6753Xa9E=} - dependencies: - wrappy: 1.0.2 - dev: true - - /p-limit/2.3.0: - resolution: {integrity: sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==} - engines: {node: '>=6'} - dependencies: - p-try: 2.2.0 - dev: true - - /p-locate/3.0.0: - resolution: {integrity: sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==} - engines: {node: '>=6'} - dependencies: - p-limit: 2.3.0 - dev: true - - /p-try/2.2.0: - resolution: {integrity: sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==} - engines: {node: '>=6'} - dev: true - + engines: + node: '>= 0.8' + resolution: + integrity: sha1-IPEzZIGwg811M3mSoWlxqi2QaUc= /packet-reader/1.0.0: - resolution: {integrity: sha512-HAKu/fG3HpHFO0AA8WE8q2g+gBJaZ9MG7fcKk+IJPLTGAD6Psw4443l+9DGRbOIh3/aXr7Phy0TjilYivJo5XQ==} dev: false - + resolution: + integrity: sha512-HAKu/fG3HpHFO0AA8WE8q2g+gBJaZ9MG7fcKk+IJPLTGAD6Psw4443l+9DGRbOIh3/aXr7Phy0TjilYivJo5XQ== /parseurl/1.3.3: - resolution: {integrity: sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==} - engines: {node: '>= 0.8'} dev: false - - /path-exists/3.0.0: - resolution: {integrity: sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=} - engines: {node: '>=4'} - dev: true - - /path-is-absolute/1.0.1: - resolution: {integrity: sha1-F0uSaHNVNP+8es5r9TpanhtcX18=} - engines: {node: '>=0.10.0'} - dev: true - - /path-parse/1.0.7: - resolution: {integrity: sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==} - dev: true - + engines: + node: '>= 0.8' + resolution: + integrity: sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ== /path-to-regexp/0.1.7: - resolution: {integrity: sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=} dev: false - + resolution: + integrity: sha1-32BBeABfUi8V60SQ5yR6G/qmf4w= /pg-connection-string/2.5.0: - resolution: {integrity: sha512-r5o/V/ORTA6TmUnyWZR9nCj1klXCO2CEKNRlVuJptZe85QuhFayC7WeMic7ndayT5IRIR0S0xFxFi2ousartlQ==} dev: false - + resolution: + integrity: sha512-r5o/V/ORTA6TmUnyWZR9nCj1klXCO2CEKNRlVuJptZe85QuhFayC7WeMic7ndayT5IRIR0S0xFxFi2ousartlQ== /pg-int8/1.0.1: - resolution: {integrity: sha512-WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw==} - engines: {node: '>=4.0.0'} dev: false - + engines: + node: '>=4.0.0' + resolution: + integrity: sha512-WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw== /pg-pool/3.3.0_pg@8.6.0: - resolution: {integrity: sha512-0O5huCql8/D6PIRFAlmccjphLYWC+JIzvUhSzXSpGaf+tjTZc4nn+Lr7mLXBbFJfvwbP0ywDv73EiaBsxn7zdg==} - peerDependencies: - pg: '>=8.0' dependencies: pg: 8.6.0 dev: false - + peerDependencies: + pg: '>=8.0' + resolution: + integrity: sha512-0O5huCql8/D6PIRFAlmccjphLYWC+JIzvUhSzXSpGaf+tjTZc4nn+Lr7mLXBbFJfvwbP0ywDv73EiaBsxn7zdg== /pg-protocol/1.5.0: - resolution: {integrity: sha512-muRttij7H8TqRNu/DxrAJQITO4Ac7RmX3Klyr/9mJEOBeIpgnF8f9jAfRz5d3XwQZl5qBjF9gLsUtMPJE0vezQ==} dev: false - + resolution: + integrity: sha512-muRttij7H8TqRNu/DxrAJQITO4Ac7RmX3Klyr/9mJEOBeIpgnF8f9jAfRz5d3XwQZl5qBjF9gLsUtMPJE0vezQ== /pg-types/2.2.0: - resolution: {integrity: sha512-qTAAlrEsl8s4OiEQY69wDvcMIdQN6wdz5ojQiOy6YRMuynxenON0O5oCpJI6lshc6scgAY8qvJ2On/p+CXY0GA==} - engines: {node: '>=4'} dependencies: pg-int8: 1.0.1 postgres-array: 2.0.0 @@ -779,15 +401,11 @@ packages: postgres-date: 1.0.7 postgres-interval: 1.2.0 dev: false - + engines: + node: '>=4' + resolution: + integrity: sha512-qTAAlrEsl8s4OiEQY69wDvcMIdQN6wdz5ojQiOy6YRMuynxenON0O5oCpJI6lshc6scgAY8qvJ2On/p+CXY0GA== /pg/8.6.0: - resolution: {integrity: sha512-qNS9u61lqljTDFvmk/N66EeGq3n6Ujzj0FFyNMGQr6XuEv4tgNTXvJQTfJdcvGit5p5/DWPu+wj920hAJFI+QQ==} - engines: {node: '>= 8.0.0'} - peerDependencies: - pg-native: '>=2.0.0' - peerDependenciesMeta: - pg-native: - optional: true dependencies: buffer-writer: 2.0.0 packet-reader: 1.0.0 @@ -797,137 +415,117 @@ packages: pg-types: 2.2.0 pgpass: 1.0.4 dev: false - + engines: + node: '>= 8.0.0' + peerDependencies: + pg-native: '>=2.0.0' + peerDependenciesMeta: + pg-native: + optional: true + resolution: + integrity: sha512-qNS9u61lqljTDFvmk/N66EeGq3n6Ujzj0FFyNMGQr6XuEv4tgNTXvJQTfJdcvGit5p5/DWPu+wj920hAJFI+QQ== /pgpass/1.0.4: - resolution: {integrity: sha512-YmuA56alyBq7M59vxVBfPJrGSozru8QAdoNlWuW3cz8l+UX3cWge0vTvjKhsSHSJpo3Bom8/Mm6hf0TR5GY0+w==} dependencies: split2: 3.2.2 dev: false - + resolution: + integrity: sha512-YmuA56alyBq7M59vxVBfPJrGSozru8QAdoNlWuW3cz8l+UX3cWge0vTvjKhsSHSJpo3Bom8/Mm6hf0TR5GY0+w== /postgres-array/2.0.0: - resolution: {integrity: sha512-VpZrUqU5A69eQyW2c5CA1jtLecCsN2U/bD6VilrFDWq5+5UIEVO7nazS3TEcHf1zuPYO/sqGvUvW62g86RXZuA==} - engines: {node: '>=4'} dev: false - + engines: + node: '>=4' + resolution: + integrity: sha512-VpZrUqU5A69eQyW2c5CA1jtLecCsN2U/bD6VilrFDWq5+5UIEVO7nazS3TEcHf1zuPYO/sqGvUvW62g86RXZuA== /postgres-bytea/1.0.0: - resolution: {integrity: sha1-AntTPAqokOJtFy1Hz5zOzFIazTU=} - engines: {node: '>=0.10.0'} dev: false - + engines: + node: '>=0.10.0' + resolution: + integrity: sha1-AntTPAqokOJtFy1Hz5zOzFIazTU= /postgres-date/1.0.7: - resolution: {integrity: sha512-suDmjLVQg78nMK2UZ454hAG+OAW+HQPZ6n++TNDUX+L0+uUlLywnoxJKDou51Zm+zTCjrCl0Nq6J9C5hP9vK/Q==} - engines: {node: '>=0.10.0'} dev: false - + engines: + node: '>=0.10.0' + resolution: + integrity: sha512-suDmjLVQg78nMK2UZ454hAG+OAW+HQPZ6n++TNDUX+L0+uUlLywnoxJKDou51Zm+zTCjrCl0Nq6J9C5hP9vK/Q== /postgres-interval/1.2.0: - resolution: {integrity: sha512-9ZhXKM/rw350N1ovuWHbGxnGh/SNJ4cnxHiM0rxE4VN41wsg8P8zWn9hv/buK00RP4WvlOyr/RBDiptyxVbkZQ==} - engines: {node: '>=0.10.0'} dependencies: xtend: 4.0.2 dev: false - - /proto-list/1.2.4: - resolution: {integrity: sha1-IS1b/hMYMGpCD2QCuOJv85ZHqEk=} - dev: true - + engines: + node: '>=0.10.0' + resolution: + integrity: sha512-9ZhXKM/rw350N1ovuWHbGxnGh/SNJ4cnxHiM0rxE4VN41wsg8P8zWn9hv/buK00RP4WvlOyr/RBDiptyxVbkZQ== /proxy-addr/2.0.7: - resolution: {integrity: sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==} - engines: {node: '>= 0.10'} dependencies: forwarded: 0.2.0 ipaddr.js: 1.9.1 dev: false - - /pseudomap/1.0.2: - resolution: {integrity: sha1-8FKijacOYYkX7wqKw0wa5aaChrM=} - dev: true - - /qs/6.10.1: - resolution: {integrity: sha512-M528Hph6wsSVOBiYUnGf+K/7w0hNshs/duGsNXPUCLH5XAqjEtiPGwNONLV0tBH8NoGb0mvD5JubnUTrujKDTg==} - engines: {node: '>=0.6'} - dependencies: - side-channel: 1.0.4 - dev: false - + engines: + node: '>= 0.10' + resolution: + integrity: sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg== /qs/6.7.0: - resolution: {integrity: sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==} - engines: {node: '>=0.6'} dev: false - + engines: + node: '>=0.6' + resolution: + integrity: sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ== /range-parser/1.2.1: - resolution: {integrity: sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==} - engines: {node: '>= 0.6'} dev: false - + engines: + node: '>= 0.6' + resolution: + integrity: sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg== /raw-body/2.4.0: - resolution: {integrity: sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==} - engines: {node: '>= 0.8'} dependencies: bytes: 3.1.0 http-errors: 1.7.2 iconv-lite: 0.4.24 unpipe: 1.0.0 dev: false - + engines: + node: '>= 0.8' + resolution: + integrity: sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q== /readable-stream/3.6.0: - resolution: {integrity: sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==} - engines: {node: '>= 6'} dependencies: inherits: 2.0.4 string_decoder: 1.3.0 util-deprecate: 1.0.2 dev: false - - /require-directory/2.1.1: - resolution: {integrity: sha1-jGStX9MNqxyXbiNE/+f3kqam30I=} - engines: {node: '>=0.10.0'} - dev: true - - /require-main-filename/2.0.0: - resolution: {integrity: sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==} - dev: true - - /resolve/1.20.0: - resolution: {integrity: sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==} - dependencies: - is-core-module: 2.4.0 - path-parse: 1.0.7 - dev: true - + engines: + node: '>= 6' + resolution: + integrity: sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA== /retry-as-promised/3.2.0: - resolution: {integrity: sha512-CybGs60B7oYU/qSQ6kuaFmRd9sTZ6oXSc0toqePvV74Ac6/IFZSI1ReFQmtCN+uvW1Mtqdwpvt/LGOiCBAY2Mg==} dependencies: any-promise: 1.3.0 dev: false - + resolution: + integrity: sha512-CybGs60B7oYU/qSQ6kuaFmRd9sTZ6oXSc0toqePvV74Ac6/IFZSI1ReFQmtCN+uvW1Mtqdwpvt/LGOiCBAY2Mg== /safe-buffer/5.1.2: - resolution: {integrity: sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==} dev: false - + resolution: + integrity: sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== /safe-buffer/5.2.1: - resolution: {integrity: sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==} dev: false - + resolution: + integrity: sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== /safer-buffer/2.1.2: - resolution: {integrity: sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==} dev: false - - /semver/5.7.1: - resolution: {integrity: sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==} - hasBin: true - dev: true - + resolution: + integrity: sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== /semver/7.3.5: - resolution: {integrity: sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==} - engines: {node: '>=10'} - hasBin: true dependencies: lru-cache: 6.0.0 dev: false - + engines: + node: '>=10' + hasBin: true + resolution: + integrity: sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ== /send/0.17.1: - resolution: {integrity: sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==} - engines: {node: '>= 0.8.0'} dependencies: debug: 2.6.9 depd: 1.1.2 @@ -943,29 +541,35 @@ packages: range-parser: 1.2.1 statuses: 1.5.0 dev: false - - /sequelize-cli/6.2.0: - resolution: {integrity: sha512-6WQ2x91hg30dUn66mXHnzvHATZ4pyI1GHSNbS/TNN/vRR4BLRSLijadeMgC8zqmKDsL0VqzVVopJWfJakuP++Q==} - engines: {node: '>=10.0.0'} - hasBin: true - dependencies: - cli-color: 1.4.0 - fs-extra: 7.0.1 - js-beautify: 1.14.0 - lodash: 4.17.21 - resolve: 1.20.0 - umzug: 2.3.0 - yargs: 13.3.2 - dev: true - + engines: + node: '>= 0.8.0' + resolution: + integrity: sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg== /sequelize-pool/6.1.0: - resolution: {integrity: sha512-4YwEw3ZgK/tY/so+GfnSgXkdwIJJ1I32uZJztIEgZeAO6HMgj64OzySbWLgxj+tXhZCJnzRfkY9gINw8Ft8ZMg==} - engines: {node: '>= 10.0.0'} dev: false - + engines: + node: '>= 10.0.0' + resolution: + integrity: sha512-4YwEw3ZgK/tY/so+GfnSgXkdwIJJ1I32uZJztIEgZeAO6HMgj64OzySbWLgxj+tXhZCJnzRfkY9gINw8Ft8ZMg== /sequelize/6.6.2_pg@8.6.0: - resolution: {integrity: sha512-H/zrzmTK+tis9PJaSigkuXI57nKBvNCtPQol0yxCvau1iWLzSOuq8t3tMOVeQ+Ep8QH2HoD9/+FCCIAqzUr/BQ==} - engines: {node: '>=10.0.0'} + dependencies: + debug: 4.3.1 + dottie: 2.0.2 + inflection: 1.12.0 + lodash: 4.17.21 + moment: 2.29.1 + moment-timezone: 0.5.33 + pg: 8.6.0 + retry-as-promised: 3.2.0 + semver: 7.3.5 + sequelize-pool: 6.1.0 + toposort-class: 1.0.1 + uuid: 8.3.2 + validator: 10.11.0 + wkx: 0.5.0 + dev: false + engines: + node: '>=10.0.0' peerDependencies: mariadb: '*' mysql2: '*' @@ -986,219 +590,112 @@ packages: optional: true tedious: optional: true - dependencies: - debug: 4.3.1 - dottie: 2.0.2 - inflection: 1.12.0 - lodash: 4.17.21 - moment: 2.29.1 - moment-timezone: 0.5.33 - pg: 8.6.0 - retry-as-promised: 3.2.0 - semver: 7.3.5 - sequelize-pool: 6.1.0 - toposort-class: 1.0.1 - uuid: 8.3.2 - validator: 10.11.0 - wkx: 0.5.0 - transitivePeerDependencies: - - supports-color - dev: false - + resolution: + integrity: sha512-H/zrzmTK+tis9PJaSigkuXI57nKBvNCtPQol0yxCvau1iWLzSOuq8t3tMOVeQ+Ep8QH2HoD9/+FCCIAqzUr/BQ== /serve-static/1.14.1: - resolution: {integrity: sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==} - engines: {node: '>= 0.8.0'} dependencies: encodeurl: 1.0.2 escape-html: 1.0.3 parseurl: 1.3.3 send: 0.17.1 dev: false - - /set-blocking/2.0.0: - resolution: {integrity: sha1-BF+XgtARrppoA93TgrJDkrPYkPc=} - dev: true - + engines: + node: '>= 0.8.0' + resolution: + integrity: sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg== /setprototypeof/1.1.1: - resolution: {integrity: sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==} dev: false - - /side-channel/1.0.4: - resolution: {integrity: sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==} - dependencies: - call-bind: 1.0.2 - get-intrinsic: 1.1.1 - object-inspect: 1.10.3 - dev: false - - /sigmund/1.0.1: - resolution: {integrity: sha1-P/IfGYytIXX587eBhT/ZTQ0ZtZA=} - dev: true - + resolution: + integrity: sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw== /split2/3.2.2: - resolution: {integrity: sha512-9NThjpgZnifTkJpzTZ7Eue85S49QwpNhZTq6GRJwObb6jnLFNGB7Qm73V5HewTROPyxD0C29xqmaI68bQtV+hg==} dependencies: readable-stream: 3.6.0 dev: false - + resolution: + integrity: sha512-9NThjpgZnifTkJpzTZ7Eue85S49QwpNhZTq6GRJwObb6jnLFNGB7Qm73V5HewTROPyxD0C29xqmaI68bQtV+hg== /statuses/1.5.0: - resolution: {integrity: sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=} - engines: {node: '>= 0.6'} dev: false - - /string-width/3.1.0: - resolution: {integrity: sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==} - engines: {node: '>=6'} - dependencies: - emoji-regex: 7.0.3 - is-fullwidth-code-point: 2.0.0 - strip-ansi: 5.2.0 - dev: true - + engines: + node: '>= 0.6' + resolution: + integrity: sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow= /string_decoder/1.3.0: - resolution: {integrity: sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==} dependencies: safe-buffer: 5.2.1 dev: false - - /strip-ansi/5.2.0: - resolution: {integrity: sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==} - engines: {node: '>=6'} - dependencies: - ansi-regex: 4.1.0 - dev: true - - /timers-ext/0.1.7: - resolution: {integrity: sha512-b85NUNzTSdodShTIbky6ZF02e8STtVVfD+fu4aXXShEELpozH+bCpJLYMPZbsABN2wDH7fJpqIoXxJpzbf0NqQ==} - dependencies: - es5-ext: 0.10.53 - next-tick: 1.1.0 - dev: true - + resolution: + integrity: sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA== /toidentifier/1.0.0: - resolution: {integrity: sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==} - engines: {node: '>=0.6'} dev: false - + engines: + node: '>=0.6' + resolution: + integrity: sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw== /toposort-class/1.0.1: - resolution: {integrity: sha1-f/0feMi+KMO6Rc1OGj9e4ZO9mYg=} dev: false - + resolution: + integrity: sha1-f/0feMi+KMO6Rc1OGj9e4ZO9mYg= /type-is/1.6.18: - resolution: {integrity: sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==} - engines: {node: '>= 0.6'} dependencies: media-typer: 0.3.0 mime-types: 2.1.31 dev: false - - /type/1.2.0: - resolution: {integrity: sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==} - dev: true - - /type/2.5.0: - resolution: {integrity: sha512-180WMDQaIMm3+7hGXWf12GtdniDEy7nYcyFMKJn/eZz/6tSLXrUN9V0wKSbMjej0I1WHWbpREDEKHtqPQa9NNw==} - dev: true - - /umzug/2.3.0: - resolution: {integrity: sha512-Z274K+e8goZK8QJxmbRPhl89HPO1K+ORFtm6rySPhFKfKc5GHhqdzD0SGhSWHkzoXasqJuItdhorSvY7/Cgflw==} - engines: {node: '>=6.0.0'} - dependencies: - bluebird: 3.7.2 - dev: true - - /universalify/0.1.2: - resolution: {integrity: sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==} - engines: {node: '>= 4.0.0'} - dev: true - + engines: + node: '>= 0.6' + resolution: + integrity: sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g== /unpipe/1.0.0: - resolution: {integrity: sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=} - engines: {node: '>= 0.8'} dev: false - + engines: + node: '>= 0.8' + resolution: + integrity: sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw= /util-deprecate/1.0.2: - resolution: {integrity: sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=} dev: false - + resolution: + integrity: sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8= /utils-merge/1.0.1: - resolution: {integrity: sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=} - engines: {node: '>= 0.4.0'} dev: false - + engines: + node: '>= 0.4.0' + resolution: + integrity: sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM= /uuid/8.3.2: - resolution: {integrity: sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==} + dev: false hasBin: true - dev: false - + resolution: + integrity: sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg== /validator/10.11.0: - resolution: {integrity: sha512-X/p3UZerAIsbBfN/IwahhYaBbY68EN/UQBWHtsbXGT5bfrH/p4NQzUCG1kF/rtKaNpnJ7jAu6NGTdSNtyNIXMw==} - engines: {node: '>= 0.10'} dev: false - + engines: + node: '>= 0.10' + resolution: + integrity: sha512-X/p3UZerAIsbBfN/IwahhYaBbY68EN/UQBWHtsbXGT5bfrH/p4NQzUCG1kF/rtKaNpnJ7jAu6NGTdSNtyNIXMw== /vary/1.1.2: - resolution: {integrity: sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=} - engines: {node: '>= 0.8'} dev: false - - /which-module/2.0.0: - resolution: {integrity: sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=} - dev: true - + engines: + node: '>= 0.8' + resolution: + integrity: sha1-IpnwLG3tMNSllhsLn3RSShj2NPw= /wkx/0.5.0: - resolution: {integrity: sha512-Xng/d4Ichh8uN4l0FToV/258EjMGU9MGcA0HV2d9B/ZpZB3lqQm7nkOdZdm5GhKtLLhAE7PiVQwN4eN+2YJJUg==} dependencies: '@types/node': 15.12.1 dev: false - - /wrap-ansi/5.1.0: - resolution: {integrity: sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==} - engines: {node: '>=6'} - dependencies: - ansi-styles: 3.2.1 - string-width: 3.1.0 - strip-ansi: 5.2.0 - dev: true - - /wrappy/1.0.2: - resolution: {integrity: sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=} - dev: true - + resolution: + integrity: sha512-Xng/d4Ichh8uN4l0FToV/258EjMGU9MGcA0HV2d9B/ZpZB3lqQm7nkOdZdm5GhKtLLhAE7PiVQwN4eN+2YJJUg== /xtend/4.0.2: - resolution: {integrity: sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==} - engines: {node: '>=0.4'} dev: false - - /y18n/4.0.3: - resolution: {integrity: sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==} - dev: true - - /yallist/2.1.2: - resolution: {integrity: sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=} - dev: true - + engines: + node: '>=0.4' + resolution: + integrity: sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ== /yallist/4.0.0: - resolution: {integrity: sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==} dev: false - - /yargs-parser/13.1.2: - resolution: {integrity: sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==} - dependencies: - camelcase: 5.3.1 - decamelize: 1.2.0 - dev: true - - /yargs/13.3.2: - resolution: {integrity: sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==} - dependencies: - cliui: 5.0.0 - find-up: 3.0.0 - get-caller-file: 2.0.5 - require-directory: 2.1.1 - require-main-filename: 2.0.0 - set-blocking: 2.0.0 - string-width: 3.1.0 - which-module: 2.0.0 - y18n: 4.0.3 - yargs-parser: 13.1.2 - dev: true + resolution: + integrity: sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== +specifiers: + cookie-parser: ^1.4.5 + cors: ^2.8.5 + express: ^4.17.1 + pg: ^8.6.0 + sequelize: ^6.6.2 diff --git a/backend/src/db_interface.js b/backend/src/db_interface.js index 84e9668..60ff18f 100644 --- a/backend/src/db_interface.js +++ b/backend/src/db_interface.js @@ -2,35 +2,12 @@ const Sequelize = require('sequelize'); const Config = require('./config.js'); if (!Config.config.db_url) { - console.error('No database url found. please set `db_url` in config.json'); + console.error("No database url found. please set `db_url` in config.json"); process.exit(); } const db = new Sequelize(Config.config.db_url); -const UnverifiedUser = db.define('UnverifiedUser', { - id: { - type: Sequelize.DataTypes.UUID, - defaultValue: Sequelize.UUIDV4, - allowNull: false, - primaryKey: true, - unique: true - }, - verificationToken: { - type: Sequelize.DataTypes.STRING, - allowNull: false - }, - email: { - type: Sequelize.DataTypes.STRING, - allowNull: false, - unique: true - }, - password_hash: { - type: Sequelize.DataTypes.STRING, - allowNull: true - } -}); - const User = db.define('User', { id: { type: Sequelize.DataTypes.UUID, @@ -58,30 +35,13 @@ const Todo = db.define('Todo', { primaryKey: true, unique: true }, - user: { - type: Sequelize.DataTypes.UUID, - allowNull: false - }, content: { type: Sequelize.DataTypes.TEXT, allowNull: false - }, - tags: { - type: Sequelize.DataTypes.ARRAY(Sequelize.DataTypes.STRING), - allowNull: true - }, - complete: { - type: Sequelize.DataTypes.BOOLEAN, - allowNull: false, - defaultValue: false - }, - deadline: { - type: Sequelize.DataTypes.DATE, - allowNull: true } }); -const Grouping = db.define('Grouping', { +const Tag = db.define('Tag', { id: { type: Sequelize.DataTypes.UUID, defaultValue: Sequelize.UUIDV4, @@ -89,48 +49,29 @@ const Grouping = db.define('Grouping', { primaryKey: true, unique: true }, - complete: { - type: Sequelize.DataTypes.BOOLEAN, - allowNull: true - }, - manually_added: { - type: Sequelize.DataTypes.ARRAY(Sequelize.DataTypes.UUID), - allowNull: true - }, - required: { - type: Sequelize.DataTypes.ARRAY(Sequelize.DataTypes.STRING), - allowNull: true - }, - exclusions: { - type: Sequelize.DataTypes.ARRAY(Sequelize.DataTypes.STRING), - allowNull: true + content: { + type: Sequelize.DataTypes.STRING, + allowNull: false } }); +User.hasMany(Todo); +Todo.hasMany(Tag); + let options = { alter: false }; if (Config.config.alter_db) { options.alter = true; } -let start = async () => { - await UnverifiedUser.sync(options); - await User.sync(options); - await Todo.sync(options); - await Grouping.sync(options); -}; -start(); + +User.sync(options); module.exports = { db: db, constructors: { - user: () => { - return User.build(); - } + user: () => { return User.build(); } }, schemas: { - user: User, - unverifiedUser: UnverifiedUser, - todo: Todo, - grouping: Grouping + user: User } -}; +} \ No newline at end of file diff --git a/backend/src/index.js b/backend/src/index.js index ed6b230..037f036 100644 --- a/backend/src/index.js +++ b/backend/src/index.js @@ -1,17 +1,19 @@ -const http = require('http'); -const https = require('https'); -const cors = require('cors'); -const express = require('express'); -const cookieParser = require('cookie-parser'); -const Config = require('./config.js'); +const http = require("http"); +const https = require("https"); +const cors = require("cors"); +const express = require("express"); +const cookieParser = require("cookie-parser"); +const Config = require("./config.js"); -const UserInterface = require('./user.js'); -const TodoInterface = require('./todo.js'); +const UserInterface = require("./user.js"); let credentials = {}; if (Config.config.https) { - if (fs.existsSync(Config.config.cert) && fs.existsSync(Config.config.cert_key)) { + if ( + fs.existsSync(Config.config.cert) && + fs.existsSync(Config.config.cert_key) + ) { credentials.key = fs.readFileSync(Config.config.cert_key); credentials.cert = fs.readFileSync(Config.config.cert); } @@ -25,7 +27,7 @@ app.use(cookieParser()); // force https app.use((req, res, next) => { if (Config.config.https) { - if (req.headers['x-forwarded-proto'] !== 'https') { + if (req.headers["x-forwarded-proto"] !== "https") { return res.redirect(`https://${req.headers.host}${req.url}`); } } @@ -33,15 +35,14 @@ app.use((req, res, next) => { }); if (!Config.config.secret) { - console.error('No password secret found. please set `secret` in config.json'); + console.error("No password secret found. please set `secret` in config.json"); process.exit(); -} else if (Config.config.https && Config.config.secret == 'TEST_SECRET') { - console.error('please do not use the testing secret in production.'); +} else if (Config.config.https && Config.config.secret == "TEST_SECRET") { + console.error("please do not use the testing secret in production."); process.exit(); } -app.use('/api/user', UserInterface.router); -app.use('/api/todo', TodoInterface.router); +app.use("/api/user", UserInterface.router); // serve static files last // app.use(express.static('./static')); @@ -56,5 +57,6 @@ if (Config.config.https) { server.listen(Config.config.port || 8080); } console.log( - `listening on port ${Config.config.port || 8080}` + ` with https ${Config.config.https ? 'enabled' : 'disabled'}` + `listening on port ${Config.config.port || 8080}` + + ` with https ${Config.config.https ? "enabled" : "disabled"}` ); diff --git a/backend/src/mail.js b/backend/src/mail.js deleted file mode 100644 index 49e57c4..0000000 --- a/backend/src/mail.js +++ /dev/null @@ -1,52 +0,0 @@ -const Config = require('./config.js'); -const nodemailer = require('nodemailer'); - -class Mailer { - sender; - started = false; - mailer; - constructor(host, port, email, password) { - this.mailer = nodemailer.createTransport({ - host: host, - port: port, - secure: true, - auth: { - user: email, - pass: password - } - }); - this.sender = email; - this.started = true; - } - async sendMail(recipients, subject, content, contentStripped) { - console.log(`sending mail to ${recipients}`); - let info = await this.mailer.sendMail({ - from: `"Todo App" <${this.sender}>`, - to: Array.isArray(recipients) ? recipients.join(', ') : recipients, - subject: subject, - text: contentStripped, - html: content - }); - } -} - -if (!global.mailer || !global.mailer.started) { - if ( - !Config.config['mail_host'] || - !Config.config['mail_port'] || - !Config.config['mail_username'] || - !Config.config['mail_password'] - ) { - console.error(`could not create email account as -mail_host, mail_port, mail_username or mail_password is not set.`); - process.exit(); - } - global.mailer = new Mailer( - Config.config['mail_host'], - Config.config['mail_port'], - Config.config['mail_username'], - Config.config['mail_password'] - ); -} - -module.exports = global.mailer; diff --git a/backend/src/todo.js b/backend/src/todo.js deleted file mode 100644 index bc31195..0000000 --- a/backend/src/todo.js +++ /dev/null @@ -1,146 +0,0 @@ -const express = require('express'); -const paginate = require('express-paginate'); -const Database = require('./db_interface.js'); -const User = require('./user.js'); -const { Op } = require('sequelize'); - -let router = express.Router(); - -router.use(express.json()); - -function map_todo(result) { - return { - id: result.id, - content: result.content, - tags: result.tags - }; -} - -function parse_tags(tags) { - result = { - complete: undefined, - required: [], - excluded: [] - }; - tags.map((tag) => { - if (tag === 'complete') { - complete = true; - } else if (tag === '~complete') { - complete = false; - } else if (tag.startsWith('~')) { - excluded.push(tag); - } else { - required.push(tag); - } - }); - return result; -} - -const todo_fields = ['currentPage', 'limit']; - -router.use(paginate.middleware(10, 50)); -router.use('/todos', User.enforce_session_login); -router.get('/todos', async (req, res) => { - if (!req.query) { - return res.status(400).json({ - error: `query must include the fields: ${todo_fields.join(', ')}}` - }); - } else { - let error = []; - for (let field of todo_fields) { - if (!req.query[field]) { - error.push(field); - } - } - if (error.length > 0) { - return res.status(400).json({ - error: `query must include the fields: ${error.join(', ')}}` - }); - } - } - let tag_options = {}; - if (req.query.tags) { - let parsed = parse_tags(req.query.tags.split(',')); - tag_options['tags'] = { - [Op.and]: parsed.required, - [Op.not]: parsed.excluded - }; - if (parsed.complete !== undefined) { - tag_options['complete'] = { - [Op.is]: parsed.complete - }; - } - } - console.log(tag_options); - let all_todos = await Database.schemas.todo.findAndCountAll({ - where: { - user: req.get('id'), - ...tag_options - }, - limit: req.query.limit, - offset: req.skip - }); - const item_count = all_todos.count; - const page_count = Math.ceil(item_count / req.query.limit); - res.json({ - result: all_todos.map(map_todo), - currentPage: req.query.currentPage, - pageCount: page_count, - itemCount: item_count, - pages: paginate.getArrayPages(req)(5, page_count, req.query.currentPage) - }); -}); - -router.use('/todo', User.enforce_session_login); -router.get('/todo/:id([a-f0-9-]+)', async (req, res) => { - let userid = req.get('id'); - let id = req.params?.id; - - let match = await Database.schemas.todo.findOne({ - where: { - user: userid, - id: id - } - }); - if (!match) { - return res.sendStatus(404); - } - - return res.json({ - result: map_todo(match), - tags: get_tags(match.id) - }); -}); - -router.use('/todo', User.enforce_session_login); -router.post('/todo/:id([a-f0-9-]+)', async (req, res) => { - let userid = req.get('id'); - let id = req.params?.id; - - let body = req.body; - - if (!body) { - return res.sendStatus(400); - } - - let match = await Database.schemas.todo.findOne({ - where: { - user: userid, - id: id - } - }); - if (!match) { - return res.sendStatus(404); - } - - // - - return res.json({ - result: map_todo(match), - tags: get_tags(match.id) - }); -}); - -module.exports = { - router: router -}; diff --git a/backend/src/user.js b/backend/src/user.js index 2968380..f0cfff1 100644 --- a/backend/src/user.js +++ b/backend/src/user.js @@ -2,7 +2,6 @@ const express = require('express'); const crypto = require('crypto'); const Config = require('./config.js'); const Database = require('./db_interface.js'); -const Mail = require('./mail.js'); let router = express.Router(); @@ -14,19 +13,19 @@ user_cache = {}; email_cache = {}; async function get_user_details(id) { - if (!id || id === 'undefined') { + if (!id) { return undefined; } console.log(`search for user with id ${id}`); if (!user_cache[id]) { - let user = await Database.schemas.user.findOne({ where: { id: id } }); - if (user === null) { + let user = await Database.schemas.user.findOne({where: {id: id}}); + if (!user) { return undefined; } user_cache[user.id] = { id: user.id, email: user.email, - password_hash: user.password_hash + password_hash: user.password_hash, }; email_cache[user.email] = user.id; } @@ -35,19 +34,19 @@ async function get_user_details(id) { } async function get_user_details_by_email(email) { - if (!email || email === 'undefined') { + if (!email) { return undefined; } console.log(`search for user with email ${email}}`); if (!email_cache[email] || !user_cache[email_cache[email]]) { - let user = await Database.schemas.user.findOne({ where: { email: email } }); - if (user === null) { + let user = await Database.schemas.user.findOne({where: {email: email}}); + if (!user) { return undefined; } user_cache[user.id] = { id: user.id, email: user.email, - password_hash: user.password_hash + password_hash: user.password_hash, }; email_cache[user.email] = user.id; } @@ -58,22 +57,22 @@ async function get_user_details_by_email(email) { router.get('/byEmail/:email', async (req, res) => { if (!req.params?.email) { res.status(400).json({ - error: 'email is a required parameter' + error: 'email is a required parameter', }); } let user = get_user_details_by_email(req.params.email); console.log(user); - if (user !== undefined && user !== {}) { + if (user != null) { res.json({ id: user.id, - email: user.email + email: user.email, }); } else { res.sendStatus(404); } }); -function hash(secret, password, base64 = true) { +function hash(secret, password) { let pw_hash = crypto.pbkdf2Sync( password, secret, @@ -82,7 +81,7 @@ function hash(secret, password, base64 = true) { 'sha512' ); - return pw_hash.toString(base64 ? 'base64' : 'hex'); + return pw_hash.toString('base64'); } function verify(secret, password, hash) { @@ -105,9 +104,9 @@ function verify_password(password, hash) { return verify(Config.config.secret, password, hash); } -function get_session_token(id, password_hash, base64 = true) { +function get_session_token(id, token) { session_entropy[id] = crypto.randomBytes(Config.config.session_entropy || 32); - return hash(session_entropy[id], password_hash, base64); + return hash(session_entropy[id], token); } function verify_session_token(id, hash, token) { @@ -119,8 +118,8 @@ function verify_session_token(id, hash, token) { } async function enforce_session_login(req, res, next) { - let userid = req.get('id'); - let session_token = req.get('authorization'); + let userid = req.cookies?.userid; + let session_token = req.cookies?._session; console.log('a', userid, session_token); if (!userid || !session_token) { return res.sendStatus(401); @@ -129,146 +128,70 @@ async function enforce_session_login(req, res, next) { if (!user) { return res.sendStatus(401); } - let verified_session = verify_session_token(userid, user.password_hash, session_token); + let verified_session = verify_session_token( + userid, + user.password_hash, + session_token + ); if (!verified_session) { return res.sendStatus(401); } return next(); } -router.post('/signup', async (req, res) => { +router.post('/new', async (req, res) => { if (!req.body?.email || !req.body?.password) { return res.status(400).json({ - error: 'must have email and password fields' + error: 'must have email and password fields', }); } - let user = await get_user_details_by_email(req.body?.email); - - if (user !== undefined && user !== {}) { - console.warn(`user already found: ${JSON.stringify(user)}`); + let user = await get_user_details_by_email(req.body.email); + console.log(user); + if (user != null) { return res.status(403).json({ - error: `email ${req.body.email} is already in use.` + error: `email ${req.body.email} is already in use.`, }); } else { - let match = await Database.schemas.unverifiedUser.findOne({ where: { email: req.body.email } }); - if (!!match) { - await Database.schemas.unverifiedUser.destroy({ where: { email: match.email } }); - } - let randomString = 'Signup'; - for (let i = 0; i < 16; i++) { - randomString += Math.floor(Math.random() * 10); - } - let password_hash = hash_password(req.body.password); - let user = await Database.schemas.unverifiedUser.create({ + let user = await Database.schemas.user.create({ email: String(req.body.email), - password_hash: password_hash, - verificationToken: get_session_token(randomString, password_hash, false) + password_hash: hash_password(req.body.password), }); - const link = `${Config.config.https ? 'https://' : 'http://'}${req.headers.host}/api/user/verify?verification=${ - user.verificationToken - }`; - const content = `Click here to verify your sign-up: -${link}`; - const contentHtml = `

Click here to verify your sign-up:

-

${link}

`; - await Mail.sendMail([String(req.body.email)], 'Verify Your Account', contentHtml, content); - return res.sendStatus(204); - } -}); -router.get('/verify', async (req, res) => { - if (!req.query?.verification) { - return res.status(400).send( - ` - -

No Verification Link

- - ` - ); - } - let verification = req.query?.verification; - let user = await Database.schemas.unverifiedUser.findOne({ where: { verificationToken: verification } }); - - if (user !== undefined && user !== {}) { - if (user.verificationToken != verification) { - return res.status(404).send( - ` - -

Unknown Verification Link

- - ` - ); - } - let newUser = await Database.schemas.user.create({ + return res.json({ + id: user.id, email: user.email, - password_hash: user.password_hash }); - - return res.send(` - -

Sign up complete.

- - `); - } else { - return res.status(404).send(` - -

Unknown Verification Link

- - `); } }); router.post('/login', async (req, res) => { if (!req.body?.email || !req.body?.password) { return res.status(400).json({ - error: 'must have email and password fields' + error: 'must have email and password fields', }); } let user = await get_user_details_by_email(req.body.email); if (!user) { return res.status(401).json({ - error: 'incorrect email or password' + error: 'incorrect email or password', }); } let verified = verify_password(req.body.password, user.password_hash); if (!verified) { return res.status(401).json({ - error: 'incorrect email or password' + error: 'incorrect email or password', }); } - return res.json({ - userid: user.id, - session_token: get_session_token(user.id, user.password_hash) + res.cookie('userid', user.id, { + httpOnly: true, + secure: true, + }); + res.cookie('_session', get_session_token(user.id, user.password_hash), { + httpOnly: true, + secure: true, }); -}); - -router.post('/logout', async (req, res) => { - if (!req.body?.session_token || !req.body?.userid) { - return res.status(400).json({ - error: 'must include user id and session token to log out' - }); - } - - let userid = req.body?.userid; - let session_token = req.body?.session_token; - - let user = await get_user_details(userid); - if (!user) { - return res.status(401).json({ - error: 'invalid user data' - }); - } - let verified = verify_session_token(user.id, user.password_hash, session_token); - - if (!verified) { - return res.status(401).json({ - error: 'invalid user data' - }); - } - - delete session_entropy[user.id]; return res.sendStatus(204); }); @@ -276,17 +199,17 @@ router.get('/:id([a-f0-9-]+)', async (req, res) => { console.log(req.params); if (!req.params?.id) { return res.status(400).json({ - error: 'must have id parameter' + error: 'must have id parameter', }); } let id = req.params?.id; console.log(id); let user = await get_user_details(id); console.log(user); - if (user !== undefined && user !== {}) { + if (user != null) { return res.json({ id: user.id, - email: user.email + email: user.email, }); } else { return res.sendStatus(404); @@ -295,20 +218,18 @@ router.get('/:id([a-f0-9-]+)', async (req, res) => { router.use('/authorized', enforce_session_login); router.get('/authorized', async (req, res) => { - let userid = req.get('id'); + let userid = req.cookies?.userid; let user = await get_user_details(userid); return res.json({ authorized: true, user: { id: user.id, - email: user.email - } + email: user.email, + }, }); }); module.exports = { router: router, enforce_session_login: enforce_session_login, - get_user_details: get_user_details, - get_user_details_by_email: get_user_details_by_email }; diff --git a/frontend/.prettierrc.yaml b/frontend/.prettierrc.yaml deleted file mode 100644 index 3a9fff3..0000000 --- a/frontend/.prettierrc.yaml +++ /dev/null @@ -1,16 +0,0 @@ -arrowParens: 'always' -bracketSpacing: true -endOfLine: 'lf' -htmlWhitespaceSensitivity: 'css' -insertPragma: false -jsxBracketSameLine: true -jsxSingleQuote: true -printWidth: 120 -proseWrap: 'preserve' -quoteProps: 'consistent' -requirePragma: false -semi: true -singleQuote: true -tabWidth: 2 -trailingComma: 'none' -useTabs: false diff --git a/frontend/package.json b/frontend/package.json index 2ff27eb..fa63682 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -7,20 +7,12 @@ "@emotion/styled": "^11.3.0", "@material-ui/core": "^5.0.0-alpha.36", "@material-ui/icons": "^4.11.2", - "@material-ui/styles": "^4.11.4", - "@reduxjs/toolkit": "^1.6.0", "@testing-library/jest-dom": "^5.11.4", "@testing-library/react": "^11.1.0", "@testing-library/user-event": "^12.1.10", - "axios": "^0.21.1", "react": "^17.0.2", "react-dom": "^17.0.2", - "react-redux": "^7.2.4", - "react-router": "^5.2.0", - "react-router-dom": "^5.2.0", "react-scripts": "4.0.3", - "redux-logger": "^3.0.6", - "redux-thunk": "^2.3.0", "web-vitals": "^1.0.1" }, "scripts": { diff --git a/frontend/pnpm-lock.yaml b/frontend/pnpm-lock.yaml index e7b0856..1a3edd4 100644 --- a/frontend/pnpm-lock.yaml +++ b/frontend/pnpm-lock.yaml @@ -3,20 +3,12 @@ dependencies: '@emotion/styled': 11.3.0_c94ce1a602d602ceca4c9cb32dbce62d '@material-ui/core': 5.0.0-alpha.36_0cc86b8010d608d52ef25836204eb4f5 '@material-ui/icons': 4.11.2_90b48a22f51b8440edf141ccfea311d4 - '@material-ui/styles': 4.11.4_react-dom@17.0.2+react@17.0.2 - '@reduxjs/toolkit': 1.6.0_react-redux@7.2.4+react@17.0.2 '@testing-library/jest-dom': 5.14.1 '@testing-library/react': 11.2.7_react-dom@17.0.2+react@17.0.2 '@testing-library/user-event': 12.8.3 - axios: 0.21.1 react: 17.0.2 react-dom: 17.0.2_react@17.0.2 - react-redux: 7.2.4_react-dom@17.0.2+react@17.0.2 - react-router: 5.2.0_react@17.0.2 - react-router-dom: 5.2.0_react@17.0.2 react-scripts: 4.0.3_react@17.0.2 - redux-logger: 3.0.6 - redux-thunk: 2.3.0 web-vitals: 1.1.2 lockfileVersion: 5.2 packages: @@ -2038,38 +2030,6 @@ packages: optional: true resolution: integrity: sha512-1j+4tIxS6x3McJ+3O9mxwzjkci/uu09nnON7ZDgqX9O3f15D8CP8cmAy0PDm47M4utMwIqj+EaS4Y6d2PZWF5Q== - /@material-ui/styles/4.11.4_react-dom@17.0.2+react@17.0.2: - dependencies: - '@babel/runtime': 7.14.6 - '@emotion/hash': 0.8.0 - '@material-ui/types': 5.1.0 - '@material-ui/utils': 4.11.2_react-dom@17.0.2+react@17.0.2 - clsx: 1.1.1 - csstype: 2.6.17 - hoist-non-react-statics: 3.3.2 - jss: 10.6.0 - jss-plugin-camel-case: 10.6.0 - jss-plugin-default-unit: 10.6.0 - jss-plugin-global: 10.6.0 - jss-plugin-nested: 10.6.0 - jss-plugin-props-sort: 10.6.0 - jss-plugin-rule-value-function: 10.6.0 - jss-plugin-vendor-prefixer: 10.6.0 - prop-types: 15.7.2 - react: 17.0.2 - react-dom: 17.0.2_react@17.0.2 - dev: false - engines: - node: '>=8.0.0' - peerDependencies: - '@types/react': ^16.8.6 || ^17.0.0 - react: ^16.8.0 || ^17.0.0 - react-dom: ^16.8.0 || ^17.0.0 - peerDependenciesMeta: - '@types/react': - optional: true - resolution: - integrity: sha512-KNTIZcnj/zprG5LW0Sao7zw+yG3O35pviHzejMdcSGCdWbiO8qzRgOYL8JAxAsWBKOKYwVZxXtHWaB5T2Kvxew== /@material-ui/system/5.0.0-alpha.36_7874f5fd290ce587db5f5f81e8a37ea9: dependencies: '@babel/runtime': 7.14.6 @@ -2099,15 +2059,6 @@ packages: optional: true resolution: integrity: sha512-1QqINDfNv5y+5TY/p66qkWAZsQGO+HDPDFpTELXtSC9F7zzuosPdJGMM8YFD7vecY4KdDWhCvA4f2G/vI6x8nw== - /@material-ui/types/5.1.0: - dev: false - peerDependencies: - '@types/react': '*' - peerDependenciesMeta: - '@types/react': - optional: true - resolution: - integrity: sha512-7cqRjrY50b8QzRSYyhSpx4WRw2YuO0KKIGQEVk5J8uoz2BanawykgZGoWEqKm7pVIbzFDN0SpPcVV4IhOFkl8A== /@material-ui/types/6.0.1: dev: false peerDependencies: @@ -2138,21 +2089,6 @@ packages: optional: true resolution: integrity: sha512-iTlwlftnH/3w4hU/xaJePMDVsL/JtYJhruJxZ2Tt/2eVzGTvYq88PLQ5+o2VBRROnxQGKRjpNuX3nss+/RudPg== - /@material-ui/utils/4.11.2_react-dom@17.0.2+react@17.0.2: - dependencies: - '@babel/runtime': 7.14.6 - prop-types: 15.7.2 - react: 17.0.2 - react-dom: 17.0.2_react@17.0.2 - react-is: 17.0.2 - dev: false - engines: - node: '>=8.0.0' - peerDependencies: - react: ^16.8.0 || ^17.0.0 - react-dom: ^16.8.0 || ^17.0.0 - resolution: - integrity: sha512-Uul8w38u+PICe2Fg2pDKCaIG7kOyhowZ9vjiC1FsVwPABTW8vPPKfF6OvxRq3IiBaI1faOJmgdvMG7rMJARBhA== /@material-ui/utils/5.0.0-alpha.35_react@17.0.2: dependencies: '@babel/runtime': 7.14.6 @@ -2243,25 +2179,6 @@ packages: dev: false resolution: integrity: sha512-VZMYa7+fXHdwIq1TDhSXoVmSPEGM/aa+6Aiq3nVVJ9bXr24zScr+NlKFKC3iPljA7ho/GAZr+d2jOf5GIRC30Q== - /@reduxjs/toolkit/1.6.0_react-redux@7.2.4+react@17.0.2: - dependencies: - immer: 9.0.3 - react: 17.0.2 - react-redux: 7.2.4_react-dom@17.0.2+react@17.0.2 - redux: 4.1.0 - redux-thunk: 2.3.0 - reselect: 4.0.0 - dev: false - peerDependencies: - react: ^16.14.0 || ^17.0.0 - react-redux: ^7.2.1 - peerDependenciesMeta: - react: - optional: true - react-redux: - optional: true - resolution: - integrity: sha512-eGL50G+Vj5AG5uD0lineb6rRtbs96M8+hxbcwkHpZ8LQcmt0Bm33WyBSnj5AweLkjQ7ZP+KFRDHiLMznljRQ3A== /@rollup/plugin-node-resolve/7.1.3_rollup@1.32.1: dependencies: '@rollup/pluginutils': 3.1.0_rollup@1.32.1 @@ -2561,13 +2478,6 @@ packages: dev: false resolution: integrity: sha512-anKkLmZZ+xm4p8JWBf4hElkM4XR+EZeA2M9BAkkTldmcyDY4mbdIJnRghDJH3Ov5ooY7/UAoENtmdMSkaAd7Cw== - /@types/hoist-non-react-statics/3.3.1: - dependencies: - '@types/react': 17.0.11 - hoist-non-react-statics: 3.3.2 - dev: false - resolution: - integrity: sha512-iMIqiko6ooLrTh1joXodJK5X9xeEALT1kM5G3ZLhD3hszxBdIEd5C75U834D9mLcINgD4OyZf5uQXjkuYydWvA== /@types/html-minifier-terser/5.1.1: dev: false resolution: @@ -2637,15 +2547,6 @@ packages: dev: false resolution: integrity: sha512-X6jVqDIibL2sY0Qtth5EzNeUgPyoCWeBZdmE5xKr7hI4zaQDwN0VaQd7pJnlOB0mDGnOVH0cZZVXg9cnWhztQg== - /@types/react-redux/7.1.16: - dependencies: - '@types/hoist-non-react-statics': 3.3.1 - '@types/react': 17.0.11 - hoist-non-react-statics: 3.3.2 - redux: 4.1.0 - dev: false - resolution: - integrity: sha512-f/FKzIrZwZk7YEO9E1yoxIuDNRiDducxkFlkw/GNMGEnK9n4K8wJzlJBghpSuOVDgEUHoDkDF7Gi9lHNQR4siw== /@types/react-transition-group/4.4.1: dependencies: '@types/react': 17.0.11 @@ -3410,12 +3311,6 @@ packages: node: '>=4' resolution: integrity: sha512-OKRkKM4ojMEZRJ5UNJHmq9tht7cEnRnqKG6KyB/trYws00Xtkv12mHtlJ0SK7cmuNbrU8dPUova3ELTuilfBbw== - /axios/0.21.1: - dependencies: - follow-redirects: 1.14.1_debug@4.3.1 - dev: false - resolution: - integrity: sha512-dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA== /axobject-query/2.2.0: dev: false resolution: @@ -4652,13 +4547,6 @@ packages: node: '>=8.0.0' resolution: integrity: sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q== - /css-vendor/2.0.8: - dependencies: - '@babel/runtime': 7.14.6 - is-in-browser: 1.1.3 - dev: false - resolution: - integrity: sha512-x9Aq0XTInxrkuFeHKbYC7zWY8ai7qJ04Kxd9MnvbC1uO5DagxoHQjm4JvG+vCdXOoFtCjbL2XSZfxmoYa9uQVQ== /css-what/3.4.2: dev: false engines: @@ -4808,10 +4696,6 @@ packages: node: '>=8' resolution: integrity: sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A== - /csstype/2.6.17: - dev: false - resolution: - integrity: sha512-u1wmTI1jJGzCJzWndZo8mk4wnPTZd1eOIYTYvuEyOQGfmDl3TrabCCfKnOC86FZwW/9djqTl933UF/cS425i9A== /csstype/3.0.8: dev: false resolution: @@ -4900,10 +4784,6 @@ packages: dev: false resolution: integrity: sha1-JJXduvbrh0q7Dhvp3yLS5aVEMmw= - /deep-diff/0.3.8: - dev: false - resolution: - integrity: sha1-wB3mPvsO7JeYgB1Ax+Da4ltYLIQ= /deep-equal/1.1.1: dependencies: is-arguments: 1.1.0 @@ -6524,17 +6404,6 @@ packages: dev: false resolution: integrity: sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ== - /history/4.10.1: - dependencies: - '@babel/runtime': 7.14.6 - loose-envify: 1.4.0 - resolve-pathname: 3.0.0 - tiny-invariant: 1.1.0 - tiny-warning: 1.0.3 - value-equal: 1.0.1 - dev: false - resolution: - integrity: sha512-36nwAD620w12kuzPAsyINPWJqlNbij+hpK1k9XRloDtym8mxzGYl2c17LnV6IAGB2Dmg4tEa7G7DlawS0+qjew== /hmac-drbg/1.0.1: dependencies: hash.js: 1.1.7 @@ -6732,10 +6601,6 @@ packages: node: '>=8.12.0' resolution: integrity: sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw== - /hyphenate-style-name/1.0.4: - dev: false - resolution: - integrity: sha512-ygGZLjmXfPHj+ZWh6LwbC37l43MhfztxetbFCoYTM2VjkIUpeHgSNn7QIyVFj7YQ1Wl9Cbw5sholVJPzWvC2MQ== /iconv-lite/0.4.24: dependencies: safer-buffer: 2.1.2 @@ -6784,10 +6649,6 @@ packages: dev: false resolution: integrity: sha512-aqXhGP7//Gui2+UrEtvxZxSquQVXTpZ7KDxfCcKAF3Vysvw0CViVaW9RZ1j1xlIYqaaaipBoqdqeibkc18PNvA== - /immer/9.0.3: - dev: false - resolution: - integrity: sha512-mONgeNSMuyjIe0lkQPa9YhdmTv8P19IeHV0biYhcXhbd5dhdB9HSK93zBpyKjp6wersSUgT5QyU0skmejUVP2A== /import-cwd/2.1.0: dependencies: import-from: 2.1.0 @@ -6848,12 +6709,6 @@ packages: node: '>=0.8.19' resolution: integrity: sha1-khi5srkoojixPcT7a21XbyMUU+o= - /indefinite-observable/2.0.1: - dependencies: - symbol-observable: 1.2.0 - dev: false - resolution: - integrity: sha512-G8vgmork+6H9S8lUAg1gtXEj2JxIQTo0g2PbFiYOdjkziSI0F7UYBiVwhZRuixhBCNGczAls34+5HJPyZysvxQ== /indent-string/4.0.0: dev: false engines: @@ -7142,10 +6997,6 @@ packages: node: '>=0.10.0' resolution: integrity: sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg== - /is-in-browser/1.1.3: - dev: false - resolution: - integrity: sha1-Vv9NtoOgeMYILrldrX3GLh0E+DU= /is-module/1.0.0: dev: false resolution: @@ -7303,10 +7154,6 @@ packages: node: '>=8' resolution: integrity: sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww== - /isarray/0.0.1: - dev: false - resolution: - integrity: sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8= /isarray/1.0.0: dev: false resolution: @@ -7990,69 +7837,6 @@ packages: graceful-fs: 4.2.6 resolution: integrity: sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ== - /jss-plugin-camel-case/10.6.0: - dependencies: - '@babel/runtime': 7.14.6 - hyphenate-style-name: 1.0.4 - jss: 10.6.0 - dev: false - resolution: - integrity: sha512-JdLpA3aI/npwj3nDMKk308pvnhoSzkW3PXlbgHAzfx0yHWnPPVUjPhXFtLJzgKZge8lsfkUxvYSQ3X2OYIFU6A== - /jss-plugin-default-unit/10.6.0: - dependencies: - '@babel/runtime': 7.14.6 - jss: 10.6.0 - dev: false - resolution: - integrity: sha512-7y4cAScMHAxvslBK2JRK37ES9UT0YfTIXWgzUWD5euvR+JR3q+o8sQKzBw7GmkQRfZijrRJKNTiSt1PBsLI9/w== - /jss-plugin-global/10.6.0: - dependencies: - '@babel/runtime': 7.14.6 - jss: 10.6.0 - dev: false - resolution: - integrity: sha512-I3w7ji/UXPi3VuWrTCbHG9rVCgB4yoBQLehGDTmsnDfXQb3r1l3WIdcO8JFp9m0YMmyy2CU7UOV6oPI7/Tmu+w== - /jss-plugin-nested/10.6.0: - dependencies: - '@babel/runtime': 7.14.6 - jss: 10.6.0 - tiny-warning: 1.0.3 - dev: false - resolution: - integrity: sha512-fOFQWgd98H89E6aJSNkEh2fAXquC9aZcAVjSw4q4RoQ9gU++emg18encR4AT4OOIFl4lQwt5nEyBBRn9V1Rk8g== - /jss-plugin-props-sort/10.6.0: - dependencies: - '@babel/runtime': 7.14.6 - jss: 10.6.0 - dev: false - resolution: - integrity: sha512-oMCe7hgho2FllNc60d9VAfdtMrZPo9n1Iu6RNa+3p9n0Bkvnv/XX5San8fTPujrTBScPqv9mOE0nWVvIaohNuw== - /jss-plugin-rule-value-function/10.6.0: - dependencies: - '@babel/runtime': 7.14.6 - jss: 10.6.0 - tiny-warning: 1.0.3 - dev: false - resolution: - integrity: sha512-TKFqhRTDHN1QrPTMYRlIQUOC2FFQb271+AbnetURKlGvRl/eWLswcgHQajwuxI464uZk91sPiTtdGi7r7XaWfA== - /jss-plugin-vendor-prefixer/10.6.0: - dependencies: - '@babel/runtime': 7.14.6 - css-vendor: 2.0.8 - jss: 10.6.0 - dev: false - resolution: - integrity: sha512-doJ7MouBXT1lypLLctCwb4nJ6lDYqrTfVS3LtXgox42Xz0gXusXIIDboeh6UwnSmox90QpVnub7au8ybrb0krQ== - /jss/10.6.0: - dependencies: - '@babel/runtime': 7.14.6 - csstype: 3.0.8 - indefinite-observable: 2.0.1 - is-in-browser: 1.1.3 - tiny-warning: 1.0.3 - dev: false - resolution: - integrity: sha512-n7SHdCozmxnzYGXBHe0NsO0eUf9TvsHVq2MXvi4JmTn3x5raynodDVE/9VQmBdWFyyj9HpHZ2B4xNZ7MMy7lkw== /jsx-ast-utils/3.2.0: dependencies: array-includes: 3.1.3 @@ -8489,18 +8273,6 @@ packages: node: '>=4' resolution: integrity: sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg== - /mini-create-react-context/0.4.1_prop-types@15.7.2+react@17.0.2: - dependencies: - '@babel/runtime': 7.14.6 - prop-types: 15.7.2 - react: 17.0.2 - tiny-warning: 1.0.3 - dev: false - peerDependencies: - prop-types: ^15.0.0 - react: ^0.14.0 || ^15.0.0 || ^16.0.0 || ^17.0.0 - resolution: - integrity: sha512-YWCYEmd5CQeHGSAKrYvXgmzzkrvssZcuuQDDeqkT+PziKGMgE+0MCCtcKbROzocGBG1meBLl2FotlRwf4gAzbQ== /mini-css-extract-plugin/0.11.3_webpack@4.44.2: dependencies: loader-utils: 1.4.0 @@ -9282,12 +9054,6 @@ packages: dev: false resolution: integrity: sha1-32BBeABfUi8V60SQ5yR6G/qmf4w= - /path-to-regexp/1.8.0: - dependencies: - isarray: 0.0.1 - dev: false - resolution: - integrity: sha512-n43JRhlUKUAlibEJhPeir1ncUID16QnEjNpwzNdO3Lm4ywrBpBZ5oLD0I6br9evr1Y9JTqwRtAh7JLoOzAQdVA== /path-type/3.0.0: dependencies: pify: 3.0.0 @@ -10450,67 +10216,12 @@ packages: dev: false resolution: integrity: sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w== - /react-redux/7.2.4_react-dom@17.0.2+react@17.0.2: - dependencies: - '@babel/runtime': 7.14.6 - '@types/react-redux': 7.1.16 - hoist-non-react-statics: 3.3.2 - loose-envify: 1.4.0 - prop-types: 15.7.2 - react: 17.0.2 - react-dom: 17.0.2_react@17.0.2 - react-is: 16.13.1 - dev: false - peerDependencies: - react: ^16.8.3 || ^17 - react-dom: '*' - react-native: '*' - peerDependenciesMeta: - react-dom: - optional: true - react-native: - optional: true - resolution: - integrity: sha512-hOQ5eOSkEJEXdpIKbnRyl04LhaWabkDPV+Ix97wqQX3T3d2NQ8DUblNXXtNMavc7DpswyQM6xfaN4HQDKNY2JA== /react-refresh/0.8.3: dev: false engines: node: '>=0.10.0' resolution: integrity: sha512-X8jZHc7nCMjaCqoU+V2I0cOhNW+QMBwSUkeXnTi8IPe6zaRWfn60ZzvFDZqWPfmSJfjub7dDW1SP0jaHWLu/hg== - /react-router-dom/5.2.0_react@17.0.2: - dependencies: - '@babel/runtime': 7.14.6 - history: 4.10.1 - loose-envify: 1.4.0 - prop-types: 15.7.2 - react: 17.0.2 - react-router: 5.2.0_react@17.0.2 - tiny-invariant: 1.1.0 - tiny-warning: 1.0.3 - dev: false - peerDependencies: - react: '>=15' - resolution: - integrity: sha512-gxAmfylo2QUjcwxI63RhQ5G85Qqt4voZpUXSEqCwykV0baaOTQDR1f0PmY8AELqIyVc0NEZUj0Gov5lNGcXgsA== - /react-router/5.2.0_react@17.0.2: - dependencies: - '@babel/runtime': 7.14.6 - history: 4.10.1 - hoist-non-react-statics: 3.3.2 - loose-envify: 1.4.0 - mini-create-react-context: 0.4.1_prop-types@15.7.2+react@17.0.2 - path-to-regexp: 1.8.0 - prop-types: 15.7.2 - react: 17.0.2 - react-is: 16.13.1 - tiny-invariant: 1.1.0 - tiny-warning: 1.0.3 - dev: false - peerDependencies: - react: '>=15' - resolution: - integrity: sha512-smz1DUuFHRKdcJC0jobGo8cVbhO3x50tCL4icacOlcwDOEQPq4TMqwx3sY1TP+DvtTgz4nm3thuo7A+BK2U0Dw== /react-scripts/4.0.3_react@17.0.2: dependencies: '@babel/core': 7.12.3 @@ -10707,22 +10418,6 @@ packages: node: '>=8' resolution: integrity: sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg== - /redux-logger/3.0.6: - dependencies: - deep-diff: 0.3.8 - dev: false - resolution: - integrity: sha1-91VZZvMJjzyIYExEnPC69XeCdL8= - /redux-thunk/2.3.0: - dev: false - resolution: - integrity: sha512-km6dclyFnmcvxhAcrQV2AkZmPQjzPDjgVlQtR0EQjxZPyJ0BnMf3in1ryuR8A2qU0HldVRfxYXbFSKlI3N7Slw== - /redux/4.1.0: - dependencies: - '@babel/runtime': 7.14.6 - dev: false - resolution: - integrity: sha512-uI2dQN43zqLWCt6B/BMGRMY6db7TTY4qeHHfGeKb3EOhmOKjU3KdWvNLJyqaHRksv/ErdNH7cFZWg9jXtewy4g== /regenerate-unicode-properties/8.2.0: dependencies: regenerate: 1.4.2 @@ -10853,10 +10548,6 @@ packages: dev: false resolution: integrity: sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8= - /reselect/4.0.0: - dev: false - resolution: - integrity: sha512-qUgANli03jjAyGlnbYVAV5vvnOmJnODyABz51RdBN7M4WaVu8mecZWgyQNkG8Yqe3KRGRt0l4K4B3XVEULC4CA== /resolve-cwd/2.0.0: dependencies: resolve-from: 3.0.0 @@ -10891,10 +10582,6 @@ packages: node: '>=8' resolution: integrity: sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw== - /resolve-pathname/3.0.0: - dev: false - resolution: - integrity: sha512-C7rARubxI8bXFNB/hqcp/4iUeIXJhJZvFPFPiSPRnhU5UPxzMFIl+2E6yY6c4k9giDJAhtV+enfA+G89N6Csng== /resolve-url-loader/3.1.3: dependencies: adjust-sourcemap-loader: 3.0.0 @@ -11874,12 +11561,6 @@ packages: hasBin: true resolution: integrity: sha512-yhy/sQYxR5BkC98CY7o31VGsg014AKLEPxdfhora76l36hD9Rdy5NZA/Ocn6yayNPgSamYdtX2rFJdcv07AYVw== - /symbol-observable/1.2.0: - dev: false - engines: - node: '>=0.10.0' - resolution: - integrity: sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ== /symbol-tree/3.2.4: dev: false resolution: @@ -12042,14 +11723,6 @@ packages: dev: false resolution: integrity: sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q= - /tiny-invariant/1.1.0: - dev: false - resolution: - integrity: sha512-ytxQvrb1cPc9WBEI/HSeYYoGD0kWnGEOR8RY6KomWLBVhqz0RgTwVO9dLrGz7dC+nN9llyI7OKAgRq8Vq4ZBSw== - /tiny-warning/1.0.3: - dev: false - resolution: - integrity: sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA== /tmpl/1.0.4: dev: false resolution: @@ -12485,10 +12158,6 @@ packages: dev: false resolution: integrity: sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew== - /value-equal/1.0.1: - dev: false - resolution: - integrity: sha512-NOJ6JZCAWr0zlxZt+xqCHNTEKOsrks2HQd4MqhP1qy4z1SkbEP467eNx6TgDKXMvUOb+OENfJCZwM+16n7fRfw== /vary/1.1.2: dev: false engines: @@ -13071,18 +12740,10 @@ specifiers: '@emotion/styled': ^11.3.0 '@material-ui/core': ^5.0.0-alpha.36 '@material-ui/icons': ^4.11.2 - '@material-ui/styles': ^4.11.4 - '@reduxjs/toolkit': ^1.6.0 '@testing-library/jest-dom': ^5.11.4 '@testing-library/react': ^11.1.0 '@testing-library/user-event': ^12.1.10 - axios: ^0.21.1 react: ^17.0.2 react-dom: ^17.0.2 - react-redux: ^7.2.4 - react-router: ^5.2.0 - react-router-dom: ^5.2.0 react-scripts: 4.0.3 - redux-logger: ^3.0.6 - redux-thunk: ^2.3.0 web-vitals: ^1.0.1 diff --git a/frontend/public/config.json b/frontend/public/config.json deleted file mode 100644 index c30666f..0000000 --- a/frontend/public/config.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "hosts": { - "localhost:3000": "LOCAL", - "todo.j4.pm": "prod" - }, - "defaultConfig": {}, - "configs": { - "LOCAL": {}, - "prod": {} - } -} \ No newline at end of file diff --git a/frontend/src/App.css b/frontend/src/App.css new file mode 100644 index 0000000..74b5e05 --- /dev/null +++ b/frontend/src/App.css @@ -0,0 +1,38 @@ +.App { + text-align: center; +} + +.App-logo { + height: 40vmin; + pointer-events: none; +} + +@media (prefers-reduced-motion: no-preference) { + .App-logo { + animation: App-logo-spin infinite 20s linear; + } +} + +.App-header { + background-color: #282c34; + min-height: 100vh; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + font-size: calc(10px + 2vmin); + color: white; +} + +.App-link { + color: #61dafb; +} + +@keyframes App-logo-spin { + from { + transform: rotate(0deg); + } + to { + transform: rotate(360deg); + } +} diff --git a/frontend/src/App.js b/frontend/src/App.js index fd79436..3784575 100644 --- a/frontend/src/App.js +++ b/frontend/src/App.js @@ -1,71 +1,25 @@ -import { BrowserRouter as Router, Switch, Route, Redirect } from 'react-router-dom'; -import RootPage from './modules/Root'; -import AboutPage from './modules/About'; -import AccountPage from './modules/Account'; -import LoginPage from './modules/Login'; -import SignupPage from './modules/Signup'; -import TodoPage from './modules/TodoList'; -import { connect } from 'react-redux'; -import ThemeProvider from './ThemeProvider'; -import Navbar from './Navbar'; +import logo from './logo.svg'; +import './App.css'; -const App = (props) => { +function App() { return ( - - - - - - - - - - - - - - - - - - - - - - - - - +
+
+ logo +

+ Edit src/App.js and save to reload. +

+ + Learn React + +
+
); -}; - -const PRoute = connect( - (state) => { - return { - token: state.login.token - }; - }, - (dispatch, props) => { - return {}; - } -)(({ children, ...props }) => { - return ( - { - return props.token !== undefined ? ( - children - ) : ( - - ); - }} - /> - ); -}); +} export default App; diff --git a/frontend/src/App.test.js b/frontend/src/App.test.js new file mode 100644 index 0000000..1f03afe --- /dev/null +++ b/frontend/src/App.test.js @@ -0,0 +1,8 @@ +import { render, screen } from '@testing-library/react'; +import App from './App'; + +test('renders learn react link', () => { + render(); + const linkElement = screen.getByText(/learn react/i); + expect(linkElement).toBeInTheDocument(); +}); diff --git a/frontend/src/Navbar.js b/frontend/src/Navbar.js deleted file mode 100644 index 109af8f..0000000 --- a/frontend/src/Navbar.js +++ /dev/null @@ -1,122 +0,0 @@ -import Grid from '@material-ui/core/Grid'; -import GroupIcon from '@material-ui/icons/Group'; -import SettingsIcon from '@material-ui/icons/Settings'; -import AssignmentIndIcon from '@material-ui/icons/AssignmentInd'; -import Box from '@material-ui/core/Box'; -import Typography from '@material-ui/core/Typography'; -import Button from '@material-ui/core/Button'; -import ExitToAppIcon from '@material-ui/icons/ExitToApp'; -import { connect } from 'react-redux'; -import { withStyles } from '@material-ui/styles'; -import { logout } from './reducers/login'; - -const styles = (theme) => { - return { - container: { - width: '100%' - }, - flexbox: { - display: 'flex', - flexGrow: 1, - width: 'auto' - }, - buttonWrapper: { - alignItems: 'flex-end' - }, - button: { - alignItems: 'flex-end' - }, - typography: { - margin: '5px 0px' - } - }; -}; - -const Navbar = (props) => { - const { classes } = props; - return ( -
- - - - - - - - -
- ); -}; - -const LoginLogoutButton = connect( - (state) => { - return { - token: state.login.token - }; - }, - (dispatch, props) => { - return {}; - } -)(({ children, ...props }) => { - const { classes } = props; - return props.token !== undefined ? ( - <> - - - - ) : ( - <> - - - - ); -}); - -export default connect( - (state, props) => { - return {}; - }, - (dispatch, props) => { - return { - logout: () => { - dispatch(logout()); - } - }; - } -)(withStyles(styles)(Navbar)); diff --git a/frontend/src/ThemeProvider.js b/frontend/src/ThemeProvider.js deleted file mode 100644 index 75a0fa7..0000000 --- a/frontend/src/ThemeProvider.js +++ /dev/null @@ -1,37 +0,0 @@ -import CssBaseline from '@material-ui/core/CssBaseline'; -import { withStyles, withTheme } from '@material-ui/styles'; -import { createTheme, ThemeProvider } from '@material-ui/core/styles'; -import theme from './theme'; - -const styles = () => { - return { - root: { - height: '100vh', - zIndex: 1, - overflow: 'hidden', - position: 'relative', - display: 'flex' - }, - content: { - zIndex: 3, - flexGrow: 1 - }, - spacing: (n) => { - return `${n * 2}px`; - } - }; -}; - -const ThemeWrapper = (props) => { - const { children, classes } = props; - return ( - - -
- {children} -
- - ); -}; - -export default withTheme(withStyles(styles)(ThemeWrapper)); diff --git a/frontend/src/index.css b/frontend/src/index.css new file mode 100644 index 0000000..ec2585e --- /dev/null +++ b/frontend/src/index.css @@ -0,0 +1,13 @@ +body { + margin: 0; + font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen', + 'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue', + sans-serif; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; +} + +code { + font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New', + monospace; +} diff --git a/frontend/src/index.js b/frontend/src/index.js index 7362884..ef2edf8 100644 --- a/frontend/src/index.js +++ b/frontend/src/index.js @@ -1,79 +1,17 @@ import React from 'react'; import ReactDOM from 'react-dom'; -import { Provider } from 'react-redux'; +import './index.css'; import App from './App'; import reportWebVitals from './reportWebVitals'; -import { configureStore } from '@reduxjs/toolkit'; -import RootReducer from './reducers'; -import axios from 'axios'; -import logger from 'redux-logger'; -const defaultConfig = { - apiUrl: 'http://localhost:8080/api' -}; - -const renderApp = ({ config, user }) => { - const isDev = process.env.NODE_ENV !== 'production'; - const store = configureStore({ - devTools: isDev, - preloadedState: { - config: config, - login: user - }, - reducer: RootReducer, - middleware: (getDefaultMiddleware) => getDefaultMiddleware().concat(logger) - }); - ReactDOM.render( - - - , - document.getElementById('root') - ); -}; +ReactDOM.render( + + + , + document.getElementById('root') +); // If you want to start measuring performance in your app, pass a function // to log results (for example: reportWebVitals(console.log)) // or send to an analytics endpoint. Learn more: https://bit.ly/CRA-vitals reportWebVitals(); - -const findConfig = (fullConfig) => { - return Object.assign(fullConfig.defaultConfig, fullConfig.configs[fullConfig.hosts[window.location.host]]); -}; - -axios - .get('/config.json') - .then( - (success) => { - return Object.assign(defaultConfig, findConfig(success.data)); - }, - () => { - return defaultConfig; - } - ) - .then((config) => { - const details = JSON.parse(localStorage.getItem('userDetails') || '{}'); - return axios - .get(`${config.apiUrl}/user/authorized`, { - headers: { - id: details.id, - Authorization: details.token - } - }) - .then( - (success) => { - return { - config, - user: details || {} - }; - }, - () => { - return { - config, - user: {} - }; - } - ); - }) - .then(({ config, user }) => { - renderApp({ config, user }); - }); diff --git a/frontend/src/logo.svg b/frontend/src/logo.svg new file mode 100644 index 0000000..9dfc1c0 --- /dev/null +++ b/frontend/src/logo.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/src/modules/About/index.js b/frontend/src/modules/About/index.js deleted file mode 100644 index 5a88a04..0000000 --- a/frontend/src/modules/About/index.js +++ /dev/null @@ -1,5 +0,0 @@ -const AboutPage = (props) => { - return
; -}; - -export default AboutPage; diff --git a/frontend/src/modules/Account/index.js b/frontend/src/modules/Account/index.js deleted file mode 100644 index dfbbd52..0000000 --- a/frontend/src/modules/Account/index.js +++ /dev/null @@ -1,5 +0,0 @@ -const AccountPage = (props) => { - return
; -}; - -export default AccountPage; diff --git a/frontend/src/modules/Login/index.js b/frontend/src/modules/Login/index.js deleted file mode 100644 index dc4c78e..0000000 --- a/frontend/src/modules/Login/index.js +++ /dev/null @@ -1,163 +0,0 @@ -import { login, forgotPassword } from '../../reducers/login'; -import { useState } from 'react'; -import Button from '@material-ui/core/Button'; -import Grid from '@material-ui/core/Grid'; -import InputAdornment from '@material-ui/core/InputAdornment'; -import IconButton from '@material-ui/core/IconButton'; -import TextField from '@material-ui/core/TextField'; -import Typography from '@material-ui/core/Typography'; -import Visibility from '@material-ui/icons/Visibility'; -import VisibilityOff from '@material-ui/icons/VisibilityOff'; -import { connect } from 'react-redux'; -import { withStyles } from '@material-ui/styles'; - -const styles = (theme) => {}; - -const LoginPage = (props) => { - const [email, setEmail] = useState(''); - const [password, setPassword] = useState(''); - const [visible, setVisible] = useState(false); - const [error, setError] = useState(false); - const [forgotPassword, setForgotPassword] = useState(false); - - const handleForgotPassword = () => { - if (!!email) { - props.forgotPassword(email); - setForgotPassword(false); - setError(false); - setEmail(''); - } else { - setError(true); - } - }; - return ( - - -
-
- - {forgotPassword ? 'Reset Password' : 'Sign in'} - - { - return setEmail(event.target.value ?? ''); - }} - onKeyPress={(event) => { - if (event.key === 'Enter') { - forgotPassword ? props.forgotPassword(email) : props.login(email, password); - } - }} - /> - {forgotPassword === false ? ( - <> -
- { - setPassword(event.target.value ?? ''); - }} - onKeyPress={(event) => { - if (event.key === 'Enter') { - props.login(email, password); - } - }} - InputProps={{ - endAdornment: ( - - { - return setVisible(!visible); - }} - edge='end'> - {visible ? : } - - - ) - }} - /> -
- -
-
- - - ) : ( - - - - - - - - - )} -
-
- - - ); -}; - -export default connect( - (state) => { - return {}; - }, - (dispatch, props) => { - return { - login: (email, password) => { - dispatch(login(email, password)); - }, - forgotPassword: (email) => { - dispatch(forgotPassword(email)); - } - }; - } -)(withStyles(styles)(LoginPage)); diff --git a/frontend/src/modules/Root/index.js b/frontend/src/modules/Root/index.js deleted file mode 100644 index d3df59d..0000000 --- a/frontend/src/modules/Root/index.js +++ /dev/null @@ -1,5 +0,0 @@ -const RootPage = (props) => { - return
; -}; - -export default RootPage; diff --git a/frontend/src/modules/Signup/index.js b/frontend/src/modules/Signup/index.js deleted file mode 100644 index e5402a5..0000000 --- a/frontend/src/modules/Signup/index.js +++ /dev/null @@ -1,162 +0,0 @@ -import { signup } from '../../reducers/login'; -import { useState } from 'react'; -import Button from '@material-ui/core/Button'; -import Grid from '@material-ui/core/Grid'; -import InputAdornment from '@material-ui/core/InputAdornment'; -import IconButton from '@material-ui/core/IconButton'; -import TextField from '@material-ui/core/TextField'; -import Typography from '@material-ui/core/Typography'; -import Visibility from '@material-ui/icons/Visibility'; -import VisibilityOff from '@material-ui/icons/VisibilityOff'; -import { connect } from 'react-redux'; -import { withStyles } from '@material-ui/styles'; - -const styles = (theme) => {}; - -const SignupPage = (props) => { - const { classes } = props; - const [email, setEmail] = useState(''); - const [password, setPassword] = useState(''); - const [confirmPassword, setConfirmPassword] = useState(''); - const [visible, setVisible] = useState(false); - const [error, setError] = useState(false); - const checkSignup = () => { - if (password !== confirmPassword) { - setError(true); - } else { - setError(false); - } - }; - - return ( - - -
-
- - Sign Up - - { - return setEmail(event.target.value ?? ''); - }} - onKeyPress={(event) => { - if (event.key === 'Enter') { - checkSignup(); - if (!error) { - props.signup(email, password); - } - } - }} - /> -
- { - setPassword(event.target.value ?? ''); - }} - onKeyPress={(event) => { - if (event.key === 'Enter') { - checkSignup(); - if (!error) { - props.signup(email, password); - } - } - }} - InputProps={{ - endAdornment: ( - - { - return setVisible(!visible); - }} - edge='end'> - {visible ? : } - - - ) - }} - /> -
-
- { - setConfirmPassword(event.target.value ?? ''); - }} - onKeyPress={(event) => { - checkSignup(); - if (event.key === 'Enter') { - if (!error) { - props.signup(email, password); - } - } - }} - InputProps={{ - endAdornment: ( - - { - return setVisible(!visible); - }} - edge='end'> - {visible ? : } - - - ) - }} - /> -
- -
-
- - - ); -}; - -export default connect( - (state) => { - return {}; - }, - (dispatch, props) => { - return { - signup: (email, password) => { - dispatch(signup(email, password)); - } - }; - } -)(withStyles(styles)(SignupPage)); diff --git a/frontend/src/modules/TodoList/index.js b/frontend/src/modules/TodoList/index.js deleted file mode 100644 index 1a7a5ea..0000000 --- a/frontend/src/modules/TodoList/index.js +++ /dev/null @@ -1,5 +0,0 @@ -const TodoPage = (props) => { - return
; -}; - -export default TodoPage; diff --git a/frontend/src/reducers/config.js b/frontend/src/reducers/config.js deleted file mode 100644 index 87cfb4a..0000000 --- a/frontend/src/reducers/config.js +++ /dev/null @@ -1,28 +0,0 @@ -import { createAction, createAsyncAction } from './utils'; -import { createReducer } from '@reduxjs/toolkit'; - -const actions = { - refresh: 'LOCAL_STORAGE_REFRESH' -}; - -export const getConfigValue = createAsyncAction((dispatch, getState, config, key) => { - const payload = { - key: key, - value: JSON.parse(localStorage.getItem(key)) || undefined - }; - return dispatch(refreshConfigValue(payload)); -}); -export const setConfigValue = createAsyncAction((dispatch, getState, config, key, value) => { - localStorage.setItem(key, JSON.stringify(value)); - return dispatch(refreshConfigValue({ key: key, value: value })); -}); - -export const refreshConfigValue = createAction(actions.refresh, (payload) => { - return payload; -}); - -export default createReducer({}, (builder) => { - builder.addDefaultCase((state, action) => { - state[action.payload?.key] = action.payload?.value; - }); -}); diff --git a/frontend/src/reducers/index.js b/frontend/src/reducers/index.js deleted file mode 100644 index e8c5219..0000000 --- a/frontend/src/reducers/index.js +++ /dev/null @@ -1,10 +0,0 @@ -import { combineReducers } from '@reduxjs/toolkit'; -import LocalStorageReducer from './localStorage'; -import LoginReducer from './login'; -import ConfigReducer from './config'; - -export default combineReducers({ - localStorage: LocalStorageReducer, - login: LoginReducer, - config: ConfigReducer -}); diff --git a/frontend/src/reducers/localStorage.js b/frontend/src/reducers/localStorage.js deleted file mode 100644 index 9eff4bf..0000000 --- a/frontend/src/reducers/localStorage.js +++ /dev/null @@ -1,28 +0,0 @@ -import { createAction, createAsyncAction } from './utils'; -import { createReducer } from '@reduxjs/toolkit'; - -const actions = { - refresh: 'LOCAL_STORAGE_REFRESH' -}; - -export const readLocalStorage = createAsyncAction((dispatch, getState, config, key) => { - const payload = { - key: key, - value: JSON.parse(localStorage.getItem(key)) || undefined - }; - return dispatch(refreshLocalStorage(payload)); -}); -export const updateLocalStorage = createAsyncAction((dispatch, getState, config, key, value) => { - localStorage.setItem(key, JSON.stringify(value)); - return dispatch(refreshLocalStorage({ key: key, value: value })); -}); - -export const refreshLocalStorage = createAction(actions.refresh, (payload) => { - return payload; -}); - -export default createReducer({}, (builder) => { - builder.addDefaultCase((state, action) => { - state[action.payload?.key] = action.payload?.value; - }); -}); diff --git a/frontend/src/reducers/login.js b/frontend/src/reducers/login.js deleted file mode 100644 index 79e3ea3..0000000 --- a/frontend/src/reducers/login.js +++ /dev/null @@ -1,120 +0,0 @@ -import axios from 'axios'; -import { createAction, createAsyncAction } from './utils'; -import { createReducer } from '@reduxjs/toolkit'; -import { updateLocalStorage } from './localStorage'; - -const actions = { - update: 'UPDATE_LOGIN_DETAILS' -}; - -const updateLoginDetails = createAction(actions.update, (payload) => { - return payload; -}); - -export const login = createAsyncAction((dispatch, getState, config, email, password) => { - axios - .post(`${config.apiUrl}/user/login`, { - email: email, - password: password - }) - .then( - (success) => { - console.error('success', success); - dispatch( - updateLoginDetails({ - id: success.data['userid'], - token: success.data['session_token'], - error: false - }) - ); - dispatch( - updateLocalStorage('userDetails', { - id: success.data['userid'], - token: success.data['session_token'] - }) - ); - window.location.pathname = '/'; - }, - (reject) => { - console.error(reject); - dispatch( - updateLoginDetails({ - id: undefined, - token: undefined, - error: true - }) - ); - dispatch( - updateLocalStorage('userDetails', { - id: undefined, - token: undefined - }) - ); - } - ); -}); - -export const signup = createAsyncAction((dispatch, getState, config, email, password) => { - axios - .post(`${config.apiUrl}/user/signup`, { - email: email, - password: password - }) - .then( - (success) => { - console.error('success', success); - window.location.pathname = '/login'; - }, - (reject) => { - console.error(reject); - } - ); -}); - -export const forgotPassword = createAsyncAction((dispatch, getState, config, email) => {}); - -export const logout = createAsyncAction((dispatch, getState, config) => { - const details = getState().login; - axios - .post(`${config.apiUrl}/user/logout`, { - userid: details.id, - session_token: details.token - }) - .then( - (success) => { - dispatch( - updateLoginDetails({ - id: undefined, - token: undefined, - error: false - }) - ); - dispatch( - updateLocalStorage('userDetails', { - id: undefined, - token: undefined - }) - ); - - window.location.pathname = '/login'; - }, - (reject) => { - console.warn(reject); - console.warn('could not log out.'); - } - ); -}); - -export default createReducer( - { - id: undefined, - token: undefined, - error: false - }, - (builder) => { - builder.addCase(actions.update, (state, action) => { - console.error(state, action); - state = { ...state, ...action?.payload }; - }); - } -); diff --git a/frontend/src/reducers/utils.js b/frontend/src/reducers/utils.js deleted file mode 100644 index 29de8b4..0000000 --- a/frontend/src/reducers/utils.js +++ /dev/null @@ -1,16 +0,0 @@ -export const createAction = (type, payload) => { - return (...args) => { - return { - type: type, - payload: payload(...args) - }; - }; -}; - -export const createAsyncAction = (payload) => { - return (...args) => { - return function (dispatch, getState, config) { - payload(dispatch, getState, getState()?.config, ...args); - }; - }; -}; diff --git a/frontend/src/theme.js b/frontend/src/theme.js deleted file mode 100644 index 3eb926f..0000000 --- a/frontend/src/theme.js +++ /dev/null @@ -1,13 +0,0 @@ -import grey from '@material-ui/core/colors/grey'; - -const theme = { - palette: { - primary: { - main: grey[200] - }, - secondary: { - main: grey[200] - } - } -}; -export default theme; diff --git a/readme.md b/readme.md deleted file mode 100644 index fe72d3f..0000000 --- a/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# Todo app - -literally i have adhd so fucking bad this is my attempt to make something that i can actually use to keep track of my shit