From 5f1a4d2745625c155c1111c7bf898a11ed717ee2 Mon Sep 17 00:00:00 2001 From: jackso-bytes Date: Sun, 21 Jul 2024 08:03:24 +0100 Subject: [PATCH 01/30] feat: :bug: build js files as well as .d.ts --- tooling/typescript/internal-package.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tooling/typescript/internal-package.json b/tooling/typescript/internal-package.json index 1ac41ef..b24ca00 100644 --- a/tooling/typescript/internal-package.json +++ b/tooling/typescript/internal-package.json @@ -2,10 +2,9 @@ "$schema": "https://json.schemastore.org/tsconfig", "extends": "./base.json", "compilerOptions": { - /** Emit types for internal packages to speed up editor performance. */ "declaration": true, "declarationMap": true, "noEmit": false, - "emitDeclarationOnly": true + "emitDeclarationOnly": false } } From 6f5a2ac37c23dc6b93df3f50662942ef3a2d44d4 Mon Sep 17 00:00:00 2001 From: jackso-bytes Date: Sun, 21 Jul 2024 08:03:53 +0100 Subject: [PATCH 02/30] fix: point start script to correct location --- packages/api/package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/api/package.json b/packages/api/package.json index e1d3fa7..29e9299 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -12,6 +12,7 @@ "license": "MIT", "scripts": { "build": "tsc", + "start": "node dist/index.", "dev": "tsc --watch", "clean": "rm -rf .turbo node_modules", "format": "prettier --check . --ignore-path ../../.gitignore", From e77aa577591f5c0677bdb7c0888111fa7f606c33 Mon Sep 17 00:00:00 2001 From: jackso-bytes Date: Sun, 21 Jul 2024 08:04:36 +0100 Subject: [PATCH 03/30] chore: :package: update lock file --- pnpm-lock.yaml | 822 ------------------------------------------------- 1 file changed, 822 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index f824592..dd0be23 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -411,76 +411,6 @@ importers: specifier: ^5.4.5 version: 5.4.5 - packages/ui: - dependencies: - '@hookform/resolvers': - specifier: ^3.3.4 - version: 3.3.4(react-hook-form@7.51.4(react@18.3.1)) - '@radix-ui/react-dropdown-menu': - specifier: ^2.0.6 - version: 2.0.6(@types/react-dom@18.3.0)(@types/react@18.3.2)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-icons': - specifier: ^1.3.0 - version: 1.3.0(react@18.3.1) - '@radix-ui/react-label': - specifier: ^2.0.2 - version: 2.0.2(@types/react-dom@18.3.0)(@types/react@18.3.2)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-slot': - specifier: ^1.0.2 - version: 1.0.2(@types/react@18.3.2)(react@18.3.1) - class-variance-authority: - specifier: ^0.7.0 - version: 0.7.0 - next-themes: - specifier: ^0.3.0 - version: 0.3.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - react-hook-form: - specifier: ^7.51.4 - version: 7.51.4(react@18.3.1) - sonner: - specifier: ^1.4.41 - version: 1.4.41(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - tailwind-merge: - specifier: ^2.3.0 - version: 2.3.0 - tailwindcss-animate: - specifier: ^1.0.7 - version: 1.0.7(tailwindcss@3.4.3(ts-node@10.9.2(@types/node@20.12.9)(typescript@5.4.5))) - devDependencies: - '@acme/eslint-config': - specifier: workspace:* - version: link:../../tooling/eslint - '@acme/prettier-config': - specifier: workspace:* - version: link:../../tooling/prettier - '@acme/tailwind-config': - specifier: workspace:* - version: link:../../tooling/tailwind - '@acme/tsconfig': - specifier: workspace:* - version: link:../../tooling/typescript - '@types/react': - specifier: ^18.3.2 - version: 18.3.2 - eslint: - specifier: ^9.2.0 - version: 9.2.0 - prettier: - specifier: ^3.2.5 - version: 3.2.5 - react: - specifier: 18.3.1 - version: 18.3.1 - tailwindcss: - specifier: ^3.4.3 - version: 3.4.3(ts-node@10.9.2(@types/node@20.12.9)(typescript@5.4.5)) - typescript: - specifier: ^5.4.5 - version: 5.4.5 - zod: - specifier: ^3.23.8 - version: 3.23.8 - packages/validators: dependencies: zod: @@ -1967,21 +1897,6 @@ packages: resolution: {integrity: sha512-vBZP4NlzfOlerQTnba4aqZoMhE/a9HY7HRqoOPaETQcSQuWEIyZMHGfVu6w9wGtGK5fED5qRs2DteVCjOH60sA==} engines: {node: '>=14'} - '@floating-ui/core@1.6.0': - resolution: {integrity: sha512-PcF++MykgmTj3CIyOQbKA/hDzOAiqI3mhuoN44WRCopIs1sgoDoU4oty4Jtqaj/y3oDU6fnVSm4QG0a3t5i0+g==} - - '@floating-ui/dom@1.6.3': - resolution: {integrity: sha512-RnDthu3mzPlQ31Ss/BTwQ1zjzIhr3lk1gZB1OC56h/1vEtaXkESrOqL5fQVMfXpwGtRwX+YsZBdyHtJMQnkArw==} - - '@floating-ui/react-dom@2.0.8': - resolution: {integrity: sha512-HOdqOt3R3OGeTKidaLvJKcgg75S6tibQ3Tif4eyd91QnIJWr0NLvoXFpJA/j8HqkFSL68GDca9AuyWEHlhyClw==} - peerDependencies: - react: '>=16.8.0' - react-dom: '>=16.8.0' - - '@floating-ui/utils@0.2.1': - resolution: {integrity: sha512-9TANp6GPoMtYzQdt54kfAyMmz1+osLlXdg2ENroU7zzrtflTLrrC/lgrIfaSe+Wu0b89GKccT7vxXA0MoAIO+Q==} - '@gar/promisify@1.1.3': resolution: {integrity: sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==} @@ -1996,11 +1911,6 @@ packages: '@hapi/topo@5.1.0': resolution: {integrity: sha512-foQZKJig7Ob0BMAYBfcJk8d77QtOe7Wo4ox7ff1lQYoNNAb6jwcY1ncdoy2e9wQZzvNy7ODZCYJkK8kzmcAnAg==} - '@hookform/resolvers@3.3.4': - resolution: {integrity: sha512-o5cgpGOuJYrd+iMKvkttOclgwRW86EsWJZZRC23prf0uU2i48Htq4PuT73AVb9ionFyZrwYEITuOFGF+BydEtQ==} - peerDependencies: - react-hook-form: ^7.0.0 - '@humanwhocodes/config-array@0.13.0': resolution: {integrity: sha512-DZLEEqFWQFiyK6h5YIeynKx7JlvCYWL0cImfSRXZ9l4Sg2efkFGTuFf6vzXjK1cq6IYkU+Eg/JizXw+TD2vRNw==} engines: {node: '>=10.10.0'} @@ -2278,291 +2188,16 @@ packages: resolution: {integrity: sha512-t2XdOfrVgcF7AW791FtdPS27NyNqcE1SpoXgk3HpziousvUMsJi4Q6NL3JyOBpsMOrvk94749o8yyonvX5quPw==} engines: {node: '>=16'} - '@radix-ui/primitive@1.0.1': - resolution: {integrity: sha512-yQ8oGX2GVsEYMWGxcovu1uGWPCxV5BFfeeYxqPmuAzUyLT9qmaMXSAhXpb0WrspIeqYzdJpkh2vHModJPgRIaw==} - - '@radix-ui/react-arrow@1.0.3': - resolution: {integrity: sha512-wSP+pHsB/jQRaL6voubsQ/ZlrGBHHrOjmBnr19hxYgtS0WvAFwZhK2WP/YY5yF9uKECCEEDGxuLxq1NBK51wFA==} - peerDependencies: - '@types/react': '*' - '@types/react-dom': '*' - react: ^16.8 || ^17.0 || ^18.0 - react-dom: ^16.8 || ^17.0 || ^18.0 - peerDependenciesMeta: - '@types/react': - optional: true - '@types/react-dom': - optional: true - - '@radix-ui/react-collection@1.0.3': - resolution: {integrity: sha512-3SzW+0PW7yBBoQlT8wNcGtaxaD0XSu0uLUFgrtHY08Acx05TaHaOmVLR73c0j/cqpDy53KBMO7s0dx2wmOIDIA==} - peerDependencies: - '@types/react': '*' - '@types/react-dom': '*' - react: ^16.8 || ^17.0 || ^18.0 - react-dom: ^16.8 || ^17.0 || ^18.0 - peerDependenciesMeta: - '@types/react': - optional: true - '@types/react-dom': - optional: true - '@radix-ui/react-compose-refs@1.0.0': resolution: {integrity: sha512-0KaSv6sx787/hK3eF53iOkiSLwAGlFMx5lotrqD2pTjB18KbybKoEIgkNZTKC60YECDQTKGTRcDBILwZVqVKvA==} peerDependencies: react: ^16.8 || ^17.0 || ^18.0 - '@radix-ui/react-compose-refs@1.0.1': - resolution: {integrity: sha512-fDSBgd44FKHa1FRMU59qBMPFcl2PZE+2nmqunj+BWFyYYjnhIDWL2ItDs3rrbJDQOtzt5nIebLCQc4QRfz6LJw==} - peerDependencies: - '@types/react': '*' - react: ^16.8 || ^17.0 || ^18.0 - peerDependenciesMeta: - '@types/react': - optional: true - - '@radix-ui/react-context@1.0.1': - resolution: {integrity: sha512-ebbrdFoYTcuZ0v4wG5tedGnp9tzcV8awzsxYph7gXUyvnNLuTIcCk1q17JEbnVhXAKG9oX3KtchwiMIAYp9NLg==} - peerDependencies: - '@types/react': '*' - react: ^16.8 || ^17.0 || ^18.0 - peerDependenciesMeta: - '@types/react': - optional: true - - '@radix-ui/react-direction@1.0.1': - resolution: {integrity: sha512-RXcvnXgyvYvBEOhCBuddKecVkoMiI10Jcm5cTI7abJRAHYfFxeu+FBQs/DvdxSYucxR5mna0dNsL6QFlds5TMA==} - peerDependencies: - '@types/react': '*' - react: ^16.8 || ^17.0 || ^18.0 - peerDependenciesMeta: - '@types/react': - optional: true - - '@radix-ui/react-dismissable-layer@1.0.5': - resolution: {integrity: sha512-aJeDjQhywg9LBu2t/At58hCvr7pEm0o2Ke1x33B+MhjNmmZ17sy4KImo0KPLgsnc/zN7GPdce8Cnn0SWvwZO7g==} - peerDependencies: - '@types/react': '*' - '@types/react-dom': '*' - react: ^16.8 || ^17.0 || ^18.0 - react-dom: ^16.8 || ^17.0 || ^18.0 - peerDependenciesMeta: - '@types/react': - optional: true - '@types/react-dom': - optional: true - - '@radix-ui/react-dropdown-menu@2.0.6': - resolution: {integrity: sha512-i6TuFOoWmLWq+M/eCLGd/bQ2HfAX1RJgvrBQ6AQLmzfvsLdefxbWu8G9zczcPFfcSPehz9GcpF6K9QYreFV8hA==} - peerDependencies: - '@types/react': '*' - '@types/react-dom': '*' - react: ^16.8 || ^17.0 || ^18.0 - react-dom: ^16.8 || ^17.0 || ^18.0 - peerDependenciesMeta: - '@types/react': - optional: true - '@types/react-dom': - optional: true - - '@radix-ui/react-focus-guards@1.0.1': - resolution: {integrity: sha512-Rect2dWbQ8waGzhMavsIbmSVCgYxkXLxxR3ZvCX79JOglzdEy4JXMb98lq4hPxUbLr77nP0UOGf4rcMU+s1pUA==} - peerDependencies: - '@types/react': '*' - react: ^16.8 || ^17.0 || ^18.0 - peerDependenciesMeta: - '@types/react': - optional: true - - '@radix-ui/react-focus-scope@1.0.4': - resolution: {integrity: sha512-sL04Mgvf+FmyvZeYfNu1EPAaaxD+aw7cYeIB9L9Fvq8+urhltTRaEo5ysKOpHuKPclsZcSUMKlN05x4u+CINpA==} - peerDependencies: - '@types/react': '*' - '@types/react-dom': '*' - react: ^16.8 || ^17.0 || ^18.0 - react-dom: ^16.8 || ^17.0 || ^18.0 - peerDependenciesMeta: - '@types/react': - optional: true - '@types/react-dom': - optional: true - - '@radix-ui/react-icons@1.3.0': - resolution: {integrity: sha512-jQxj/0LKgp+j9BiTXz3O3sgs26RNet2iLWmsPyRz2SIcR4q/4SbazXfnYwbAr+vLYKSfc7qxzyGQA1HLlYiuNw==} - peerDependencies: - react: ^16.x || ^17.x || ^18.x - - '@radix-ui/react-id@1.0.1': - resolution: {integrity: sha512-tI7sT/kqYp8p96yGWY1OAnLHrqDgzHefRBKQ2YAkBS5ja7QLcZ9Z/uY7bEjPUatf8RomoXM8/1sMj1IJaE5UzQ==} - peerDependencies: - '@types/react': '*' - react: ^16.8 || ^17.0 || ^18.0 - peerDependenciesMeta: - '@types/react': - optional: true - - '@radix-ui/react-label@2.0.2': - resolution: {integrity: sha512-N5ehvlM7qoTLx7nWPodsPYPgMzA5WM8zZChQg8nyFJKnDO5WHdba1vv5/H6IO5LtJMfD2Q3wh1qHFGNtK0w3bQ==} - peerDependencies: - '@types/react': '*' - '@types/react-dom': '*' - react: ^16.8 || ^17.0 || ^18.0 - react-dom: ^16.8 || ^17.0 || ^18.0 - peerDependenciesMeta: - '@types/react': - optional: true - '@types/react-dom': - optional: true - - '@radix-ui/react-menu@2.0.6': - resolution: {integrity: sha512-BVkFLS+bUC8HcImkRKPSiVumA1VPOOEC5WBMiT+QAVsPzW1FJzI9KnqgGxVDPBcql5xXrHkD3JOVoXWEXD8SYA==} - peerDependencies: - '@types/react': '*' - '@types/react-dom': '*' - react: ^16.8 || ^17.0 || ^18.0 - react-dom: ^16.8 || ^17.0 || ^18.0 - peerDependenciesMeta: - '@types/react': - optional: true - '@types/react-dom': - optional: true - - '@radix-ui/react-popper@1.1.3': - resolution: {integrity: sha512-cKpopj/5RHZWjrbF2846jBNacjQVwkP068DfmgrNJXpvVWrOvlAmE9xSiy5OqeE+Gi8D9fP+oDhUnPqNMY8/5w==} - peerDependencies: - '@types/react': '*' - '@types/react-dom': '*' - react: ^16.8 || ^17.0 || ^18.0 - react-dom: ^16.8 || ^17.0 || ^18.0 - peerDependenciesMeta: - '@types/react': - optional: true - '@types/react-dom': - optional: true - - '@radix-ui/react-portal@1.0.4': - resolution: {integrity: sha512-Qki+C/EuGUVCQTOTD5vzJzJuMUlewbzuKyUy+/iHM2uwGiru9gZeBJtHAPKAEkB5KWGi9mP/CHKcY0wt1aW45Q==} - peerDependencies: - '@types/react': '*' - '@types/react-dom': '*' - react: ^16.8 || ^17.0 || ^18.0 - react-dom: ^16.8 || ^17.0 || ^18.0 - peerDependenciesMeta: - '@types/react': - optional: true - '@types/react-dom': - optional: true - - '@radix-ui/react-presence@1.0.1': - resolution: {integrity: sha512-UXLW4UAbIY5ZjcvzjfRFo5gxva8QirC9hF7wRE4U5gz+TP0DbRk+//qyuAQ1McDxBt1xNMBTaciFGvEmJvAZCg==} - peerDependencies: - '@types/react': '*' - '@types/react-dom': '*' - react: ^16.8 || ^17.0 || ^18.0 - react-dom: ^16.8 || ^17.0 || ^18.0 - peerDependenciesMeta: - '@types/react': - optional: true - '@types/react-dom': - optional: true - - '@radix-ui/react-primitive@1.0.3': - resolution: {integrity: sha512-yi58uVyoAcK/Nq1inRY56ZSjKypBNKTa/1mcL8qdl6oJeEaDbOldlzrGn7P6Q3Id5d+SYNGc5AJgc4vGhjs5+g==} - peerDependencies: - '@types/react': '*' - '@types/react-dom': '*' - react: ^16.8 || ^17.0 || ^18.0 - react-dom: ^16.8 || ^17.0 || ^18.0 - peerDependenciesMeta: - '@types/react': - optional: true - '@types/react-dom': - optional: true - - '@radix-ui/react-roving-focus@1.0.4': - resolution: {integrity: sha512-2mUg5Mgcu001VkGy+FfzZyzbmuUWzgWkj3rvv4yu+mLw03+mTzbxZHvfcGyFp2b8EkQeMkpRQ5FiA2Vr2O6TeQ==} - peerDependencies: - '@types/react': '*' - '@types/react-dom': '*' - react: ^16.8 || ^17.0 || ^18.0 - react-dom: ^16.8 || ^17.0 || ^18.0 - peerDependenciesMeta: - '@types/react': - optional: true - '@types/react-dom': - optional: true - '@radix-ui/react-slot@1.0.1': resolution: {integrity: sha512-avutXAFL1ehGvAXtPquu0YK5oz6ctS474iM3vNGQIkswrVhdrS52e3uoMQBzZhNRAIE0jBnUyXWNmSjGHhCFcw==} peerDependencies: react: ^16.8 || ^17.0 || ^18.0 - '@radix-ui/react-slot@1.0.2': - resolution: {integrity: sha512-YeTpuq4deV+6DusvVUW4ivBgnkHwECUu0BiN43L5UCDFgdhsRUWAghhTF5MbvNTPzmiFOx90asDSUjWuCNapwg==} - peerDependencies: - '@types/react': '*' - react: ^16.8 || ^17.0 || ^18.0 - peerDependenciesMeta: - '@types/react': - optional: true - - '@radix-ui/react-use-callback-ref@1.0.1': - resolution: {integrity: sha512-D94LjX4Sp0xJFVaoQOd3OO9k7tpBYNOXdVhkltUbGv2Qb9OXdrg/CpsjlZv7ia14Sylv398LswWBVVu5nqKzAQ==} - peerDependencies: - '@types/react': '*' - react: ^16.8 || ^17.0 || ^18.0 - peerDependenciesMeta: - '@types/react': - optional: true - - '@radix-ui/react-use-controllable-state@1.0.1': - resolution: {integrity: sha512-Svl5GY5FQeN758fWKrjM6Qb7asvXeiZltlT4U2gVfl8Gx5UAv2sMR0LWo8yhsIZh2oQ0eFdZ59aoOOMV7b47VA==} - peerDependencies: - '@types/react': '*' - react: ^16.8 || ^17.0 || ^18.0 - peerDependenciesMeta: - '@types/react': - optional: true - - '@radix-ui/react-use-escape-keydown@1.0.3': - resolution: {integrity: sha512-vyL82j40hcFicA+M4Ex7hVkB9vHgSse1ZWomAqV2Je3RleKGO5iM8KMOEtfoSB0PnIelMd2lATjTGMYqN5ylTg==} - peerDependencies: - '@types/react': '*' - react: ^16.8 || ^17.0 || ^18.0 - peerDependenciesMeta: - '@types/react': - optional: true - - '@radix-ui/react-use-layout-effect@1.0.1': - resolution: {integrity: sha512-v/5RegiJWYdoCvMnITBkNNx6bCj20fiaJnWtRkU18yITptraXjffz5Qbn05uOiQnOvi+dbkznkoaMltz1GnszQ==} - peerDependencies: - '@types/react': '*' - react: ^16.8 || ^17.0 || ^18.0 - peerDependenciesMeta: - '@types/react': - optional: true - - '@radix-ui/react-use-rect@1.0.1': - resolution: {integrity: sha512-Cq5DLuSiuYVKNU8orzJMbl15TXilTnJKUCltMVQg53BQOF1/C5toAaGrowkgksdBQ9H+SRL23g0HDmg9tvmxXw==} - peerDependencies: - '@types/react': '*' - react: ^16.8 || ^17.0 || ^18.0 - peerDependenciesMeta: - '@types/react': - optional: true - - '@radix-ui/react-use-size@1.0.1': - resolution: {integrity: sha512-ibay+VqrgcaI6veAojjofPATwledXiSmX+C0KrBk/xgpX9rBzPV3OsfwlhQdUOFbh+LKQorLYT+xTXW9V8yd0g==} - peerDependencies: - '@types/react': '*' - react: ^16.8 || ^17.0 || ^18.0 - peerDependenciesMeta: - '@types/react': - optional: true - - '@radix-ui/rect@1.0.1': - resolution: {integrity: sha512-fyrgCaedtvMg9NK3en0pnOYJdtfwxUcNolezkNPUsoX57X8oQk+NkqcvzHXD2uKNij6GXmWU9NDru2IWjrO4BQ==} - '@react-native-community/cli-clean@13.6.6': resolution: {integrity: sha512-cBwJTwl0NyeA4nyMxbhkWZhxtILYkbU3TW3k8AXLg+iGphe0zikYMGB3T+haTvTc6alTyEFwPbimk9bGIqkjAQ==} @@ -3414,10 +3049,6 @@ packages: argparse@2.0.1: resolution: {integrity: sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==} - aria-hidden@1.2.4: - resolution: {integrity: sha512-y+CcFFwelSXpLZk/7fMB2mUbGtX9lKycf1MWJ7CaTIERyitVlyQx6C+sxcROU2BAJ24OiZyK+8wj2i8AlBoS3A==} - engines: {node: '>=10'} - aria-query@5.3.0: resolution: {integrity: sha512-b0P0sZPKtyu8HkeRAfCq0IfURZK+SuwMjY1UXGBU27wpAiTwQAIlq56IbIO+ytk/JjS1fMR14ee5WBBfKi5J6A==} @@ -3742,9 +3373,6 @@ packages: citty@0.1.6: resolution: {integrity: sha512-tskPPKEs8D2KPafUypv2gxwJP8h/OaJmC82QQGGDQcHvXX43xF2VDACcJVmZ0EuSxkpO9Kc4MlrA3q0+FG58AQ==} - class-variance-authority@0.7.0: - resolution: {integrity: sha512-jFI8IQw4hczaL4ALINxqLEXQbWcNjoSkloa4IaufXCJr6QawJyw7tuRysRsrE8w2p/4gGaxKIt/hX3qz/IbD1A==} - clean-stack@2.2.0: resolution: {integrity: sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==} engines: {node: '>=6'} @@ -3795,10 +3423,6 @@ packages: resolution: {integrity: sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w==} engines: {node: '>=0.8'} - clsx@2.0.0: - resolution: {integrity: sha512-rQ1+kcj+ttHG0MKVGBUXwayCCF1oh39BF5COIpRzuCEv8Mwjv0XucrI2ExNTOn9IlLifGClWQcU9BrZORvtw6Q==} - engines: {node: '>=6'} - cluster-key-slot@1.1.2: resolution: {integrity: sha512-RMr0FhtfXemyinomL4hrWcYJxmX6deFdCxpJzhDttxgO1+bcCnkk+9drydLVDmAMG7NE6aN/fl4F7ucU/90gAA==} engines: {node: '>=0.10.0'} @@ -4180,9 +3804,6 @@ packages: resolution: {integrity: sha512-bwy0MGW55bG41VqxxypOsdSdGqLwXPI/focwgTYCFMbdUiBAxLg9CFzG08sz2aqzknwiX7Hkl0bQENjg8iLByw==} engines: {node: '>=8'} - detect-node-es@1.1.0: - resolution: {integrity: sha512-ypdmJU/TbBby2Dxibuv7ZLW3Bs1QEmM7nHjEANfohJLvE0XVujisn1qPJcZxg+qDucsr+bP6fLD1rPS3AhJ7EQ==} - didyoumean@1.2.2: resolution: {integrity: sha512-gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw==} @@ -4943,10 +4564,6 @@ packages: resolution: {integrity: sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==} engines: {node: '>= 0.4'} - get-nonce@1.0.1: - resolution: {integrity: sha512-FJhYRoDaiatfEkUK8HKlicmu/3SGFD51q3itKDGoSTysQJBnfOcxU5GxnhE1E6soB76MbT0MBtnKJuXyAx+96Q==} - engines: {node: '>=6'} - get-port-please@3.1.2: resolution: {integrity: sha512-Gxc29eLs1fbn6LQ4jSU4vXjlwyZhF5HsGuMAa7gqBP4Rw4yxxltyDUuF5MBclFzDTXO+ACchGQoeela4DSfzdQ==} @@ -6221,12 +5838,6 @@ packages: nodemailer: optional: true - next-themes@0.3.0: - resolution: {integrity: sha512-/QHIrsYpd6Kfk7xakK4svpDI5mmXP0gfvCoJdGpZQ2TOrQZmsW0QxjaiLn8wbIKjtm4BTSqLoix4lxYYOnLJ/w==} - peerDependencies: - react: ^16.8 || ^17 || ^18 - react-dom: ^16.8 || ^17 || ^18 - next-tick@1.1.0: resolution: {integrity: sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==} @@ -6926,12 +6537,6 @@ packages: peerDependencies: react: '>=17.0.0' - react-hook-form@7.51.4: - resolution: {integrity: sha512-V14i8SEkh+V1gs6YtD0hdHYnoL4tp/HX/A45wWQN15CYr9bFRmmRdYStSO5L65lCCZRF+kYiSKhm9alqbcdiVA==} - engines: {node: '>=12.22.0'} - peerDependencies: - react: ^16.8.0 || ^17 || ^18 - react-is@16.13.1: resolution: {integrity: sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==} @@ -7030,41 +6635,11 @@ packages: resolution: {integrity: sha512-jCvmsr+1IUSMUyzOkRcvnVbX3ZYC6g9TDrDbFuFmRDq7PD4yaGbLKNQL6k2jnArV8hjYxh7hVhAZB6s9HDGpZA==} engines: {node: '>=0.10.0'} - react-remove-scroll-bar@2.3.6: - resolution: {integrity: sha512-DtSYaao4mBmX+HDo5YWYdBWQwYIQQshUV/dVxFxK+KM26Wjwp1gZ6rv6OC3oujI6Bfu6Xyg3TwK533AQutsn/g==} - engines: {node: '>=10'} - peerDependencies: - '@types/react': ^16.8.0 || ^17.0.0 || ^18.0.0 - react: ^16.8.0 || ^17.0.0 || ^18.0.0 - peerDependenciesMeta: - '@types/react': - optional: true - - react-remove-scroll@2.5.5: - resolution: {integrity: sha512-ImKhrzJJsyXJfBZ4bzu8Bwpka14c/fQt0k+cyFp/PBhTfyDnU5hjOtM4AG/0AMyy8oKzOTR0lDgJIM7pYXI0kw==} - engines: {node: '>=10'} - peerDependencies: - '@types/react': ^16.8.0 || ^17.0.0 || ^18.0.0 - react: ^16.8.0 || ^17.0.0 || ^18.0.0 - peerDependenciesMeta: - '@types/react': - optional: true - react-shallow-renderer@16.15.0: resolution: {integrity: sha512-oScf2FqQ9LFVQgA73vr86xl2NaOIX73rh+YFqcOp68CWj56tSfgtGKrEbyhCj0rSijyG9M1CYprTh39fBi5hzA==} peerDependencies: react: ^16.0.0 || ^17.0.0 || ^18.0.0 - react-style-singleton@2.2.1: - resolution: {integrity: sha512-ZWj0fHEMyWkHzKYUr2Bs/4zU6XLmq9HsgBURm7g5pAVfyn49DgUiNgY2d4lXRlYSiCif9YBGpQleewkcqddc7g==} - engines: {node: '>=10'} - peerDependencies: - '@types/react': ^16.8.0 || ^17.0.0 || ^18.0.0 - react: ^16.8.0 || ^17.0.0 || ^18.0.0 - peerDependenciesMeta: - '@types/react': - optional: true - react@18.3.1: resolution: {integrity: sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ==} engines: {node: '>=0.10.0'} @@ -7443,12 +7018,6 @@ packages: resolution: {integrity: sha512-B6w7tkwNid7ToxjZ08rQMT8M9BJAf8DKx8Ft4NivzH0zBUfd6jldGcisJn/RLgxcX3FPNDdNQCUEMMT79b+oCQ==} engines: {node: '>= 10.0.0', npm: '>= 3.0.0'} - sonner@1.4.41: - resolution: {integrity: sha512-uG511ggnnsw6gcn/X+YKkWPo5ep9il9wYi3QJxHsYe7yTZ4+cOd1wuodOUmOpFuXL+/RE3R04LczdNCDygTDgQ==} - peerDependencies: - react: ^18.0.0 - react-dom: ^18.0.0 - source-map-js@1.2.0: resolution: {integrity: sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==} engines: {node: '>=0.10.0'} @@ -7685,9 +7254,6 @@ packages: resolution: {integrity: sha512-ulAk51I9UVUyJgxlv9M6lFot2WP3e7t8Kz9+IS6D4rVba1tR9kON+Ey69f+1R4Q8cd45Lod6a4IcJIxnzGc/zA==} engines: {node: '>=18'} - tailwind-merge@2.3.0: - resolution: {integrity: sha512-vkYrLpIP+lgR0tQCG6AP7zZXCTLc1Lnv/CCRT3BqJ9CZ3ui2++GPaGb1x/ILsINIMSYqqvrpqjUFsMNLlW99EA==} - tailwindcss-animate@1.0.7: resolution: {integrity: sha512-bl6mpH3T7I3UFxuvDEXLxy/VuFxBk5bbzplh7tXI68mwMokNYd1t9qPBHlnyTwfa4JGC4zP516I1hYYtQ/vspA==} peerDependencies: @@ -8097,31 +7663,11 @@ packages: urlpattern-polyfill@8.0.2: resolution: {integrity: sha512-Qp95D4TPJl1kC9SKigDcqgyM2VDVO4RiJc2d4qe5GrYm+zbIQCWWKAFaJNQ4BhdFeDGwBmAxqJBwWSJDb9T3BQ==} - use-callback-ref@1.3.2: - resolution: {integrity: sha512-elOQwe6Q8gqZgDA8mrh44qRTQqpIHDcZ3hXTLjBe1i4ph8XpNJnO+aQf3NaG+lriLopI4HMx9VjQLfPQ6vhnoA==} - engines: {node: '>=10'} - peerDependencies: - '@types/react': ^16.8.0 || ^17.0.0 || ^18.0.0 - react: ^16.8.0 || ^17.0.0 || ^18.0.0 - peerDependenciesMeta: - '@types/react': - optional: true - use-latest-callback@0.1.9: resolution: {integrity: sha512-CL/29uS74AwreI/f2oz2hLTW7ZqVeV5+gxFeGudzQrgkCytrHw33G4KbnQOrRlAEzzAFXi7dDLMC9zhWcVpzmw==} peerDependencies: react: '>=16.8' - use-sidecar@1.1.2: - resolution: {integrity: sha512-epTbsLuzZ7lPClpz2TyryBfztm7m+28DlEv2ZCQ3MDr5ssiwyOwGH/e5F9CkfWjJ1t4clvI58yF822/GUkjjhw==} - engines: {node: '>=10'} - peerDependencies: - '@types/react': ^16.9.0 || ^17.0.0 || ^18.0.0 - react: ^16.8.0 || ^17.0.0 || ^18.0.0 - peerDependenciesMeta: - '@types/react': - optional: true - utf-8-validate@6.0.3: resolution: {integrity: sha512-uIuGf9TWQ/y+0Lp+KGZCMuJWc3N9BHA+l/UmHd/oUHwJJDeysyTRxNQVkbzsIWfGFbRe3OcgML/i0mvVRPOyDA==} engines: {node: '>=6.14.2'} @@ -9939,23 +9485,6 @@ snapshots: '@fastify/busboy@2.1.1': {} - '@floating-ui/core@1.6.0': - dependencies: - '@floating-ui/utils': 0.2.1 - - '@floating-ui/dom@1.6.3': - dependencies: - '@floating-ui/core': 1.6.0 - '@floating-ui/utils': 0.2.1 - - '@floating-ui/react-dom@2.0.8(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': - dependencies: - '@floating-ui/dom': 1.6.3 - react: 18.3.1 - react-dom: 18.3.1(react@18.3.1) - - '@floating-ui/utils@0.2.1': {} - '@gar/promisify@1.1.3': {} '@graphql-typed-document-node/core@3.2.0(graphql@15.8.0)': @@ -9968,10 +9497,6 @@ snapshots: dependencies: '@hapi/hoek': 9.3.0 - '@hookform/resolvers@3.3.4(react-hook-form@7.51.4(react@18.3.1))': - dependencies: - react-hook-form: 7.51.4(react@18.3.1) - '@humanwhocodes/config-array@0.13.0': dependencies: '@humanwhocodes/object-schema': 2.0.3 @@ -10233,289 +9758,17 @@ snapshots: '@planetscale/database@1.18.0': optional: true - '@radix-ui/primitive@1.0.1': - dependencies: - '@babel/runtime': 7.24.5 - - '@radix-ui/react-arrow@1.0.3(@types/react-dom@18.3.0)(@types/react@18.3.2)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': - dependencies: - '@babel/runtime': 7.24.5 - '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.3.0)(@types/react@18.3.2)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - react: 18.3.1 - react-dom: 18.3.1(react@18.3.1) - optionalDependencies: - '@types/react': 18.3.2 - '@types/react-dom': 18.3.0 - - '@radix-ui/react-collection@1.0.3(@types/react-dom@18.3.0)(@types/react@18.3.2)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': - dependencies: - '@babel/runtime': 7.24.5 - '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.3.2)(react@18.3.1) - '@radix-ui/react-context': 1.0.1(@types/react@18.3.2)(react@18.3.1) - '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.3.0)(@types/react@18.3.2)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-slot': 1.0.2(@types/react@18.3.2)(react@18.3.1) - react: 18.3.1 - react-dom: 18.3.1(react@18.3.1) - optionalDependencies: - '@types/react': 18.3.2 - '@types/react-dom': 18.3.0 - '@radix-ui/react-compose-refs@1.0.0(react@18.3.1)': dependencies: '@babel/runtime': 7.24.5 react: 18.3.1 - '@radix-ui/react-compose-refs@1.0.1(@types/react@18.3.2)(react@18.3.1)': - dependencies: - '@babel/runtime': 7.24.5 - react: 18.3.1 - optionalDependencies: - '@types/react': 18.3.2 - - '@radix-ui/react-context@1.0.1(@types/react@18.3.2)(react@18.3.1)': - dependencies: - '@babel/runtime': 7.24.5 - react: 18.3.1 - optionalDependencies: - '@types/react': 18.3.2 - - '@radix-ui/react-direction@1.0.1(@types/react@18.3.2)(react@18.3.1)': - dependencies: - '@babel/runtime': 7.24.5 - react: 18.3.1 - optionalDependencies: - '@types/react': 18.3.2 - - '@radix-ui/react-dismissable-layer@1.0.5(@types/react-dom@18.3.0)(@types/react@18.3.2)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': - dependencies: - '@babel/runtime': 7.24.5 - '@radix-ui/primitive': 1.0.1 - '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.3.2)(react@18.3.1) - '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.3.0)(@types/react@18.3.2)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-use-callback-ref': 1.0.1(@types/react@18.3.2)(react@18.3.1) - '@radix-ui/react-use-escape-keydown': 1.0.3(@types/react@18.3.2)(react@18.3.1) - react: 18.3.1 - react-dom: 18.3.1(react@18.3.1) - optionalDependencies: - '@types/react': 18.3.2 - '@types/react-dom': 18.3.0 - - '@radix-ui/react-dropdown-menu@2.0.6(@types/react-dom@18.3.0)(@types/react@18.3.2)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': - dependencies: - '@babel/runtime': 7.24.5 - '@radix-ui/primitive': 1.0.1 - '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.3.2)(react@18.3.1) - '@radix-ui/react-context': 1.0.1(@types/react@18.3.2)(react@18.3.1) - '@radix-ui/react-id': 1.0.1(@types/react@18.3.2)(react@18.3.1) - '@radix-ui/react-menu': 2.0.6(@types/react-dom@18.3.0)(@types/react@18.3.2)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.3.0)(@types/react@18.3.2)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-use-controllable-state': 1.0.1(@types/react@18.3.2)(react@18.3.1) - react: 18.3.1 - react-dom: 18.3.1(react@18.3.1) - optionalDependencies: - '@types/react': 18.3.2 - '@types/react-dom': 18.3.0 - - '@radix-ui/react-focus-guards@1.0.1(@types/react@18.3.2)(react@18.3.1)': - dependencies: - '@babel/runtime': 7.24.5 - react: 18.3.1 - optionalDependencies: - '@types/react': 18.3.2 - - '@radix-ui/react-focus-scope@1.0.4(@types/react-dom@18.3.0)(@types/react@18.3.2)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': - dependencies: - '@babel/runtime': 7.24.5 - '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.3.2)(react@18.3.1) - '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.3.0)(@types/react@18.3.2)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-use-callback-ref': 1.0.1(@types/react@18.3.2)(react@18.3.1) - react: 18.3.1 - react-dom: 18.3.1(react@18.3.1) - optionalDependencies: - '@types/react': 18.3.2 - '@types/react-dom': 18.3.0 - - '@radix-ui/react-icons@1.3.0(react@18.3.1)': - dependencies: - react: 18.3.1 - - '@radix-ui/react-id@1.0.1(@types/react@18.3.2)(react@18.3.1)': - dependencies: - '@babel/runtime': 7.24.5 - '@radix-ui/react-use-layout-effect': 1.0.1(@types/react@18.3.2)(react@18.3.1) - react: 18.3.1 - optionalDependencies: - '@types/react': 18.3.2 - - '@radix-ui/react-label@2.0.2(@types/react-dom@18.3.0)(@types/react@18.3.2)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': - dependencies: - '@babel/runtime': 7.24.5 - '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.3.0)(@types/react@18.3.2)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - react: 18.3.1 - react-dom: 18.3.1(react@18.3.1) - optionalDependencies: - '@types/react': 18.3.2 - '@types/react-dom': 18.3.0 - - '@radix-ui/react-menu@2.0.6(@types/react-dom@18.3.0)(@types/react@18.3.2)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': - dependencies: - '@babel/runtime': 7.24.5 - '@radix-ui/primitive': 1.0.1 - '@radix-ui/react-collection': 1.0.3(@types/react-dom@18.3.0)(@types/react@18.3.2)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.3.2)(react@18.3.1) - '@radix-ui/react-context': 1.0.1(@types/react@18.3.2)(react@18.3.1) - '@radix-ui/react-direction': 1.0.1(@types/react@18.3.2)(react@18.3.1) - '@radix-ui/react-dismissable-layer': 1.0.5(@types/react-dom@18.3.0)(@types/react@18.3.2)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-focus-guards': 1.0.1(@types/react@18.3.2)(react@18.3.1) - '@radix-ui/react-focus-scope': 1.0.4(@types/react-dom@18.3.0)(@types/react@18.3.2)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-id': 1.0.1(@types/react@18.3.2)(react@18.3.1) - '@radix-ui/react-popper': 1.1.3(@types/react-dom@18.3.0)(@types/react@18.3.2)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-portal': 1.0.4(@types/react-dom@18.3.0)(@types/react@18.3.2)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-presence': 1.0.1(@types/react-dom@18.3.0)(@types/react@18.3.2)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.3.0)(@types/react@18.3.2)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-roving-focus': 1.0.4(@types/react-dom@18.3.0)(@types/react@18.3.2)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-slot': 1.0.2(@types/react@18.3.2)(react@18.3.1) - '@radix-ui/react-use-callback-ref': 1.0.1(@types/react@18.3.2)(react@18.3.1) - aria-hidden: 1.2.4 - react: 18.3.1 - react-dom: 18.3.1(react@18.3.1) - react-remove-scroll: 2.5.5(@types/react@18.3.2)(react@18.3.1) - optionalDependencies: - '@types/react': 18.3.2 - '@types/react-dom': 18.3.0 - - '@radix-ui/react-popper@1.1.3(@types/react-dom@18.3.0)(@types/react@18.3.2)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': - dependencies: - '@babel/runtime': 7.24.5 - '@floating-ui/react-dom': 2.0.8(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-arrow': 1.0.3(@types/react-dom@18.3.0)(@types/react@18.3.2)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.3.2)(react@18.3.1) - '@radix-ui/react-context': 1.0.1(@types/react@18.3.2)(react@18.3.1) - '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.3.0)(@types/react@18.3.2)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-use-callback-ref': 1.0.1(@types/react@18.3.2)(react@18.3.1) - '@radix-ui/react-use-layout-effect': 1.0.1(@types/react@18.3.2)(react@18.3.1) - '@radix-ui/react-use-rect': 1.0.1(@types/react@18.3.2)(react@18.3.1) - '@radix-ui/react-use-size': 1.0.1(@types/react@18.3.2)(react@18.3.1) - '@radix-ui/rect': 1.0.1 - react: 18.3.1 - react-dom: 18.3.1(react@18.3.1) - optionalDependencies: - '@types/react': 18.3.2 - '@types/react-dom': 18.3.0 - - '@radix-ui/react-portal@1.0.4(@types/react-dom@18.3.0)(@types/react@18.3.2)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': - dependencies: - '@babel/runtime': 7.24.5 - '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.3.0)(@types/react@18.3.2)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - react: 18.3.1 - react-dom: 18.3.1(react@18.3.1) - optionalDependencies: - '@types/react': 18.3.2 - '@types/react-dom': 18.3.0 - - '@radix-ui/react-presence@1.0.1(@types/react-dom@18.3.0)(@types/react@18.3.2)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': - dependencies: - '@babel/runtime': 7.24.5 - '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.3.2)(react@18.3.1) - '@radix-ui/react-use-layout-effect': 1.0.1(@types/react@18.3.2)(react@18.3.1) - react: 18.3.1 - react-dom: 18.3.1(react@18.3.1) - optionalDependencies: - '@types/react': 18.3.2 - '@types/react-dom': 18.3.0 - - '@radix-ui/react-primitive@1.0.3(@types/react-dom@18.3.0)(@types/react@18.3.2)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': - dependencies: - '@babel/runtime': 7.24.5 - '@radix-ui/react-slot': 1.0.2(@types/react@18.3.2)(react@18.3.1) - react: 18.3.1 - react-dom: 18.3.1(react@18.3.1) - optionalDependencies: - '@types/react': 18.3.2 - '@types/react-dom': 18.3.0 - - '@radix-ui/react-roving-focus@1.0.4(@types/react-dom@18.3.0)(@types/react@18.3.2)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': - dependencies: - '@babel/runtime': 7.24.5 - '@radix-ui/primitive': 1.0.1 - '@radix-ui/react-collection': 1.0.3(@types/react-dom@18.3.0)(@types/react@18.3.2)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.3.2)(react@18.3.1) - '@radix-ui/react-context': 1.0.1(@types/react@18.3.2)(react@18.3.1) - '@radix-ui/react-direction': 1.0.1(@types/react@18.3.2)(react@18.3.1) - '@radix-ui/react-id': 1.0.1(@types/react@18.3.2)(react@18.3.1) - '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.3.0)(@types/react@18.3.2)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-use-callback-ref': 1.0.1(@types/react@18.3.2)(react@18.3.1) - '@radix-ui/react-use-controllable-state': 1.0.1(@types/react@18.3.2)(react@18.3.1) - react: 18.3.1 - react-dom: 18.3.1(react@18.3.1) - optionalDependencies: - '@types/react': 18.3.2 - '@types/react-dom': 18.3.0 - '@radix-ui/react-slot@1.0.1(react@18.3.1)': dependencies: '@babel/runtime': 7.24.5 '@radix-ui/react-compose-refs': 1.0.0(react@18.3.1) react: 18.3.1 - '@radix-ui/react-slot@1.0.2(@types/react@18.3.2)(react@18.3.1)': - dependencies: - '@babel/runtime': 7.24.5 - '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.3.2)(react@18.3.1) - react: 18.3.1 - optionalDependencies: - '@types/react': 18.3.2 - - '@radix-ui/react-use-callback-ref@1.0.1(@types/react@18.3.2)(react@18.3.1)': - dependencies: - '@babel/runtime': 7.24.5 - react: 18.3.1 - optionalDependencies: - '@types/react': 18.3.2 - - '@radix-ui/react-use-controllable-state@1.0.1(@types/react@18.3.2)(react@18.3.1)': - dependencies: - '@babel/runtime': 7.24.5 - '@radix-ui/react-use-callback-ref': 1.0.1(@types/react@18.3.2)(react@18.3.1) - react: 18.3.1 - optionalDependencies: - '@types/react': 18.3.2 - - '@radix-ui/react-use-escape-keydown@1.0.3(@types/react@18.3.2)(react@18.3.1)': - dependencies: - '@babel/runtime': 7.24.5 - '@radix-ui/react-use-callback-ref': 1.0.1(@types/react@18.3.2)(react@18.3.1) - react: 18.3.1 - optionalDependencies: - '@types/react': 18.3.2 - - '@radix-ui/react-use-layout-effect@1.0.1(@types/react@18.3.2)(react@18.3.1)': - dependencies: - '@babel/runtime': 7.24.5 - react: 18.3.1 - optionalDependencies: - '@types/react': 18.3.2 - - '@radix-ui/react-use-rect@1.0.1(@types/react@18.3.2)(react@18.3.1)': - dependencies: - '@babel/runtime': 7.24.5 - '@radix-ui/rect': 1.0.1 - react: 18.3.1 - optionalDependencies: - '@types/react': 18.3.2 - - '@radix-ui/react-use-size@1.0.1(@types/react@18.3.2)(react@18.3.1)': - dependencies: - '@babel/runtime': 7.24.5 - '@radix-ui/react-use-layout-effect': 1.0.1(@types/react@18.3.2)(react@18.3.1) - react: 18.3.1 - optionalDependencies: - '@types/react': 18.3.2 - - '@radix-ui/rect@1.0.1': - dependencies: - '@babel/runtime': 7.24.5 - '@react-native-community/cli-clean@13.6.6': dependencies: '@react-native-community/cli-tools': 13.6.6 @@ -11634,10 +10887,6 @@ snapshots: argparse@2.0.1: {} - aria-hidden@1.2.4: - dependencies: - tslib: 2.6.2 - aria-query@5.3.0: dependencies: dequal: 2.0.3 @@ -12066,10 +11315,6 @@ snapshots: dependencies: consola: 3.2.3 - class-variance-authority@0.7.0: - dependencies: - clsx: 2.0.0 - clean-stack@2.2.0: {} cli-color@2.0.4: @@ -12122,8 +11367,6 @@ snapshots: clone@2.1.2: {} - clsx@2.0.0: {} - cluster-key-slot@1.1.2: {} color-convert@1.9.3: @@ -12460,8 +11703,6 @@ snapshots: detect-libc@2.0.3: {} - detect-node-es@1.1.0: {} - didyoumean@1.2.2: {} diff@4.0.2: {} @@ -13462,8 +12703,6 @@ snapshots: has-symbols: 1.0.3 hasown: 2.0.2 - get-nonce@1.0.1: {} - get-port-please@3.1.2: {} get-port@3.2.0: {} @@ -14877,11 +14116,6 @@ snapshots: next: 14.2.3(react-dom@18.3.1(react@18.3.1))(react@18.3.1) react: 18.3.1 - next-themes@0.3.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1): - dependencies: - react: 18.3.1 - react-dom: 18.3.1(react@18.3.1) - next-tick@1.1.0: {} next@14.2.3(react-dom@18.3.1(react@18.3.1))(react@18.3.1): @@ -15637,10 +14871,6 @@ snapshots: dependencies: react: 18.3.1 - react-hook-form@7.51.4(react@18.3.1): - dependencies: - react: 18.3.1 - react-is@16.13.1: {} react-is@17.0.2: {} @@ -15797,40 +15027,12 @@ snapshots: react-refresh@0.14.2: {} - react-remove-scroll-bar@2.3.6(@types/react@18.3.2)(react@18.3.1): - dependencies: - react: 18.3.1 - react-style-singleton: 2.2.1(@types/react@18.3.2)(react@18.3.1) - tslib: 2.6.2 - optionalDependencies: - '@types/react': 18.3.2 - - react-remove-scroll@2.5.5(@types/react@18.3.2)(react@18.3.1): - dependencies: - react: 18.3.1 - react-remove-scroll-bar: 2.3.6(@types/react@18.3.2)(react@18.3.1) - react-style-singleton: 2.2.1(@types/react@18.3.2)(react@18.3.1) - tslib: 2.6.2 - use-callback-ref: 1.3.2(@types/react@18.3.2)(react@18.3.1) - use-sidecar: 1.1.2(@types/react@18.3.2)(react@18.3.1) - optionalDependencies: - '@types/react': 18.3.2 - react-shallow-renderer@16.15.0(react@18.3.1): dependencies: object-assign: 4.1.1 react: 18.3.1 react-is: 18.2.0 - react-style-singleton@2.2.1(@types/react@18.3.2)(react@18.3.1): - dependencies: - get-nonce: 1.0.1 - invariant: 2.2.4 - react: 18.3.1 - tslib: 2.6.2 - optionalDependencies: - '@types/react': 18.3.2 - react@18.3.1: dependencies: loose-envify: 1.4.0 @@ -16266,11 +15468,6 @@ snapshots: ip-address: 9.0.5 smart-buffer: 4.2.0 - sonner@1.4.41(react-dom@18.3.1(react@18.3.1))(react@18.3.1): - dependencies: - react: 18.3.1 - react-dom: 18.3.1(react@18.3.1) - source-map-js@1.2.0: {} source-map-support@0.5.21: @@ -16499,10 +15696,6 @@ snapshots: system-architecture@0.1.0: {} - tailwind-merge@2.3.0: - dependencies: - '@babel/runtime': 7.24.5 - tailwindcss-animate@1.0.7(tailwindcss@3.4.3(ts-node@10.9.2(@types/node@20.12.9)(typescript@5.4.5))): dependencies: tailwindcss: 3.4.3(ts-node@10.9.2(@types/node@20.12.9)(typescript@5.4.5)) @@ -16929,25 +16122,10 @@ snapshots: urlpattern-polyfill@8.0.2: {} - use-callback-ref@1.3.2(@types/react@18.3.2)(react@18.3.1): - dependencies: - react: 18.3.1 - tslib: 2.6.2 - optionalDependencies: - '@types/react': 18.3.2 - use-latest-callback@0.1.9(react@18.3.1): dependencies: react: 18.3.1 - use-sidecar@1.1.2(@types/react@18.3.2)(react@18.3.1): - dependencies: - detect-node-es: 1.1.0 - react: 18.3.1 - tslib: 2.6.2 - optionalDependencies: - '@types/react': 18.3.2 - utf-8-validate@6.0.3: dependencies: node-gyp-build: 4.8.0 From fba0b59e0322d5e576a3da247972cd8121bb98ec Mon Sep 17 00:00:00 2001 From: jackso-bytes Date: Sun, 21 Jul 2024 08:33:01 +0100 Subject: [PATCH 04/30] fix: :bug: fix typo in start script --- packages/api/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/api/package.json b/packages/api/package.json index 29e9299..b7d8fa7 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -12,7 +12,7 @@ "license": "MIT", "scripts": { "build": "tsc", - "start": "node dist/index.", + "start": "node dist/index.js", "dev": "tsc --watch", "clean": "rm -rf .turbo node_modules", "format": "prettier --check . --ignore-path ../../.gitignore", From 85dab76b29797b8ac52c235f8001013831f28fcc Mon Sep 17 00:00:00 2001 From: jackso-bytes Date: Sun, 21 Jul 2024 08:48:07 +0100 Subject: [PATCH 05/30] feat: :bug: explicitly point at root.js for render deploy --- packages/api/src/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/api/src/index.ts b/packages/api/src/index.ts index 1cbe6fd..b86b5cc 100644 --- a/packages/api/src/index.ts +++ b/packages/api/src/index.ts @@ -1,7 +1,7 @@ import type { inferRouterInputs, inferRouterOutputs } from "@trpc/server"; import type { AppRouter } from "./root"; -import { appRouter } from "./root"; +import { appRouter } from "./root.js"; import { createCallerFactory, createTRPCContext } from "./trpc"; /** From 8c964809dbd7fe8b43c0e2ad09a4af2705da2934 Mon Sep 17 00:00:00 2001 From: jackso-bytes Date: Sun, 21 Jul 2024 08:53:35 +0100 Subject: [PATCH 06/30] fix: :bug: --- packages/api/src/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/api/src/index.ts b/packages/api/src/index.ts index b86b5cc..0e044bf 100644 --- a/packages/api/src/index.ts +++ b/packages/api/src/index.ts @@ -2,7 +2,7 @@ import type { inferRouterInputs, inferRouterOutputs } from "@trpc/server"; import type { AppRouter } from "./root"; import { appRouter } from "./root.js"; -import { createCallerFactory, createTRPCContext } from "./trpc"; +import { createCallerFactory, createTRPCContext } from "./trpc.js"; /** * Create a server-side caller for the tRPC API From 6c3c112774ac47f482eca68ce3a9178fa7bf03eb Mon Sep 17 00:00:00 2001 From: jackso-bytes Date: Sun, 21 Jul 2024 09:04:48 +0100 Subject: [PATCH 07/30] fix: :bug: point to compiled files for render --- packages/api/src/root.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/api/src/root.ts b/packages/api/src/root.ts index c44c7d0..a14ef94 100644 --- a/packages/api/src/root.ts +++ b/packages/api/src/root.ts @@ -1,7 +1,7 @@ -import { authRouter } from "./router/auth"; -import { getEstimateRouter } from "./router/getEstimate"; -import { postRouter } from "./router/post"; -import { createTRPCRouter } from "./trpc"; +import { authRouter } from "./router/auth.js"; +import { getEstimateRouter } from "./router/getEstimate.js"; +import { postRouter } from "./router/post.js"; +import { createTRPCRouter } from "./trpc.js"; export const appRouter = createTRPCRouter({ auth: authRouter, From ffe731b28f72e364410e21a2c945491636c95116 Mon Sep 17 00:00:00 2001 From: jackso-bytes Date: Sun, 21 Jul 2024 09:10:05 +0100 Subject: [PATCH 08/30] fix: :bug: point at compiled files in router as well --- packages/api/src/router/getEstimate.ts | 2 +- packages/api/src/router/post.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/api/src/router/getEstimate.ts b/packages/api/src/router/getEstimate.ts index 9c1a907..1e4cc88 100644 --- a/packages/api/src/router/getEstimate.ts +++ b/packages/api/src/router/getEstimate.ts @@ -5,7 +5,7 @@ import OpenAI from "openai"; import { z } from "zod"; import type { GptProductInfoJson, WorldFoodFactsProductInfo } from "../types"; -import { publicProcedure } from "../trpc"; +import { publicProcedure } from "../trpc.js"; export const getEstimateRouter = { getEstimate: publicProcedure diff --git a/packages/api/src/router/post.ts b/packages/api/src/router/post.ts index 9ab103e..7dfe8a3 100644 --- a/packages/api/src/router/post.ts +++ b/packages/api/src/router/post.ts @@ -4,7 +4,7 @@ import { z } from "zod"; import { desc, eq } from "@acme/db"; import { CreatePostSchema, Post } from "@acme/db/schema"; -import { protectedProcedure, publicProcedure } from "../trpc"; +import { protectedProcedure, publicProcedure } from "../trpc.js"; export const postRouter = { all: publicProcedure.query(({ ctx }) => { From 974704838c5e354b29630a1777d3df8ffc01c652 Mon Sep 17 00:00:00 2001 From: jackso-bytes Date: Sun, 21 Jul 2024 09:18:16 +0100 Subject: [PATCH 09/30] fix: :bug: point to compiled file in auth as well --- packages/api/src/router/auth.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/api/src/router/auth.ts b/packages/api/src/router/auth.ts index 230c088..4f15db9 100644 --- a/packages/api/src/router/auth.ts +++ b/packages/api/src/router/auth.ts @@ -1,6 +1,6 @@ import type { TRPCRouterRecord } from "@trpc/server"; -import { protectedProcedure, publicProcedure } from "../trpc"; +import { protectedProcedure, publicProcedure } from "../trpc.js"; export const authRouter = { getSession: publicProcedure.query(({ ctx }) => { From e58e4cdc9fd8637a488ff59da7125016b345df62 Mon Sep 17 00:00:00 2001 From: jackso-bytes Date: Sun, 21 Jul 2024 09:46:06 +0100 Subject: [PATCH 10/30] fix: :bug: don't point explicitly at compiled files --- packages/api/src/index.ts | 2 +- packages/api/src/root.ts | 8 ++++---- packages/api/src/router/auth.ts | 2 +- packages/api/src/router/getEstimate.ts | 2 +- packages/api/src/router/post.ts | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/api/src/index.ts b/packages/api/src/index.ts index 0e044bf..b86b5cc 100644 --- a/packages/api/src/index.ts +++ b/packages/api/src/index.ts @@ -2,7 +2,7 @@ import type { inferRouterInputs, inferRouterOutputs } from "@trpc/server"; import type { AppRouter } from "./root"; import { appRouter } from "./root.js"; -import { createCallerFactory, createTRPCContext } from "./trpc.js"; +import { createCallerFactory, createTRPCContext } from "./trpc"; /** * Create a server-side caller for the tRPC API diff --git a/packages/api/src/root.ts b/packages/api/src/root.ts index a14ef94..c44c7d0 100644 --- a/packages/api/src/root.ts +++ b/packages/api/src/root.ts @@ -1,7 +1,7 @@ -import { authRouter } from "./router/auth.js"; -import { getEstimateRouter } from "./router/getEstimate.js"; -import { postRouter } from "./router/post.js"; -import { createTRPCRouter } from "./trpc.js"; +import { authRouter } from "./router/auth"; +import { getEstimateRouter } from "./router/getEstimate"; +import { postRouter } from "./router/post"; +import { createTRPCRouter } from "./trpc"; export const appRouter = createTRPCRouter({ auth: authRouter, diff --git a/packages/api/src/router/auth.ts b/packages/api/src/router/auth.ts index 4f15db9..230c088 100644 --- a/packages/api/src/router/auth.ts +++ b/packages/api/src/router/auth.ts @@ -1,6 +1,6 @@ import type { TRPCRouterRecord } from "@trpc/server"; -import { protectedProcedure, publicProcedure } from "../trpc.js"; +import { protectedProcedure, publicProcedure } from "../trpc"; export const authRouter = { getSession: publicProcedure.query(({ ctx }) => { diff --git a/packages/api/src/router/getEstimate.ts b/packages/api/src/router/getEstimate.ts index 1e4cc88..9c1a907 100644 --- a/packages/api/src/router/getEstimate.ts +++ b/packages/api/src/router/getEstimate.ts @@ -5,7 +5,7 @@ import OpenAI from "openai"; import { z } from "zod"; import type { GptProductInfoJson, WorldFoodFactsProductInfo } from "../types"; -import { publicProcedure } from "../trpc.js"; +import { publicProcedure } from "../trpc"; export const getEstimateRouter = { getEstimate: publicProcedure diff --git a/packages/api/src/router/post.ts b/packages/api/src/router/post.ts index 7dfe8a3..9ab103e 100644 --- a/packages/api/src/router/post.ts +++ b/packages/api/src/router/post.ts @@ -4,7 +4,7 @@ import { z } from "zod"; import { desc, eq } from "@acme/db"; import { CreatePostSchema, Post } from "@acme/db/schema"; -import { protectedProcedure, publicProcedure } from "../trpc.js"; +import { protectedProcedure, publicProcedure } from "../trpc"; export const postRouter = { all: publicProcedure.query(({ ctx }) => { From d78a64071fcb88880996ca2f1351930cb800c883 Mon Sep 17 00:00:00 2001 From: jackso-bytes Date: Sun, 21 Jul 2024 10:18:08 +0100 Subject: [PATCH 11/30] fix: :bug: don't point at compiled files --- packages/api/src/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/api/src/index.ts b/packages/api/src/index.ts index b86b5cc..1cbe6fd 100644 --- a/packages/api/src/index.ts +++ b/packages/api/src/index.ts @@ -1,7 +1,7 @@ import type { inferRouterInputs, inferRouterOutputs } from "@trpc/server"; import type { AppRouter } from "./root"; -import { appRouter } from "./root.js"; +import { appRouter } from "./root"; import { createCallerFactory, createTRPCContext } from "./trpc"; /** From 81794c35bdc0815e1df26a884886e1c4b55786fd Mon Sep 17 00:00:00 2001 From: jackso-bytes Date: Sun, 21 Jul 2024 10:30:02 +0100 Subject: [PATCH 12/30] fix: :bug: point at .js files again --- packages/api/src/index.ts | 6 +++--- packages/api/src/root.ts | 8 ++++---- packages/api/src/router/auth.ts | 2 +- packages/api/src/router/getEstimate.ts | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/packages/api/src/index.ts b/packages/api/src/index.ts index 1cbe6fd..55befe8 100644 --- a/packages/api/src/index.ts +++ b/packages/api/src/index.ts @@ -1,8 +1,8 @@ import type { inferRouterInputs, inferRouterOutputs } from "@trpc/server"; -import type { AppRouter } from "./root"; -import { appRouter } from "./root"; -import { createCallerFactory, createTRPCContext } from "./trpc"; +import type { AppRouter } from "./root.js"; +import { appRouter } from "./root.js"; +import { createCallerFactory, createTRPCContext } from "./trpc.js"; /** * Create a server-side caller for the tRPC API diff --git a/packages/api/src/root.ts b/packages/api/src/root.ts index c44c7d0..a14ef94 100644 --- a/packages/api/src/root.ts +++ b/packages/api/src/root.ts @@ -1,7 +1,7 @@ -import { authRouter } from "./router/auth"; -import { getEstimateRouter } from "./router/getEstimate"; -import { postRouter } from "./router/post"; -import { createTRPCRouter } from "./trpc"; +import { authRouter } from "./router/auth.js"; +import { getEstimateRouter } from "./router/getEstimate.js"; +import { postRouter } from "./router/post.js"; +import { createTRPCRouter } from "./trpc.js"; export const appRouter = createTRPCRouter({ auth: authRouter, diff --git a/packages/api/src/router/auth.ts b/packages/api/src/router/auth.ts index 230c088..4f15db9 100644 --- a/packages/api/src/router/auth.ts +++ b/packages/api/src/router/auth.ts @@ -1,6 +1,6 @@ import type { TRPCRouterRecord } from "@trpc/server"; -import { protectedProcedure, publicProcedure } from "../trpc"; +import { protectedProcedure, publicProcedure } from "../trpc.js"; export const authRouter = { getSession: publicProcedure.query(({ ctx }) => { diff --git a/packages/api/src/router/getEstimate.ts b/packages/api/src/router/getEstimate.ts index 9c1a907..1e4cc88 100644 --- a/packages/api/src/router/getEstimate.ts +++ b/packages/api/src/router/getEstimate.ts @@ -5,7 +5,7 @@ import OpenAI from "openai"; import { z } from "zod"; import type { GptProductInfoJson, WorldFoodFactsProductInfo } from "../types"; -import { publicProcedure } from "../trpc"; +import { publicProcedure } from "../trpc.js"; export const getEstimateRouter = { getEstimate: publicProcedure From 6fcde74c04efe5be4fd290fcdb186f2fd488ec3c Mon Sep 17 00:00:00 2001 From: jackso-bytes Date: Sun, 21 Jul 2024 12:09:08 +0100 Subject: [PATCH 13/30] feat: :sparkles: add backend only build cmd --- package.json | 1 + turbo.json | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/package.json b/package.json index b7da174..d1bc818 100644 --- a/package.json +++ b/package.json @@ -7,6 +7,7 @@ "packageManager": "pnpm@9.1.0", "scripts": { "build": "turbo build", + "build:backend": "turbo build --filter='./packages/*'", "clean": "git clean -xdf node_modules", "clean:workspaces": "turbo clean", "db:push": "pnpm -F db push", diff --git a/turbo.json b/turbo.json index 6f2cbbb..0d7662a 100644 --- a/turbo.json +++ b/turbo.json @@ -17,6 +17,10 @@ ".vercel/output/**" ] }, + "build:backend": { + "dependsOn": ["^topo"], + "outputs": [".output/**", ".vercel/output/**"] + }, "dev": { "persistent": true, "cache": false From 9672671be731ea7fa0d33e0290a83903e7d4d71e Mon Sep 17 00:00:00 2001 From: jackso-bytes Date: Sun, 21 Jul 2024 12:28:24 +0100 Subject: [PATCH 14/30] fix: :bug: don't point at compiled files explicitly --- packages/api/src/index.ts | 6 +++--- packages/api/src/root.ts | 8 ++++---- packages/api/src/router/auth.ts | 2 +- packages/api/src/router/getEstimate.ts | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/packages/api/src/index.ts b/packages/api/src/index.ts index 55befe8..1cbe6fd 100644 --- a/packages/api/src/index.ts +++ b/packages/api/src/index.ts @@ -1,8 +1,8 @@ import type { inferRouterInputs, inferRouterOutputs } from "@trpc/server"; -import type { AppRouter } from "./root.js"; -import { appRouter } from "./root.js"; -import { createCallerFactory, createTRPCContext } from "./trpc.js"; +import type { AppRouter } from "./root"; +import { appRouter } from "./root"; +import { createCallerFactory, createTRPCContext } from "./trpc"; /** * Create a server-side caller for the tRPC API diff --git a/packages/api/src/root.ts b/packages/api/src/root.ts index a14ef94..c44c7d0 100644 --- a/packages/api/src/root.ts +++ b/packages/api/src/root.ts @@ -1,7 +1,7 @@ -import { authRouter } from "./router/auth.js"; -import { getEstimateRouter } from "./router/getEstimate.js"; -import { postRouter } from "./router/post.js"; -import { createTRPCRouter } from "./trpc.js"; +import { authRouter } from "./router/auth"; +import { getEstimateRouter } from "./router/getEstimate"; +import { postRouter } from "./router/post"; +import { createTRPCRouter } from "./trpc"; export const appRouter = createTRPCRouter({ auth: authRouter, diff --git a/packages/api/src/router/auth.ts b/packages/api/src/router/auth.ts index 4f15db9..230c088 100644 --- a/packages/api/src/router/auth.ts +++ b/packages/api/src/router/auth.ts @@ -1,6 +1,6 @@ import type { TRPCRouterRecord } from "@trpc/server"; -import { protectedProcedure, publicProcedure } from "../trpc.js"; +import { protectedProcedure, publicProcedure } from "../trpc"; export const authRouter = { getSession: publicProcedure.query(({ ctx }) => { diff --git a/packages/api/src/router/getEstimate.ts b/packages/api/src/router/getEstimate.ts index 1e4cc88..9c1a907 100644 --- a/packages/api/src/router/getEstimate.ts +++ b/packages/api/src/router/getEstimate.ts @@ -5,7 +5,7 @@ import OpenAI from "openai"; import { z } from "zod"; import type { GptProductInfoJson, WorldFoodFactsProductInfo } from "../types"; -import { publicProcedure } from "../trpc.js"; +import { publicProcedure } from "../trpc"; export const getEstimateRouter = { getEstimate: publicProcedure From 514c3c0d5a62082225bca0e908686e5ab82b2571 Mon Sep 17 00:00:00 2001 From: jackso-bytes Date: Sun, 21 Jul 2024 12:39:48 +0100 Subject: [PATCH 15/30] fix: :bug: try pointing at compiled files again --- packages/api/src/index.ts | 6 +++--- packages/api/src/root.ts | 8 ++++---- packages/api/src/router/auth.ts | 2 +- packages/api/src/router/getEstimate.ts | 2 +- packages/api/src/router/post.ts | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/packages/api/src/index.ts b/packages/api/src/index.ts index 1cbe6fd..55befe8 100644 --- a/packages/api/src/index.ts +++ b/packages/api/src/index.ts @@ -1,8 +1,8 @@ import type { inferRouterInputs, inferRouterOutputs } from "@trpc/server"; -import type { AppRouter } from "./root"; -import { appRouter } from "./root"; -import { createCallerFactory, createTRPCContext } from "./trpc"; +import type { AppRouter } from "./root.js"; +import { appRouter } from "./root.js"; +import { createCallerFactory, createTRPCContext } from "./trpc.js"; /** * Create a server-side caller for the tRPC API diff --git a/packages/api/src/root.ts b/packages/api/src/root.ts index c44c7d0..a14ef94 100644 --- a/packages/api/src/root.ts +++ b/packages/api/src/root.ts @@ -1,7 +1,7 @@ -import { authRouter } from "./router/auth"; -import { getEstimateRouter } from "./router/getEstimate"; -import { postRouter } from "./router/post"; -import { createTRPCRouter } from "./trpc"; +import { authRouter } from "./router/auth.js"; +import { getEstimateRouter } from "./router/getEstimate.js"; +import { postRouter } from "./router/post.js"; +import { createTRPCRouter } from "./trpc.js"; export const appRouter = createTRPCRouter({ auth: authRouter, diff --git a/packages/api/src/router/auth.ts b/packages/api/src/router/auth.ts index 230c088..4f15db9 100644 --- a/packages/api/src/router/auth.ts +++ b/packages/api/src/router/auth.ts @@ -1,6 +1,6 @@ import type { TRPCRouterRecord } from "@trpc/server"; -import { protectedProcedure, publicProcedure } from "../trpc"; +import { protectedProcedure, publicProcedure } from "../trpc.js"; export const authRouter = { getSession: publicProcedure.query(({ ctx }) => { diff --git a/packages/api/src/router/getEstimate.ts b/packages/api/src/router/getEstimate.ts index 9c1a907..1e4cc88 100644 --- a/packages/api/src/router/getEstimate.ts +++ b/packages/api/src/router/getEstimate.ts @@ -5,7 +5,7 @@ import OpenAI from "openai"; import { z } from "zod"; import type { GptProductInfoJson, WorldFoodFactsProductInfo } from "../types"; -import { publicProcedure } from "../trpc"; +import { publicProcedure } from "../trpc.js"; export const getEstimateRouter = { getEstimate: publicProcedure diff --git a/packages/api/src/router/post.ts b/packages/api/src/router/post.ts index 9ab103e..7dfe8a3 100644 --- a/packages/api/src/router/post.ts +++ b/packages/api/src/router/post.ts @@ -4,7 +4,7 @@ import { z } from "zod"; import { desc, eq } from "@acme/db"; import { CreatePostSchema, Post } from "@acme/db/schema"; -import { protectedProcedure, publicProcedure } from "../trpc"; +import { protectedProcedure, publicProcedure } from "../trpc.js"; export const postRouter = { all: publicProcedure.query(({ ctx }) => { From a311be3b7d1f52541a98c2212bf1cbc5b196579f Mon Sep 17 00:00:00 2001 From: jackso-bytes Date: Sun, 21 Jul 2024 12:55:51 +0100 Subject: [PATCH 16/30] fix: :bug: point to compiled files in db as well --- packages/db/src/client.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/db/src/client.ts b/packages/db/src/client.ts index 671359a..9ffe761 100644 --- a/packages/db/src/client.ts +++ b/packages/db/src/client.ts @@ -1,6 +1,6 @@ import { sql } from "@vercel/postgres"; import { drizzle } from "drizzle-orm/vercel-postgres"; -import * as schema from "./schema"; +import * as schema from "./schema.js"; export const db = drizzle(sql, { schema }); From f06a5c9fdc7ecc44c1d7febf8db7382f0ed000fa Mon Sep 17 00:00:00 2001 From: jackso-bytes Date: Sun, 21 Jul 2024 13:03:22 +0100 Subject: [PATCH 17/30] feat: :sparkles: add build script to db --- packages/db/package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/db/package.json b/packages/db/package.json index db18094..7e372cf 100644 --- a/packages/db/package.json +++ b/packages/db/package.json @@ -20,6 +20,7 @@ "license": "MIT", "scripts": { "build": "tsc", + "start": "node dist/index.js", "dev": "tsc --watch", "clean": "rm -rf .turbo node_modules", "format": "prettier --check . --ignore-path ../../.gitignore", From dae0be07e547f5b9c5ae9528403b2996e3e3b976 Mon Sep 17 00:00:00 2001 From: jackso-bytes Date: Sun, 21 Jul 2024 13:09:21 +0100 Subject: [PATCH 18/30] fix: :bug: point at dist folder for compiled files --- packages/api/src/index.ts | 6 +++--- packages/api/src/root.ts | 8 ++++---- packages/api/src/router/auth.ts | 2 +- packages/api/src/router/getEstimate.ts | 2 +- packages/api/src/router/post.ts | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/packages/api/src/index.ts b/packages/api/src/index.ts index 55befe8..d7d8381 100644 --- a/packages/api/src/index.ts +++ b/packages/api/src/index.ts @@ -1,8 +1,8 @@ import type { inferRouterInputs, inferRouterOutputs } from "@trpc/server"; -import type { AppRouter } from "./root.js"; -import { appRouter } from "./root.js"; -import { createCallerFactory, createTRPCContext } from "./trpc.js"; +import type { AppRouter } from "../dist/root.js"; +import { appRouter } from "../dist/root.js"; +import { createCallerFactory, createTRPCContext } from "../dist/trpc.js"; /** * Create a server-side caller for the tRPC API diff --git a/packages/api/src/root.ts b/packages/api/src/root.ts index a14ef94..a5c33ea 100644 --- a/packages/api/src/root.ts +++ b/packages/api/src/root.ts @@ -1,7 +1,7 @@ -import { authRouter } from "./router/auth.js"; -import { getEstimateRouter } from "./router/getEstimate.js"; -import { postRouter } from "./router/post.js"; -import { createTRPCRouter } from "./trpc.js"; +import { authRouter } from "../dist/router/auth.js"; +import { getEstimateRouter } from "../dist/router/getEstimate.js"; +import { postRouter } from "../dist/router/post.js"; +import { createTRPCRouter } from "../dist/trpc.js"; export const appRouter = createTRPCRouter({ auth: authRouter, diff --git a/packages/api/src/router/auth.ts b/packages/api/src/router/auth.ts index 4f15db9..ba7c32b 100644 --- a/packages/api/src/router/auth.ts +++ b/packages/api/src/router/auth.ts @@ -1,6 +1,6 @@ import type { TRPCRouterRecord } from "@trpc/server"; -import { protectedProcedure, publicProcedure } from "../trpc.js"; +import { protectedProcedure, publicProcedure } from "../../dist/trpc.js"; export const authRouter = { getSession: publicProcedure.query(({ ctx }) => { diff --git a/packages/api/src/router/getEstimate.ts b/packages/api/src/router/getEstimate.ts index 1e4cc88..737f2af 100644 --- a/packages/api/src/router/getEstimate.ts +++ b/packages/api/src/router/getEstimate.ts @@ -5,7 +5,7 @@ import OpenAI from "openai"; import { z } from "zod"; import type { GptProductInfoJson, WorldFoodFactsProductInfo } from "../types"; -import { publicProcedure } from "../trpc.js"; +import { publicProcedure } from "../../dist/trpc.js"; export const getEstimateRouter = { getEstimate: publicProcedure diff --git a/packages/api/src/router/post.ts b/packages/api/src/router/post.ts index 7dfe8a3..e1a28f0 100644 --- a/packages/api/src/router/post.ts +++ b/packages/api/src/router/post.ts @@ -4,7 +4,7 @@ import { z } from "zod"; import { desc, eq } from "@acme/db"; import { CreatePostSchema, Post } from "@acme/db/schema"; -import { protectedProcedure, publicProcedure } from "../trpc.js"; +import { protectedProcedure, publicProcedure } from "../../dist/trpc.js"; export const postRouter = { all: publicProcedure.query(({ ctx }) => { From 1bb48c476aed8e829d56f2875c2c56bb8c00f156 Mon Sep 17 00:00:00 2001 From: jackso-bytes Date: Sun, 21 Jul 2024 13:11:52 +0100 Subject: [PATCH 19/30] Revert "fix: :bug: point at dist folder for compiled files" This reverts commit dae0be07e547f5b9c5ae9528403b2996e3e3b976. --- packages/api/src/index.ts | 6 +++--- packages/api/src/root.ts | 8 ++++---- packages/api/src/router/auth.ts | 2 +- packages/api/src/router/getEstimate.ts | 2 +- packages/api/src/router/post.ts | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/packages/api/src/index.ts b/packages/api/src/index.ts index d7d8381..55befe8 100644 --- a/packages/api/src/index.ts +++ b/packages/api/src/index.ts @@ -1,8 +1,8 @@ import type { inferRouterInputs, inferRouterOutputs } from "@trpc/server"; -import type { AppRouter } from "../dist/root.js"; -import { appRouter } from "../dist/root.js"; -import { createCallerFactory, createTRPCContext } from "../dist/trpc.js"; +import type { AppRouter } from "./root.js"; +import { appRouter } from "./root.js"; +import { createCallerFactory, createTRPCContext } from "./trpc.js"; /** * Create a server-side caller for the tRPC API diff --git a/packages/api/src/root.ts b/packages/api/src/root.ts index a5c33ea..a14ef94 100644 --- a/packages/api/src/root.ts +++ b/packages/api/src/root.ts @@ -1,7 +1,7 @@ -import { authRouter } from "../dist/router/auth.js"; -import { getEstimateRouter } from "../dist/router/getEstimate.js"; -import { postRouter } from "../dist/router/post.js"; -import { createTRPCRouter } from "../dist/trpc.js"; +import { authRouter } from "./router/auth.js"; +import { getEstimateRouter } from "./router/getEstimate.js"; +import { postRouter } from "./router/post.js"; +import { createTRPCRouter } from "./trpc.js"; export const appRouter = createTRPCRouter({ auth: authRouter, diff --git a/packages/api/src/router/auth.ts b/packages/api/src/router/auth.ts index ba7c32b..4f15db9 100644 --- a/packages/api/src/router/auth.ts +++ b/packages/api/src/router/auth.ts @@ -1,6 +1,6 @@ import type { TRPCRouterRecord } from "@trpc/server"; -import { protectedProcedure, publicProcedure } from "../../dist/trpc.js"; +import { protectedProcedure, publicProcedure } from "../trpc.js"; export const authRouter = { getSession: publicProcedure.query(({ ctx }) => { diff --git a/packages/api/src/router/getEstimate.ts b/packages/api/src/router/getEstimate.ts index 737f2af..1e4cc88 100644 --- a/packages/api/src/router/getEstimate.ts +++ b/packages/api/src/router/getEstimate.ts @@ -5,7 +5,7 @@ import OpenAI from "openai"; import { z } from "zod"; import type { GptProductInfoJson, WorldFoodFactsProductInfo } from "../types"; -import { publicProcedure } from "../../dist/trpc.js"; +import { publicProcedure } from "../trpc.js"; export const getEstimateRouter = { getEstimate: publicProcedure diff --git a/packages/api/src/router/post.ts b/packages/api/src/router/post.ts index e1a28f0..7dfe8a3 100644 --- a/packages/api/src/router/post.ts +++ b/packages/api/src/router/post.ts @@ -4,7 +4,7 @@ import { z } from "zod"; import { desc, eq } from "@acme/db"; import { CreatePostSchema, Post } from "@acme/db/schema"; -import { protectedProcedure, publicProcedure } from "../../dist/trpc.js"; +import { protectedProcedure, publicProcedure } from "../trpc.js"; export const postRouter = { all: publicProcedure.query(({ ctx }) => { From 7d7acfc07c82caa28385d85273dda2832f53c0b6 Mon Sep 17 00:00:00 2001 From: jackso-bytes Date: Sun, 21 Jul 2024 13:12:30 +0100 Subject: [PATCH 20/30] Revert "fix: :bug: try pointing at compiled files again" This reverts commit 514c3c0d5a62082225bca0e908686e5ab82b2571. --- packages/api/src/index.ts | 6 +++--- packages/api/src/root.ts | 8 ++++---- packages/api/src/router/auth.ts | 2 +- packages/api/src/router/getEstimate.ts | 2 +- packages/api/src/router/post.ts | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/packages/api/src/index.ts b/packages/api/src/index.ts index 55befe8..1cbe6fd 100644 --- a/packages/api/src/index.ts +++ b/packages/api/src/index.ts @@ -1,8 +1,8 @@ import type { inferRouterInputs, inferRouterOutputs } from "@trpc/server"; -import type { AppRouter } from "./root.js"; -import { appRouter } from "./root.js"; -import { createCallerFactory, createTRPCContext } from "./trpc.js"; +import type { AppRouter } from "./root"; +import { appRouter } from "./root"; +import { createCallerFactory, createTRPCContext } from "./trpc"; /** * Create a server-side caller for the tRPC API diff --git a/packages/api/src/root.ts b/packages/api/src/root.ts index a14ef94..c44c7d0 100644 --- a/packages/api/src/root.ts +++ b/packages/api/src/root.ts @@ -1,7 +1,7 @@ -import { authRouter } from "./router/auth.js"; -import { getEstimateRouter } from "./router/getEstimate.js"; -import { postRouter } from "./router/post.js"; -import { createTRPCRouter } from "./trpc.js"; +import { authRouter } from "./router/auth"; +import { getEstimateRouter } from "./router/getEstimate"; +import { postRouter } from "./router/post"; +import { createTRPCRouter } from "./trpc"; export const appRouter = createTRPCRouter({ auth: authRouter, diff --git a/packages/api/src/router/auth.ts b/packages/api/src/router/auth.ts index 4f15db9..230c088 100644 --- a/packages/api/src/router/auth.ts +++ b/packages/api/src/router/auth.ts @@ -1,6 +1,6 @@ import type { TRPCRouterRecord } from "@trpc/server"; -import { protectedProcedure, publicProcedure } from "../trpc.js"; +import { protectedProcedure, publicProcedure } from "../trpc"; export const authRouter = { getSession: publicProcedure.query(({ ctx }) => { diff --git a/packages/api/src/router/getEstimate.ts b/packages/api/src/router/getEstimate.ts index 1e4cc88..9c1a907 100644 --- a/packages/api/src/router/getEstimate.ts +++ b/packages/api/src/router/getEstimate.ts @@ -5,7 +5,7 @@ import OpenAI from "openai"; import { z } from "zod"; import type { GptProductInfoJson, WorldFoodFactsProductInfo } from "../types"; -import { publicProcedure } from "../trpc.js"; +import { publicProcedure } from "../trpc"; export const getEstimateRouter = { getEstimate: publicProcedure diff --git a/packages/api/src/router/post.ts b/packages/api/src/router/post.ts index 7dfe8a3..9ab103e 100644 --- a/packages/api/src/router/post.ts +++ b/packages/api/src/router/post.ts @@ -4,7 +4,7 @@ import { z } from "zod"; import { desc, eq } from "@acme/db"; import { CreatePostSchema, Post } from "@acme/db/schema"; -import { protectedProcedure, publicProcedure } from "../trpc.js"; +import { protectedProcedure, publicProcedure } from "../trpc"; export const postRouter = { all: publicProcedure.query(({ ctx }) => { From 2ff1cf29f39168867b7f407e93f1cf7d594bbc4b Mon Sep 17 00:00:00 2001 From: jackso-bytes Date: Sun, 21 Jul 2024 13:12:45 +0100 Subject: [PATCH 21/30] Revert "fix: :bug: point to compiled files in db as well" This reverts commit a311be3b7d1f52541a98c2212bf1cbc5b196579f. --- packages/db/src/client.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/db/src/client.ts b/packages/db/src/client.ts index 9ffe761..671359a 100644 --- a/packages/db/src/client.ts +++ b/packages/db/src/client.ts @@ -1,6 +1,6 @@ import { sql } from "@vercel/postgres"; import { drizzle } from "drizzle-orm/vercel-postgres"; -import * as schema from "./schema.js"; +import * as schema from "./schema"; export const db = drizzle(sql, { schema }); From 993376eaa59b4be32fb8d255a32c5f9122a3694a Mon Sep 17 00:00:00 2001 From: jackso-bytes Date: Sun, 21 Jul 2024 15:53:17 +0100 Subject: [PATCH 22/30] feat: :sparkles: refactor to build next not package --- package.json | 2 +- packages/api/package.json | 1 - turbo.json | 10 ++++++++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index d1bc818..8788d1e 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "packageManager": "pnpm@9.1.0", "scripts": { "build": "turbo build", - "build:backend": "turbo build --filter='./packages/*'", + "build:backend": "turbo run build --ignore='apps/expo'", "clean": "git clean -xdf node_modules", "clean:workspaces": "turbo clean", "db:push": "pnpm -F db push", diff --git a/packages/api/package.json b/packages/api/package.json index b7d8fa7..e1d3fa7 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -12,7 +12,6 @@ "license": "MIT", "scripts": { "build": "tsc", - "start": "node dist/index.js", "dev": "tsc --watch", "clean": "rm -rf .turbo node_modules", "format": "prettier --check . --ignore-path ../../.gitignore", diff --git a/turbo.json b/turbo.json index 0d7662a..5f20678 100644 --- a/turbo.json +++ b/turbo.json @@ -18,8 +18,14 @@ ] }, "build:backend": { - "dependsOn": ["^topo"], - "outputs": [".output/**", ".vercel/output/**"] + "dependsOn": ["^build:backend"], + "outputs": [ + ".next/**", + "!.next/cache/**", + "next-env.d.ts", + ".output/**", + ".vercel/output/**" + ] }, "dev": { "persistent": true, From a057773979bb4bf920de990f3aac1632832edfbd Mon Sep 17 00:00:00 2001 From: jackso-bytes Date: Sun, 21 Jul 2024 15:54:05 +0100 Subject: [PATCH 23/30] fix: :bug: rm db start added in error --- packages/db/package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/db/package.json b/packages/db/package.json index 7e372cf..db18094 100644 --- a/packages/db/package.json +++ b/packages/db/package.json @@ -20,7 +20,6 @@ "license": "MIT", "scripts": { "build": "tsc", - "start": "node dist/index.js", "dev": "tsc --watch", "clean": "rm -rf .turbo node_modules", "format": "prettier --check . --ignore-path ../../.gitignore", From 5ee646b3139162d19a426d40d4281698605345bf Mon Sep 17 00:00:00 2001 From: jackso-bytes Date: Sun, 21 Jul 2024 16:01:05 +0100 Subject: [PATCH 24/30] fix: :bug: fix ignore syntax --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8788d1e..9b30f1f 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "packageManager": "pnpm@9.1.0", "scripts": { "build": "turbo build", - "build:backend": "turbo run build --ignore='apps/expo'", + "build:backend": "turbo run build --ignore apps/expo", "clean": "git clean -xdf node_modules", "clean:workspaces": "turbo clean", "db:push": "pnpm -F db push", From e5b17c69a313dd17a06e20e3e9177b01719ebf48 Mon Sep 17 00:00:00 2001 From: jackso-bytes Date: Sun, 21 Jul 2024 16:19:36 +0100 Subject: [PATCH 25/30] feat: :sparkles: add prod baseUrl --- apps/expo/src/utils/api.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/expo/src/utils/api.tsx b/apps/expo/src/utils/api.tsx index 0ff34c7..cea1667 100644 --- a/apps/expo/src/utils/api.tsx +++ b/apps/expo/src/utils/api.tsx @@ -30,7 +30,7 @@ const getBaseUrl = () => { const localhost = debuggerHost?.split(":")[0]; if (!localhost) { - // return "https://turbo.t3.gg"; + return "https://fssmono.onrender.com"; throw new Error( "Failed to get localhost. Please point to your production server.", ); From a1a45bc50764a70e11be7d7625dcac8b1b819ce2 Mon Sep 17 00:00:00 2001 From: jackso-bytes Date: Thu, 25 Jul 2024 07:25:15 +0100 Subject: [PATCH 26/30] feat: :fire: rm unused summary route --- apps/expo/src/app/(tabs)/_layout.tsx | 11 +---------- apps/expo/src/app/(tabs)/summary.tsx | 16 ---------------- 2 files changed, 1 insertion(+), 26 deletions(-) delete mode 100644 apps/expo/src/app/(tabs)/summary.tsx diff --git a/apps/expo/src/app/(tabs)/_layout.tsx b/apps/expo/src/app/(tabs)/_layout.tsx index 535b5b3..d3bc72b 100644 --- a/apps/expo/src/app/(tabs)/_layout.tsx +++ b/apps/expo/src/app/(tabs)/_layout.tsx @@ -1,6 +1,6 @@ import React from "react"; import { Tabs } from "expo-router"; -import { BarChart3, House, Info } from "lucide-react-native"; +import { House, Info } from "lucide-react-native"; import Header from "~/components/Header"; @@ -51,15 +51,6 @@ export default function TabLayout() { ), }} /> - ( - - ), - }} - /> ); } diff --git a/apps/expo/src/app/(tabs)/summary.tsx b/apps/expo/src/app/(tabs)/summary.tsx deleted file mode 100644 index a94d19d..0000000 --- a/apps/expo/src/app/(tabs)/summary.tsx +++ /dev/null @@ -1,16 +0,0 @@ -import { Text, View } from "react-native"; - -export const Summary = () => { - return ( - - - Summary - - - ); -}; - -export default Summary; From b018fe4330541d283e6a3445ff20cacefb4c4237 Mon Sep 17 00:00:00 2001 From: jackso-bytes Date: Thu, 25 Jul 2024 10:16:20 +0100 Subject: [PATCH 27/30] feat: :sparkles: handle loading states etc --- apps/expo/src/components/Header.tsx | 2 +- apps/expo/src/components/HomePage.tsx | 44 +++++++++++++++++++++------ apps/expo/src/components/Loading.tsx | 14 +++++++++ 3 files changed, 49 insertions(+), 11 deletions(-) create mode 100644 apps/expo/src/components/Loading.tsx diff --git a/apps/expo/src/components/Header.tsx b/apps/expo/src/components/Header.tsx index c3ed2e7..98cfdc2 100644 --- a/apps/expo/src/components/Header.tsx +++ b/apps/expo/src/components/Header.tsx @@ -3,7 +3,7 @@ import { Image, Text, View } from "react-native"; import FssLogoCircle from "../../assets/fssCircle.png"; -const Header = () => { +export const Header = () => { return ( diff --git a/apps/expo/src/components/HomePage.tsx b/apps/expo/src/components/HomePage.tsx index 1e9100a..cbf3e57 100644 --- a/apps/expo/src/components/HomePage.tsx +++ b/apps/expo/src/components/HomePage.tsx @@ -4,15 +4,16 @@ import { Button, Text, TouchableOpacity, View } from "react-native"; import { CameraView, useCameraPermissions } from "expo-camera"; import EcoScoreIcon from "~/components/icons/EcoScoreIcon"; +import Loading from "~/components/Loading"; import { api } from "~/utils/api"; -export function HomePage() { +export const HomePage = () => { const [facing, setFacing] = useState("back"); const [permission, requestPermission] = useCameraPermissions(); const [scannedData, setScannedData] = useState(null); const [scanned, setScanned] = useState(false); - const { isError, data, error, refetch } = + const { isError, isLoading, data, error, isFetched, refetch } = api.getEstimate.getEstimate.useQuery( { barCodeUniqueId: scannedData ?? "" }, { @@ -31,9 +32,7 @@ export function HomePage() { setFacing((current) => (current === "back" ? "front" : "back")); } - const productName = - data?.WorldFoodFactsProductInfo?.product.product_name ?? - "Sorry, we couldn't find that product"; + const productName = data?.WorldFoodFactsProductInfo?.product.product_name; const productGrade = data?.WorldFoodFactsProductInfo?.product.ecoscore_data?.grade; const productTotalCO2: string | number = @@ -51,8 +50,31 @@ export function HomePage() { ); } + if (isLoading) { + return ; + } + + if (scanned && isFetched && !productName) { + return ( + + Sorry! We couldn't find that product. + +