From 5d784d688a6f94af745fd686d9ef55d0b445f5e0 Mon Sep 17 00:00:00 2001 From: glidaa Date: Thu, 13 Jan 2022 15:39:20 +1100 Subject: [PATCH 1/8] changed birthdate and gender --- .gitignore | 1 + amplify/.config/project-config.json | 6 +- .../fsCognito-cloudformation-template.yml | 7 - .../src/package-lock.json | 46 ++ .../function/fsCoreApiResolver/src/index.js | 10 - .../fsCoreApiResolver/src/package-lock.json | 100 ++- .../fsJoinProject/src/package-lock.json | 680 +----------------- .../fsLeaveProject/src/package-lock.json | 10 +- .../fsSendRealtimeData/src/package-lock.json | 10 +- .../fsUserDisconnection/src/package-lock.json | 10 +- amplify/hooks/README.md | 7 + amplify/team-provider-info.json | 63 ++ package.json | 3 + public/index.html | 2 +- src/assets/chevron-right-outline.svg | 9 + src/aws-exports.js | 8 +- src/components/ActionSheet.js | 2 +- src/components/AuthFlow/NewAccount.js | 59 +- .../AuthFlow/NewAccount.module.scss | 8 - src/components/SidePanel/AccountSettings.js | 45 +- src/components/TasksPanel/TaskItem.js | 12 +- .../TasksPanel/TaskItem.module.scss | 2 +- .../UI/fields/CardSelect.module.scss | 2 +- .../UI/fields/DateField.module.scss | 2 +- src/components/UI/fields/Select.module.scss | 4 +- src/components/UI/fields/TagField.module.scss | 4 +- .../UI/fields/TextField.module.scss | 2 +- src/components/UI/fields/Textarea.module.scss | 2 +- src/graphql/mutations.js | 4 - src/graphql/queries.js | 6 - src/graphql/schema.json | 123 +--- src/graphql/subscriptions.js | 2 - 32 files changed, 271 insertions(+), 980 deletions(-) create mode 100644 amplify/hooks/README.md create mode 100644 src/assets/chevron-right-outline.svg diff --git a/.gitignore b/.gitignore index 0e272c9f..996c98c6 100644 --- a/.gitignore +++ b/.gitignore @@ -33,6 +33,7 @@ amplify/backend/.temp build/ dist/ node_modules/ +aws-exports.js awsconfiguration.json amplifyconfiguration.json amplifyconfiguration.dart diff --git a/amplify/.config/project-config.json b/amplify/.config/project-config.json index 9c27728b..c9f7c3b9 100644 --- a/amplify/.config/project-config.json +++ b/amplify/.config/project-config.json @@ -2,7 +2,7 @@ "providers": [ "awscloudformation" ], - "projectName": "fstestttt", + "projectName": "forwardslash", "version": "3.1", "frontend": "javascript", "javascript": { @@ -10,8 +10,8 @@ "config": { "SourceDir": "src", "DistributionDir": "build", - "BuildCommand": "npm.cmd run-script build", - "StartCommand": "npm.cmd run-script start" + "BuildCommand": "yarn", + "StartCommand": "yarn start" } } } \ No newline at end of file diff --git a/amplify/backend/auth/fsCognito/fsCognito-cloudformation-template.yml b/amplify/backend/auth/fsCognito/fsCognito-cloudformation-template.yml index c2fbcc94..29c071d2 100644 --- a/amplify/backend/auth/fsCognito/fsCognito-cloudformation-template.yml +++ b/amplify/backend/auth/fsCognito/fsCognito-cloudformation-template.yml @@ -178,9 +178,6 @@ Resources: ] Schema: - - Name: birthdate - Required: true - Mutable: true - Name: email Required: true @@ -190,10 +187,6 @@ Resources: Required: true Mutable: true - - Name: gender - Required: true - Mutable: true - - Name: given_name Required: true Mutable: true diff --git a/amplify/backend/function/fsCognitoPostConfirmation/src/package-lock.json b/amplify/backend/function/fsCognitoPostConfirmation/src/package-lock.json index 5cf66ac9..b8c0c9f9 100644 --- a/amplify/backend/function/fsCognitoPostConfirmation/src/package-lock.json +++ b/amplify/backend/function/fsCognitoPostConfirmation/src/package-lock.json @@ -4,6 +4,42 @@ "lockfileVersion": 1, "requires": true, "dependencies": { + "@sendgrid/client": { + "version": "7.6.0", + "resolved": "https://registry.npmjs.org/@sendgrid/client/-/client-7.6.0.tgz", + "integrity": "sha512-cpBVZKLlMTO+vpE18krTixubYmZa98oTbLkqBDuTiA3zRkW+urrxg7pDR24TkI35Mid0Zru8jDHwnOiqrXu0TA==", + "requires": { + "@sendgrid/helpers": "^7.6.0", + "axios": "^0.21.4" + }, + "dependencies": { + "axios": { + "version": "0.21.4", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz", + "integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==", + "requires": { + "follow-redirects": "^1.14.0" + } + } + } + }, + "@sendgrid/helpers": { + "version": "7.6.0", + "resolved": "https://registry.npmjs.org/@sendgrid/helpers/-/helpers-7.6.0.tgz", + "integrity": "sha512-0uWD+HSXLl4Z/X3cN+UMQC20RE7xwAACgppnfjDyvKG0KvJcUgDGz7HDdQkiMUdcVWfmyk6zKSg7XKfKzBjTwA==", + "requires": { + "deepmerge": "^4.2.2" + } + }, + "@sendgrid/mail": { + "version": "7.6.0", + "resolved": "https://registry.npmjs.org/@sendgrid/mail/-/mail-7.6.0.tgz", + "integrity": "sha512-0KdaSZzflJD/vUAZjB3ALBIuaVGoLq22hrb2fvQXZHRepU/yhRNlEOqrr05MfKBnKskzq1blnD1J0fHxiwaolw==", + "requires": { + "@sendgrid/client": "^7.6.0", + "@sendgrid/helpers": "^7.6.0" + } + }, "axios": { "version": "0.24.0", "resolved": "https://registry.npmjs.org/axios/-/axios-0.24.0.tgz", @@ -12,6 +48,16 @@ "follow-redirects": "^1.14.4" } }, + "deepmerge": { + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz", + "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==" + }, + "dotenv": { + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-10.0.0.tgz", + "integrity": "sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q==" + }, "follow-redirects": { "version": "1.14.5", "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.5.tgz", diff --git a/amplify/backend/function/fsCoreApiResolver/src/index.js b/amplify/backend/function/fsCoreApiResolver/src/index.js index 6c1d5c6c..e5c5d95b 100644 --- a/amplify/backend/function/fsCoreApiResolver/src/index.js +++ b/amplify/backend/function/fsCoreApiResolver/src/index.js @@ -1063,14 +1063,6 @@ exports.handler = async function (ctx) { ...((updateData.lastName && [{ Name: 'family_name', Value: updateData.lastName - }]) || []), - ...((updateData.birthdate && [{ - Name: 'birthdate', - Value: updateData.birthdate - }]) || []), - ...((updateData.gender && [{ - Name: 'gender', - Value: updateData.gender }]) || []) ], UserPoolId: USERPOOL, @@ -2315,8 +2307,6 @@ exports.handler = async function (ctx) { username firstName lastName - gender - birthdate email plan avatar diff --git a/amplify/backend/function/fsCoreApiResolver/src/package-lock.json b/amplify/backend/function/fsCoreApiResolver/src/package-lock.json index 1afaf400..bf1ec9ed 100644 --- a/amplify/backend/function/fsCoreApiResolver/src/package-lock.json +++ b/amplify/backend/function/fsCoreApiResolver/src/package-lock.json @@ -1,8 +1,106 @@ { "name": "fs-core-api-resolver", "version": "2.0.0", - "lockfileVersion": 1, + "lockfileVersion": 2, "requires": true, + "packages": { + "": { + "name": "fs-core-api-resolver", + "version": "2.0.0", + "license": "Apache-2.0", + "dependencies": { + "@sendgrid/mail": "^7.6.0", + "dotenv": "^10.0.0", + "uuid": "^8.3.2" + } + }, + "node_modules/@sendgrid/client": { + "version": "7.6.0", + "resolved": "https://registry.npmjs.org/@sendgrid/client/-/client-7.6.0.tgz", + "integrity": "sha512-cpBVZKLlMTO+vpE18krTixubYmZa98oTbLkqBDuTiA3zRkW+urrxg7pDR24TkI35Mid0Zru8jDHwnOiqrXu0TA==", + "dependencies": { + "@sendgrid/helpers": "^7.6.0", + "axios": "^0.21.4" + }, + "engines": { + "node": "6.* || 8.* || >=10.*" + } + }, + "node_modules/@sendgrid/helpers": { + "version": "7.6.0", + "resolved": "https://registry.npmjs.org/@sendgrid/helpers/-/helpers-7.6.0.tgz", + "integrity": "sha512-0uWD+HSXLl4Z/X3cN+UMQC20RE7xwAACgppnfjDyvKG0KvJcUgDGz7HDdQkiMUdcVWfmyk6zKSg7XKfKzBjTwA==", + "dependencies": { + "deepmerge": "^4.2.2" + }, + "engines": { + "node": ">= 6.0.0" + } + }, + "node_modules/@sendgrid/mail": { + "version": "7.6.0", + "resolved": "https://registry.npmjs.org/@sendgrid/mail/-/mail-7.6.0.tgz", + "integrity": "sha512-0KdaSZzflJD/vUAZjB3ALBIuaVGoLq22hrb2fvQXZHRepU/yhRNlEOqrr05MfKBnKskzq1blnD1J0fHxiwaolw==", + "dependencies": { + "@sendgrid/client": "^7.6.0", + "@sendgrid/helpers": "^7.6.0" + }, + "engines": { + "node": "6.* || 8.* || >=10.*" + } + }, + "node_modules/axios": { + "version": "0.21.4", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz", + "integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==", + "dependencies": { + "follow-redirects": "^1.14.0" + } + }, + "node_modules/deepmerge": { + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz", + "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/dotenv": { + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-10.0.0.tgz", + "integrity": "sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q==", + "engines": { + "node": ">=10" + } + }, + "node_modules/follow-redirects": { + "version": "1.14.5", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.5.tgz", + "integrity": "sha512-wtphSXy7d4/OR+MvIFbCVBDzZ5520qV8XfPklSN5QtxuMUJZ+b0Wnst1e1lCDocfzuCkHqj8k0FpZqO+UIaKNA==", + "funding": [ + { + "type": "individual", + "url": "https://github.com/sponsors/RubenVerborgh" + } + ], + "engines": { + "node": ">=4.0" + }, + "peerDependenciesMeta": { + "debug": { + "optional": true + } + } + }, + "node_modules/uuid": { + "version": "8.3.2", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", + "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==", + "bin": { + "uuid": "dist/bin/uuid" + } + } + }, "dependencies": { "@sendgrid/client": { "version": "7.6.0", diff --git a/amplify/backend/function/fsJoinProject/src/package-lock.json b/amplify/backend/function/fsJoinProject/src/package-lock.json index f89dd1bd..4f5258e1 100644 --- a/amplify/backend/function/fsJoinProject/src/package-lock.json +++ b/amplify/backend/function/fsJoinProject/src/package-lock.json @@ -1,686 +1,8 @@ { "name": "fsJoinProject", "version": "2.0.0", - "lockfileVersion": 2, + "lockfileVersion": 1, "requires": true, - "packages": { - "": { - "name": "fsJoinProject", - "version": "2.0.0", - "license": "Apache-2.0", - "dependencies": { - "cognito-express": "^2.0.19" - } - }, - "node_modules/ajv": { - "version": "6.12.6", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", - "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", - "dependencies": { - "fast-deep-equal": "^3.1.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/epoberezkin" - } - }, - "node_modules/asn1": { - "version": "0.2.6", - "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.6.tgz", - "integrity": "sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==", - "dependencies": { - "safer-buffer": "~2.1.0" - } - }, - "node_modules/asn1.js": { - "version": "5.4.1", - "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz", - "integrity": "sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==", - "dependencies": { - "bn.js": "^4.0.0", - "inherits": "^2.0.1", - "minimalistic-assert": "^1.0.0", - "safer-buffer": "^2.1.0" - } - }, - "node_modules/assert-plus": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", - "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=", - "engines": { - "node": ">=0.8" - } - }, - "node_modules/asynckit": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", - "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=" - }, - "node_modules/aws-sign2": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz", - "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=", - "engines": { - "node": "*" - } - }, - "node_modules/aws4": { - "version": "1.11.0", - "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz", - "integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==" - }, - "node_modules/bcrypt-pbkdf": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz", - "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=", - "dependencies": { - "tweetnacl": "^0.14.3" - } - }, - "node_modules/bluebird": { - "version": "3.7.2", - "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz", - "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==" - }, - "node_modules/bn.js": { - "version": "4.12.0", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", - "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==" - }, - "node_modules/brorand": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz", - "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=" - }, - "node_modules/buffer-equal-constant-time": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz", - "integrity": "sha1-+OcRMvf/5uAaXJaXpMbz5I1cyBk=" - }, - "node_modules/caseless": { - "version": "0.12.0", - "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", - "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=" - }, - "node_modules/cognito-express": { - "version": "2.0.19", - "resolved": "https://registry.npmjs.org/cognito-express/-/cognito-express-2.0.19.tgz", - "integrity": "sha512-SEDfInb5hUifSVwG9pE2T9YstGH3KB8Ebcie+Q5Uqb14p5cgAAqDpaR6rx5+XMVjQ1YGVbUMvx7TNOH6KPL+aA==", - "dependencies": { - "jsonwebtoken": "^8.3.0", - "jwk-to-pem": "^2.0.0", - "request": "^2.88.0", - "request-promise": "^4.2.2" - } - }, - "node_modules/combined-stream": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", - "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", - "dependencies": { - "delayed-stream": "~1.0.0" - }, - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/core-util-is": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", - "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=" - }, - "node_modules/dashdash": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", - "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=", - "dependencies": { - "assert-plus": "^1.0.0" - }, - "engines": { - "node": ">=0.10" - } - }, - "node_modules/delayed-stream": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", - "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=", - "engines": { - "node": ">=0.4.0" - } - }, - "node_modules/ecc-jsbn": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz", - "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=", - "dependencies": { - "jsbn": "~0.1.0", - "safer-buffer": "^2.1.0" - } - }, - "node_modules/ecdsa-sig-formatter": { - "version": "1.0.11", - "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz", - "integrity": "sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==", - "dependencies": { - "safe-buffer": "^5.0.1" - } - }, - "node_modules/elliptic": { - "version": "6.5.4", - "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz", - "integrity": "sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==", - "dependencies": { - "bn.js": "^4.11.9", - "brorand": "^1.1.0", - "hash.js": "^1.0.0", - "hmac-drbg": "^1.0.1", - "inherits": "^2.0.4", - "minimalistic-assert": "^1.0.1", - "minimalistic-crypto-utils": "^1.0.1" - } - }, - "node_modules/extend": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", - "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==" - }, - "node_modules/extsprintf": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz", - "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=", - "engines": [ - "node >=0.6.0" - ] - }, - "node_modules/fast-deep-equal": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", - "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==" - }, - "node_modules/fast-json-stable-stringify": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", - "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==" - }, - "node_modules/forever-agent": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", - "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=", - "engines": { - "node": "*" - } - }, - "node_modules/form-data": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz", - "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==", - "dependencies": { - "asynckit": "^0.4.0", - "combined-stream": "^1.0.6", - "mime-types": "^2.1.12" - }, - "engines": { - "node": ">= 0.12" - } - }, - "node_modules/getpass": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", - "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=", - "dependencies": { - "assert-plus": "^1.0.0" - } - }, - "node_modules/har-schema": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz", - "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=", - "engines": { - "node": ">=4" - } - }, - "node_modules/har-validator": { - "version": "5.1.5", - "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz", - "integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==", - "deprecated": "this library is no longer supported", - "dependencies": { - "ajv": "^6.12.3", - "har-schema": "^2.0.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/hash.js": { - "version": "1.1.7", - "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz", - "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==", - "dependencies": { - "inherits": "^2.0.3", - "minimalistic-assert": "^1.0.1" - } - }, - "node_modules/hmac-drbg": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz", - "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=", - "dependencies": { - "hash.js": "^1.0.3", - "minimalistic-assert": "^1.0.0", - "minimalistic-crypto-utils": "^1.0.1" - } - }, - "node_modules/http-signature": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz", - "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=", - "dependencies": { - "assert-plus": "^1.0.0", - "jsprim": "^1.2.2", - "sshpk": "^1.7.0" - }, - "engines": { - "node": ">=0.8", - "npm": ">=1.3.7" - } - }, - "node_modules/inherits": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" - }, - "node_modules/is-typedarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", - "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=" - }, - "node_modules/isstream": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", - "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=" - }, - "node_modules/jsbn": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz", - "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=" - }, - "node_modules/json-schema": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz", - "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=" - }, - "node_modules/json-schema-traverse": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==" - }, - "node_modules/json-stringify-safe": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", - "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=" - }, - "node_modules/jsonwebtoken": { - "version": "8.5.1", - "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-8.5.1.tgz", - "integrity": "sha512-XjwVfRS6jTMsqYs0EsuJ4LGxXV14zQybNd4L2r0UvbVnSF9Af8x7p5MzbJ90Ioz/9TI41/hTCvznF/loiSzn8w==", - "dependencies": { - "jws": "^3.2.2", - "lodash.includes": "^4.3.0", - "lodash.isboolean": "^3.0.3", - "lodash.isinteger": "^4.0.4", - "lodash.isnumber": "^3.0.3", - "lodash.isplainobject": "^4.0.6", - "lodash.isstring": "^4.0.1", - "lodash.once": "^4.0.0", - "ms": "^2.1.1", - "semver": "^5.6.0" - }, - "engines": { - "node": ">=4", - "npm": ">=1.4.28" - } - }, - "node_modules/jsprim": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz", - "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=", - "engines": [ - "node >=0.6.0" - ], - "dependencies": { - "assert-plus": "1.0.0", - "extsprintf": "1.3.0", - "json-schema": "0.2.3", - "verror": "1.10.0" - } - }, - "node_modules/jwa": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/jwa/-/jwa-1.4.1.tgz", - "integrity": "sha512-qiLX/xhEEFKUAJ6FiBMbes3w9ATzyk5W7Hvzpa/SLYdxNtng+gcurvrI7TbACjIXlsJyr05/S1oUhZrc63evQA==", - "dependencies": { - "buffer-equal-constant-time": "1.0.1", - "ecdsa-sig-formatter": "1.0.11", - "safe-buffer": "^5.0.1" - } - }, - "node_modules/jwk-to-pem": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/jwk-to-pem/-/jwk-to-pem-2.0.5.tgz", - "integrity": "sha512-L90jwellhO8jRKYwbssU9ifaMVqajzj3fpRjDKcsDzrslU9syRbFqfkXtT4B89HYAap+xsxNcxgBSB09ig+a7A==", - "dependencies": { - "asn1.js": "^5.3.0", - "elliptic": "^6.5.4", - "safe-buffer": "^5.0.1" - } - }, - "node_modules/jws": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/jws/-/jws-3.2.2.tgz", - "integrity": "sha512-YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA==", - "dependencies": { - "jwa": "^1.4.1", - "safe-buffer": "^5.0.1" - } - }, - "node_modules/lodash": { - "version": "4.17.21", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", - "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" - }, - "node_modules/lodash.includes": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/lodash.includes/-/lodash.includes-4.3.0.tgz", - "integrity": "sha1-YLuYqHy5I8aMoeUTJUgzFISfVT8=" - }, - "node_modules/lodash.isboolean": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz", - "integrity": "sha1-bC4XHbKiV82WgC/UOwGyDV9YcPY=" - }, - "node_modules/lodash.isinteger": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz", - "integrity": "sha1-YZwK89A/iwTDH1iChAt3sRzWg0M=" - }, - "node_modules/lodash.isnumber": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz", - "integrity": "sha1-POdoEMWSjQM1IwGsKHMX8RwLH/w=" - }, - "node_modules/lodash.isplainobject": { - "version": "4.0.6", - "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz", - "integrity": "sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs=" - }, - "node_modules/lodash.isstring": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz", - "integrity": "sha1-1SfftUVuynzJu5XV2ur4i6VKVFE=" - }, - "node_modules/lodash.once": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz", - "integrity": "sha1-DdOXEhPHxW34gJd9UEyI+0cal6w=" - }, - "node_modules/mime-db": { - "version": "1.51.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.51.0.tgz", - "integrity": "sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g==", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/mime-types": { - "version": "2.1.34", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.34.tgz", - "integrity": "sha512-6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A==", - "dependencies": { - "mime-db": "1.51.0" - }, - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/minimalistic-assert": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz", - "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==" - }, - "node_modules/minimalistic-crypto-utils": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz", - "integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=" - }, - "node_modules/ms": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" - }, - "node_modules/oauth-sign": { - "version": "0.9.0", - "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz", - "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==", - "engines": { - "node": "*" - } - }, - "node_modules/performance-now": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", - "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=" - }, - "node_modules/psl": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz", - "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==" - }, - "node_modules/punycode": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", - "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==", - "engines": { - "node": ">=6" - } - }, - "node_modules/qs": { - "version": "6.5.2", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz", - "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==", - "engines": { - "node": ">=0.6" - } - }, - "node_modules/request": { - "version": "2.88.2", - "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz", - "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==", - "deprecated": "request has been deprecated, see https://github.com/request/request/issues/3142", - "dependencies": { - "aws-sign2": "~0.7.0", - "aws4": "^1.8.0", - "caseless": "~0.12.0", - "combined-stream": "~1.0.6", - "extend": "~3.0.2", - "forever-agent": "~0.6.1", - "form-data": "~2.3.2", - "har-validator": "~5.1.3", - "http-signature": "~1.2.0", - "is-typedarray": "~1.0.0", - "isstream": "~0.1.2", - "json-stringify-safe": "~5.0.1", - "mime-types": "~2.1.19", - "oauth-sign": "~0.9.0", - "performance-now": "^2.1.0", - "qs": "~6.5.2", - "safe-buffer": "^5.1.2", - "tough-cookie": "~2.5.0", - "tunnel-agent": "^0.6.0", - "uuid": "^3.3.2" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/request-promise": { - "version": "4.2.6", - "resolved": "https://registry.npmjs.org/request-promise/-/request-promise-4.2.6.tgz", - "integrity": "sha512-HCHI3DJJUakkOr8fNoCc73E5nU5bqITjOYFMDrKHYOXWXrgD/SBaC7LjwuPymUprRyuF06UK7hd/lMHkmUXglQ==", - "deprecated": "request-promise has been deprecated because it extends the now deprecated request package, see https://github.com/request/request/issues/3142", - "dependencies": { - "bluebird": "^3.5.0", - "request-promise-core": "1.1.4", - "stealthy-require": "^1.1.1", - "tough-cookie": "^2.3.3" - }, - "engines": { - "node": ">=0.10.0" - }, - "peerDependencies": { - "request": "^2.34" - } - }, - "node_modules/request-promise-core": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.4.tgz", - "integrity": "sha512-TTbAfBBRdWD7aNNOoVOBH4pN/KigV6LyapYNNlAPA8JwbovRti1E88m3sYAwsLi5ryhPKsE9APwnjFTgdUjTpw==", - "dependencies": { - "lodash": "^4.17.19" - }, - "engines": { - "node": ">=0.10.0" - }, - "peerDependencies": { - "request": "^2.34" - } - }, - "node_modules/safe-buffer": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", - "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ] - }, - "node_modules/safer-buffer": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", - "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" - }, - "node_modules/semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", - "bin": { - "semver": "bin/semver" - } - }, - "node_modules/sshpk": { - "version": "1.16.1", - "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz", - "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==", - "dependencies": { - "asn1": "~0.2.3", - "assert-plus": "^1.0.0", - "bcrypt-pbkdf": "^1.0.0", - "dashdash": "^1.12.0", - "ecc-jsbn": "~0.1.1", - "getpass": "^0.1.1", - "jsbn": "~0.1.0", - "safer-buffer": "^2.0.2", - "tweetnacl": "~0.14.0" - }, - "bin": { - "sshpk-conv": "bin/sshpk-conv", - "sshpk-sign": "bin/sshpk-sign", - "sshpk-verify": "bin/sshpk-verify" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/stealthy-require": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz", - "integrity": "sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks=", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/tough-cookie": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz", - "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==", - "dependencies": { - "psl": "^1.1.28", - "punycode": "^2.1.1" - }, - "engines": { - "node": ">=0.8" - } - }, - "node_modules/tunnel-agent": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", - "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", - "dependencies": { - "safe-buffer": "^5.0.1" - }, - "engines": { - "node": "*" - } - }, - "node_modules/tweetnacl": { - "version": "0.14.5", - "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", - "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=" - }, - "node_modules/uri-js": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", - "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", - "dependencies": { - "punycode": "^2.1.0" - } - }, - "node_modules/uuid": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", - "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==", - "deprecated": "Please upgrade to version 7 or higher. Older versions may use Math.random() in certain circumstances, which is known to be problematic. See https://v8.dev/blog/math-random for details.", - "bin": { - "uuid": "bin/uuid" - } - }, - "node_modules/verror": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", - "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=", - "engines": [ - "node >=0.6.0" - ], - "dependencies": { - "assert-plus": "^1.0.0", - "core-util-is": "1.0.2", - "extsprintf": "^1.2.0" - } - } - }, "dependencies": { "ajv": { "version": "6.12.6", diff --git a/amplify/backend/function/fsLeaveProject/src/package-lock.json b/amplify/backend/function/fsLeaveProject/src/package-lock.json index af89540e..15477b7e 100644 --- a/amplify/backend/function/fsLeaveProject/src/package-lock.json +++ b/amplify/backend/function/fsLeaveProject/src/package-lock.json @@ -1,13 +1,5 @@ { "name": "fsLeaveProject", "version": "2.0.0", - "lockfileVersion": 2, - "requires": true, - "packages": { - "": { - "name": "fsLeaveProject", - "version": "2.0.0", - "license": "Apache-2.0" - } - } + "lockfileVersion": 1 } diff --git a/amplify/backend/function/fsSendRealtimeData/src/package-lock.json b/amplify/backend/function/fsSendRealtimeData/src/package-lock.json index 09bb84c4..4651b96b 100644 --- a/amplify/backend/function/fsSendRealtimeData/src/package-lock.json +++ b/amplify/backend/function/fsSendRealtimeData/src/package-lock.json @@ -1,13 +1,5 @@ { "name": "fsSendRealtimeData", "version": "2.0.0", - "lockfileVersion": 2, - "requires": true, - "packages": { - "": { - "name": "fsSendRealtimeData", - "version": "2.0.0", - "license": "Apache-2.0" - } - } + "lockfileVersion": 1 } diff --git a/amplify/backend/function/fsUserDisconnection/src/package-lock.json b/amplify/backend/function/fsUserDisconnection/src/package-lock.json index 6d638da5..84218664 100644 --- a/amplify/backend/function/fsUserDisconnection/src/package-lock.json +++ b/amplify/backend/function/fsUserDisconnection/src/package-lock.json @@ -1,13 +1,5 @@ { "name": "fsUserDisconnection", "version": "2.0.0", - "lockfileVersion": 2, - "requires": true, - "packages": { - "": { - "name": "fsUserDisconnection", - "version": "2.0.0", - "license": "Apache-2.0" - } - } + "lockfileVersion": 1 } diff --git a/amplify/hooks/README.md b/amplify/hooks/README.md new file mode 100644 index 00000000..8fb601ea --- /dev/null +++ b/amplify/hooks/README.md @@ -0,0 +1,7 @@ +# Command Hooks + +Command hooks can be used to run custom scripts upon Amplify CLI lifecycle events like pre-push, post-add-function, etc. + +To get started, add your script files based on the expected naming convention in this directory. + +Learn more about the script file naming convention, hook parameters, third party dependencies, and advanced configurations at https://docs.amplify.aws/cli/usage/command-hooks diff --git a/amplify/team-provider-info.json b/amplify/team-provider-info.json index 5cd64c4f..5a6c5cde 100644 --- a/amplify/team-provider-info.json +++ b/amplify/team-provider-info.json @@ -1,4 +1,67 @@ { + "dev": { + "awscloudformation": { + "AuthRoleName": "amplify-fstestttt-dev-115806-authRole", + "UnauthRoleArn": "arn:aws:iam::026152918307:role/amplify-fstestttt-dev-115806-unauthRole", + "AuthRoleArn": "arn:aws:iam::026152918307:role/amplify-fstestttt-dev-115806-authRole", + "Region": "us-east-1", + "DeploymentBucketName": "amplify-fstestttt-dev-115806-deployment", + "UnauthRoleName": "amplify-fstestttt-dev-115806-unauthRole", + "StackName": "amplify-fstestttt-dev-115806", + "StackId": "arn:aws:cloudformation:us-east-1:026152918307:stack/amplify-fstestttt-dev-115806/72d63fb0-5042-11ec-8a38-1293b79fe18b", + "AmplifyAppId": "de6e5rijl3m8h" + }, + "categories": { + "function": { + "fsCognitoPostConfirmation": { + "deploymentBucketName": "amplify-fstestttt-dev-115806-deployment", + "s3Key": "amplify-builds/fsCognitoPostConfirmation-563936524c325968536e-build.zip" + }, + "fsCoreApiResolver": { + "deploymentBucketName": "amplify-fstestttt-dev-115806-deployment", + "s3Key": "amplify-builds/fsCoreApiResolver-496b796b6f33494f656f-build.zip" + }, + "fsCognitoPostConfirmationInvoker": { + "deploymentBucketName": "amplify-fstestttt-dev-115806-deployment", + "s3Key": "amplify-builds/fsCognitoPostConfirmationInvoker-2b6e7742464651426843-build.zip" + }, + "fsDailyReport": { + "deploymentBucketName": "amplify-fstestttt-dev-115806-deployment", + "s3Key": "amplify-builds/fsDailyReport-45476977466f41396b59-build.zip" + }, + "fsUserConnection": { + "deploymentBucketName": "amplify-fstestttt-dev-115806-deployment", + "s3Key": "amplify-builds/fsUserConnection-44412f7a763879394765-build.zip" + }, + "fsUserDisconnection": { + "deploymentBucketName": "amplify-fstestttt-dev-115806-deployment", + "s3Key": "amplify-builds/fsUserDisconnection-415176574d4b446c4e35-build.zip" + }, + "fsJoinProject": { + "deploymentBucketName": "amplify-fstestttt-dev-115806-deployment", + "s3Key": "amplify-builds/fsJoinProject-647266325278636f724d-build.zip" + }, + "fsLeaveProject": { + "deploymentBucketName": "amplify-fstestttt-dev-115806-deployment", + "s3Key": "amplify-builds/fsLeaveProject-6932724c69364d67446a-build.zip" + }, + "fsSendRealtimeData": { + "deploymentBucketName": "amplify-fstestttt-dev-115806-deployment", + "s3Key": "amplify-builds/fsSendRealtimeData-446b4d2b53376d6a3775-build.zip" + } + }, + "hosting": { + "amplifyhosting": { + "appId": "de6e5rijl3m8h", + "type": "manual" + } + }, + "auth": { + "userPoolGroups": {}, + "fsCognito": {} + } + } + }, "mainn": { "awscloudformation": { "AuthRoleName": "amplify-forwardslashtesting-mainn-131231-authRole", diff --git a/package.json b/package.json index 08d9643b..45993c5c 100644 --- a/package.json +++ b/package.json @@ -19,6 +19,9 @@ "aws-sdk": "^2.1037.0", "draft-js": "0.11.7", "draft-js-export-html": "1.4.1", + "eslint-plugin-import": "^2.25.4", + "eslint-plugin-react": "^7.28.0", + "eslint-plugin-react-hooks": "^4.3.0", "fuse.js": "^6.4.6", "history": "^5.1.0", "nanoid": "^3.1.30", diff --git a/public/index.html b/public/index.html index f04d928f..2f6b9a16 100644 --- a/public/index.html +++ b/public/index.html @@ -39,7 +39,7 @@ - Forward Slash + Forwardslash + + diff --git a/src/aws-exports.js b/src/aws-exports.js index 2b22090d..11902c7a 100644 --- a/src/aws-exports.js +++ b/src/aws-exports.js @@ -3,13 +3,13 @@ const awsmobile = { "aws_project_region": "us-east-1", - "aws_appsync_graphqlEndpoint": "https://wc4bxcmfu5gkrlmeqyoj2ilvcm.appsync-api.us-east-1.amazonaws.com/graphql", + "aws_appsync_graphqlEndpoint": "https://khds4uckibbp7hkf3kjvs3hi3m.appsync-api.us-east-1.amazonaws.com/graphql", "aws_appsync_region": "us-east-1", "aws_appsync_authenticationType": "AMAZON_COGNITO_USER_POOLS", - "aws_cognito_identity_pool_id": "us-east-1:83b9baef-6204-481d-9c31-3ff39e0a6a9a", + "aws_cognito_identity_pool_id": "us-east-1:154a027d-0ada-47fb-b0ce-8328881cf96e", "aws_cognito_region": "us-east-1", - "aws_user_pools_id": "us-east-1_jllb3Qjdd", - "aws_user_pools_web_client_id": "7ojagvnc5f5tvnfcfpp3fg9l67", + "aws_user_pools_id": "us-east-1_7Mc3Irc63", + "aws_user_pools_web_client_id": "2iihb9furck6m9fnnkhpj7skqo", "oauth": {}, "aws_cognito_username_attributes": [], "aws_cognito_social_providers": [], diff --git a/src/components/ActionSheet.js b/src/components/ActionSheet.js index 37136a6f..aaeafcf2 100644 --- a/src/components/ActionSheet.js +++ b/src/components/ActionSheet.js @@ -9,7 +9,7 @@ import { ReactComponent as RemoveIcon } from "../assets/trash-outline.svg" import { ReactComponent as CopyIcon } from "../assets/copy-outline.svg" import { ReactComponent as DuplicateIcon } from "../assets/duplicate-outline.svg" import { ReactComponent as ShareIcon } from "../assets/share-outline.svg" -import { ReactComponent as DetailsIcon } from "../assets/information-circle-outline.svg"; +import { ReactComponent as DetailsIcon } from "../assets/chevron-right-outline.svg"; import { ReactComponent as CheckmarkIcon } from "../assets/checkmark-circle-outline.svg"; import styles from "./ActionSheet.module.scss" diff --git a/src/components/AuthFlow/NewAccount.js b/src/components/AuthFlow/NewAccount.js index 737bba8a..2988a656 100644 --- a/src/components/AuthFlow/NewAccount.js +++ b/src/components/AuthFlow/NewAccount.js @@ -21,14 +21,12 @@ const NewAccount = (props) => { const [email, setEmail] = useState("") const [phoneNumber, setPhoneNumber] = useState("") const [password, setPassword] = useState("") - const [dateOfBirth, setDateOfBirth] = useState("") - const [gender, setGender] = useState("male") const [firstNameError, setFirstNameError] = useState(null) const [lastNameError, setLastNameError] = useState(null) const [usernameError, setUsernameError] = useState(null) const [emailError, setEmailError] = useState(null) const [passwordError, setPasswordError] = useState(null) - const [dateOfBirthError, setDateOfBirthError] = useState(null) + const [verificationCodeError, setVerificationCodeError] = useState(null) const [isBusy, setIsBusy] = useState(false) const validateFirstName = (value = firstName) => { @@ -49,9 +47,9 @@ const NewAccount = (props) => { setUsernameError("Required field.") return } - const re = /^\w+$/; - const isValid = re.test(value) - if (!isValid) setUsernameError("Only letters, numbers and underscore are allowed.") + //const re = /^\w+$/; + //const isValid = re.test(value) + //if (!isValid) setUsernameError("Only letters, numbers and underscore are allowed.") } const validateEmail = (value = email) => { setEmailError(null) @@ -77,25 +75,18 @@ const NewAccount = (props) => { const isValid = re.test(value) if (!isValid) setPasswordError("Password must contain lowercase, uppercase, numerical and symbolic characters.") } - const validateDateOfBirth = (value = dateOfBirth) => { - setDateOfBirthError(null) - if (!value) { - setDateOfBirthError("Required field.") - } - } + const getIsSubmissionPossible = ( firstName, lastName, username, email, password, - dateOfBirth, firstNameError, lastNameError, usernameError, emailError, passwordError, - dateOfBirthError ) => { return !( !firstName || @@ -103,13 +94,11 @@ const NewAccount = (props) => { !username || !email || !password || - !dateOfBirth || firstNameError || lastNameError || usernameError || emailError || - passwordError || - dateOfBirthError + passwordError ) } const isSubmissionPossible = useMemo(() => getIsSubmissionPossible( @@ -118,26 +107,21 @@ const NewAccount = (props) => { username, email, password, - dateOfBirth, firstNameError, lastNameError, usernameError, - emailError, - passwordError, - dateOfBirthError + emailError ), [ firstName, lastName, username, email, password, - dateOfBirth, firstNameError, lastNameError, usernameError, emailError, - passwordError, - dateOfBirthError + passwordError ]) const handleNewAccount = async (e) => { e.preventDefault() @@ -150,8 +134,6 @@ const NewAccount = (props) => { given_name: firstName.trim(), family_name: lastName.trim(), email: email.trim(), - birthdate: new Date(dateOfBirth).toISOString().substring(0, 10), - gender: gender, phone_number: phoneNumber, } @@ -216,13 +198,6 @@ const NewAccount = (props) => { setPassword(value) validatePassword(value) break - case "dateOfBirth": - setDateOfBirth(value) - validateDateOfBirth(value) - break - case "gender": - setGender(value) - break case "verificationCode": setVerificationCode(value) setVerificationCodeError(null) @@ -291,23 +266,7 @@ const NewAccount = (props) => { error={passwordError} value={password} /> - - setNewGender(e.target.value)} - value={newGender} - readOnly={!isSynced} - /> + : } @@ -314,14 +314,14 @@ const TaskItem = (props) => { ...(item.id === selectedTask && [styles.focused] || []), ].join(" ")} > - + openRightPanel(item)}> {item.due ? formatDate(item.due) : "No Due"} - openRightPanel(item)}> 768 ? 24 : 18 } - /> + /> {(command && selectedTask === item.id) && ( diff --git a/src/components/TasksPanel/TaskItem.module.scss b/src/components/TasksPanel/TaskItem.module.scss index 15201e82..f33f8854 100644 --- a/src/components/TasksPanel/TaskItem.module.scss +++ b/src/components/TasksPanel/TaskItem.module.scss @@ -57,7 +57,7 @@ flex-direction: row; justify-content: space-between; align-items: center; - border: 2px solid transparent; + border: 1px solid transparent; border-radius: 10px; padding: 8px 12px; margin: 4px 0; diff --git a/src/components/UI/fields/CardSelect.module.scss b/src/components/UI/fields/CardSelect.module.scss index cec14646..31c3a962 100644 --- a/src/components/UI/fields/CardSelect.module.scss +++ b/src/components/UI/fields/CardSelect.module.scss @@ -24,7 +24,7 @@ width: 100%; text-align: left; padding: 12px; - border: 2px solid transparent; + border: 1px solid transparent; outline: none; cursor: pointer; border-radius: 8px; diff --git a/src/components/UI/fields/DateField.module.scss b/src/components/UI/fields/DateField.module.scss index 658eb5f8..fc5f6ace 100644 --- a/src/components/UI/fields/DateField.module.scss +++ b/src/components/UI/fields/DateField.module.scss @@ -20,7 +20,7 @@ width: calc(100% - 24px); padding: 10px; border-radius: 8px; - border: 2px solid transparent; + border: 1px solid transparent; background-color: transparent; @include themify(border-color, "outline"); &.error { diff --git a/src/components/UI/fields/Select.module.scss b/src/components/UI/fields/Select.module.scss index 1b413729..313e963c 100644 --- a/src/components/UI/fields/Select.module.scss +++ b/src/components/UI/fields/Select.module.scss @@ -6,7 +6,7 @@ justify-content: center; padding: 10px; border-radius: 8px; - border: 2px solid transparent; + border: 1px solid transparent; background-color: transparent; @include themify(border-color, "outline"); & > label { @@ -30,7 +30,7 @@ .Selection { position: relative; padding: 3px 10px; - border: 2px solid transparent; + border: 1px solid transparent; font-weight: 600; font-size: 14px; border-radius: 100000000000000px; diff --git a/src/components/UI/fields/TagField.module.scss b/src/components/UI/fields/TagField.module.scss index 2245d26f..6caec860 100644 --- a/src/components/UI/fields/TagField.module.scss +++ b/src/components/UI/fields/TagField.module.scss @@ -18,7 +18,7 @@ font-weight: 400; padding: 7.5px 10px; border-radius: 8px; - border: 2px solid transparent; + border: 1px solid transparent; background-color: transparent; @include themify(border-color, "outline"); & > label { @@ -87,7 +87,7 @@ border: none; flex-direction: row; align-items: center; - box-shadow: 0px 2px 4px rgb(0 0 0 / 6%); + box-shadow: 0px 1px 4px rgb(0 0 0 / 6%); @include themify(color, "outline"); @include themify(background-color, "fieldBg"); & > span { diff --git a/src/components/UI/fields/TextField.module.scss b/src/components/UI/fields/TextField.module.scss index e87e5fef..881ca19b 100644 --- a/src/components/UI/fields/TextField.module.scss +++ b/src/components/UI/fields/TextField.module.scss @@ -22,7 +22,7 @@ font-weight: 400; padding: 10px; border-radius: 8px; - border: 2px solid transparent; + border: 1px solid transparent; background-color: transparent; @include themify(border-color, "outline"); & > label { diff --git a/src/components/UI/fields/Textarea.module.scss b/src/components/UI/fields/Textarea.module.scss index 7986f0cf..5c21361a 100644 --- a/src/components/UI/fields/Textarea.module.scss +++ b/src/components/UI/fields/Textarea.module.scss @@ -10,7 +10,7 @@ width: calc(100% - 24px); padding: 10px; border-radius: 8px; - border: 2px solid transparent; + border: 1px solid transparent; background-color: transparent; @include themify(border-color, "outline"); & > label { diff --git a/src/graphql/mutations.js b/src/graphql/mutations.js index 032cdacf..83d70b82 100644 --- a/src/graphql/mutations.js +++ b/src/graphql/mutations.js @@ -7,8 +7,6 @@ export const pushUserUpdate = /* GraphQL */ ` username firstName lastName - gender - birthdate email plan avatar @@ -169,8 +167,6 @@ export const updateUser = /* GraphQL */ ` username firstName lastName - gender - birthdate email plan avatar diff --git a/src/graphql/queries.js b/src/graphql/queries.js index 39532b27..b2988d00 100644 --- a/src/graphql/queries.js +++ b/src/graphql/queries.js @@ -7,8 +7,6 @@ export const getUserByUsername = /* GraphQL */ ` username firstName lastName - gender - birthdate email plan avatar @@ -27,8 +25,6 @@ export const listUsersByUsernames = /* GraphQL */ ` username firstName lastName - gender - birthdate email plan avatar @@ -237,8 +233,6 @@ export const searchUsers = /* GraphQL */ ` username firstName lastName - gender - birthdate email plan avatar diff --git a/src/graphql/schema.json b/src/graphql/schema.json index 01508995..16f96095 100644 --- a/src/graphql/schema.json +++ b/src/graphql/schema.json @@ -344,36 +344,6 @@ }, "isDeprecated" : false, "deprecationReason" : null - }, { - "name" : "gender", - "description" : null, - "args" : [ ], - "type" : { - "kind" : "NON_NULL", - "name" : null, - "ofType" : { - "kind" : "ENUM", - "name" : "Gender", - "ofType" : null - } - }, - "isDeprecated" : false, - "deprecationReason" : null - }, { - "name" : "birthdate", - "description" : null, - "args" : [ ], - "type" : { - "kind" : "NON_NULL", - "name" : null, - "ofType" : { - "kind" : "SCALAR", - "name" : "String", - "ofType" : null - } - }, - "isDeprecated" : false, - "deprecationReason" : null }, { "name" : "email", "description" : null, @@ -516,25 +486,6 @@ "interfaces" : null, "enumValues" : null, "possibleTypes" : null - }, { - "kind" : "ENUM", - "name" : "Gender", - "description" : null, - "fields" : null, - "inputFields" : null, - "interfaces" : null, - "enumValues" : [ { - "name" : "male", - "description" : null, - "isDeprecated" : false, - "deprecationReason" : null - }, { - "name" : "female", - "description" : null, - "isDeprecated" : false, - "deprecationReason" : null - } ], - "possibleTypes" : null }, { "kind" : "SCALAR", "name" : "AWSEmail", @@ -1644,15 +1595,6 @@ "ofType" : null }, "defaultValue" : null - }, { - "name" : "birthdate", - "description" : null, - "type" : { - "kind" : "INPUT_OBJECT", - "name" : "SearchableStringFilterInput", - "ofType" : null - }, - "defaultValue" : null }, { "name" : "email", "description" : null, @@ -2091,11 +2033,6 @@ "description" : null, "isDeprecated" : false, "deprecationReason" : null - }, { - "name" : "birthdate", - "description" : null, - "isDeprecated" : false, - "deprecationReason" : null }, { "name" : "email", "description" : null, @@ -2669,28 +2606,6 @@ }, "isDeprecated" : false, "deprecationReason" : null - }, { - "name" : "gender", - "description" : null, - "args" : [ ], - "type" : { - "kind" : "ENUM", - "name" : "Gender", - "ofType" : null - }, - "isDeprecated" : false, - "deprecationReason" : null - }, { - "name" : "birthdate", - "description" : null, - "args" : [ ], - "type" : { - "kind" : "SCALAR", - "name" : "String", - "ofType" : null - }, - "isDeprecated" : false, - "deprecationReason" : null }, { "name" : "email", "description" : null, @@ -2852,24 +2767,6 @@ "ofType" : null }, "defaultValue" : null - }, { - "name" : "gender", - "description" : null, - "type" : { - "kind" : "ENUM", - "name" : "Gender", - "ofType" : null - }, - "defaultValue" : null - }, { - "name" : "birthdate", - "description" : null, - "type" : { - "kind" : "SCALAR", - "name" : "String", - "ofType" : null - }, - "defaultValue" : null }, { "name" : "email", "description" : null, @@ -4873,25 +4770,7 @@ "ofType" : null }, "defaultValue" : null - }, { - "name" : "gender", - "description" : null, - "type" : { - "kind" : "ENUM", - "name" : "Gender", - "ofType" : null - }, - "defaultValue" : null - }, { - "name" : "birthdate", - "description" : null, - "type" : { - "kind" : "SCALAR", - "name" : "String", - "ofType" : null - }, - "defaultValue" : null - } ], + }], "interfaces" : null, "enumValues" : null, "possibleTypes" : null diff --git a/src/graphql/subscriptions.js b/src/graphql/subscriptions.js index 3280d80a..c840b950 100644 --- a/src/graphql/subscriptions.js +++ b/src/graphql/subscriptions.js @@ -7,8 +7,6 @@ export const onPushUserUpdate = /* GraphQL */ ` username firstName lastName - gender - birthdate email plan avatar From 5c11660825280ec380fdf86afe970f66695e5d30 Mon Sep 17 00:00:00 2001 From: glidaa Date: Thu, 13 Jan 2022 16:21:25 +1100 Subject: [PATCH 2/8] not sure --- amplify/README.md | 8 ++++++++ amplify/team-provider-info.json | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 amplify/README.md diff --git a/amplify/README.md b/amplify/README.md new file mode 100644 index 00000000..7c0a9e28 --- /dev/null +++ b/amplify/README.md @@ -0,0 +1,8 @@ +# Getting Started with Amplify CLI +This directory was generated by [Amplify CLI](https://docs.amplify.aws/cli). + +Helpful resources: +- Amplify documentation: https://docs.amplify.aws +- Amplify CLI documentation: https://docs.amplify.aws/cli +- More details on this folder & generated files: https://docs.amplify.aws/cli/reference/files +- Join Amplify's community: https://amplify.aws/community/ diff --git a/amplify/team-provider-info.json b/amplify/team-provider-info.json index 5a6c5cde..39426c10 100644 --- a/amplify/team-provider-info.json +++ b/amplify/team-provider-info.json @@ -19,7 +19,7 @@ }, "fsCoreApiResolver": { "deploymentBucketName": "amplify-fstestttt-dev-115806-deployment", - "s3Key": "amplify-builds/fsCoreApiResolver-496b796b6f33494f656f-build.zip" + "s3Key": "amplify-builds/fsCoreApiResolver-354d47465a6b5a446b77-build.zip" }, "fsCognitoPostConfirmationInvoker": { "deploymentBucketName": "amplify-fstestttt-dev-115806-deployment", From 05a36d46a607fb3b7f1129abe084348e78108c45 Mon Sep 17 00:00:00 2001 From: glidaa Date: Thu, 13 Jan 2022 16:23:08 +1100 Subject: [PATCH 3/8] new team --- amplify/team-provider-info.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/amplify/team-provider-info.json b/amplify/team-provider-info.json index 39426c10..5a6c5cde 100644 --- a/amplify/team-provider-info.json +++ b/amplify/team-provider-info.json @@ -19,7 +19,7 @@ }, "fsCoreApiResolver": { "deploymentBucketName": "amplify-fstestttt-dev-115806-deployment", - "s3Key": "amplify-builds/fsCoreApiResolver-354d47465a6b5a446b77-build.zip" + "s3Key": "amplify-builds/fsCoreApiResolver-496b796b6f33494f656f-build.zip" }, "fsCognitoPostConfirmationInvoker": { "deploymentBucketName": "amplify-fstestttt-dev-115806-deployment", From 18ffc47d2a10a87d06e3a1b235cfd106f928be66 Mon Sep 17 00:00:00 2001 From: glidaa Date: Thu, 13 Jan 2022 16:35:44 +1100 Subject: [PATCH 4/8] fix --- .../fsCognito-cloudformation-template.yml | 7 ++ .../function/fsCoreApiResolver/src/index.js | 10 ++ .../fsCoreApiResolver/src/package-lock.json | 100 +----------------- amplify/team-provider-info.json | 2 +- 4 files changed, 19 insertions(+), 100 deletions(-) diff --git a/amplify/backend/auth/fsCognito/fsCognito-cloudformation-template.yml b/amplify/backend/auth/fsCognito/fsCognito-cloudformation-template.yml index 29c071d2..c2fbcc94 100644 --- a/amplify/backend/auth/fsCognito/fsCognito-cloudformation-template.yml +++ b/amplify/backend/auth/fsCognito/fsCognito-cloudformation-template.yml @@ -178,6 +178,9 @@ Resources: ] Schema: + - Name: birthdate + Required: true + Mutable: true - Name: email Required: true @@ -187,6 +190,10 @@ Resources: Required: true Mutable: true + - Name: gender + Required: true + Mutable: true + - Name: given_name Required: true Mutable: true diff --git a/amplify/backend/function/fsCoreApiResolver/src/index.js b/amplify/backend/function/fsCoreApiResolver/src/index.js index e5c5d95b..6c1d5c6c 100644 --- a/amplify/backend/function/fsCoreApiResolver/src/index.js +++ b/amplify/backend/function/fsCoreApiResolver/src/index.js @@ -1063,6 +1063,14 @@ exports.handler = async function (ctx) { ...((updateData.lastName && [{ Name: 'family_name', Value: updateData.lastName + }]) || []), + ...((updateData.birthdate && [{ + Name: 'birthdate', + Value: updateData.birthdate + }]) || []), + ...((updateData.gender && [{ + Name: 'gender', + Value: updateData.gender }]) || []) ], UserPoolId: USERPOOL, @@ -2307,6 +2315,8 @@ exports.handler = async function (ctx) { username firstName lastName + gender + birthdate email plan avatar diff --git a/amplify/backend/function/fsCoreApiResolver/src/package-lock.json b/amplify/backend/function/fsCoreApiResolver/src/package-lock.json index bf1ec9ed..1afaf400 100644 --- a/amplify/backend/function/fsCoreApiResolver/src/package-lock.json +++ b/amplify/backend/function/fsCoreApiResolver/src/package-lock.json @@ -1,106 +1,8 @@ { "name": "fs-core-api-resolver", "version": "2.0.0", - "lockfileVersion": 2, + "lockfileVersion": 1, "requires": true, - "packages": { - "": { - "name": "fs-core-api-resolver", - "version": "2.0.0", - "license": "Apache-2.0", - "dependencies": { - "@sendgrid/mail": "^7.6.0", - "dotenv": "^10.0.0", - "uuid": "^8.3.2" - } - }, - "node_modules/@sendgrid/client": { - "version": "7.6.0", - "resolved": "https://registry.npmjs.org/@sendgrid/client/-/client-7.6.0.tgz", - "integrity": "sha512-cpBVZKLlMTO+vpE18krTixubYmZa98oTbLkqBDuTiA3zRkW+urrxg7pDR24TkI35Mid0Zru8jDHwnOiqrXu0TA==", - "dependencies": { - "@sendgrid/helpers": "^7.6.0", - "axios": "^0.21.4" - }, - "engines": { - "node": "6.* || 8.* || >=10.*" - } - }, - "node_modules/@sendgrid/helpers": { - "version": "7.6.0", - "resolved": "https://registry.npmjs.org/@sendgrid/helpers/-/helpers-7.6.0.tgz", - "integrity": "sha512-0uWD+HSXLl4Z/X3cN+UMQC20RE7xwAACgppnfjDyvKG0KvJcUgDGz7HDdQkiMUdcVWfmyk6zKSg7XKfKzBjTwA==", - "dependencies": { - "deepmerge": "^4.2.2" - }, - "engines": { - "node": ">= 6.0.0" - } - }, - "node_modules/@sendgrid/mail": { - "version": "7.6.0", - "resolved": "https://registry.npmjs.org/@sendgrid/mail/-/mail-7.6.0.tgz", - "integrity": "sha512-0KdaSZzflJD/vUAZjB3ALBIuaVGoLq22hrb2fvQXZHRepU/yhRNlEOqrr05MfKBnKskzq1blnD1J0fHxiwaolw==", - "dependencies": { - "@sendgrid/client": "^7.6.0", - "@sendgrid/helpers": "^7.6.0" - }, - "engines": { - "node": "6.* || 8.* || >=10.*" - } - }, - "node_modules/axios": { - "version": "0.21.4", - "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz", - "integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==", - "dependencies": { - "follow-redirects": "^1.14.0" - } - }, - "node_modules/deepmerge": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz", - "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/dotenv": { - "version": "10.0.0", - "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-10.0.0.tgz", - "integrity": "sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q==", - "engines": { - "node": ">=10" - } - }, - "node_modules/follow-redirects": { - "version": "1.14.5", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.5.tgz", - "integrity": "sha512-wtphSXy7d4/OR+MvIFbCVBDzZ5520qV8XfPklSN5QtxuMUJZ+b0Wnst1e1lCDocfzuCkHqj8k0FpZqO+UIaKNA==", - "funding": [ - { - "type": "individual", - "url": "https://github.com/sponsors/RubenVerborgh" - } - ], - "engines": { - "node": ">=4.0" - }, - "peerDependenciesMeta": { - "debug": { - "optional": true - } - } - }, - "node_modules/uuid": { - "version": "8.3.2", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", - "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==", - "bin": { - "uuid": "dist/bin/uuid" - } - } - }, "dependencies": { "@sendgrid/client": { "version": "7.6.0", diff --git a/amplify/team-provider-info.json b/amplify/team-provider-info.json index 5a6c5cde..39426c10 100644 --- a/amplify/team-provider-info.json +++ b/amplify/team-provider-info.json @@ -19,7 +19,7 @@ }, "fsCoreApiResolver": { "deploymentBucketName": "amplify-fstestttt-dev-115806-deployment", - "s3Key": "amplify-builds/fsCoreApiResolver-496b796b6f33494f656f-build.zip" + "s3Key": "amplify-builds/fsCoreApiResolver-354d47465a6b5a446b77-build.zip" }, "fsCognitoPostConfirmationInvoker": { "deploymentBucketName": "amplify-fstestttt-dev-115806-deployment", From a716c746d0d3a9ab972b7440ba38936d3cce9fd5 Mon Sep 17 00:00:00 2001 From: glidaa Date: Thu, 13 Jan 2022 16:42:12 +1100 Subject: [PATCH 5/8] revert --- .gitignore | 1 - amplify/.config/project-config.json | 6 +- .../src/package-lock.json | 46 -- .../fsJoinProject/src/package-lock.json | 680 +++++++++++++++++- .../fsLeaveProject/src/package-lock.json | 10 +- .../fsSendRealtimeData/src/package-lock.json | 10 +- .../fsUserDisconnection/src/package-lock.json | 10 +- amplify/hooks/README.md | 7 - amplify/team-provider-info.json | 3 + package.json | 3 - public/index.html | 2 +- src/assets/chevron-right-outline.svg | 9 - src/aws-exports.js | 8 +- src/components/ActionSheet.js | 2 +- src/components/AuthFlow/NewAccount.js | 59 +- .../AuthFlow/NewAccount.module.scss | 8 + src/components/SidePanel/AccountSettings.js | 45 +- src/components/TasksPanel/TaskItem.js | 12 +- .../TasksPanel/TaskItem.module.scss | 2 +- .../UI/fields/CardSelect.module.scss | 2 +- .../UI/fields/DateField.module.scss | 2 +- src/components/UI/fields/Select.module.scss | 4 +- src/components/UI/fields/TagField.module.scss | 4 +- .../UI/fields/TextField.module.scss | 2 +- src/components/UI/fields/Textarea.module.scss | 2 +- src/graphql/mutations.js | 4 + src/graphql/queries.js | 6 + src/graphql/schema.json | 123 +++- src/graphql/subscriptions.js | 2 + 29 files changed, 965 insertions(+), 109 deletions(-) delete mode 100644 amplify/hooks/README.md delete mode 100644 src/assets/chevron-right-outline.svg diff --git a/.gitignore b/.gitignore index 996c98c6..0e272c9f 100644 --- a/.gitignore +++ b/.gitignore @@ -33,7 +33,6 @@ amplify/backend/.temp build/ dist/ node_modules/ -aws-exports.js awsconfiguration.json amplifyconfiguration.json amplifyconfiguration.dart diff --git a/amplify/.config/project-config.json b/amplify/.config/project-config.json index c9f7c3b9..9c27728b 100644 --- a/amplify/.config/project-config.json +++ b/amplify/.config/project-config.json @@ -2,7 +2,7 @@ "providers": [ "awscloudformation" ], - "projectName": "forwardslash", + "projectName": "fstestttt", "version": "3.1", "frontend": "javascript", "javascript": { @@ -10,8 +10,8 @@ "config": { "SourceDir": "src", "DistributionDir": "build", - "BuildCommand": "yarn", - "StartCommand": "yarn start" + "BuildCommand": "npm.cmd run-script build", + "StartCommand": "npm.cmd run-script start" } } } \ No newline at end of file diff --git a/amplify/backend/function/fsCognitoPostConfirmation/src/package-lock.json b/amplify/backend/function/fsCognitoPostConfirmation/src/package-lock.json index b8c0c9f9..5cf66ac9 100644 --- a/amplify/backend/function/fsCognitoPostConfirmation/src/package-lock.json +++ b/amplify/backend/function/fsCognitoPostConfirmation/src/package-lock.json @@ -4,42 +4,6 @@ "lockfileVersion": 1, "requires": true, "dependencies": { - "@sendgrid/client": { - "version": "7.6.0", - "resolved": "https://registry.npmjs.org/@sendgrid/client/-/client-7.6.0.tgz", - "integrity": "sha512-cpBVZKLlMTO+vpE18krTixubYmZa98oTbLkqBDuTiA3zRkW+urrxg7pDR24TkI35Mid0Zru8jDHwnOiqrXu0TA==", - "requires": { - "@sendgrid/helpers": "^7.6.0", - "axios": "^0.21.4" - }, - "dependencies": { - "axios": { - "version": "0.21.4", - "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz", - "integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==", - "requires": { - "follow-redirects": "^1.14.0" - } - } - } - }, - "@sendgrid/helpers": { - "version": "7.6.0", - "resolved": "https://registry.npmjs.org/@sendgrid/helpers/-/helpers-7.6.0.tgz", - "integrity": "sha512-0uWD+HSXLl4Z/X3cN+UMQC20RE7xwAACgppnfjDyvKG0KvJcUgDGz7HDdQkiMUdcVWfmyk6zKSg7XKfKzBjTwA==", - "requires": { - "deepmerge": "^4.2.2" - } - }, - "@sendgrid/mail": { - "version": "7.6.0", - "resolved": "https://registry.npmjs.org/@sendgrid/mail/-/mail-7.6.0.tgz", - "integrity": "sha512-0KdaSZzflJD/vUAZjB3ALBIuaVGoLq22hrb2fvQXZHRepU/yhRNlEOqrr05MfKBnKskzq1blnD1J0fHxiwaolw==", - "requires": { - "@sendgrid/client": "^7.6.0", - "@sendgrid/helpers": "^7.6.0" - } - }, "axios": { "version": "0.24.0", "resolved": "https://registry.npmjs.org/axios/-/axios-0.24.0.tgz", @@ -48,16 +12,6 @@ "follow-redirects": "^1.14.4" } }, - "deepmerge": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz", - "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==" - }, - "dotenv": { - "version": "10.0.0", - "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-10.0.0.tgz", - "integrity": "sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q==" - }, "follow-redirects": { "version": "1.14.5", "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.5.tgz", diff --git a/amplify/backend/function/fsJoinProject/src/package-lock.json b/amplify/backend/function/fsJoinProject/src/package-lock.json index 4f5258e1..f89dd1bd 100644 --- a/amplify/backend/function/fsJoinProject/src/package-lock.json +++ b/amplify/backend/function/fsJoinProject/src/package-lock.json @@ -1,8 +1,686 @@ { "name": "fsJoinProject", "version": "2.0.0", - "lockfileVersion": 1, + "lockfileVersion": 2, "requires": true, + "packages": { + "": { + "name": "fsJoinProject", + "version": "2.0.0", + "license": "Apache-2.0", + "dependencies": { + "cognito-express": "^2.0.19" + } + }, + "node_modules/ajv": { + "version": "6.12.6", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", + "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", + "dependencies": { + "fast-deep-equal": "^3.1.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/epoberezkin" + } + }, + "node_modules/asn1": { + "version": "0.2.6", + "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.6.tgz", + "integrity": "sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==", + "dependencies": { + "safer-buffer": "~2.1.0" + } + }, + "node_modules/asn1.js": { + "version": "5.4.1", + "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz", + "integrity": "sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==", + "dependencies": { + "bn.js": "^4.0.0", + "inherits": "^2.0.1", + "minimalistic-assert": "^1.0.0", + "safer-buffer": "^2.1.0" + } + }, + "node_modules/assert-plus": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", + "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=", + "engines": { + "node": ">=0.8" + } + }, + "node_modules/asynckit": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", + "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=" + }, + "node_modules/aws-sign2": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz", + "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=", + "engines": { + "node": "*" + } + }, + "node_modules/aws4": { + "version": "1.11.0", + "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz", + "integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==" + }, + "node_modules/bcrypt-pbkdf": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz", + "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=", + "dependencies": { + "tweetnacl": "^0.14.3" + } + }, + "node_modules/bluebird": { + "version": "3.7.2", + "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz", + "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==" + }, + "node_modules/bn.js": { + "version": "4.12.0", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", + "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==" + }, + "node_modules/brorand": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz", + "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=" + }, + "node_modules/buffer-equal-constant-time": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz", + "integrity": "sha1-+OcRMvf/5uAaXJaXpMbz5I1cyBk=" + }, + "node_modules/caseless": { + "version": "0.12.0", + "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", + "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=" + }, + "node_modules/cognito-express": { + "version": "2.0.19", + "resolved": "https://registry.npmjs.org/cognito-express/-/cognito-express-2.0.19.tgz", + "integrity": "sha512-SEDfInb5hUifSVwG9pE2T9YstGH3KB8Ebcie+Q5Uqb14p5cgAAqDpaR6rx5+XMVjQ1YGVbUMvx7TNOH6KPL+aA==", + "dependencies": { + "jsonwebtoken": "^8.3.0", + "jwk-to-pem": "^2.0.0", + "request": "^2.88.0", + "request-promise": "^4.2.2" + } + }, + "node_modules/combined-stream": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", + "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", + "dependencies": { + "delayed-stream": "~1.0.0" + }, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/core-util-is": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", + "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=" + }, + "node_modules/dashdash": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", + "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=", + "dependencies": { + "assert-plus": "^1.0.0" + }, + "engines": { + "node": ">=0.10" + } + }, + "node_modules/delayed-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", + "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=", + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/ecc-jsbn": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz", + "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=", + "dependencies": { + "jsbn": "~0.1.0", + "safer-buffer": "^2.1.0" + } + }, + "node_modules/ecdsa-sig-formatter": { + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz", + "integrity": "sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==", + "dependencies": { + "safe-buffer": "^5.0.1" + } + }, + "node_modules/elliptic": { + "version": "6.5.4", + "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz", + "integrity": "sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==", + "dependencies": { + "bn.js": "^4.11.9", + "brorand": "^1.1.0", + "hash.js": "^1.0.0", + "hmac-drbg": "^1.0.1", + "inherits": "^2.0.4", + "minimalistic-assert": "^1.0.1", + "minimalistic-crypto-utils": "^1.0.1" + } + }, + "node_modules/extend": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", + "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==" + }, + "node_modules/extsprintf": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz", + "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=", + "engines": [ + "node >=0.6.0" + ] + }, + "node_modules/fast-deep-equal": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", + "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==" + }, + "node_modules/fast-json-stable-stringify": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", + "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==" + }, + "node_modules/forever-agent": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", + "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=", + "engines": { + "node": "*" + } + }, + "node_modules/form-data": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz", + "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==", + "dependencies": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.6", + "mime-types": "^2.1.12" + }, + "engines": { + "node": ">= 0.12" + } + }, + "node_modules/getpass": { + "version": "0.1.7", + "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", + "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=", + "dependencies": { + "assert-plus": "^1.0.0" + } + }, + "node_modules/har-schema": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz", + "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=", + "engines": { + "node": ">=4" + } + }, + "node_modules/har-validator": { + "version": "5.1.5", + "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz", + "integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==", + "deprecated": "this library is no longer supported", + "dependencies": { + "ajv": "^6.12.3", + "har-schema": "^2.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/hash.js": { + "version": "1.1.7", + "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz", + "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==", + "dependencies": { + "inherits": "^2.0.3", + "minimalistic-assert": "^1.0.1" + } + }, + "node_modules/hmac-drbg": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz", + "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=", + "dependencies": { + "hash.js": "^1.0.3", + "minimalistic-assert": "^1.0.0", + "minimalistic-crypto-utils": "^1.0.1" + } + }, + "node_modules/http-signature": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz", + "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=", + "dependencies": { + "assert-plus": "^1.0.0", + "jsprim": "^1.2.2", + "sshpk": "^1.7.0" + }, + "engines": { + "node": ">=0.8", + "npm": ">=1.3.7" + } + }, + "node_modules/inherits": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" + }, + "node_modules/is-typedarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", + "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=" + }, + "node_modules/isstream": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", + "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=" + }, + "node_modules/jsbn": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz", + "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=" + }, + "node_modules/json-schema": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz", + "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=" + }, + "node_modules/json-schema-traverse": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", + "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==" + }, + "node_modules/json-stringify-safe": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", + "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=" + }, + "node_modules/jsonwebtoken": { + "version": "8.5.1", + "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-8.5.1.tgz", + "integrity": "sha512-XjwVfRS6jTMsqYs0EsuJ4LGxXV14zQybNd4L2r0UvbVnSF9Af8x7p5MzbJ90Ioz/9TI41/hTCvznF/loiSzn8w==", + "dependencies": { + "jws": "^3.2.2", + "lodash.includes": "^4.3.0", + "lodash.isboolean": "^3.0.3", + "lodash.isinteger": "^4.0.4", + "lodash.isnumber": "^3.0.3", + "lodash.isplainobject": "^4.0.6", + "lodash.isstring": "^4.0.1", + "lodash.once": "^4.0.0", + "ms": "^2.1.1", + "semver": "^5.6.0" + }, + "engines": { + "node": ">=4", + "npm": ">=1.4.28" + } + }, + "node_modules/jsprim": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz", + "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=", + "engines": [ + "node >=0.6.0" + ], + "dependencies": { + "assert-plus": "1.0.0", + "extsprintf": "1.3.0", + "json-schema": "0.2.3", + "verror": "1.10.0" + } + }, + "node_modules/jwa": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/jwa/-/jwa-1.4.1.tgz", + "integrity": "sha512-qiLX/xhEEFKUAJ6FiBMbes3w9ATzyk5W7Hvzpa/SLYdxNtng+gcurvrI7TbACjIXlsJyr05/S1oUhZrc63evQA==", + "dependencies": { + "buffer-equal-constant-time": "1.0.1", + "ecdsa-sig-formatter": "1.0.11", + "safe-buffer": "^5.0.1" + } + }, + "node_modules/jwk-to-pem": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/jwk-to-pem/-/jwk-to-pem-2.0.5.tgz", + "integrity": "sha512-L90jwellhO8jRKYwbssU9ifaMVqajzj3fpRjDKcsDzrslU9syRbFqfkXtT4B89HYAap+xsxNcxgBSB09ig+a7A==", + "dependencies": { + "asn1.js": "^5.3.0", + "elliptic": "^6.5.4", + "safe-buffer": "^5.0.1" + } + }, + "node_modules/jws": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/jws/-/jws-3.2.2.tgz", + "integrity": "sha512-YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA==", + "dependencies": { + "jwa": "^1.4.1", + "safe-buffer": "^5.0.1" + } + }, + "node_modules/lodash": { + "version": "4.17.21", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", + "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" + }, + "node_modules/lodash.includes": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/lodash.includes/-/lodash.includes-4.3.0.tgz", + "integrity": "sha1-YLuYqHy5I8aMoeUTJUgzFISfVT8=" + }, + "node_modules/lodash.isboolean": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz", + "integrity": "sha1-bC4XHbKiV82WgC/UOwGyDV9YcPY=" + }, + "node_modules/lodash.isinteger": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz", + "integrity": "sha1-YZwK89A/iwTDH1iChAt3sRzWg0M=" + }, + "node_modules/lodash.isnumber": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz", + "integrity": "sha1-POdoEMWSjQM1IwGsKHMX8RwLH/w=" + }, + "node_modules/lodash.isplainobject": { + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz", + "integrity": "sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs=" + }, + "node_modules/lodash.isstring": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz", + "integrity": "sha1-1SfftUVuynzJu5XV2ur4i6VKVFE=" + }, + "node_modules/lodash.once": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz", + "integrity": "sha1-DdOXEhPHxW34gJd9UEyI+0cal6w=" + }, + "node_modules/mime-db": { + "version": "1.51.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.51.0.tgz", + "integrity": "sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g==", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/mime-types": { + "version": "2.1.34", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.34.tgz", + "integrity": "sha512-6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A==", + "dependencies": { + "mime-db": "1.51.0" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/minimalistic-assert": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz", + "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==" + }, + "node_modules/minimalistic-crypto-utils": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz", + "integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=" + }, + "node_modules/ms": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" + }, + "node_modules/oauth-sign": { + "version": "0.9.0", + "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz", + "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==", + "engines": { + "node": "*" + } + }, + "node_modules/performance-now": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", + "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=" + }, + "node_modules/psl": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz", + "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==" + }, + "node_modules/punycode": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", + "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==", + "engines": { + "node": ">=6" + } + }, + "node_modules/qs": { + "version": "6.5.2", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz", + "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==", + "engines": { + "node": ">=0.6" + } + }, + "node_modules/request": { + "version": "2.88.2", + "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz", + "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==", + "deprecated": "request has been deprecated, see https://github.com/request/request/issues/3142", + "dependencies": { + "aws-sign2": "~0.7.0", + "aws4": "^1.8.0", + "caseless": "~0.12.0", + "combined-stream": "~1.0.6", + "extend": "~3.0.2", + "forever-agent": "~0.6.1", + "form-data": "~2.3.2", + "har-validator": "~5.1.3", + "http-signature": "~1.2.0", + "is-typedarray": "~1.0.0", + "isstream": "~0.1.2", + "json-stringify-safe": "~5.0.1", + "mime-types": "~2.1.19", + "oauth-sign": "~0.9.0", + "performance-now": "^2.1.0", + "qs": "~6.5.2", + "safe-buffer": "^5.1.2", + "tough-cookie": "~2.5.0", + "tunnel-agent": "^0.6.0", + "uuid": "^3.3.2" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/request-promise": { + "version": "4.2.6", + "resolved": "https://registry.npmjs.org/request-promise/-/request-promise-4.2.6.tgz", + "integrity": "sha512-HCHI3DJJUakkOr8fNoCc73E5nU5bqITjOYFMDrKHYOXWXrgD/SBaC7LjwuPymUprRyuF06UK7hd/lMHkmUXglQ==", + "deprecated": "request-promise has been deprecated because it extends the now deprecated request package, see https://github.com/request/request/issues/3142", + "dependencies": { + "bluebird": "^3.5.0", + "request-promise-core": "1.1.4", + "stealthy-require": "^1.1.1", + "tough-cookie": "^2.3.3" + }, + "engines": { + "node": ">=0.10.0" + }, + "peerDependencies": { + "request": "^2.34" + } + }, + "node_modules/request-promise-core": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.4.tgz", + "integrity": "sha512-TTbAfBBRdWD7aNNOoVOBH4pN/KigV6LyapYNNlAPA8JwbovRti1E88m3sYAwsLi5ryhPKsE9APwnjFTgdUjTpw==", + "dependencies": { + "lodash": "^4.17.19" + }, + "engines": { + "node": ">=0.10.0" + }, + "peerDependencies": { + "request": "^2.34" + } + }, + "node_modules/safe-buffer": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", + "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ] + }, + "node_modules/safer-buffer": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" + }, + "node_modules/semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "bin": { + "semver": "bin/semver" + } + }, + "node_modules/sshpk": { + "version": "1.16.1", + "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz", + "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==", + "dependencies": { + "asn1": "~0.2.3", + "assert-plus": "^1.0.0", + "bcrypt-pbkdf": "^1.0.0", + "dashdash": "^1.12.0", + "ecc-jsbn": "~0.1.1", + "getpass": "^0.1.1", + "jsbn": "~0.1.0", + "safer-buffer": "^2.0.2", + "tweetnacl": "~0.14.0" + }, + "bin": { + "sshpk-conv": "bin/sshpk-conv", + "sshpk-sign": "bin/sshpk-sign", + "sshpk-verify": "bin/sshpk-verify" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/stealthy-require": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz", + "integrity": "sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks=", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/tough-cookie": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz", + "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==", + "dependencies": { + "psl": "^1.1.28", + "punycode": "^2.1.1" + }, + "engines": { + "node": ">=0.8" + } + }, + "node_modules/tunnel-agent": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", + "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", + "dependencies": { + "safe-buffer": "^5.0.1" + }, + "engines": { + "node": "*" + } + }, + "node_modules/tweetnacl": { + "version": "0.14.5", + "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", + "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=" + }, + "node_modules/uri-js": { + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", + "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", + "dependencies": { + "punycode": "^2.1.0" + } + }, + "node_modules/uuid": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", + "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==", + "deprecated": "Please upgrade to version 7 or higher. Older versions may use Math.random() in certain circumstances, which is known to be problematic. See https://v8.dev/blog/math-random for details.", + "bin": { + "uuid": "bin/uuid" + } + }, + "node_modules/verror": { + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", + "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=", + "engines": [ + "node >=0.6.0" + ], + "dependencies": { + "assert-plus": "^1.0.0", + "core-util-is": "1.0.2", + "extsprintf": "^1.2.0" + } + } + }, "dependencies": { "ajv": { "version": "6.12.6", diff --git a/amplify/backend/function/fsLeaveProject/src/package-lock.json b/amplify/backend/function/fsLeaveProject/src/package-lock.json index 15477b7e..af89540e 100644 --- a/amplify/backend/function/fsLeaveProject/src/package-lock.json +++ b/amplify/backend/function/fsLeaveProject/src/package-lock.json @@ -1,5 +1,13 @@ { "name": "fsLeaveProject", "version": "2.0.0", - "lockfileVersion": 1 + "lockfileVersion": 2, + "requires": true, + "packages": { + "": { + "name": "fsLeaveProject", + "version": "2.0.0", + "license": "Apache-2.0" + } + } } diff --git a/amplify/backend/function/fsSendRealtimeData/src/package-lock.json b/amplify/backend/function/fsSendRealtimeData/src/package-lock.json index 4651b96b..09bb84c4 100644 --- a/amplify/backend/function/fsSendRealtimeData/src/package-lock.json +++ b/amplify/backend/function/fsSendRealtimeData/src/package-lock.json @@ -1,5 +1,13 @@ { "name": "fsSendRealtimeData", "version": "2.0.0", - "lockfileVersion": 1 + "lockfileVersion": 2, + "requires": true, + "packages": { + "": { + "name": "fsSendRealtimeData", + "version": "2.0.0", + "license": "Apache-2.0" + } + } } diff --git a/amplify/backend/function/fsUserDisconnection/src/package-lock.json b/amplify/backend/function/fsUserDisconnection/src/package-lock.json index 84218664..6d638da5 100644 --- a/amplify/backend/function/fsUserDisconnection/src/package-lock.json +++ b/amplify/backend/function/fsUserDisconnection/src/package-lock.json @@ -1,5 +1,13 @@ { "name": "fsUserDisconnection", "version": "2.0.0", - "lockfileVersion": 1 + "lockfileVersion": 2, + "requires": true, + "packages": { + "": { + "name": "fsUserDisconnection", + "version": "2.0.0", + "license": "Apache-2.0" + } + } } diff --git a/amplify/hooks/README.md b/amplify/hooks/README.md deleted file mode 100644 index 8fb601ea..00000000 --- a/amplify/hooks/README.md +++ /dev/null @@ -1,7 +0,0 @@ -# Command Hooks - -Command hooks can be used to run custom scripts upon Amplify CLI lifecycle events like pre-push, post-add-function, etc. - -To get started, add your script files based on the expected naming convention in this directory. - -Learn more about the script file naming convention, hook parameters, third party dependencies, and advanced configurations at https://docs.amplify.aws/cli/usage/command-hooks diff --git a/amplify/team-provider-info.json b/amplify/team-provider-info.json index 39426c10..c08dae81 100644 --- a/amplify/team-provider-info.json +++ b/amplify/team-provider-info.json @@ -1,4 +1,5 @@ { +<<<<<<< HEAD "dev": { "awscloudformation": { "AuthRoleName": "amplify-fstestttt-dev-115806-authRole", @@ -62,6 +63,8 @@ } } }, +======= +>>>>>>> parent of 5d784d6 (changed birthdate and gender) "mainn": { "awscloudformation": { "AuthRoleName": "amplify-forwardslashtesting-mainn-131231-authRole", diff --git a/package.json b/package.json index 45993c5c..08d9643b 100644 --- a/package.json +++ b/package.json @@ -19,9 +19,6 @@ "aws-sdk": "^2.1037.0", "draft-js": "0.11.7", "draft-js-export-html": "1.4.1", - "eslint-plugin-import": "^2.25.4", - "eslint-plugin-react": "^7.28.0", - "eslint-plugin-react-hooks": "^4.3.0", "fuse.js": "^6.4.6", "history": "^5.1.0", "nanoid": "^3.1.30", diff --git a/public/index.html b/public/index.html index 2f6b9a16..f04d928f 100644 --- a/public/index.html +++ b/public/index.html @@ -39,7 +39,7 @@ - Forwardslash + Forward Slash - - diff --git a/src/aws-exports.js b/src/aws-exports.js index 11902c7a..2b22090d 100644 --- a/src/aws-exports.js +++ b/src/aws-exports.js @@ -3,13 +3,13 @@ const awsmobile = { "aws_project_region": "us-east-1", - "aws_appsync_graphqlEndpoint": "https://khds4uckibbp7hkf3kjvs3hi3m.appsync-api.us-east-1.amazonaws.com/graphql", + "aws_appsync_graphqlEndpoint": "https://wc4bxcmfu5gkrlmeqyoj2ilvcm.appsync-api.us-east-1.amazonaws.com/graphql", "aws_appsync_region": "us-east-1", "aws_appsync_authenticationType": "AMAZON_COGNITO_USER_POOLS", - "aws_cognito_identity_pool_id": "us-east-1:154a027d-0ada-47fb-b0ce-8328881cf96e", + "aws_cognito_identity_pool_id": "us-east-1:83b9baef-6204-481d-9c31-3ff39e0a6a9a", "aws_cognito_region": "us-east-1", - "aws_user_pools_id": "us-east-1_7Mc3Irc63", - "aws_user_pools_web_client_id": "2iihb9furck6m9fnnkhpj7skqo", + "aws_user_pools_id": "us-east-1_jllb3Qjdd", + "aws_user_pools_web_client_id": "7ojagvnc5f5tvnfcfpp3fg9l67", "oauth": {}, "aws_cognito_username_attributes": [], "aws_cognito_social_providers": [], diff --git a/src/components/ActionSheet.js b/src/components/ActionSheet.js index aaeafcf2..37136a6f 100644 --- a/src/components/ActionSheet.js +++ b/src/components/ActionSheet.js @@ -9,7 +9,7 @@ import { ReactComponent as RemoveIcon } from "../assets/trash-outline.svg" import { ReactComponent as CopyIcon } from "../assets/copy-outline.svg" import { ReactComponent as DuplicateIcon } from "../assets/duplicate-outline.svg" import { ReactComponent as ShareIcon } from "../assets/share-outline.svg" -import { ReactComponent as DetailsIcon } from "../assets/chevron-right-outline.svg"; +import { ReactComponent as DetailsIcon } from "../assets/information-circle-outline.svg"; import { ReactComponent as CheckmarkIcon } from "../assets/checkmark-circle-outline.svg"; import styles from "./ActionSheet.module.scss" diff --git a/src/components/AuthFlow/NewAccount.js b/src/components/AuthFlow/NewAccount.js index 2988a656..737bba8a 100644 --- a/src/components/AuthFlow/NewAccount.js +++ b/src/components/AuthFlow/NewAccount.js @@ -21,12 +21,14 @@ const NewAccount = (props) => { const [email, setEmail] = useState("") const [phoneNumber, setPhoneNumber] = useState("") const [password, setPassword] = useState("") + const [dateOfBirth, setDateOfBirth] = useState("") + const [gender, setGender] = useState("male") const [firstNameError, setFirstNameError] = useState(null) const [lastNameError, setLastNameError] = useState(null) const [usernameError, setUsernameError] = useState(null) const [emailError, setEmailError] = useState(null) const [passwordError, setPasswordError] = useState(null) - + const [dateOfBirthError, setDateOfBirthError] = useState(null) const [verificationCodeError, setVerificationCodeError] = useState(null) const [isBusy, setIsBusy] = useState(false) const validateFirstName = (value = firstName) => { @@ -47,9 +49,9 @@ const NewAccount = (props) => { setUsernameError("Required field.") return } - //const re = /^\w+$/; - //const isValid = re.test(value) - //if (!isValid) setUsernameError("Only letters, numbers and underscore are allowed.") + const re = /^\w+$/; + const isValid = re.test(value) + if (!isValid) setUsernameError("Only letters, numbers and underscore are allowed.") } const validateEmail = (value = email) => { setEmailError(null) @@ -75,18 +77,25 @@ const NewAccount = (props) => { const isValid = re.test(value) if (!isValid) setPasswordError("Password must contain lowercase, uppercase, numerical and symbolic characters.") } - + const validateDateOfBirth = (value = dateOfBirth) => { + setDateOfBirthError(null) + if (!value) { + setDateOfBirthError("Required field.") + } + } const getIsSubmissionPossible = ( firstName, lastName, username, email, password, + dateOfBirth, firstNameError, lastNameError, usernameError, emailError, passwordError, + dateOfBirthError ) => { return !( !firstName || @@ -94,11 +103,13 @@ const NewAccount = (props) => { !username || !email || !password || + !dateOfBirth || firstNameError || lastNameError || usernameError || emailError || - passwordError + passwordError || + dateOfBirthError ) } const isSubmissionPossible = useMemo(() => getIsSubmissionPossible( @@ -107,21 +118,26 @@ const NewAccount = (props) => { username, email, password, + dateOfBirth, firstNameError, lastNameError, usernameError, - emailError + emailError, + passwordError, + dateOfBirthError ), [ firstName, lastName, username, email, password, + dateOfBirth, firstNameError, lastNameError, usernameError, emailError, - passwordError + passwordError, + dateOfBirthError ]) const handleNewAccount = async (e) => { e.preventDefault() @@ -134,6 +150,8 @@ const NewAccount = (props) => { given_name: firstName.trim(), family_name: lastName.trim(), email: email.trim(), + birthdate: new Date(dateOfBirth).toISOString().substring(0, 10), + gender: gender, phone_number: phoneNumber, } @@ -198,6 +216,13 @@ const NewAccount = (props) => { setPassword(value) validatePassword(value) break + case "dateOfBirth": + setDateOfBirth(value) + validateDateOfBirth(value) + break + case "gender": + setGender(value) + break case "verificationCode": setVerificationCode(value) setVerificationCodeError(null) @@ -266,7 +291,23 @@ const NewAccount = (props) => { error={passwordError} value={password} /> - + + setNewGender(e.target.value)} + value={newGender} + readOnly={!isSynced} + /> : } @@ -314,14 +314,14 @@ const TaskItem = (props) => { ...(item.id === selectedTask && [styles.focused] || []), ].join(" ")} > - openRightPanel(item)}> + {item.due ? formatDate(item.due) : "No Due"} - openRightPanel(item)}> 768 ? 24 : 18 } - /> + /> {(command && selectedTask === item.id) && ( diff --git a/src/components/TasksPanel/TaskItem.module.scss b/src/components/TasksPanel/TaskItem.module.scss index f33f8854..15201e82 100644 --- a/src/components/TasksPanel/TaskItem.module.scss +++ b/src/components/TasksPanel/TaskItem.module.scss @@ -57,7 +57,7 @@ flex-direction: row; justify-content: space-between; align-items: center; - border: 1px solid transparent; + border: 2px solid transparent; border-radius: 10px; padding: 8px 12px; margin: 4px 0; diff --git a/src/components/UI/fields/CardSelect.module.scss b/src/components/UI/fields/CardSelect.module.scss index 31c3a962..cec14646 100644 --- a/src/components/UI/fields/CardSelect.module.scss +++ b/src/components/UI/fields/CardSelect.module.scss @@ -24,7 +24,7 @@ width: 100%; text-align: left; padding: 12px; - border: 1px solid transparent; + border: 2px solid transparent; outline: none; cursor: pointer; border-radius: 8px; diff --git a/src/components/UI/fields/DateField.module.scss b/src/components/UI/fields/DateField.module.scss index fc5f6ace..658eb5f8 100644 --- a/src/components/UI/fields/DateField.module.scss +++ b/src/components/UI/fields/DateField.module.scss @@ -20,7 +20,7 @@ width: calc(100% - 24px); padding: 10px; border-radius: 8px; - border: 1px solid transparent; + border: 2px solid transparent; background-color: transparent; @include themify(border-color, "outline"); &.error { diff --git a/src/components/UI/fields/Select.module.scss b/src/components/UI/fields/Select.module.scss index 313e963c..1b413729 100644 --- a/src/components/UI/fields/Select.module.scss +++ b/src/components/UI/fields/Select.module.scss @@ -6,7 +6,7 @@ justify-content: center; padding: 10px; border-radius: 8px; - border: 1px solid transparent; + border: 2px solid transparent; background-color: transparent; @include themify(border-color, "outline"); & > label { @@ -30,7 +30,7 @@ .Selection { position: relative; padding: 3px 10px; - border: 1px solid transparent; + border: 2px solid transparent; font-weight: 600; font-size: 14px; border-radius: 100000000000000px; diff --git a/src/components/UI/fields/TagField.module.scss b/src/components/UI/fields/TagField.module.scss index 6caec860..2245d26f 100644 --- a/src/components/UI/fields/TagField.module.scss +++ b/src/components/UI/fields/TagField.module.scss @@ -18,7 +18,7 @@ font-weight: 400; padding: 7.5px 10px; border-radius: 8px; - border: 1px solid transparent; + border: 2px solid transparent; background-color: transparent; @include themify(border-color, "outline"); & > label { @@ -87,7 +87,7 @@ border: none; flex-direction: row; align-items: center; - box-shadow: 0px 1px 4px rgb(0 0 0 / 6%); + box-shadow: 0px 2px 4px rgb(0 0 0 / 6%); @include themify(color, "outline"); @include themify(background-color, "fieldBg"); & > span { diff --git a/src/components/UI/fields/TextField.module.scss b/src/components/UI/fields/TextField.module.scss index 881ca19b..e87e5fef 100644 --- a/src/components/UI/fields/TextField.module.scss +++ b/src/components/UI/fields/TextField.module.scss @@ -22,7 +22,7 @@ font-weight: 400; padding: 10px; border-radius: 8px; - border: 1px solid transparent; + border: 2px solid transparent; background-color: transparent; @include themify(border-color, "outline"); & > label { diff --git a/src/components/UI/fields/Textarea.module.scss b/src/components/UI/fields/Textarea.module.scss index 5c21361a..7986f0cf 100644 --- a/src/components/UI/fields/Textarea.module.scss +++ b/src/components/UI/fields/Textarea.module.scss @@ -10,7 +10,7 @@ width: calc(100% - 24px); padding: 10px; border-radius: 8px; - border: 1px solid transparent; + border: 2px solid transparent; background-color: transparent; @include themify(border-color, "outline"); & > label { diff --git a/src/graphql/mutations.js b/src/graphql/mutations.js index 83d70b82..032cdacf 100644 --- a/src/graphql/mutations.js +++ b/src/graphql/mutations.js @@ -7,6 +7,8 @@ export const pushUserUpdate = /* GraphQL */ ` username firstName lastName + gender + birthdate email plan avatar @@ -167,6 +169,8 @@ export const updateUser = /* GraphQL */ ` username firstName lastName + gender + birthdate email plan avatar diff --git a/src/graphql/queries.js b/src/graphql/queries.js index b2988d00..39532b27 100644 --- a/src/graphql/queries.js +++ b/src/graphql/queries.js @@ -7,6 +7,8 @@ export const getUserByUsername = /* GraphQL */ ` username firstName lastName + gender + birthdate email plan avatar @@ -25,6 +27,8 @@ export const listUsersByUsernames = /* GraphQL */ ` username firstName lastName + gender + birthdate email plan avatar @@ -233,6 +237,8 @@ export const searchUsers = /* GraphQL */ ` username firstName lastName + gender + birthdate email plan avatar diff --git a/src/graphql/schema.json b/src/graphql/schema.json index 16f96095..01508995 100644 --- a/src/graphql/schema.json +++ b/src/graphql/schema.json @@ -344,6 +344,36 @@ }, "isDeprecated" : false, "deprecationReason" : null + }, { + "name" : "gender", + "description" : null, + "args" : [ ], + "type" : { + "kind" : "NON_NULL", + "name" : null, + "ofType" : { + "kind" : "ENUM", + "name" : "Gender", + "ofType" : null + } + }, + "isDeprecated" : false, + "deprecationReason" : null + }, { + "name" : "birthdate", + "description" : null, + "args" : [ ], + "type" : { + "kind" : "NON_NULL", + "name" : null, + "ofType" : { + "kind" : "SCALAR", + "name" : "String", + "ofType" : null + } + }, + "isDeprecated" : false, + "deprecationReason" : null }, { "name" : "email", "description" : null, @@ -486,6 +516,25 @@ "interfaces" : null, "enumValues" : null, "possibleTypes" : null + }, { + "kind" : "ENUM", + "name" : "Gender", + "description" : null, + "fields" : null, + "inputFields" : null, + "interfaces" : null, + "enumValues" : [ { + "name" : "male", + "description" : null, + "isDeprecated" : false, + "deprecationReason" : null + }, { + "name" : "female", + "description" : null, + "isDeprecated" : false, + "deprecationReason" : null + } ], + "possibleTypes" : null }, { "kind" : "SCALAR", "name" : "AWSEmail", @@ -1595,6 +1644,15 @@ "ofType" : null }, "defaultValue" : null + }, { + "name" : "birthdate", + "description" : null, + "type" : { + "kind" : "INPUT_OBJECT", + "name" : "SearchableStringFilterInput", + "ofType" : null + }, + "defaultValue" : null }, { "name" : "email", "description" : null, @@ -2033,6 +2091,11 @@ "description" : null, "isDeprecated" : false, "deprecationReason" : null + }, { + "name" : "birthdate", + "description" : null, + "isDeprecated" : false, + "deprecationReason" : null }, { "name" : "email", "description" : null, @@ -2606,6 +2669,28 @@ }, "isDeprecated" : false, "deprecationReason" : null + }, { + "name" : "gender", + "description" : null, + "args" : [ ], + "type" : { + "kind" : "ENUM", + "name" : "Gender", + "ofType" : null + }, + "isDeprecated" : false, + "deprecationReason" : null + }, { + "name" : "birthdate", + "description" : null, + "args" : [ ], + "type" : { + "kind" : "SCALAR", + "name" : "String", + "ofType" : null + }, + "isDeprecated" : false, + "deprecationReason" : null }, { "name" : "email", "description" : null, @@ -2767,6 +2852,24 @@ "ofType" : null }, "defaultValue" : null + }, { + "name" : "gender", + "description" : null, + "type" : { + "kind" : "ENUM", + "name" : "Gender", + "ofType" : null + }, + "defaultValue" : null + }, { + "name" : "birthdate", + "description" : null, + "type" : { + "kind" : "SCALAR", + "name" : "String", + "ofType" : null + }, + "defaultValue" : null }, { "name" : "email", "description" : null, @@ -4770,7 +4873,25 @@ "ofType" : null }, "defaultValue" : null - }], + }, { + "name" : "gender", + "description" : null, + "type" : { + "kind" : "ENUM", + "name" : "Gender", + "ofType" : null + }, + "defaultValue" : null + }, { + "name" : "birthdate", + "description" : null, + "type" : { + "kind" : "SCALAR", + "name" : "String", + "ofType" : null + }, + "defaultValue" : null + } ], "interfaces" : null, "enumValues" : null, "possibleTypes" : null diff --git a/src/graphql/subscriptions.js b/src/graphql/subscriptions.js index c840b950..3280d80a 100644 --- a/src/graphql/subscriptions.js +++ b/src/graphql/subscriptions.js @@ -7,6 +7,8 @@ export const onPushUserUpdate = /* GraphQL */ ` username firstName lastName + gender + birthdate email plan avatar From f014843c489bbeda08044aee2022c1f223ea20b2 Mon Sep 17 00:00:00 2001 From: glidaa Date: Thu, 13 Jan 2022 17:03:18 +1100 Subject: [PATCH 6/8] space --- src/store.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/store.js b/src/store.js index 8b62247a..08b369dd 100644 --- a/src/store.js +++ b/src/store.js @@ -11,4 +11,6 @@ import reducers from "./reducers" export default createStore( combineReducers(reducers), applyMiddleware(thunk, caching) -) \ No newline at end of file +) + + From 8e2d988408bc4681478531b632984155dee04432 Mon Sep 17 00:00:00 2001 From: glidaa Date: Thu, 13 Jan 2022 17:04:11 +1100 Subject: [PATCH 7/8] Revert "fix" This reverts commit 18ffc47d2a10a87d06e3a1b235cfd106f928be66. --- .../fsCognito-cloudformation-template.yml | 7 -- .../function/fsCoreApiResolver/src/index.js | 10 -- .../fsCoreApiResolver/src/package-lock.json | 100 +++++++++++++++++- amplify/team-provider-info.json | 2 +- 4 files changed, 100 insertions(+), 19 deletions(-) diff --git a/amplify/backend/auth/fsCognito/fsCognito-cloudformation-template.yml b/amplify/backend/auth/fsCognito/fsCognito-cloudformation-template.yml index c2fbcc94..29c071d2 100644 --- a/amplify/backend/auth/fsCognito/fsCognito-cloudformation-template.yml +++ b/amplify/backend/auth/fsCognito/fsCognito-cloudformation-template.yml @@ -178,9 +178,6 @@ Resources: ] Schema: - - Name: birthdate - Required: true - Mutable: true - Name: email Required: true @@ -190,10 +187,6 @@ Resources: Required: true Mutable: true - - Name: gender - Required: true - Mutable: true - - Name: given_name Required: true Mutable: true diff --git a/amplify/backend/function/fsCoreApiResolver/src/index.js b/amplify/backend/function/fsCoreApiResolver/src/index.js index 6c1d5c6c..e5c5d95b 100644 --- a/amplify/backend/function/fsCoreApiResolver/src/index.js +++ b/amplify/backend/function/fsCoreApiResolver/src/index.js @@ -1063,14 +1063,6 @@ exports.handler = async function (ctx) { ...((updateData.lastName && [{ Name: 'family_name', Value: updateData.lastName - }]) || []), - ...((updateData.birthdate && [{ - Name: 'birthdate', - Value: updateData.birthdate - }]) || []), - ...((updateData.gender && [{ - Name: 'gender', - Value: updateData.gender }]) || []) ], UserPoolId: USERPOOL, @@ -2315,8 +2307,6 @@ exports.handler = async function (ctx) { username firstName lastName - gender - birthdate email plan avatar diff --git a/amplify/backend/function/fsCoreApiResolver/src/package-lock.json b/amplify/backend/function/fsCoreApiResolver/src/package-lock.json index 1afaf400..bf1ec9ed 100644 --- a/amplify/backend/function/fsCoreApiResolver/src/package-lock.json +++ b/amplify/backend/function/fsCoreApiResolver/src/package-lock.json @@ -1,8 +1,106 @@ { "name": "fs-core-api-resolver", "version": "2.0.0", - "lockfileVersion": 1, + "lockfileVersion": 2, "requires": true, + "packages": { + "": { + "name": "fs-core-api-resolver", + "version": "2.0.0", + "license": "Apache-2.0", + "dependencies": { + "@sendgrid/mail": "^7.6.0", + "dotenv": "^10.0.0", + "uuid": "^8.3.2" + } + }, + "node_modules/@sendgrid/client": { + "version": "7.6.0", + "resolved": "https://registry.npmjs.org/@sendgrid/client/-/client-7.6.0.tgz", + "integrity": "sha512-cpBVZKLlMTO+vpE18krTixubYmZa98oTbLkqBDuTiA3zRkW+urrxg7pDR24TkI35Mid0Zru8jDHwnOiqrXu0TA==", + "dependencies": { + "@sendgrid/helpers": "^7.6.0", + "axios": "^0.21.4" + }, + "engines": { + "node": "6.* || 8.* || >=10.*" + } + }, + "node_modules/@sendgrid/helpers": { + "version": "7.6.0", + "resolved": "https://registry.npmjs.org/@sendgrid/helpers/-/helpers-7.6.0.tgz", + "integrity": "sha512-0uWD+HSXLl4Z/X3cN+UMQC20RE7xwAACgppnfjDyvKG0KvJcUgDGz7HDdQkiMUdcVWfmyk6zKSg7XKfKzBjTwA==", + "dependencies": { + "deepmerge": "^4.2.2" + }, + "engines": { + "node": ">= 6.0.0" + } + }, + "node_modules/@sendgrid/mail": { + "version": "7.6.0", + "resolved": "https://registry.npmjs.org/@sendgrid/mail/-/mail-7.6.0.tgz", + "integrity": "sha512-0KdaSZzflJD/vUAZjB3ALBIuaVGoLq22hrb2fvQXZHRepU/yhRNlEOqrr05MfKBnKskzq1blnD1J0fHxiwaolw==", + "dependencies": { + "@sendgrid/client": "^7.6.0", + "@sendgrid/helpers": "^7.6.0" + }, + "engines": { + "node": "6.* || 8.* || >=10.*" + } + }, + "node_modules/axios": { + "version": "0.21.4", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz", + "integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==", + "dependencies": { + "follow-redirects": "^1.14.0" + } + }, + "node_modules/deepmerge": { + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz", + "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/dotenv": { + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-10.0.0.tgz", + "integrity": "sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q==", + "engines": { + "node": ">=10" + } + }, + "node_modules/follow-redirects": { + "version": "1.14.5", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.5.tgz", + "integrity": "sha512-wtphSXy7d4/OR+MvIFbCVBDzZ5520qV8XfPklSN5QtxuMUJZ+b0Wnst1e1lCDocfzuCkHqj8k0FpZqO+UIaKNA==", + "funding": [ + { + "type": "individual", + "url": "https://github.com/sponsors/RubenVerborgh" + } + ], + "engines": { + "node": ">=4.0" + }, + "peerDependenciesMeta": { + "debug": { + "optional": true + } + } + }, + "node_modules/uuid": { + "version": "8.3.2", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", + "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==", + "bin": { + "uuid": "dist/bin/uuid" + } + } + }, "dependencies": { "@sendgrid/client": { "version": "7.6.0", diff --git a/amplify/team-provider-info.json b/amplify/team-provider-info.json index c08dae81..b21555c0 100644 --- a/amplify/team-provider-info.json +++ b/amplify/team-provider-info.json @@ -20,7 +20,7 @@ }, "fsCoreApiResolver": { "deploymentBucketName": "amplify-fstestttt-dev-115806-deployment", - "s3Key": "amplify-builds/fsCoreApiResolver-354d47465a6b5a446b77-build.zip" + "s3Key": "amplify-builds/fsCoreApiResolver-496b796b6f33494f656f-build.zip" }, "fsCognitoPostConfirmationInvoker": { "deploymentBucketName": "amplify-fstestttt-dev-115806-deployment", From 72afd5bd161f157a8b1d14579ab85868e3ea0546 Mon Sep 17 00:00:00 2001 From: glidaa Date: Fri, 14 Jan 2022 10:55:41 +1100 Subject: [PATCH 8/8] minor change --- src/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/index.js b/src/index.js index 26263b97..34d55e95 100644 --- a/src/index.js +++ b/src/index.js @@ -22,7 +22,7 @@ const root = ReactDOM.createRoot(container); root.render( - + );