From ac4349c09646c7ae25d97e2a6d0996513c30cec4 Mon Sep 17 00:00:00 2001 From: Banks Nussman Date: Sat, 14 Oct 2023 20:50:13 -0400 Subject: [PATCH 1/6] chore: update dependencies --- api/package.json | 6 +- app/package.json | 2 +- pnpm-lock.yaml | 313 ++++++++++++------------------------------- website/package.json | 2 +- 4 files changed, 92 insertions(+), 231 deletions(-) diff --git a/api/package.json b/api/package.json index 589fdb95..8d2897f0 100644 --- a/api/package.json +++ b/api/package.json @@ -27,8 +27,8 @@ "@banksnussman/graphql-fields-to-relations": "^2.0.0", "@mikro-orm/core": "5.8.8", "@mikro-orm/postgresql": "5.8.8", - "@sentry/integrations": "^7.73.0", - "@sentry/node": "^7.73.0", + "@sentry/integrations": "^7.74.0", + "@sentry/node": "^7.74.0", "aws-sdk": "^2.1473.0", "bcrypt": "^5.1.1", "body-parser": "^1.20.2", @@ -58,7 +58,7 @@ "@types/body-parser": "^1.19.3", "@types/cors": "^2.8.14", "@types/express": "^4.17.19", - "@types/node": "^20.8.5", + "@types/node": "^20.8.6", "@types/nodemailer": "^6.4.11", "@types/uuid": "^9.0.5", "@types/ws": "^8.5.7", diff --git a/app/package.json b/app/package.json index 642ede2b..bc2aaa2d 100644 --- a/app/package.json +++ b/app/package.json @@ -51,7 +51,7 @@ "react-native-svg": "13.9.0", "react-native-web": "~0.19.7", "sentry-expo": "~7.0.1", - "styled-components": "^6.0.9", + "styled-components": "^6.1.0", "styled-system": "^5.1.5" }, "devDependencies": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index b4c574df..21c83b1f 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -31,11 +31,11 @@ importers: specifier: 5.8.8 version: 5.8.8(@mikro-orm/core@5.8.8)(@mikro-orm/migrations@5.8.8) '@sentry/integrations': - specifier: ^7.73.0 - version: 7.73.0 + specifier: ^7.74.0 + version: 7.74.0 '@sentry/node': - specifier: ^7.73.0 - version: 7.73.0 + specifier: ^7.74.0 + version: 7.74.0 aws-sdk: specifier: ^2.1473.0 version: 2.1473.0 @@ -119,8 +119,8 @@ importers: specifier: ^4.17.19 version: 4.17.19 '@types/node': - specifier: ^20.8.5 - version: 20.8.5 + specifier: ^20.8.6 + version: 20.8.6 '@types/nodemailer': specifier: ^6.4.11 version: 6.4.11 @@ -135,7 +135,7 @@ importers: version: 8.2.1 ts-node: specifier: ^10.9.1 - version: 10.9.1(@types/node@20.8.5)(typescript@5.2.2) + version: 10.9.1(@types/node@20.8.6)(typescript@5.2.2) typescript: specifier: ^5.1.6 version: 5.2.2 @@ -260,8 +260,8 @@ importers: specifier: ~7.0.1 version: 7.0.1(expo-application@5.3.0)(expo-constants@14.4.2)(expo-device@5.4.0)(expo@49.0.13)(react-native@0.72.5)(react@18.2.0) styled-components: - specifier: ^6.0.9 - version: 6.0.9(react-dom@18.2.0)(react@18.2.0) + specifier: ^6.1.0 + version: 6.1.0(react-dom@18.2.0)(react@18.2.0) styled-system: specifier: ^5.1.5 version: 5.1.5 @@ -271,7 +271,7 @@ importers: version: 7.22.9 '@graphql-codegen/cli': specifier: ^5.0.0 - version: 5.0.0(@types/node@20.8.5)(graphql@16.8.1) + version: 5.0.0(@types/node@20.8.6)(graphql@16.8.1) '@graphql-codegen/typescript': specifier: ^4.0.1 version: 4.0.1(graphql@16.8.1) @@ -368,7 +368,7 @@ importers: devDependencies: '@graphql-codegen/cli': specifier: ^5.0.0 - version: 5.0.0(@types/node@20.8.5)(graphql@16.8.1) + version: 5.0.0(@types/node@20.8.6)(graphql@16.8.1) '@graphql-codegen/typescript': specifier: 4.0.1 version: 4.0.1(graphql@16.8.1) @@ -382,8 +382,8 @@ importers: specifier: ^17.0.3 version: 17.0.3(graphql-ws@5.14.1)(react-dom@18.2.0)(react@18.2.0) '@types/node': - specifier: ^20.8.5 - version: 20.8.5 + specifier: ^20.8.6 + version: 20.8.6 '@types/react': specifier: ^18.2.18 version: 18.2.18 @@ -398,7 +398,7 @@ importers: version: 5.2.2 vite: specifier: ^4.4.11 - version: 4.4.11(@types/node@20.8.5) + version: 4.4.11(@types/node@20.8.6) packages: @@ -663,26 +663,6 @@ packages: - encoding dev: true - /@babel/cli@7.23.0(@babel/core@7.22.9): - resolution: {integrity: sha512-17E1oSkGk2IwNILM4jtfAvgjt+ohmpfBky8aLerUfYZhiPNg7ca+CRCxZn8QDxwNhV/upsc2VHBCqGFIR+iBfA==} - engines: {node: '>=6.9.0'} - hasBin: true - peerDependencies: - '@babel/core': ^7.0.0-0 - dependencies: - '@babel/core': 7.22.9 - '@jridgewell/trace-mapping': 0.3.19 - commander: 4.1.1 - convert-source-map: 2.0.0 - fs-readdir-recursive: 1.1.0 - glob: 7.2.3 - make-dir: 2.1.0 - slash: 2.0.0 - optionalDependencies: - '@nicolo-ribaudo/chokidar-2': 2.1.8-no-fsevents.3 - chokidar: 3.5.3 - dev: false - /@babel/code-frame@7.10.4: resolution: {integrity: sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==} dependencies: @@ -1336,16 +1316,6 @@ packages: '@babel/plugin-transform-optional-chaining': 7.22.10(@babel/core@7.22.9) dev: true - /@babel/plugin-external-helpers@7.22.5(@babel/core@7.22.9): - resolution: {integrity: sha512-ngnNEWxmykPk82mH4ajZT0qTztr3Je6hrMuKAslZVM8G1YZTENJSYwrIGtt6KOtznug3exmAtF4so/nPqJuA4A==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0-0 - dependencies: - '@babel/core': 7.22.9 - '@babel/helper-plugin-utils': 7.22.5 - dev: false - /@babel/plugin-proposal-async-generator-functions@7.20.7(@babel/core@7.22.9): resolution: {integrity: sha512-xMbiLsn/8RK7Wq7VeVytytS2L6qE69bXPB10YCmMdDZbKF4okCqY74pI/jJQ/8U0b/F6NrT2+14b8/P9/3AMGA==} engines: {node: '>=6.9.0'} @@ -2418,16 +2388,6 @@ packages: '@babel/core': 7.22.9 '@babel/helper-plugin-utils': 7.22.5 - /@babel/plugin-transform-react-jsx-development@7.22.5(@babel/core@7.22.9): - resolution: {integrity: sha512-bDhuzwWMuInwCYeDeMzyi7TaBgRQei6DqxhbyniL7/VG4RSS7HtSL2QbY4eESy1KJqlWt8g3xeEBGPuo+XqC8A==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0-0 - dependencies: - '@babel/core': 7.22.9 - '@babel/plugin-transform-react-jsx': 7.22.15(@babel/core@7.22.9) - dev: false - /@babel/plugin-transform-react-jsx-self@7.22.5(@babel/core@7.22.9): resolution: {integrity: sha512-nTh2ogNUtxbiSbxaT4Ds6aXnXEipHweN9YRgOX/oNXdf0cCrGn/+2LozFa3lnPV5D90MkjhgckCPBrsoSc1a7g==} engines: {node: '>=6.9.0'} @@ -2493,17 +2453,6 @@ packages: '@babel/types': 7.22.10 dev: true - /@babel/plugin-transform-react-pure-annotations@7.22.5(@babel/core@7.22.9): - resolution: {integrity: sha512-gP4k85wx09q+brArVinTXhWiyzLl9UpmGva0+mWyKxk6JZequ05x3eUcIUE+FyttPKJFRRVtAvQaJ6YF9h1ZpA==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0-0 - dependencies: - '@babel/core': 7.22.9 - '@babel/helper-annotate-as-pure': 7.22.5 - '@babel/helper-plugin-utils': 7.22.5 - dev: false - /@babel/plugin-transform-regenerator@7.22.10(@babel/core@7.22.9): resolution: {integrity: sha512-F28b1mDt8KcT5bUyJc/U9nwzw6cV+UmTeRlXYIl2TNqMMJif0Jeey9/RQ3C4NOd2zp0/TRsDns9ttj2L523rsw==} engines: {node: '>=6.9.0'} @@ -3013,21 +2962,6 @@ packages: esutils: 2.0.3 dev: false - /@babel/preset-react@7.22.15(@babel/core@7.22.9): - resolution: {integrity: sha512-Csy1IJ2uEh/PecCBXXoZGAZBeCATTuePzCSB7dLYWS0vOEj6CNpjxIhW4duWwZodBNueH7QO14WbGn8YyeuN9w==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0-0 - dependencies: - '@babel/core': 7.22.9 - '@babel/helper-plugin-utils': 7.22.5 - '@babel/helper-validator-option': 7.22.15 - '@babel/plugin-transform-react-display-name': 7.22.5(@babel/core@7.22.9) - '@babel/plugin-transform-react-jsx': 7.22.15(@babel/core@7.22.9) - '@babel/plugin-transform-react-jsx-development': 7.22.5(@babel/core@7.22.9) - '@babel/plugin-transform-react-pure-annotations': 7.22.5(@babel/core@7.22.9) - dev: false - /@babel/preset-typescript@7.22.5(@babel/core@7.22.9): resolution: {integrity: sha512-YbPaal9LxztSGhmndR46FmAbkJ/1fAsw293tSU+I5E5h+cnJ3d4GTwyUgGYmOXJYdGA+uNePle4qbaRzj2NISQ==} engines: {node: '>=6.9.0'} @@ -5110,7 +5044,7 @@ packages: react-native: 0.72.5(@babel/core@7.22.9)(@babel/preset-env@7.23.2)(react@18.2.0) dev: false - /@graphql-codegen/cli@5.0.0(@types/node@20.8.5)(graphql@16.8.1): + /@graphql-codegen/cli@5.0.0(@types/node@20.8.6)(graphql@16.8.1): resolution: {integrity: sha512-A7J7+be/a6e+/ul2KI5sfJlpoqeqwX8EzktaKCeduyVKgOLA6W5t+NUGf6QumBDXU8PEOqXk3o3F+RAwCWOiqA==} hasBin: true peerDependencies: @@ -5128,12 +5062,12 @@ packages: '@graphql-tools/apollo-engine-loader': 8.0.0(graphql@16.8.1) '@graphql-tools/code-file-loader': 8.0.2(graphql@16.8.1) '@graphql-tools/git-loader': 8.0.2(graphql@16.8.1) - '@graphql-tools/github-loader': 8.0.0(@types/node@20.8.5)(graphql@16.8.1) + '@graphql-tools/github-loader': 8.0.0(@types/node@20.8.6)(graphql@16.8.1) '@graphql-tools/graphql-file-loader': 8.0.0(graphql@16.8.1) '@graphql-tools/json-file-loader': 8.0.0(graphql@16.8.1) '@graphql-tools/load': 8.0.0(graphql@16.8.1) - '@graphql-tools/prisma-loader': 8.0.1(@types/node@20.8.5)(graphql@16.8.1) - '@graphql-tools/url-loader': 8.0.0(@types/node@20.8.5)(graphql@16.8.1) + '@graphql-tools/prisma-loader': 8.0.1(@types/node@20.8.6)(graphql@16.8.1) + '@graphql-tools/url-loader': 8.0.0(@types/node@20.8.6)(graphql@16.8.1) '@graphql-tools/utils': 10.0.4(graphql@16.8.1) '@whatwg-node/fetch': 0.8.8 chalk: 4.1.2 @@ -5141,7 +5075,7 @@ packages: debounce: 1.2.1 detect-indent: 6.1.0 graphql: 16.8.1 - graphql-config: 5.0.2(@types/node@20.8.5)(graphql@16.8.1) + graphql-config: 5.0.2(@types/node@20.8.6)(graphql@16.8.1) inquirer: 8.2.5 is-glob: 4.0.3 jiti: 1.19.1 @@ -5415,7 +5349,7 @@ packages: - utf-8-validate dev: true - /@graphql-tools/executor-http@1.0.2(@types/node@20.8.5)(graphql@16.8.1): + /@graphql-tools/executor-http@1.0.2(@types/node@20.8.6)(graphql@16.8.1): resolution: {integrity: sha512-JKTB4E3kdQM2/1NEcyrVPyQ8057ZVthCV5dFJiKktqY9IdmF00M8gupFcW3jlbM/Udn78ickeUBsUzA3EouqpA==} engines: {node: '>=16.0.0'} peerDependencies: @@ -5426,7 +5360,7 @@ packages: '@whatwg-node/fetch': 0.9.9 extract-files: 11.0.0 graphql: 16.8.1 - meros: 1.3.0(@types/node@20.8.5) + meros: 1.3.0(@types/node@20.8.6) tslib: 2.6.2 value-or-promise: 1.0.12 transitivePeerDependencies: @@ -5481,14 +5415,14 @@ packages: - supports-color dev: true - /@graphql-tools/github-loader@8.0.0(@types/node@20.8.5)(graphql@16.8.1): + /@graphql-tools/github-loader@8.0.0(@types/node@20.8.6)(graphql@16.8.1): resolution: {integrity: sha512-VuroArWKcG4yaOWzV0r19ElVIV6iH6UKDQn1MXemND0xu5TzrFme0kf3U9o0YwNo0kUYEk9CyFM0BYg4he17FA==} engines: {node: '>=16.0.0'} peerDependencies: graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0 dependencies: '@ardatan/sync-fetch': 0.0.1 - '@graphql-tools/executor-http': 1.0.2(@types/node@20.8.5)(graphql@16.8.1) + '@graphql-tools/executor-http': 1.0.2(@types/node@20.8.6)(graphql@16.8.1) '@graphql-tools/graphql-tag-pluck': 8.0.2(graphql@16.8.1) '@graphql-tools/utils': 10.0.4(graphql@16.8.1) '@whatwg-node/fetch': 0.9.9 @@ -5611,13 +5545,13 @@ packages: tslib: 2.5.3 dev: true - /@graphql-tools/prisma-loader@8.0.1(@types/node@20.8.5)(graphql@16.8.1): + /@graphql-tools/prisma-loader@8.0.1(@types/node@20.8.6)(graphql@16.8.1): resolution: {integrity: sha512-bl6e5sAYe35Z6fEbgKXNrqRhXlCJYeWKBkarohgYA338/SD9eEhXtg3Cedj7fut3WyRLoQFpHzfiwxKs7XrgXg==} engines: {node: '>=16.0.0'} peerDependencies: graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0 dependencies: - '@graphql-tools/url-loader': 8.0.0(@types/node@20.8.5)(graphql@16.8.1) + '@graphql-tools/url-loader': 8.0.0(@types/node@20.8.6)(graphql@16.8.1) '@graphql-tools/utils': 10.0.4(graphql@16.8.1) '@types/js-yaml': 4.0.5 '@types/json-stable-stringify': 1.0.34 @@ -5698,7 +5632,7 @@ packages: value-or-promise: 1.0.12 dev: false - /@graphql-tools/url-loader@8.0.0(@types/node@20.8.5)(graphql@16.8.1): + /@graphql-tools/url-loader@8.0.0(@types/node@20.8.6)(graphql@16.8.1): resolution: {integrity: sha512-rPc9oDzMnycvz+X+wrN3PLrhMBQkG4+sd8EzaFN6dypcssiefgWKToXtRKI8HHK68n2xEq1PyrOpkjHFJB+GwA==} engines: {node: '>=16.0.0'} peerDependencies: @@ -5707,7 +5641,7 @@ packages: '@ardatan/sync-fetch': 0.0.1 '@graphql-tools/delegate': 10.0.0(graphql@16.8.1) '@graphql-tools/executor-graphql-ws': 1.1.0(graphql@16.8.1) - '@graphql-tools/executor-http': 1.0.2(@types/node@20.8.5)(graphql@16.8.1) + '@graphql-tools/executor-http': 1.0.2(@types/node@20.8.6)(graphql@16.8.1) '@graphql-tools/executor-legacy-ws': 1.0.1(graphql@16.8.1) '@graphql-tools/utils': 10.0.4(graphql@16.8.1) '@graphql-tools/wrap': 10.0.0(graphql@16.8.1) @@ -5871,7 +5805,7 @@ packages: dependencies: '@jest/fake-timers': 29.5.0 '@jest/types': 29.6.3 - '@types/node': 20.8.5 + '@types/node': 20.8.6 jest-mock: 29.5.0 dev: false @@ -5881,7 +5815,7 @@ packages: dependencies: '@jest/types': 29.6.3 '@sinonjs/fake-timers': 10.2.0 - '@types/node': 20.8.5 + '@types/node': 20.8.6 jest-message-util: 29.5.0 jest-mock: 29.5.0 jest-util: 29.5.0 @@ -5900,7 +5834,7 @@ packages: dependencies: '@types/istanbul-lib-coverage': 2.0.4 '@types/istanbul-reports': 3.0.1 - '@types/node': 20.8.5 + '@types/node': 20.8.6 '@types/yargs': 15.0.15 chalk: 4.1.2 dev: false @@ -5911,7 +5845,7 @@ packages: dependencies: '@types/istanbul-lib-coverage': 2.0.4 '@types/istanbul-reports': 3.0.1 - '@types/node': 20.8.5 + '@types/node': 20.8.6 '@types/yargs': 16.0.5 chalk: 4.1.2 dev: false @@ -5923,7 +5857,7 @@ packages: '@jest/schemas': 29.6.3 '@types/istanbul-lib-coverage': 2.0.4 '@types/istanbul-reports': 3.0.1 - '@types/node': 20.8.5 + '@types/node': 20.8.6 '@types/yargs': 17.0.24 chalk: 4.1.2 dev: false @@ -6200,12 +6134,6 @@ packages: - supports-color - tedious - /@nicolo-ribaudo/chokidar-2@2.1.8-no-fsevents.3: - resolution: {integrity: sha512-s88O1aVtXftvp5bCPB7WnmXc5IwOZZ7YPuwNPt+GtOOXpPvad1LfbmjYv+qII7zP6RU2QGnqve27dnLycEnyEQ==} - requiresBuild: true - dev: false - optional: true - /@nodelib/fs.scandir@2.1.5: resolution: {integrity: sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==} engines: {node: '>= 8'} @@ -7657,13 +7585,13 @@ packages: tslib: 1.14.1 dev: false - /@sentry-internal/tracing@7.73.0: - resolution: {integrity: sha512-ig3WL/Nqp8nRQ52P205NaypGKNfIl/G+cIqge9xPW6zfRb5kJdM1YParw9GSJ1SPjEZBkBORGAML0on5H2FILw==} + /@sentry-internal/tracing@7.74.0: + resolution: {integrity: sha512-JK6IRGgdtZjswGfaGIHNWIThffhOHzVIIaGmglui+VFIzOsOqePjoxaDV0MEvzafxXZD7eWqGE5RGuZ0n6HFVg==} engines: {node: '>=8'} dependencies: - '@sentry/core': 7.73.0 - '@sentry/types': 7.73.0 - '@sentry/utils': 7.73.0 + '@sentry/core': 7.74.0 + '@sentry/types': 7.74.0 + '@sentry/utils': 7.74.0 tslib: 2.6.2 dev: false @@ -7725,12 +7653,12 @@ packages: tslib: 1.14.1 dev: false - /@sentry/core@7.73.0: - resolution: {integrity: sha512-9FEz4Gq848LOgVN2OxJGYuQqxv7cIVw69VlAzWHEm3njt8mjvlTq+7UiFsGRo84+59V2FQuHxzA7vVjl90WfSg==} + /@sentry/core@7.74.0: + resolution: {integrity: sha512-83NRuqn7nDZkSVBN5yJQqcpXDG4yMYiB7TkYUKrGTzBpRy6KUOrkCdybuKk0oraTIGiGSe5WEwCFySiNgR9FzA==} engines: {node: '>=8'} dependencies: - '@sentry/types': 7.73.0 - '@sentry/utils': 7.73.0 + '@sentry/types': 7.74.0 + '@sentry/utils': 7.74.0 tslib: 2.6.2 dev: false @@ -7764,25 +7692,25 @@ packages: tslib: 1.14.1 dev: false - /@sentry/integrations@7.73.0: - resolution: {integrity: sha512-IjVpn4d+aSL9L1Ntu/oAdRwujz4BzzavDsZf96Xgc/AjBnjAEUT+wT1dAwluThfuKDXmWOJHhZ2cHHMfqI+7vw==} + /@sentry/integrations@7.74.0: + resolution: {integrity: sha512-O4UyxiV5wzXSDnEd9Z/SIt/5M12URWNtIJPPJjowlllzw8X9e3zBcnXmjMOLZ+mZWjQmRDjOoz3lPPQ17f7fvw==} engines: {node: '>=8'} dependencies: - '@sentry/core': 7.73.0 - '@sentry/types': 7.73.0 - '@sentry/utils': 7.73.0 + '@sentry/core': 7.74.0 + '@sentry/types': 7.74.0 + '@sentry/utils': 7.74.0 localforage: 1.10.0 tslib: 2.6.2 dev: false - /@sentry/node@7.73.0: - resolution: {integrity: sha512-i50bRfmgkRRx0XXUbg9jGD/RuznDJxJXc4rBILhoJuhl+BjRIaoXA3ayplfJn8JLZxsNh75uJaCq4IUK70SORw==} + /@sentry/node@7.74.0: + resolution: {integrity: sha512-uBmW2/z0cz/WFIG74ZF7lSipO0XNzMf9yrdqnZXnGDYsUZE4I4QiqDN0hNi6fkTgf9MYRC8uFem2OkAvyPJ74Q==} engines: {node: '>=8'} dependencies: - '@sentry-internal/tracing': 7.73.0 - '@sentry/core': 7.73.0 - '@sentry/types': 7.73.0 - '@sentry/utils': 7.73.0 + '@sentry-internal/tracing': 7.74.0 + '@sentry/core': 7.74.0 + '@sentry/types': 7.74.0 + '@sentry/utils': 7.74.0 cookie: 0.5.0 https-proxy-agent: 5.0.1 lru_map: 0.3.3 @@ -7868,8 +7796,8 @@ packages: engines: {node: '>=8'} dev: false - /@sentry/types@7.73.0: - resolution: {integrity: sha512-/v8++bly8jW7r4cP2wswYiiVpn7eLLcqwnfPUMeCQze4zj3F3nTRIKc9BGHzU0V+fhHa3RwRC2ksqTGq1oJMDg==} + /@sentry/types@7.74.0: + resolution: {integrity: sha512-rI5eIRbUycWjn6s6o3yAjjWtIvYSxZDdnKv5je2EZINfLKcMPj1dkl6wQd2F4y7gLfD/N6Y0wZYIXC3DUdJQQg==} engines: {node: '>=8'} dev: false @@ -7889,11 +7817,11 @@ packages: tslib: 1.14.1 dev: false - /@sentry/utils@7.73.0: - resolution: {integrity: sha512-h3ZK/qpf4k76FhJV9uiSbvMz3V/0Ovy94C+5/9UgPMVCJXFmVsdw8n/dwANJ7LupVPfYP23xFGgebDMFlK1/2w==} + /@sentry/utils@7.74.0: + resolution: {integrity: sha512-k3np8nuTPtx5KDODPtULfFln4UXdE56MZCcF19Jv6Ljxf+YN/Ady1+0Oi3e0XoSvFpWNyWnglauT7M65qCE6kg==} engines: {node: '>=8'} dependencies: - '@sentry/types': 7.73.0 + '@sentry/types': 7.74.0 tslib: 2.6.2 dev: false @@ -8075,30 +8003,30 @@ packages: /@types/bcrypt@5.0.0: resolution: {integrity: sha512-agtcFKaruL8TmcvqbndlqHPSJgsolhf/qPWchFlgnW1gECTN/nKbFcoFnvKAQRFfKbh+BO6A3SWdJu9t+xF3Lw==} dependencies: - '@types/node': 20.8.5 + '@types/node': 20.8.6 dev: true /@types/body-parser@1.19.3: resolution: {integrity: sha512-oyl4jvAfTGX9Bt6Or4H9ni1Z447/tQuxnZsytsCaExKlmJiU8sFgnIBRzJUpKwB5eWn9HuBYlUlVA74q/yN0eQ==} dependencies: '@types/connect': 3.4.36 - '@types/node': 20.8.5 + '@types/node': 20.8.6 /@types/connect@3.4.36: resolution: {integrity: sha512-P63Zd/JUGq+PdrM1lv0Wv5SBYeA2+CORvbrXbngriYY0jzLUWfQMQQxOhjONEz/wlHOAxOdY7CY65rgQdTjq2w==} dependencies: - '@types/node': 20.8.5 + '@types/node': 20.8.6 /@types/cors@2.8.14: resolution: {integrity: sha512-RXHUvNWYICtbP6s18PnOCaqToK8y14DnLd75c6HfyKf228dxy7pHNOQkxPtvXKp/hINFMDjbYzsj63nnpPMSRQ==} dependencies: - '@types/node': 20.8.5 + '@types/node': 20.8.6 dev: true /@types/express-serve-static-core@4.17.37: resolution: {integrity: sha512-ZohaCYTgGFcOP7u6aJOhY9uIZQgZ2vxC2yWoArY+FeDXlqeH66ZVBjgvg+RLVAS/DWNq4Ap9ZXu1+SUQiiWYMg==} dependencies: - '@types/node': 20.8.5 + '@types/node': 20.8.6 '@types/qs': 6.9.8 '@types/range-parser': 1.2.5 '@types/send': 0.17.2 @@ -8183,19 +8111,19 @@ packages: /@types/node-fetch@2.6.6: resolution: {integrity: sha512-95X8guJYhfqiuVVhRFxVQcf4hW/2bCuoPwDasMf/531STFoNoWTT7YDnWdXHEZKqAGUigmpG31r2FE70LwnzJw==} dependencies: - '@types/node': 20.8.5 + '@types/node': 20.8.6 form-data: 4.0.0 dev: false - /@types/node@20.8.5: - resolution: {integrity: sha512-SPlobFgbidfIeOYlzXiEjSYeIJiOCthv+9tSQVpvk4PAdIIc+2SmjNVzWXk9t0Y7dl73Zdf+OgXKHX9XtkqUpw==} + /@types/node@20.8.6: + resolution: {integrity: sha512-eWO4K2Ji70QzKUqRy6oyJWUeB7+g2cRagT3T/nxYibYcT4y2BDL8lqolRXjTHmkZCdJfIPaY73KbJAZmcryxTQ==} dependencies: undici-types: 5.25.3 /@types/nodemailer@6.4.11: resolution: {integrity: sha512-Ld2c0frwpGT4VseuoeboCXQ7UJIkK3X7Lx/4YsZEiUHtHsthWAOCYtf6PAiLhMtfwV0cWJRabLBS3+LD8x6Nrw==} dependencies: - '@types/node': 20.8.5 + '@types/node': 20.8.6 dev: true /@types/parse-json@4.0.0: @@ -8275,14 +8203,14 @@ packages: resolution: {integrity: sha512-aAG6yRf6r0wQ29bkS+x97BIs64ZLxeE/ARwyS6wrldMm3C1MdKwCcnnEwMC1slI8wuxJOpiUH9MioC0A0i+GJw==} dependencies: '@types/mime': 1.3.3 - '@types/node': 20.8.5 + '@types/node': 20.8.6 /@types/serve-static@1.15.3: resolution: {integrity: sha512-yVRvFsEMrv7s0lGhzrggJjNOSmZCdgCjw9xWrPr/kNNLp6FaDfMC1KaYl3TSJ0c58bECwNBMoQrZJ8hA8E1eFg==} dependencies: '@types/http-errors': 2.0.2 '@types/mime': 3.0.2 - '@types/node': 20.8.5 + '@types/node': 20.8.6 /@types/stack-utils@2.0.1: resolution: {integrity: sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==} @@ -8303,7 +8231,7 @@ packages: /@types/ws@8.5.7: resolution: {integrity: sha512-6UrLjiDUvn40CMrAubXuIVtj2PEfKDffJS7ychvnPU44j+KVeXmdHHTgqcM/dxLUTHxlXHiFM8Skmb8ozGdTnQ==} dependencies: - '@types/node': 20.8.5 + '@types/node': 20.8.6 dev: true /@types/yargs-parser@21.0.0: @@ -8359,7 +8287,7 @@ packages: '@babel/plugin-transform-react-jsx-source': 7.22.5(@babel/core@7.23.0) '@types/babel__core': 7.20.2 react-refresh: 0.14.0 - vite: 4.4.11(@types/node@20.8.5) + vite: 4.4.11(@types/node@20.8.6) transitivePeerDependencies: - supports-color dev: true @@ -8985,13 +8913,6 @@ packages: engines: {node: '>=0.6'} dev: false - /binary-extensions@2.2.0: - resolution: {integrity: sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==} - engines: {node: '>=8'} - requiresBuild: true - dev: false - optional: true - /bl@4.1.0: resolution: {integrity: sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==} dependencies: @@ -9345,23 +9266,6 @@ packages: resolution: {integrity: sha512-yrLQ/yVUFXkzg7EDQsPieE/53+0RlaWTs+wBrvW36cyilJ2SaDWfl4Yj7MtLTXleV9uEKefbAGUPv2/iWSooRA==} dev: false - /chokidar@3.5.3: - resolution: {integrity: sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==} - engines: {node: '>= 8.10.0'} - requiresBuild: true - dependencies: - anymatch: 3.1.3 - braces: 3.0.2 - glob-parent: 5.1.2 - is-binary-path: 2.1.0 - is-glob: 4.0.3 - normalize-path: 3.0.0 - readdirp: 3.6.0 - optionalDependencies: - fsevents: 2.3.3 - dev: false - optional: true - /chownr@2.0.0: resolution: {integrity: sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==} engines: {node: '>=10'} @@ -10900,10 +10804,6 @@ packages: minipass: 3.3.6 dev: false - /fs-readdir-recursive@1.1.0: - resolution: {integrity: sha512-GNanXlVr2pf02+sPN40XN8HG+ePaNcvM0q5mZBd668Obwb0yD5GiUbZOFgwn8kGMY6I3mdyDJzieUy3PTYyTRA==} - dev: false - /fs.realpath@1.0.0: resolution: {integrity: sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==} @@ -11064,7 +10964,7 @@ packages: /graceful-fs@4.2.11: resolution: {integrity: sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==} - /graphql-config@5.0.2(@types/node@20.8.5)(graphql@16.8.1): + /graphql-config@5.0.2(@types/node@20.8.6)(graphql@16.8.1): resolution: {integrity: sha512-7TPxOrlbiG0JplSZYCyxn2XQtqVhXomEjXUmWJVSS5ET1nPhOJSsIb/WTwqWhcYX6G0RlHXSj9PLtGTKmxLNGg==} engines: {node: '>= 16.0.0'} peerDependencies: @@ -11078,7 +10978,7 @@ packages: '@graphql-tools/json-file-loader': 8.0.0(graphql@16.8.1) '@graphql-tools/load': 8.0.0(graphql@16.8.1) '@graphql-tools/merge': 9.0.0(graphql@16.8.1) - '@graphql-tools/url-loader': 8.0.0(@types/node@20.8.5)(graphql@16.8.1) + '@graphql-tools/url-loader': 8.0.0(@types/node@20.8.6)(graphql@16.8.1) '@graphql-tools/utils': 10.0.4(graphql@16.8.1) cosmiconfig: 8.2.0 graphql: 16.8.1 @@ -11500,15 +11400,6 @@ packages: resolution: {integrity: sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==} dev: false - /is-binary-path@2.1.0: - resolution: {integrity: sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==} - engines: {node: '>=8'} - requiresBuild: true - dependencies: - binary-extensions: 2.2.0 - dev: false - optional: true - /is-buffer@1.1.6: resolution: {integrity: sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==} dev: false @@ -11733,7 +11624,7 @@ packages: '@jest/environment': 29.5.0 '@jest/fake-timers': 29.5.0 '@jest/types': 29.6.3 - '@types/node': 20.8.5 + '@types/node': 20.8.6 jest-mock: 29.5.0 jest-util: 29.5.0 dev: false @@ -11763,7 +11654,7 @@ packages: engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} dependencies: '@jest/types': 29.6.3 - '@types/node': 20.8.5 + '@types/node': 20.8.6 jest-util: 29.5.0 dev: false @@ -11777,7 +11668,7 @@ packages: engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} dependencies: '@jest/types': 27.5.1 - '@types/node': 20.8.5 + '@types/node': 20.8.6 chalk: 4.1.2 ci-info: 3.8.0 graceful-fs: 4.2.11 @@ -11789,7 +11680,7 @@ packages: engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} dependencies: '@jest/types': 29.6.3 - '@types/node': 20.8.5 + '@types/node': 20.8.6 chalk: 4.1.2 ci-info: 3.8.0 graceful-fs: 4.2.11 @@ -11812,7 +11703,7 @@ packages: resolution: {integrity: sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==} engines: {node: '>= 10.13.0'} dependencies: - '@types/node': 20.8.5 + '@types/node': 20.8.6 merge-stream: 2.0.0 supports-color: 8.1.1 dev: false @@ -12435,7 +12326,7 @@ packages: resolution: {integrity: sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==} engines: {node: '>= 8'} - /meros@1.3.0(@types/node@20.8.5): + /meros@1.3.0(@types/node@20.8.6): resolution: {integrity: sha512-2BNGOimxEz5hmjUG2FwoxCt5HN7BXdaWyFqEwxPTrJzVdABtrL4TiHTcsWSFAxPQ/tOnEaQEJh3qWq71QRMY+w==} engines: {node: '>=13'} peerDependencies: @@ -12444,7 +12335,7 @@ packages: '@types/node': optional: true dependencies: - '@types/node': 20.8.5 + '@types/node': 20.8.6 dev: true /methods@1.1.2: @@ -14219,15 +14110,6 @@ packages: string_decoder: 1.3.0 util-deprecate: 1.0.2 - /readdirp@3.6.0: - resolution: {integrity: sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==} - engines: {node: '>=8.10.0'} - requiresBuild: true - dependencies: - picomatch: 2.3.1 - dev: false - optional: true - /readline@1.3.0: resolution: {integrity: sha512-k2d6ACCkiNYz222Fs/iNze30rRJ1iIicW7JuX/7/cozvih6YCkFZH+J6mAFDVgv0dRBaAyr4jDqC95R2y4IADg==} dev: false @@ -14746,11 +14628,6 @@ packages: resolution: {integrity: sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==} dev: false - /slash@2.0.0: - resolution: {integrity: sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==} - engines: {node: '>=6'} - dev: false - /slash@3.0.0: resolution: {integrity: sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==} engines: {node: '>=8'} @@ -14977,27 +14854,13 @@ packages: resolution: {integrity: sha512-0MP/Cxx5SzeeZ10p/bZI0S6MpgD+yxAhi1BOQ34jgnMXsCq3j1t6tQnZu+KdlL7dvJTLT3g9xN8tl10TqgFMcg==} dev: false - /styled-components@6.0.9(react-dom@18.2.0)(react@18.2.0): - resolution: {integrity: sha512-dDEXXF66b4iQhI1YHgvkBqfdJPGj2EifyLd298PVs50nz7KDfBKnAmWVnkZtw6+Nb6Izf19BAUyfYy8p434JAg==} + /styled-components@6.1.0(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-VWNfYYBuXzuLS/QYEeoPgMErP26WL+dX9//rEh80B2mmlS1yRxRxuL5eax4m6ybYEUoHWlTy2XOU32767mlMkg==} engines: {node: '>= 16'} peerDependencies: - babel-plugin-styled-components: '>= 2' react: ^18.1.0 react-dom: ^18.1.0 - peerDependenciesMeta: - babel-plugin-styled-components: - optional: true dependencies: - '@babel/cli': 7.23.0(@babel/core@7.22.9) - '@babel/core': 7.22.9 - '@babel/helper-module-imports': 7.22.15 - '@babel/plugin-external-helpers': 7.22.5(@babel/core@7.22.9) - '@babel/plugin-proposal-class-properties': 7.18.6(@babel/core@7.22.9) - '@babel/plugin-proposal-object-rest-spread': 7.20.7(@babel/core@7.22.9) - '@babel/preset-env': 7.23.2(@babel/core@7.22.9) - '@babel/preset-react': 7.22.15(@babel/core@7.22.9) - '@babel/preset-typescript': 7.23.2(@babel/core@7.22.9) - '@babel/traverse': 7.23.2 '@emotion/is-prop-valid': 1.2.1 '@emotion/unitless': 0.8.1 '@types/stylis': 4.2.1 @@ -15009,8 +14872,6 @@ packages: shallowequal: 1.1.0 stylis: 4.3.0 tslib: 2.6.2 - transitivePeerDependencies: - - supports-color dev: false /styled-system@5.1.5: @@ -15297,7 +15158,7 @@ packages: resolution: {integrity: sha512-PGcnJoTBnVGy6yYNFxWVNkdcAuAMstvutN9MgDJIV6L0oG8fB+ZNNy1T+wJzah8RPGor1mZuPQkVfXNDpy9eHA==} dev: true - /ts-node@10.9.1(@types/node@20.8.5)(typescript@5.2.2): + /ts-node@10.9.1(@types/node@20.8.6)(typescript@5.2.2): resolution: {integrity: sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==} hasBin: true peerDependencies: @@ -15316,7 +15177,7 @@ packages: '@tsconfig/node12': 1.0.11 '@tsconfig/node14': 1.0.3 '@tsconfig/node16': 1.0.3 - '@types/node': 20.8.5 + '@types/node': 20.8.6 acorn: 8.8.1 acorn-walk: 8.2.0 arg: 4.1.3 @@ -15406,7 +15267,7 @@ packages: class-validator: optional: true dependencies: - '@types/node': 20.8.5 + '@types/node': 20.8.6 '@types/semver': 7.5.0 class-validator: 0.14.0 graphql: 16.8.1 @@ -15739,7 +15600,7 @@ packages: engines: {node: '>= 0.8'} dev: false - /vite@4.4.11(@types/node@20.8.5): + /vite@4.4.11(@types/node@20.8.6): resolution: {integrity: sha512-ksNZJlkcU9b0lBwAGZGGaZHCMqHsc8OpgtoYhsQ4/I2v5cnpmmmqe5pM4nv/4Hn6G/2GhTdj0DhZh2e+Er1q5A==} engines: {node: ^14.18.0 || >=16.0.0} hasBin: true @@ -15767,7 +15628,7 @@ packages: terser: optional: true dependencies: - '@types/node': 20.8.5 + '@types/node': 20.8.6 esbuild: 0.18.20 postcss: 8.4.31 rollup: 3.29.4 @@ -15865,7 +15726,7 @@ packages: /wkx@0.5.0: resolution: {integrity: sha512-Xng/d4Ichh8uN4l0FToV/258EjMGU9MGcA0HV2d9B/ZpZB3lqQm7nkOdZdm5GhKtLLhAE7PiVQwN4eN+2YJJUg==} dependencies: - '@types/node': 20.8.5 + '@types/node': 20.8.6 dev: false /wonka@4.0.15: diff --git a/website/package.json b/website/package.json index 3e47d091..1c771102 100644 --- a/website/package.json +++ b/website/package.json @@ -36,7 +36,7 @@ "@graphql-codegen/typescript-operations": "4.0.1", "@graphql-codegen/typescript-react-apollo": "4.0.0", "@types/apollo-upload-client": "^17.0.3", - "@types/node": "^20.8.5", + "@types/node": "^20.8.6", "@types/react": "^18.2.18", "@types/react-dom": "^18.2.8", "@vitejs/plugin-react": "^4.1.0", From 1ac53982d05c709f2cdaaa24e43628b7d757852f Mon Sep 17 00:00:00 2001 From: Banks Nussman Date: Sat, 14 Oct 2023 23:36:49 -0400 Subject: [PATCH 2/6] chore: clean up app entry --- app/App.tsx | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/app/App.tsx b/app/App.tsx index e8ed2ccc..220937cb 100644 --- a/app/App.tsx +++ b/app/App.tsx @@ -143,25 +143,19 @@ function Beep() { ); } -function App2() { +function App() { return ( - + + + ); } -function App() { - return ( - - - - ); -} - export default App; From 9ea656775ed6ea1ee43244d1ede0aa47951bd8ed Mon Sep 17 00:00:00 2001 From: Banks Nussman Date: Sat, 14 Oct 2023 23:43:04 -0400 Subject: [PATCH 3/6] clean up unused code --- app/routes/ride/StatusBar.tsx | 36 ----------------------------------- app/utils/OfflineToken.ts | 24 ----------------------- 2 files changed, 60 deletions(-) delete mode 100644 app/routes/ride/StatusBar.tsx delete mode 100644 app/utils/OfflineToken.ts diff --git a/app/routes/ride/StatusBar.tsx b/app/routes/ride/StatusBar.tsx deleted file mode 100644 index 5a4006dd..00000000 --- a/app/routes/ride/StatusBar.tsx +++ /dev/null @@ -1,36 +0,0 @@ -import React from "react"; -import { Text, Slider } from "native-base"; - -interface Props { - state: number; -} - -export function StatusBar({ state }: Props) { - const iconMap = ["🚫", "⏱", "🚕", "📍", "🚕"]; - - return ( - - - - - - {iconMap[state] ?? "🍆"} - - - ); -} diff --git a/app/utils/OfflineToken.ts b/app/utils/OfflineToken.ts deleted file mode 100644 index d31978c7..00000000 --- a/app/utils/OfflineToken.ts +++ /dev/null @@ -1,24 +0,0 @@ -import { gql } from "@apollo/client"; -import AsyncStorage from "@react-native-async-storage/async-storage"; -import { client } from "./Apollo"; - -const RemoveToken = gql` - mutation RemoveToken($token: String!) { - removeToken(token: $token) - } -`; - -export async function removeOldToken(): Promise { - const tokenid = await AsyncStorage.getItem("token"); - - if (tokenid !== null) { - const result = await client.mutate({ - mutation: RemoveToken, - variables: { token: tokenid }, - }); - - if (result) { - AsyncStorage.removeItem("token"); - } - } -} From 1071afb8b2b1c04cc9660c8db4468c125fb95476 Mon Sep 17 00:00:00 2001 From: Banks Nussman Date: Sun, 15 Oct 2023 20:23:25 -0400 Subject: [PATCH 4/6] chore: update `@mikro-orm/*` --- api/package.json | 8 +++--- pnpm-lock.yaml | 68 ++++++++++++++++++++++++------------------------ 2 files changed, 38 insertions(+), 38 deletions(-) diff --git a/api/package.json b/api/package.json index 8d2897f0..0b359bc4 100644 --- a/api/package.json +++ b/api/package.json @@ -25,8 +25,8 @@ "dependencies": { "@apollo/server": "^4.9.4", "@banksnussman/graphql-fields-to-relations": "^2.0.0", - "@mikro-orm/core": "5.8.8", - "@mikro-orm/postgresql": "5.8.8", + "@mikro-orm/core": "5.8.9", + "@mikro-orm/postgresql": "5.8.9", "@sentry/integrations": "^7.74.0", "@sentry/node": "^7.74.0", "aws-sdk": "^2.1473.0", @@ -52,8 +52,8 @@ "ws": "^8.14.2" }, "devDependencies": { - "@mikro-orm/cli": "5.8.8", - "@mikro-orm/migrations": "5.8.8", + "@mikro-orm/cli": "5.8.9", + "@mikro-orm/migrations": "5.8.9", "@types/bcrypt": "^5.0.0", "@types/body-parser": "^1.19.3", "@types/cors": "^2.8.14", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 21c83b1f..3670287d 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -25,11 +25,11 @@ importers: specifier: ^2.0.0 version: 2.0.0 '@mikro-orm/core': - specifier: 5.8.8 - version: 5.8.8(@mikro-orm/migrations@5.8.8)(@mikro-orm/postgresql@5.8.8) + specifier: 5.8.9 + version: 5.8.9(@mikro-orm/migrations@5.8.9)(@mikro-orm/postgresql@5.8.9) '@mikro-orm/postgresql': - specifier: 5.8.8 - version: 5.8.8(@mikro-orm/core@5.8.8)(@mikro-orm/migrations@5.8.8) + specifier: 5.8.9 + version: 5.8.9(@mikro-orm/core@5.8.9)(@mikro-orm/migrations@5.8.9) '@sentry/integrations': specifier: ^7.74.0 version: 7.74.0 @@ -101,11 +101,11 @@ importers: version: 8.14.2 devDependencies: '@mikro-orm/cli': - specifier: 5.8.8 - version: 5.8.8(@mikro-orm/migrations@5.8.8)(@mikro-orm/postgresql@5.8.8)(pg@8.11.3) + specifier: 5.8.9 + version: 5.8.9(@mikro-orm/migrations@5.8.9)(@mikro-orm/postgresql@5.8.9)(pg@8.11.3) '@mikro-orm/migrations': - specifier: 5.8.8 - version: 5.8.8(@mikro-orm/core@5.8.8)(pg@8.11.3) + specifier: 5.8.9 + version: 5.8.9(@mikro-orm/core@5.8.9)(pg@8.11.3) '@types/bcrypt': specifier: ^5.0.0 version: 5.0.0 @@ -5936,8 +5936,8 @@ packages: - supports-color dev: false - /@mikro-orm/cli@5.8.8(@mikro-orm/migrations@5.8.8)(@mikro-orm/postgresql@5.8.8)(pg@8.11.3): - resolution: {integrity: sha512-vAiBy4LSMXeupM8K8XqzrQY+OtH3KLzjqFuFKGgUN6lIQFzQbXgYdS/Q78OlZ8UsIPDWlpUfdDrEoVNECLA/2g==} + /@mikro-orm/cli@5.8.9(@mikro-orm/migrations@5.8.9)(@mikro-orm/postgresql@5.8.9)(pg@8.11.3): + resolution: {integrity: sha512-qt2/YRQJbNx6ldB1dbdA2IcydCqmSbIQSRVbJjvxM3fnv5pR7hQBg7rMuTzz0EbVSGEQS+heIpIKBTVEohlwsw==} engines: {node: '>= 14.0.0'} hasBin: true peerDependencies: @@ -5974,10 +5974,10 @@ packages: optional: true dependencies: '@jercle/yargonaut': 1.1.5 - '@mikro-orm/core': 5.8.8(@mikro-orm/migrations@5.8.8)(@mikro-orm/postgresql@5.8.8) - '@mikro-orm/knex': 5.8.8(@mikro-orm/core@5.8.8)(@mikro-orm/migrations@5.8.8)(pg@8.11.3) - '@mikro-orm/migrations': 5.8.8(@mikro-orm/core@5.8.8)(pg@8.11.3) - '@mikro-orm/postgresql': 5.8.8(@mikro-orm/core@5.8.8)(@mikro-orm/migrations@5.8.8) + '@mikro-orm/core': 5.8.9(@mikro-orm/migrations@5.8.9)(@mikro-orm/postgresql@5.8.9) + '@mikro-orm/knex': 5.8.9(@mikro-orm/core@5.8.9)(@mikro-orm/migrations@5.8.9)(pg@8.11.3) + '@mikro-orm/migrations': 5.8.9(@mikro-orm/core@5.8.9)(pg@8.11.3) + '@mikro-orm/postgresql': 5.8.9(@mikro-orm/core@5.8.9)(@mikro-orm/migrations@5.8.9) fs-extra: 11.1.1 tsconfig-paths: 4.2.0 yargs: 17.7.2 @@ -5993,8 +5993,8 @@ packages: - tedious dev: true - /@mikro-orm/core@5.8.8(@mikro-orm/migrations@5.8.8)(@mikro-orm/postgresql@5.8.8): - resolution: {integrity: sha512-lPAqq3RqsoQtCAMmJognwEyvEn1WqvSCiCzfZrUZBt2oPTXvIpo2mbH82kYxruqYO2QcfAQg2JhlNn9W2pwWdQ==} + /@mikro-orm/core@5.8.9(@mikro-orm/migrations@5.8.9)(@mikro-orm/postgresql@5.8.9): + resolution: {integrity: sha512-fvc1dUs1Z/7Q/qf98dEwWKOHZ1caHkwJKBRV4ZSymfqJj5NyL3MK8Q8aURj/2PBepfrqdaiaInGJ0B7a1g6XJw==} engines: {node: '>= 14.0.0'} peerDependencies: '@mikro-orm/better-sqlite': ^5.0.0 @@ -6029,18 +6029,18 @@ packages: '@mikro-orm/sqlite': optional: true dependencies: - '@mikro-orm/migrations': 5.8.8(@mikro-orm/core@5.8.8)(pg@8.11.3) - '@mikro-orm/postgresql': 5.8.8(@mikro-orm/core@5.8.8)(@mikro-orm/migrations@5.8.8) + '@mikro-orm/migrations': 5.8.9(@mikro-orm/core@5.8.9)(pg@8.11.3) + '@mikro-orm/postgresql': 5.8.9(@mikro-orm/core@5.8.9)(@mikro-orm/migrations@5.8.9) acorn-loose: 8.3.0 acorn-walk: 8.2.0 dotenv: 16.3.1 fs-extra: 11.1.1 globby: 11.1.0 - mikro-orm: 5.8.8 + mikro-orm: 5.8.9 reflect-metadata: 0.1.13 - /@mikro-orm/knex@5.8.8(@mikro-orm/core@5.8.8)(@mikro-orm/migrations@5.8.8)(pg@8.11.3): - resolution: {integrity: sha512-rFX5wuu4a2VGbspYutrYncwCJoI7tZqdXSSOzlDSvj/jTyIiwyW4XgyquPse+1M2jWp3Xx9xZFVGiJYjCiMlMw==} + /@mikro-orm/knex@5.8.9(@mikro-orm/core@5.8.9)(@mikro-orm/migrations@5.8.9)(pg@8.11.3): + resolution: {integrity: sha512-lEnSnaXQZ156ziB+xQlYGr3LJb3pIYGRm8sNcRO2AVQzTkOmXQENyeTc1cK+hzmNboByMlYescBZhe45+cQtwA==} engines: {node: '>= 14.0.0'} peerDependencies: '@mikro-orm/core': ^5.0.0 @@ -6070,8 +6070,8 @@ packages: sqlite3: optional: true dependencies: - '@mikro-orm/core': 5.8.8(@mikro-orm/migrations@5.8.8)(@mikro-orm/postgresql@5.8.8) - '@mikro-orm/migrations': 5.8.8(@mikro-orm/core@5.8.8)(pg@8.11.3) + '@mikro-orm/core': 5.8.9(@mikro-orm/migrations@5.8.9)(@mikro-orm/postgresql@5.8.9) + '@mikro-orm/migrations': 5.8.9(@mikro-orm/core@5.8.9)(pg@8.11.3) fs-extra: 11.1.1 knex: 2.5.1(pg@8.11.3) pg: 8.11.3 @@ -6081,14 +6081,14 @@ packages: - supports-color - tedious - /@mikro-orm/migrations@5.8.8(@mikro-orm/core@5.8.8)(pg@8.11.3): - resolution: {integrity: sha512-0PuMW5VHeA/4pR7ikqe097XfD0XaRwD3Ls/V2FDTT1m3v8FL4pwqU4O7CClLpDk3/Fl3rNYus+Dh8vRqPiMBPA==} + /@mikro-orm/migrations@5.8.9(@mikro-orm/core@5.8.9)(pg@8.11.3): + resolution: {integrity: sha512-+TFJYyFQt2zuu0XsluZE/tNTIYty+xuqg7z1bBBv6DWIPDd50YmzZNC+MPplyudfT1pzjqUiqiwVzCV4ytfy7w==} engines: {node: '>= 14.0.0'} peerDependencies: '@mikro-orm/core': ^5.0.0 dependencies: - '@mikro-orm/core': 5.8.8(@mikro-orm/migrations@5.8.8)(@mikro-orm/postgresql@5.8.8) - '@mikro-orm/knex': 5.8.8(@mikro-orm/core@5.8.8)(@mikro-orm/migrations@5.8.8)(pg@8.11.3) + '@mikro-orm/core': 5.8.9(@mikro-orm/migrations@5.8.9)(@mikro-orm/postgresql@5.8.9) + '@mikro-orm/knex': 5.8.9(@mikro-orm/core@5.8.9)(@mikro-orm/migrations@5.8.9)(pg@8.11.3) fs-extra: 11.1.1 knex: 2.5.1(pg@8.11.3) umzug: 3.3.1 @@ -6104,8 +6104,8 @@ packages: - supports-color - tedious - /@mikro-orm/postgresql@5.8.8(@mikro-orm/core@5.8.8)(@mikro-orm/migrations@5.8.8): - resolution: {integrity: sha512-c5SvV4uqWGC/S7pqe28dKrK2/P7ZXn04MlQ5cklt4s8tZ2sBUL4eG7J48Kk6ZO9b2Z3xFVzF47CMYKWfbZD4hQ==} + /@mikro-orm/postgresql@5.8.9(@mikro-orm/core@5.8.9)(@mikro-orm/migrations@5.8.9): + resolution: {integrity: sha512-r8nIBXoVd5RCcSvst566UDrZVTrywdIcYmgIIYjhyXl68YjuiXsd6ncPIWiydX9mrxxBdKZ/uOKauzLW/qvOFw==} engines: {node: '>= 14.0.0'} peerDependencies: '@mikro-orm/core': ^5.0.0 @@ -6120,9 +6120,9 @@ packages: '@mikro-orm/seeder': optional: true dependencies: - '@mikro-orm/core': 5.8.8(@mikro-orm/migrations@5.8.8)(@mikro-orm/postgresql@5.8.8) - '@mikro-orm/knex': 5.8.8(@mikro-orm/core@5.8.8)(@mikro-orm/migrations@5.8.8)(pg@8.11.3) - '@mikro-orm/migrations': 5.8.8(@mikro-orm/core@5.8.8)(pg@8.11.3) + '@mikro-orm/core': 5.8.9(@mikro-orm/migrations@5.8.9)(@mikro-orm/postgresql@5.8.9) + '@mikro-orm/knex': 5.8.9(@mikro-orm/core@5.8.9)(@mikro-orm/migrations@5.8.9)(pg@8.11.3) + '@mikro-orm/migrations': 5.8.9(@mikro-orm/core@5.8.9)(pg@8.11.3) pg: 8.11.3 transitivePeerDependencies: - better-sqlite3 @@ -12706,8 +12706,8 @@ packages: braces: 3.0.2 picomatch: 2.3.1 - /mikro-orm@5.8.8: - resolution: {integrity: sha512-DE+EquF+2CEu/7sMQK0lrmfN3NpMTh5jqBWrdEKPvrWTYFGl7rzC08/9nYoPKEFXd+9JUykmZdVqXtkyRnqU9g==} + /mikro-orm@5.8.9: + resolution: {integrity: sha512-zklwaoLL5budjVhfylNZGFmv7ysCCZFXgVzzzLDr7A67MNKTL2LFhWgRHqi7z/dIoAW+38o8uRkaUK9xpL9n0Q==} engines: {node: '>= 14.0.0'} /mime-db@1.37.0: From 4022a7fa3f71e4d0a7a2f0993bb9a4ceeed703d7 Mon Sep 17 00:00:00 2001 From: Banks Nussman Date: Mon, 16 Oct 2023 12:58:15 -0400 Subject: [PATCH 5/6] feat: allow users to delete ratings --- api/src/rating/resolver.ts | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/api/src/rating/resolver.ts b/api/src/rating/resolver.ts index f5b59e33..fc7ee342 100644 --- a/api/src/rating/resolver.ts +++ b/api/src/rating/resolver.ts @@ -89,15 +89,25 @@ export class RatingResolver { } @Mutation(() => Boolean) - @Authorized(UserRole.ADMIN) + @Authorized() public async deleteRating(@Ctx() ctx: Context, @Arg('id') id: string): Promise { const rating = await ctx.em.findOneOrFail(Rating, id, { populate: ['rated'] }); - if (!rating.rated.rating) throw new Error("You are trying to delete a rating for a user who's rating value is undefined"); + if (ctx.user.role === UserRole.USER && rating.rater.id !== ctx.user.id) { + throw new Error("You can't delete a rating that you didn't create."); + } + + if (!rating.rated.rating) { + throw new Error("You are trying to delete a rating for a user who's rating value is undefined"); + } const numberOfRatings = await ctx.em.count(Rating, { rated: rating.rated.id }); - rating.rated.rating = numberOfRatings <= 1 ? undefined : rating.rated.rating = (rating.rated.rating * numberOfRatings - rating.stars) / (numberOfRatings - 1); + if (numberOfRatings <= 1) { + rating.rated.rating = undefined; + } else { + rating.rated.rating = (rating.rated.rating * numberOfRatings - rating.stars) / (numberOfRatings - 1); + } ctx.em.persist(rating.rated); From a302e8743b4e53bfb43872210f62e41b0508d1e5 Mon Sep 17 00:00:00 2001 From: Banks Nussman Date: Mon, 16 Oct 2023 13:25:55 -0400 Subject: [PATCH 6/6] feat: allow users to delete ratings --- app/components/Rating.tsx | 53 ++++++++++++++++++++++++++++++++++++--- 1 file changed, 49 insertions(+), 4 deletions(-) diff --git a/app/components/Rating.tsx b/app/components/Rating.tsx index 4cdf8abb..ad0c3eab 100644 --- a/app/components/Rating.tsx +++ b/app/components/Rating.tsx @@ -6,14 +6,24 @@ import { Navigation } from "../utils/Navigation"; import { useUser } from "../utils/useUser"; import { Avatar } from "./Avatar"; import { printStars } from "./Stars"; -import { Unpacked } from "../utils/constants"; +import { Unpacked, isMobile } from "../utils/constants"; import { Card } from "./Card"; +import { Alert } from "react-native"; +import { ApolloError, gql, useMutation } from "@apollo/client"; + +type Rating = Unpacked; interface Props { - item: Unpacked; + item: Rating; index: number; } +export const DeleteRating = gql` + mutation DeleteRating($id: String!) { + deleteRating(id: $id) + } +`; + export function Rating(props: Props) { const { item } = props; const { user } = useUser(); @@ -21,7 +31,41 @@ export function Rating(props: Props) { const otherUser = user?.id === item.rater.id ? item.rated : item.rater; const isRater = user?.id === item.rater.id; - const isRated = user?.id === item.rated.id; + + const [_deleteRating] = useMutation(DeleteRating); + + const onLongPress = () => { + if (isMobile) { + Alert.alert( + "Delete Rating?", + "Are you sure you want to delete this rating?", + [ + { + text: "No", + style: "cancel", + }, + { text: "Yes", onPress: deleteRating }, + ], + { cancelable: true } + ); + } else { + deleteRating(); + } + }; + + const deleteRating = () => { + _deleteRating({ + variables: { id: item.id }, + update: (cache) => { + cache.evict({ + id: cache.identify({ + __typename: "Rating", + id: item.id, + }), + }); + }, + }).catch((error: ApolloError) => alert(error?.message)); + }; return ( navigation.push("Profile", { id: otherUser.id })} + onLongPress={onLongPress} > @@ -43,7 +88,7 @@ export function Rating(props: Props) { {otherUser.name} - {`${isRater ? "Rated" : "Recieved"} - ${new Date( + {`${isRater ? "You rated" : "Rated you"} - ${new Date( item.timestamp ).toLocaleString(undefined, { dateStyle: 'short', timeStyle: "short" })}`}