From d2ab3159788d38218a70047072b706ede14f4fc2 Mon Sep 17 00:00:00 2001 From: Bradley Shellnut Date: Fri, 13 Jan 2023 21:13:59 -0800 Subject: [PATCH 001/141] Introduce custom media queries and add iconify icons. --- environmentVariables.js | 10 -- environmentVariables.json | 10 ++ package.json | 13 +- pnpm-lock.yaml | 184 +++++++++++++------------ postcss.config.cjs | 18 +-- src/lib/components/button/index.svelte | 1 + src/lib/stores/search.ts | 6 +- src/routes/+layout.svelte | 4 + src/routes/collection/+page.server.ts | 12 ++ src/routes/collection/+page.svelte | 7 +- src/routes/game/[id]/+page.svelte | 14 +- src/routes/wishlist/+page.svelte | 3 +- 12 files changed, 161 insertions(+), 121 deletions(-) delete mode 100644 environmentVariables.js create mode 100644 environmentVariables.json create mode 100644 src/routes/collection/+page.server.ts diff --git a/environmentVariables.js b/environmentVariables.js deleted file mode 100644 index 825ed8d..0000000 --- a/environmentVariables.js +++ /dev/null @@ -1,10 +0,0 @@ -module.exports = { - environmentVariables: { - '--xsmall-viewport': '480px', - '--small-viewport': '640px', - '--medium-viewport': '768px', - '--large-viewport': '1024px', - '--xlarge-viewport': '1280px', - '--xxlarge-viewport': '1536px', - } -} \ No newline at end of file diff --git a/environmentVariables.json b/environmentVariables.json new file mode 100644 index 0000000..9f739bf --- /dev/null +++ b/environmentVariables.json @@ -0,0 +1,10 @@ +{ + "environment-variables": { + "--xsmall-viewport": "480px", + "--small-viewport": "640px", + "--medium-viewport": "768px", + "--large-viewport": "1024px", + "--xlarge-viewport": "1280px", + "--xxlarge-viewport": "1536px" + } +} diff --git a/package.json b/package.json index da4ad35..06db873 100644 --- a/package.json +++ b/package.json @@ -17,12 +17,12 @@ "@rgossiaux/svelte-headlessui": "1.0.2", "@rgossiaux/svelte-heroicons": "^0.1.2", "@sveltejs/adapter-auto": "^1.0.0", - "@sveltejs/adapter-vercel": "^1.0.1", - "@sveltejs/kit": "^1.0.7", + "@sveltejs/adapter-vercel": "^1.0.2", + "@sveltejs/kit": "^1.0.13", "@types/cookie": "^0.5.1", "@types/node": "^18.11.18", - "@typescript-eslint/eslint-plugin": "^5.48.0", - "@typescript-eslint/parser": "^5.48.0", + "@typescript-eslint/eslint-plugin": "^5.48.1", + "@typescript-eslint/parser": "^5.48.1", "autoprefixer": "^10.4.13", "eslint": "^8.31.0", "eslint-config-prettier": "^8.6.0", @@ -40,7 +40,7 @@ "prettier": "^2.8.2", "prettier-plugin-svelte": "^2.9.0", "sass": "^1.57.1", - "svelte": "^3.55.0", + "svelte": "^3.55.1", "svelte-check": "^2.10.3", "svelte-preprocess": "^4.10.7", "tslib": "^2.4.1", @@ -57,8 +57,9 @@ "@types/feather-icons": "^4.29.1", "cookie": "^0.5.0", "feather-icons": "^4.29.0", + "iconify-icon": "^1.0.2", "svelte-lazy-loader": "^1.0.0", "zod": "^3.20.2", - "zod-to-json-schema": "^3.20.1" + "zod-to-json-schema": "^3.20.2" } } \ No newline at end of file diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 67a2e1f..3f42555 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -9,19 +9,20 @@ specifiers: '@rgossiaux/svelte-headlessui': 1.0.2 '@rgossiaux/svelte-heroicons': ^0.1.2 '@sveltejs/adapter-auto': ^1.0.0 - '@sveltejs/adapter-vercel': ^1.0.1 - '@sveltejs/kit': ^1.0.7 + '@sveltejs/adapter-vercel': ^1.0.2 + '@sveltejs/kit': ^1.0.13 '@types/cookie': ^0.5.1 '@types/feather-icons': ^4.29.1 '@types/node': ^18.11.18 - '@typescript-eslint/eslint-plugin': ^5.48.0 - '@typescript-eslint/parser': ^5.48.0 + '@typescript-eslint/eslint-plugin': ^5.48.1 + '@typescript-eslint/parser': ^5.48.1 autoprefixer: ^10.4.13 cookie: ^0.5.0 eslint: ^8.31.0 eslint-config-prettier: ^8.6.0 eslint-plugin-svelte3: ^4.0.0 feather-icons: ^4.29.0 + iconify-icon: ^1.0.2 just-clone: ^6.2.0 just-debounce-it: ^3.2.0 postcss: ^8.4.21 @@ -35,7 +36,7 @@ specifiers: prettier: ^2.8.2 prettier-plugin-svelte: ^2.9.0 sass: ^1.57.1 - svelte: ^3.55.0 + svelte: ^3.55.1 svelte-check: ^2.10.3 svelte-lazy-loader: ^1.0.0 svelte-preprocess: ^4.10.7 @@ -44,7 +45,7 @@ specifiers: vite: ^4.0.4 vitest: ^0.25.3 zod: ^3.20.2 - zod-to-json-schema: ^3.20.1 + zod-to-json-schema: ^3.20.2 dependencies: '@fontsource/fira-mono': 4.5.10 @@ -54,25 +55,26 @@ dependencies: '@types/feather-icons': 4.29.1 cookie: 0.5.0 feather-icons: 4.29.0 + iconify-icon: 1.0.2 svelte-lazy-loader: 1.0.0 zod: 3.20.2 - zod-to-json-schema: 3.20.1_zod@3.20.2 + zod-to-json-schema: 3.20.2_zod@3.20.2 devDependencies: '@playwright/test': 1.29.2 - '@rgossiaux/svelte-headlessui': 1.0.2_svelte@3.55.0 - '@rgossiaux/svelte-heroicons': 0.1.2_svelte@3.55.0 - '@sveltejs/adapter-auto': 1.0.0_@sveltejs+kit@1.0.7 - '@sveltejs/adapter-vercel': 1.0.1_@sveltejs+kit@1.0.7 - '@sveltejs/kit': 1.0.7_svelte@3.55.0+vite@4.0.4 + '@rgossiaux/svelte-headlessui': 1.0.2_svelte@3.55.1 + '@rgossiaux/svelte-heroicons': 0.1.2_svelte@3.55.1 + '@sveltejs/adapter-auto': 1.0.0_@sveltejs+kit@1.0.13 + '@sveltejs/adapter-vercel': 1.0.2_@sveltejs+kit@1.0.13 + '@sveltejs/kit': 1.0.13_svelte@3.55.1+vite@4.0.4 '@types/cookie': 0.5.1 '@types/node': 18.11.18 - '@typescript-eslint/eslint-plugin': 5.48.0_k73wpmdolxikpyqun3p36akaaq - '@typescript-eslint/parser': 5.48.0_iukboom6ndih5an6iafl45j2fe + '@typescript-eslint/eslint-plugin': 5.48.1_3jon24igvnqaqexgwtxk6nkpse + '@typescript-eslint/parser': 5.48.1_iukboom6ndih5an6iafl45j2fe autoprefixer: 10.4.13_postcss@8.4.21 eslint: 8.31.0 eslint-config-prettier: 8.6.0_eslint@8.31.0 - eslint-plugin-svelte3: 4.0.0_6go7qzsvzihesfwmyvq3tnl5qq + eslint-plugin-svelte3: 4.0.0_btuntbn75dxkba3nofpps2nvzm just-clone: 6.2.0 just-debounce-it: 3.2.0 postcss: 8.4.21 @@ -84,11 +86,11 @@ devDependencies: postcss-media-minmax: 5.0.0_postcss@8.4.21 postcss-nested: 6.0.0_postcss@8.4.21 prettier: 2.8.2 - prettier-plugin-svelte: 2.9.0_74vfyr7qjo56zgjcvkwi6gyjxm + prettier-plugin-svelte: 2.9.0_y74x4qymbshr6ujrzcfe2sydsa sass: 1.57.1 - svelte: 3.55.0 - svelte-check: 2.10.3_2ucm3gises2g7s47d5nd3e3tqa - svelte-preprocess: 4.10.7_vsntmwrrlk5avk6zexsfqc76hy + svelte: 3.55.1 + svelte-check: 2.10.3_mraflicfyjy3x4taxigiwsr23i + svelte-preprocess: 4.10.7_kmnkm63hwcse26ffcjvrch7uda tslib: 2.4.1 typescript: 4.9.4 vite: 4.0.4_ovmyjmuuyckt3r3gpaexj2onji @@ -360,6 +362,10 @@ packages: resolution: {integrity: sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==} dev: true + /@iconify/types/2.0.0: + resolution: {integrity: sha512-+wluvCrRhXrhyOmRDJ3q8mux9JkKy5SJ/v8ol2tu4FVjyYvtEzkc/3pK15ET6RKg4b4w4BmTk1+gsCUhf21Ykg==} + dev: false + /@jridgewell/resolve-uri/3.1.0: resolution: {integrity: sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==} engines: {node: '>=6.0.0'} @@ -450,20 +456,20 @@ packages: resolution: {integrity: sha512-a5Sab1C4/icpTZVzZc5Ghpz88yQtGOyNqYXcZgOssB2uuAr+wF/MvN6bgtW32q7HHrvBki+BsZ0OuNv6EV3K9g==} dev: true - /@rgossiaux/svelte-headlessui/1.0.2_svelte@3.55.0: + /@rgossiaux/svelte-headlessui/1.0.2_svelte@3.55.1: resolution: {integrity: sha512-sauopYTSivhzXe1kAvgawkhyYJcQlK8Li3p0d2OtcCIVprOzdbard5lbqWB4xHDv83zAobt2mR08oizO2poHLQ==} peerDependencies: svelte: ^3.44.0 dependencies: - svelte: 3.55.0 + svelte: 3.55.1 dev: true - /@rgossiaux/svelte-heroicons/0.1.2_svelte@3.55.0: + /@rgossiaux/svelte-heroicons/0.1.2_svelte@3.55.1: resolution: {integrity: sha512-c5Ep1QDvBo9HD/P0AxbXItDbn6x77fldCjjL0aBjNseUntV4fkdHkBde1IaLr8i0kmrhTSovjkIen8W83jUPzg==} peerDependencies: svelte: ^3.44.0 dependencies: - svelte: 3.55.0 + svelte: 3.55.1 dev: true /@rollup/pluginutils/4.2.1: @@ -474,21 +480,21 @@ packages: picomatch: 2.3.1 dev: true - /@sveltejs/adapter-auto/1.0.0_@sveltejs+kit@1.0.7: + /@sveltejs/adapter-auto/1.0.0_@sveltejs+kit@1.0.13: resolution: {integrity: sha512-yKyPvlLVua1bJ/42FrR3X041mFGdB4GzTZOAEoHUcNBRE5Mhx94+eqHpC3hNvAOiLEDcKfVO0ObyKSu7qldU+w==} peerDependencies: '@sveltejs/kit': ^1.0.0 dependencies: - '@sveltejs/kit': 1.0.7_svelte@3.55.0+vite@4.0.4 + '@sveltejs/kit': 1.0.13_svelte@3.55.1+vite@4.0.4 import-meta-resolve: 2.2.0 dev: true - /@sveltejs/adapter-vercel/1.0.1_@sveltejs+kit@1.0.7: - resolution: {integrity: sha512-2v06K1dKC8VmQnB8P/dAdBuNSQYvJbhBkCFpiBptkptoYMcSZnT2fYqsmtoUJDn13ACDQttorcFIQkf0BeFMQw==} + /@sveltejs/adapter-vercel/1.0.2_@sveltejs+kit@1.0.13: + resolution: {integrity: sha512-Ms2cTlqpA8Rf6Pl8GuqC6bLoMdA30W688+wV8i6DcHlLO3Z9NBEZET2jF+tEmRF1jrxxAWEDngdQBfs25eOBxw==} peerDependencies: '@sveltejs/kit': ^1.0.0 dependencies: - '@sveltejs/kit': 1.0.7_svelte@3.55.0+vite@4.0.4 + '@sveltejs/kit': 1.0.13_svelte@3.55.1+vite@4.0.4 '@vercel/nft': 0.22.6 esbuild: 0.16.8 transitivePeerDependencies: @@ -496,8 +502,8 @@ packages: - supports-color dev: true - /@sveltejs/kit/1.0.7_svelte@3.55.0+vite@4.0.4: - resolution: {integrity: sha512-u8JS4aXFWlrnu/tjl+EhJ/FvBEjLYDyMaLe7EAU4sW+PfDqnqyHBAPg/IQi5JuBg6l+Z816F4WrTe+zplUTQDg==} + /@sveltejs/kit/1.0.13_svelte@3.55.1+vite@4.0.4: + resolution: {integrity: sha512-AuHqAojgg+tL9lXSQKkB1VjadFDW+vwOoWLq+BU8pAgFvZMlh3rGCyEdPbEgE3V6pwWn/+37AOrA8fILMHWzRQ==} engines: {node: ^16.14 || >=18} hasBin: true requiresBuild: true @@ -505,7 +511,7 @@ packages: svelte: ^3.54.0 vite: ^4.0.0 dependencies: - '@sveltejs/vite-plugin-svelte': 2.0.2_svelte@3.55.0+vite@4.0.4 + '@sveltejs/vite-plugin-svelte': 2.0.2_svelte@3.55.1+vite@4.0.4 '@types/cookie': 0.5.1 cookie: 0.5.0 devalue: 4.2.0 @@ -516,15 +522,15 @@ packages: sade: 1.8.1 set-cookie-parser: 2.5.1 sirv: 2.0.2 - svelte: 3.55.0 + svelte: 3.55.1 tiny-glob: 0.2.9 - undici: 5.14.0 + undici: 5.15.0 vite: 4.0.4_ovmyjmuuyckt3r3gpaexj2onji transitivePeerDependencies: - supports-color dev: true - /@sveltejs/vite-plugin-svelte/2.0.2_svelte@3.55.0+vite@4.0.4: + /@sveltejs/vite-plugin-svelte/2.0.2_svelte@3.55.1+vite@4.0.4: resolution: {integrity: sha512-xCEan0/NNpQuL0l5aS42FjwQ6wwskdxC3pW1OeFtEKNZwRg7Evro9lac9HesGP6TdFsTv2xMes5ASQVKbCacxg==} engines: {node: ^14.18.0 || >= 16} peerDependencies: @@ -535,8 +541,8 @@ packages: deepmerge: 4.2.2 kleur: 4.1.5 magic-string: 0.27.0 - svelte: 3.55.0 - svelte-hmr: 0.15.1_svelte@3.55.0 + svelte: 3.55.1 + svelte-hmr: 0.15.1_svelte@3.55.1 vite: 4.0.4_ovmyjmuuyckt3r3gpaexj2onji vitefu: 0.2.4_vite@4.0.4 transitivePeerDependencies: @@ -583,8 +589,8 @@ packages: resolution: {integrity: sha512-21cFJr9z3g5dW8B0CVI9g2O9beqaThGQ6ZFBqHfwhzLDKUxaqTIy3vnfah/UPkfOiF2pLq+tGz+W8RyCskuslw==} dev: true - /@typescript-eslint/eslint-plugin/5.48.0_k73wpmdolxikpyqun3p36akaaq: - resolution: {integrity: sha512-SVLafp0NXpoJY7ut6VFVUU9I+YeFsDzeQwtK0WZ+xbRN3mtxJ08je+6Oi2N89qDn087COdO0u3blKZNv9VetRQ==} + /@typescript-eslint/eslint-plugin/5.48.1_3jon24igvnqaqexgwtxk6nkpse: + resolution: {integrity: sha512-9nY5K1Rp2ppmpb9s9S2aBiF3xo5uExCehMDmYmmFqqyxgenbHJ3qbarcLt4ITgaD6r/2ypdlcFRdcuVPnks+fQ==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: '@typescript-eslint/parser': ^5.0.0 @@ -594,10 +600,10 @@ packages: typescript: optional: true dependencies: - '@typescript-eslint/parser': 5.48.0_iukboom6ndih5an6iafl45j2fe - '@typescript-eslint/scope-manager': 5.48.0 - '@typescript-eslint/type-utils': 5.48.0_iukboom6ndih5an6iafl45j2fe - '@typescript-eslint/utils': 5.48.0_iukboom6ndih5an6iafl45j2fe + '@typescript-eslint/parser': 5.48.1_iukboom6ndih5an6iafl45j2fe + '@typescript-eslint/scope-manager': 5.48.1 + '@typescript-eslint/type-utils': 5.48.1_iukboom6ndih5an6iafl45j2fe + '@typescript-eslint/utils': 5.48.1_iukboom6ndih5an6iafl45j2fe debug: 4.3.4 eslint: 8.31.0 ignore: 5.2.1 @@ -610,8 +616,8 @@ packages: - supports-color dev: true - /@typescript-eslint/parser/5.48.0_iukboom6ndih5an6iafl45j2fe: - resolution: {integrity: sha512-1mxNA8qfgxX8kBvRDIHEzrRGrKHQfQlbW6iHyfHYS0Q4X1af+S6mkLNtgCOsGVl8+/LUPrqdHMssAemkrQ01qg==} + /@typescript-eslint/parser/5.48.1_iukboom6ndih5an6iafl45j2fe: + resolution: {integrity: sha512-4yg+FJR/V1M9Xoq56SF9Iygqm+r5LMXvheo6DQ7/yUWynQ4YfCRnsKuRgqH4EQ5Ya76rVwlEpw4Xu+TgWQUcdA==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 @@ -620,9 +626,9 @@ packages: typescript: optional: true dependencies: - '@typescript-eslint/scope-manager': 5.48.0 - '@typescript-eslint/types': 5.48.0 - '@typescript-eslint/typescript-estree': 5.48.0_typescript@4.9.4 + '@typescript-eslint/scope-manager': 5.48.1 + '@typescript-eslint/types': 5.48.1 + '@typescript-eslint/typescript-estree': 5.48.1_typescript@4.9.4 debug: 4.3.4 eslint: 8.31.0 typescript: 4.9.4 @@ -630,16 +636,16 @@ packages: - supports-color dev: true - /@typescript-eslint/scope-manager/5.48.0: - resolution: {integrity: sha512-0AA4LviDtVtZqlyUQnZMVHydDATpD9SAX/RC5qh6cBd3xmyWvmXYF+WT1oOmxkeMnWDlUVTwdODeucUnjz3gow==} + /@typescript-eslint/scope-manager/5.48.1: + resolution: {integrity: sha512-S035ueRrbxRMKvSTv9vJKIWgr86BD8s3RqoRZmsSh/s8HhIs90g6UlK8ZabUSjUZQkhVxt7nmZ63VJ9dcZhtDQ==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dependencies: - '@typescript-eslint/types': 5.48.0 - '@typescript-eslint/visitor-keys': 5.48.0 + '@typescript-eslint/types': 5.48.1 + '@typescript-eslint/visitor-keys': 5.48.1 dev: true - /@typescript-eslint/type-utils/5.48.0_iukboom6ndih5an6iafl45j2fe: - resolution: {integrity: sha512-vbtPO5sJyFjtHkGlGK4Sthmta0Bbls4Onv0bEqOGm7hP9h8UpRsHJwsrCiWtCUndTRNQO/qe6Ijz9rnT/DB+7g==} + /@typescript-eslint/type-utils/5.48.1_iukboom6ndih5an6iafl45j2fe: + resolution: {integrity: sha512-Hyr8HU8Alcuva1ppmqSYtM/Gp0q4JOp1F+/JH5D1IZm/bUBrV0edoewQZiEc1r6I8L4JL21broddxK8HAcZiqQ==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: eslint: '*' @@ -648,8 +654,8 @@ packages: typescript: optional: true dependencies: - '@typescript-eslint/typescript-estree': 5.48.0_typescript@4.9.4 - '@typescript-eslint/utils': 5.48.0_iukboom6ndih5an6iafl45j2fe + '@typescript-eslint/typescript-estree': 5.48.1_typescript@4.9.4 + '@typescript-eslint/utils': 5.48.1_iukboom6ndih5an6iafl45j2fe debug: 4.3.4 eslint: 8.31.0 tsutils: 3.21.0_typescript@4.9.4 @@ -658,13 +664,13 @@ packages: - supports-color dev: true - /@typescript-eslint/types/5.48.0: - resolution: {integrity: sha512-UTe67B0Ypius0fnEE518NB2N8gGutIlTojeTg4nt0GQvikReVkurqxd2LvYa9q9M5MQ6rtpNyWTBxdscw40Xhw==} + /@typescript-eslint/types/5.48.1: + resolution: {integrity: sha512-xHyDLU6MSuEEdIlzrrAerCGS3T7AA/L8Hggd0RCYBi0w3JMvGYxlLlXHeg50JI9Tfg5MrtsfuNxbS/3zF1/ATg==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dev: true - /@typescript-eslint/typescript-estree/5.48.0_typescript@4.9.4: - resolution: {integrity: sha512-7pjd94vvIjI1zTz6aq/5wwE/YrfIyEPLtGJmRfyNR9NYIW+rOvzzUv3Cmq2hRKpvt6e9vpvPUQ7puzX7VSmsEw==} + /@typescript-eslint/typescript-estree/5.48.1_typescript@4.9.4: + resolution: {integrity: sha512-Hut+Osk5FYr+sgFh8J/FHjqX6HFcDzTlWLrFqGoK5kVUN3VBHF/QzZmAsIXCQ8T/W9nQNBTqalxi1P3LSqWnRA==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: typescript: '*' @@ -672,8 +678,8 @@ packages: typescript: optional: true dependencies: - '@typescript-eslint/types': 5.48.0 - '@typescript-eslint/visitor-keys': 5.48.0 + '@typescript-eslint/types': 5.48.1 + '@typescript-eslint/visitor-keys': 5.48.1 debug: 4.3.4 globby: 11.1.0 is-glob: 4.0.3 @@ -684,17 +690,17 @@ packages: - supports-color dev: true - /@typescript-eslint/utils/5.48.0_iukboom6ndih5an6iafl45j2fe: - resolution: {integrity: sha512-x2jrMcPaMfsHRRIkL+x96++xdzvrdBCnYRd5QiW5Wgo1OB4kDYPbC1XjWP/TNqlfK93K/lUL92erq5zPLgFScQ==} + /@typescript-eslint/utils/5.48.1_iukboom6ndih5an6iafl45j2fe: + resolution: {integrity: sha512-SmQuSrCGUOdmGMwivW14Z0Lj8dxG1mOFZ7soeJ0TQZEJcs3n5Ndgkg0A4bcMFzBELqLJ6GTHnEU+iIoaD6hFGA==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 dependencies: '@types/json-schema': 7.0.11 '@types/semver': 7.3.13 - '@typescript-eslint/scope-manager': 5.48.0 - '@typescript-eslint/types': 5.48.0 - '@typescript-eslint/typescript-estree': 5.48.0_typescript@4.9.4 + '@typescript-eslint/scope-manager': 5.48.1 + '@typescript-eslint/types': 5.48.1 + '@typescript-eslint/typescript-estree': 5.48.1_typescript@4.9.4 eslint: 8.31.0 eslint-scope: 5.1.1 eslint-utils: 3.0.0_eslint@8.31.0 @@ -704,11 +710,11 @@ packages: - typescript dev: true - /@typescript-eslint/visitor-keys/5.48.0: - resolution: {integrity: sha512-5motVPz5EgxQ0bHjut3chzBkJ3Z3sheYVcSwS5BpHZpLqSptSmELNtGixmgj65+rIfhvtQTz5i9OP2vtzdDH7Q==} + /@typescript-eslint/visitor-keys/5.48.1: + resolution: {integrity: sha512-Ns0XBwmfuX7ZknznfXozgnydyR8F6ev/KEGePP4i74uL3ArsKbEhJ7raeKr1JSa997DBDwol/4a0Y+At82c9dA==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dependencies: - '@typescript-eslint/types': 5.48.0 + '@typescript-eslint/types': 5.48.1 eslint-visitor-keys: 3.3.0 dev: true @@ -1117,14 +1123,14 @@ packages: eslint: 8.31.0 dev: true - /eslint-plugin-svelte3/4.0.0_6go7qzsvzihesfwmyvq3tnl5qq: + /eslint-plugin-svelte3/4.0.0_btuntbn75dxkba3nofpps2nvzm: resolution: {integrity: sha512-OIx9lgaNzD02+MDFNLw0GEUbuovNcglg+wnd/UY0fbZmlQSz7GlQiQ1f+yX0XvC07XPcDOnFcichqI3xCwp71g==} peerDependencies: eslint: '>=8.0.0' svelte: ^3.2.0 dependencies: eslint: 8.31.0 - svelte: 3.55.0 + svelte: 3.55.1 dev: true /eslint-scope/5.1.1: @@ -1463,6 +1469,12 @@ packages: - supports-color dev: true + /iconify-icon/1.0.2: + resolution: {integrity: sha512-mehAvz2a4eUAlPo76Wul4zzsPNr3hbOHiauMhPrTVIdLOt0AnccnNloh1EeTO3tYeBv7iaJZfdCPHczvi+CkXQ==} + dependencies: + '@iconify/types': 2.0.0 + dev: false + /ignore/5.2.1: resolution: {integrity: sha512-d2qQLzTJ9WxQftPAuEQpSPmKqzxePjzVbpAVv62AQ64NTL+wR4JkrVqR/LqFsFEUsHDAiId52mJteHDFuDkElA==} engines: {node: '>= 4'} @@ -1990,14 +2002,14 @@ packages: engines: {node: '>= 0.8.0'} dev: true - /prettier-plugin-svelte/2.9.0_74vfyr7qjo56zgjcvkwi6gyjxm: + /prettier-plugin-svelte/2.9.0_y74x4qymbshr6ujrzcfe2sydsa: resolution: {integrity: sha512-3doBi5NO4IVgaNPtwewvrgPpqAcvNv0NwJNflr76PIGgi9nf1oguQV1Hpdm9TI2ALIQVn/9iIwLpBO5UcD2Jiw==} peerDependencies: prettier: ^1.16.4 || ^2.0.0 svelte: ^3.2.0 dependencies: prettier: 2.8.2 - svelte: 3.55.0 + svelte: 3.55.1 dev: true /prettier/2.8.2: @@ -2257,7 +2269,7 @@ packages: engines: {node: '>= 0.4'} dev: true - /svelte-check/2.10.3_2ucm3gises2g7s47d5nd3e3tqa: + /svelte-check/2.10.3_mraflicfyjy3x4taxigiwsr23i: resolution: {integrity: sha512-Nt1aWHTOKFReBpmJ1vPug0aGysqPwJh2seM1OvICfM2oeyaA62mOiy5EvkXhltGfhCcIQcq2LoE0l1CwcWPjlw==} hasBin: true peerDependencies: @@ -2269,8 +2281,8 @@ packages: import-fresh: 3.3.0 picocolors: 1.0.0 sade: 1.8.1 - svelte: 3.55.0 - svelte-preprocess: 4.10.7_vsntmwrrlk5avk6zexsfqc76hy + svelte: 3.55.1 + svelte-preprocess: 4.10.7_kmnkm63hwcse26ffcjvrch7uda typescript: 4.9.4 transitivePeerDependencies: - '@babel/core' @@ -2285,20 +2297,20 @@ packages: - sugarss dev: true - /svelte-hmr/0.15.1_svelte@3.55.0: + /svelte-hmr/0.15.1_svelte@3.55.1: resolution: {integrity: sha512-BiKB4RZ8YSwRKCNVdNxK/GfY+r4Kjgp9jCLEy0DuqAKfmQtpL38cQK3afdpjw4sqSs4PLi3jIPJIFp259NkZtA==} engines: {node: ^12.20 || ^14.13.1 || >= 16} peerDependencies: svelte: '>=3.19.0' dependencies: - svelte: 3.55.0 + svelte: 3.55.1 dev: true /svelte-lazy-loader/1.0.0: resolution: {integrity: sha512-AZD6R60vksyojn21FgXLglmBiBB9K5Dkdu0hdGrLbCaRCYT68IsWkZfRUqKhMx1IfzqWcZQ8X9y/f+Ih0oNQkQ==} dev: false - /svelte-preprocess/4.10.7_vsntmwrrlk5avk6zexsfqc76hy: + /svelte-preprocess/4.10.7_kmnkm63hwcse26ffcjvrch7uda: resolution: {integrity: sha512-sNPBnqYD6FnmdBrUmBCaqS00RyCsCpj2BG58A1JBswNF7b0OKviwxqVrOL/CKyJrLSClrSeqQv5BXNg2RUbPOw==} engines: {node: '>= 9.11.2'} requiresBuild: true @@ -2348,12 +2360,12 @@ packages: sass: 1.57.1 sorcery: 0.10.0 strip-indent: 3.0.0 - svelte: 3.55.0 + svelte: 3.55.1 typescript: 4.9.4 dev: true - /svelte/3.55.0: - resolution: {integrity: sha512-uGu2FVMlOuey4JoKHKrpZFkoYyj0VLjJdz47zX5+gVK5odxHM40RVhar9/iK2YFRVxvfg9FkhfVlR0sjeIrOiA==} + /svelte/3.55.1: + resolution: {integrity: sha512-S+87/P0Ve67HxKkEV23iCdAh/SX1xiSfjF1HOglno/YTbSTW7RniICMCofWGdJJbdjw3S+0PfFb1JtGfTXE0oQ==} engines: {node: '>= 8'} dev: true @@ -2451,8 +2463,8 @@ packages: hasBin: true dev: true - /undici/5.14.0: - resolution: {integrity: sha512-yJlHYw6yXPPsuOH0x2Ib1Km61vu4hLiRRQoafs+WUgX1vO64vgnxiCEN9dpIrhZyHFsai3F0AEj4P9zy19enEQ==} + /undici/5.15.0: + resolution: {integrity: sha512-wCAZJDyjw9Myv+Ay62LAoB+hZLPW9SmKbQkbHIhMw/acKSlpn7WohdMUc/Vd4j1iSMBO0hWwU8mjB7a5p5bl8g==} engines: {node: '>=12.18'} dependencies: busboy: 1.6.0 @@ -2618,8 +2630,8 @@ packages: engines: {node: '>=10'} dev: true - /zod-to-json-schema/3.20.1_zod@3.20.2: - resolution: {integrity: sha512-U+zmNJUKqzv92E+LdEYv0g2LxBLks4HAwfC6cue8jXby5PAeSEPGO4xV9Sl4zmLYyFvJkm0FOfOs6orUO+AI1w==} + /zod-to-json-schema/3.20.2_zod@3.20.2: + resolution: {integrity: sha512-qka3UAXmVXD8z5SHkRU89UyHp8JHJW7zc8RQCpt7QloJOn6uijwkjUm8o+M/cF1IysmKc5gxac/QeDikaQMdzQ==} peerDependencies: zod: ^3.20.0 dependencies: diff --git a/postcss.config.cjs b/postcss.config.cjs index 01f5c21..ef732c8 100644 --- a/postcss.config.cjs +++ b/postcss.config.cjs @@ -6,14 +6,16 @@ const postcssNested = require('postcss-nested'); const postcssEnvFunction = require('postcss-env-function'); const config = { - plugins: [ - autoprefixer(), - postcssMediaMinmax, - customMedia, - atImport(), - postcssNested, - postcssEnvFunction(), - ] + plugins: [ + autoprefixer(), + postcssMediaMinmax, + customMedia, + atImport(), + postcssNested, + postcssEnvFunction({ + importFrom: './environmentVariables.json' + }) + ] }; module.exports = config; diff --git a/src/lib/components/button/index.svelte b/src/lib/components/button/index.svelte index 482acd5..9d977ce 100644 --- a/src/lib/components/button/index.svelte +++ b/src/lib/components/button/index.svelte @@ -17,6 +17,7 @@ border-radius: 4px; margin: 0; padding: 1rem; + min-width: 20rem; max-width: 30rem; background-color: var(--color-btn-primary-active); } diff --git a/src/lib/stores/search.ts b/src/lib/stores/search.ts index 6f0ecb1..49c85b3 100644 --- a/src/lib/stores/search.ts +++ b/src/lib/stores/search.ts @@ -1,4 +1,4 @@ -import { writable } from 'svelte/store'; +import { writable, type Writable } from 'svelte/store'; import type { SavedGameType } from '../types'; export const createSearchStore = (data: SavedGameType[]) => { @@ -16,8 +16,10 @@ export const createSearchStore = (data: SavedGameType[]) => { }; export const searchHandler = (store) => { + console.log(`Store value: ${JSON.stringify(store)}`); + const searchTerm = store.search.toLowerCase() || ''; - store.filtered = store.data.filter((item) => { + store.filtered = store.data.filter((item: SavedGameType) => { return item.searchTerms.toLowerCase().includes(searchTerm); }); }; diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte index 6e95385..bdbbbeb 100644 --- a/src/routes/+layout.svelte +++ b/src/routes/+layout.svelte @@ -4,6 +4,7 @@ import debounce from 'just-debounce-it'; import clone from 'just-clone'; import { Toy } from '@leveluptuts/svelte-toy'; + import 'iconify-icon'; // import '../app.postcss'; import Analytics from '$lib/components/analytics.svelte'; import Header from '$lib/components/header/Header.svelte'; @@ -42,6 +43,9 @@ if (!item?.searchTerms) { item.searchTerms = `${item?.name?.toLowerCase()}`; } + if (!item?.includeInRandom) { + item.includeInRandom = false; + } } wishlistStore.addAll(wishlist); } diff --git a/src/routes/collection/+page.server.ts b/src/routes/collection/+page.server.ts new file mode 100644 index 0000000..02aeef0 --- /dev/null +++ b/src/routes/collection/+page.server.ts @@ -0,0 +1,12 @@ +export const load: PageServerLoad = async ({ fetch, url }) => { + const searchParams = Object.fromEntries(url?.searchParams); + const q = searchParams?.q; + const limit = parseInt(searchParams?.limit) || 10; + const skip = parseInt(searchParams?.skip) || 0; + + return { + q, + limit, + skip + }; +}; diff --git a/src/routes/collection/+page.svelte b/src/routes/collection/+page.svelte index 0e58f5c..ae89c03 100644 --- a/src/routes/collection/+page.svelte +++ b/src/routes/collection/+page.svelte @@ -8,6 +8,10 @@ import RemoveCollectionDialog from '$root/lib/components/dialog/RemoveCollectionDialog.svelte'; import RemoveWishlistDialog from '$root/lib/components/dialog/RemoveWishlistDialog.svelte'; import { createSearchStore, searchHandler } from '$root/lib/stores/search'; + import type { PageData } from './$types'; + + export let data: PageData; + console.log(`Page data: ${JSON.stringify(data)}`) let gameToRemove: GameType | SavedGameType; let pageSize = 10; @@ -76,7 +80,7 @@

Your Collection

- +
@@ -109,6 +113,7 @@ From c088048411b0e38888ded56238815890b6efb2f4 Mon Sep 17 00:00:00 2001 From: Bradley Shellnut Date: Sun, 15 Jan 2023 13:38:13 -0800 Subject: [PATCH 003/141] Simplify buttons on game page and reactive button text. --- .vscode/settings.json | 2 +- package.json | 1 + pnpm-lock.yaml | 12 +++++- src/routes/+layout.svelte | 2 +- src/routes/game/[id]/+page.svelte | 69 ++++++++++++++++--------------- 5 files changed, 50 insertions(+), 36 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index fbad5ce..f995fd8 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,3 +1,3 @@ { - "cSpell.words": ["kickstarter", "msrp"] + "cSpell.words": ["iconify", "kickstarter", "msrp"] } diff --git a/package.json b/package.json index 06db873..e4e4a99 100644 --- a/package.json +++ b/package.json @@ -13,6 +13,7 @@ "format": "prettier --write --plugin-search-dir=. ." }, "devDependencies": { + "@iconify/svelte": "^3.0.1", "@playwright/test": "^1.29.2", "@rgossiaux/svelte-headlessui": "1.0.2", "@rgossiaux/svelte-heroicons": "^0.1.2", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 3f42555..d2684ce 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -2,6 +2,7 @@ lockfileVersion: 5.4 specifiers: '@fontsource/fira-mono': ^4.5.10 + '@iconify/svelte': ^3.0.1 '@leveluptuts/svelte-side-menu': ^1.0.5 '@leveluptuts/svelte-toy': ^2.0.3 '@lukeed/uuid': ^2.0.0 @@ -61,6 +62,7 @@ dependencies: zod-to-json-schema: 3.20.2_zod@3.20.2 devDependencies: + '@iconify/svelte': 3.0.1_svelte@3.55.1 '@playwright/test': 1.29.2 '@rgossiaux/svelte-headlessui': 1.0.2_svelte@3.55.1 '@rgossiaux/svelte-heroicons': 0.1.2_svelte@3.55.1 @@ -362,9 +364,17 @@ packages: resolution: {integrity: sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==} dev: true + /@iconify/svelte/3.0.1_svelte@3.55.1: + resolution: {integrity: sha512-onjjl496hTXUBWJxeCxo/c5zmVHS3HnKUQv5Cqf1ZsUbY4d0wVJfSDaV1hw1m6b0BNlJCOmbpc23Q6AOO5qqKg==} + peerDependencies: + svelte: '>=3' + dependencies: + '@iconify/types': 2.0.0 + svelte: 3.55.1 + dev: true + /@iconify/types/2.0.0: resolution: {integrity: sha512-+wluvCrRhXrhyOmRDJ3q8mux9JkKy5SJ/v8ol2tu4FVjyYvtEzkc/3pK15ET6RKg4b4w4BmTk1+gsCUhf21Ykg==} - dev: false /@jridgewell/resolve-uri/3.1.0: resolution: {integrity: sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==} diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte index bdbbbeb..2a6b3a6 100644 --- a/src/routes/+layout.svelte +++ b/src/routes/+layout.svelte @@ -4,7 +4,7 @@ import debounce from 'just-debounce-it'; import clone from 'just-clone'; import { Toy } from '@leveluptuts/svelte-toy'; - import 'iconify-icon'; + // import 'iconify-icon'; // import '../app.postcss'; import Analytics from '$lib/components/analytics.svelte'; import Header from '$lib/components/header/Header.svelte'; diff --git a/src/routes/game/[id]/+page.svelte b/src/routes/game/[id]/+page.svelte index 96647c9..f2fb8c9 100644 --- a/src/routes/game/[id]/+page.svelte +++ b/src/routes/game/[id]/+page.svelte @@ -1,6 +1,7 @@
@@ -70,50 +97,22 @@
- {#if existsInCollection} - - {:else} - - {/if} - {#if existsInWishlist} - - {:else} - - {/if} + +
diff --git a/src/lib/components/preferences/profile.svelte b/src/lib/components/preferences/profile.svelte index a2aa539..b3a35f2 100644 --- a/src/lib/components/preferences/profile.svelte +++ b/src/lib/components/preferences/profile.svelte @@ -1,7 +1,8 @@
@@ -19,10 +20,10 @@ Min Age - {#if data?.errors?.minAge} + {#if $errors?.minAge}
-

- {data?.errors?.minAge} +

+ {$errors?.minAge}

{/if} @@ -49,10 +50,10 @@ bind:value={exactMinPlayers} /> - {#if data?.errors?.minPlayers} + {#if $errors?.minPlayers}
-

- {data?.errors?.minPlayers} +

+ {$errors?.minPlayers}

{/if} @@ -79,10 +80,10 @@ bind:value={exactMaxPlayers} /> - {#if data?.error?.id === 'maxPlayers'} + {#if $errors?.id === 'maxPlayers'}
-

- Error: {data.error.message} +

+ Error: {$errors.message}

{/if} diff --git a/src/lib/components/search/textSearch/index.svelte b/src/lib/components/search/textSearch/index.svelte index b7b97b4..7fe41a2 100644 --- a/src/lib/components/search/textSearch/index.svelte +++ b/src/lib/components/search/textSearch/index.svelte @@ -1,7 +1,7 @@ -
{ +{#if dev} + +{/if} + + { skip = 0; }}>
- - - + + + {#if $errors?.q}{$errors?.q}{/if} + + +
{#if advancedSearch} @@ -174,7 +180,9 @@ - + {#if disclosureOpen} + + {/if}
{/if} diff --git a/src/lib/config.ts b/src/lib/config.ts new file mode 100644 index 0000000..5048265 --- /dev/null +++ b/src/lib/config.ts @@ -0,0 +1,5 @@ +import { dev } from '$app/environment'; + +export const title = 'Bored Game'; +export const description = 'Bored? Find a game! Bored Game!'; +export const url = dev ? 'http://localhost:5173' : 'https://boredgame.vercel.app'; diff --git a/src/lib/zodValidation.ts b/src/lib/zodValidation.ts index d0ab820..4498339 100644 --- a/src/lib/zodValidation.ts +++ b/src/lib/zodValidation.ts @@ -31,13 +31,15 @@ function IntegerString>(schema export const search_schema = z .object({ - name: z.string().trim().optional(), + q: z.string().trim().optional().default(''), minAge: IntegerString(z.number().min(1).max(120).optional()), minPlayers: IntegerString(z.number().min(1).max(50).optional()), maxPlayers: IntegerString(z.number().min(1).max(50).optional()), exactMinAge: z.preprocess((a) => Boolean(a), z.boolean().optional()), exactMinPlayers: z.preprocess((a) => Boolean(a), z.boolean().optional()), - exactMaxPlayers: z.preprocess((a) => Boolean(a), z.boolean().optional()) + exactMaxPlayers: z.preprocess((a) => Boolean(a), z.boolean().optional()), + limit: z.number().min(10).max(100).default(10), + skip: z.number().min(0).default(0) }) .superRefine( ({ minPlayers, maxPlayers, minAge, exactMinAge, exactMinPlayers, exactMaxPlayers }, ctx) => { diff --git a/src/routes/+page.server.ts b/src/routes/+page.server.ts index 67f6811..17d6728 100644 --- a/src/routes/+page.server.ts +++ b/src/routes/+page.server.ts @@ -1,8 +1,16 @@ -import type { PageServerLoad, Actions } from './$types'; +import { superValidate } from 'sveltekit-superforms/server'; +import { search_schema } from '$lib/zodValidation'; -export const actions: Actions = { - default: async ({ request, locals }): Promise => { - // Do things in here - return {}; - } -} \ No newline at end of file +export const load = async ({ fetch, url }) => { + const formData = Object.fromEntries(url?.searchParams); + formData.name = formData?.q; + const form = await superValidate(formData, search_schema); + return { form }; +}; + +export const actions = { + default: async ({ request, locals }): Promise => { + // Do things in here + return {}; + } +}; diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte index 6ab8cba..0077668 100644 --- a/src/routes/+page.svelte +++ b/src/routes/+page.svelte @@ -1,13 +1,11 @@ @@ -26,7 +24,7 @@
- + \ No newline at end of file diff --git a/src/routes/search/+page.server.ts b/src/routes/search/+page.server.ts index c87f0a4..da8e3a5 100644 --- a/src/routes/search/+page.server.ts +++ b/src/routes/search/+page.server.ts @@ -6,7 +6,7 @@ import type { GameType, SearchQuery } from '$lib/types'; import { mapAPIGameToBoredGame } from '$lib/util/gameMapper'; import { search_schema } from '$lib/zodValidation'; -async function searchForGames(urlQueryParams) { +async function searchForGames(urlQueryParams: SearchQuery) { try { const url = `https://api.boardgameatlas.com/api/search${ urlQueryParams ? `?${urlQueryParams}` : '' @@ -27,7 +27,7 @@ async function searchForGames(urlQueryParams) { let totalCount = 0; if (response.ok) { const gameResponse = await response.json(); - const gameList = gameResponse?.games; + const gameList: GameType[] = gameResponse?.games; totalCount = gameResponse?.count; console.log('totalCount', totalCount); gameList.forEach((game) => { @@ -110,7 +110,8 @@ export const load = async ({ fetch, url }) => { }; export const actions: Actions = { - random: async ({ request }: RequestEvent): Promise => { + random: async ({ request }): Promise => { + const form = await superValidate(request, search_schema); const queryParams: SearchQuery = { order_by: 'rank', ascending: false, @@ -127,47 +128,9 @@ export const actions: Actions = { const urlQueryParams = new URLSearchParams(newQueryParams); - try { - const url = `https://api.boardgameatlas.com/api/search${ - urlQueryParams ? `?${urlQueryParams}` : '' - }`; - const response = await fetch(url, { - method: 'get', - headers: { - 'content-type': 'application/json' - } - }); - // console.log('board game response', response); - - if (!response.ok) { - console.log('Status not 200', response.status); - throw error(response.status); - } - - if (response.status === 200) { - const gameResponse = await response.json(); - // console.log('gameResponse', gameResponse); - const gameList = gameResponse?.games; - const totalCount = gameResponse?.count; - console.log('totalCount', totalCount); - const games: GameType[] = []; - gameList.forEach((game) => { - game.players = `${game.min_players}-${game.max_players}`; - game.playtime = `${game.min_playtime}-${game.max_playtime}`; - games.push(mapAPIGameToBoredGame(game)); - }); - - // console.log('returning from search', games) - - return { - games - }; - } - } catch (e) { - console.log(`Error searching board games ${e}`); - } return { - games: [] + form, + searchData: await searchForGames(urlQueryParams) }; } }; diff --git a/src/routes/search/+page.svelte b/src/routes/search/+page.svelte index 45839f1..62afc82 100644 --- a/src/routes/search/+page.svelte +++ b/src/routes/search/+page.svelte @@ -4,7 +4,6 @@ import TextSearch from '$lib/components/search/textSearch/index.svelte'; export let data; - const { form, errors, constraints } = superForm(data?.form); $: if (data?.searchData?.games) { gameStore.removeAll(); @@ -13,5 +12,5 @@
- +
From c53e5ffdc0683b3784c5b1f88b638892b7c53b54 Mon Sep 17 00:00:00 2001 From: Bradley Shellnut Date: Tue, 23 May 2023 23:28:23 -0700 Subject: [PATCH 014/141] Fixing auth routes. --- src/lib/components/header/index.svelte | 46 +++---- .../components/search/textSearch/index.svelte | 4 +- src/lib/components/signin.svelte | 0 src/lib/components/signup.svelte | 113 ++++++++++++++++++ src/routes/auth/signin/+page.svelte | 2 +- src/routes/auth/signout/+page.server.ts | 4 +- src/routes/auth/signup/+page.svelte | 6 +- 7 files changed, 140 insertions(+), 35 deletions(-) create mode 100644 src/lib/components/signin.svelte create mode 100644 src/lib/components/signup.svelte diff --git a/src/lib/components/header/index.svelte b/src/lib/components/header/index.svelte index 98995d5..cd7ff9e 100644 --- a/src/lib/components/header/index.svelte +++ b/src/lib/components/header/index.svelte @@ -1,8 +1,10 @@
@@ -15,38 +17,26 @@
diff --git a/src/lib/components/search/textSearch/index.svelte b/src/lib/components/search/textSearch/index.svelte index 94d770b..df958ab 100644 --- a/src/lib/components/search/textSearch/index.svelte +++ b/src/lib/components/search/textSearch/index.svelte @@ -25,7 +25,7 @@ } export let data: Validation; - const { form, constraints, errors, enhance } = superForm(data, { + const { form, constraints, errors } = superForm(data, { onSubmit: () => { boredState.update((n) => ({ ...n, loading: true })); }, @@ -145,7 +145,7 @@ {/if} -
+
diff --git a/src/lib/components/signin.svelte b/src/lib/components/signin.svelte new file mode 100644 index 0000000..e69de29 diff --git a/src/lib/components/signup.svelte b/src/lib/components/signup.svelte new file mode 100644 index 0000000..7914324 --- /dev/null +++ b/src/lib/components/signup.svelte @@ -0,0 +1,113 @@ + + + +

Signup user

+ + + + + + + + + or Cancel + diff --git a/src/routes/auth/signin/+page.svelte b/src/routes/auth/signin/+page.svelte index 80d3325..3bd68ec 100644 --- a/src/routes/auth/signin/+page.svelte +++ b/src/routes/auth/signin/+page.svelte @@ -11,7 +11,7 @@ }); -
+ {#if $errors._errors}
- {/if}
- + + + {#if $errors.username} + {$errors.username} + {/if}
- + + + {#if $errors.firstName} + {$errors.firstName} + {/if}
- + + + {#if $errors.lastName} + {$errors.lastName} + {/if}
- Change Password + + + {#if $errors.email} + {$errors.email} + {/if} +
+
+ +
+ diff --git a/src/routes/wishlist/+page.server.ts b/src/routes/(protected)/wishlist/+page.server.ts similarity index 100% rename from src/routes/wishlist/+page.server.ts rename to src/routes/(protected)/wishlist/+page.server.ts diff --git a/src/routes/wishlist/+page.svelte b/src/routes/(protected)/wishlist/+page.svelte similarity index 100% rename from src/routes/wishlist/+page.svelte rename to src/routes/(protected)/wishlist/+page.svelte diff --git a/src/routes/auth/signin/+page.svelte b/src/routes/auth/signin/+page.svelte index e7053fc..207ec33 100644 --- a/src/routes/auth/signin/+page.svelte +++ b/src/routes/auth/signin/+page.svelte @@ -50,7 +50,7 @@ - +
diff --git a/src/routes/auth/signout/+page.server.ts b/src/routes/auth/signout/+page.server.ts index 55299bd..0a0d104 100644 --- a/src/routes/auth/signout/+page.server.ts +++ b/src/routes/auth/signout/+page.server.ts @@ -3,6 +3,7 @@ import { redirect } from '@sveltejs/kit'; export const actions = { default: async ({ locals }) => { + console.log('Signing out user'); const session = await locals.auth.validate(); if (!session) { throw redirect(302, '/auth/signin'); From bdfc1dfd3ff07890d0f591d5a178d46a785cd6d6 Mon Sep 17 00:00:00 2001 From: Bradley Shellnut Date: Sun, 13 Aug 2023 22:12:02 -0700 Subject: [PATCH 044/141] Updating dependencies, fixing search, fixing wishlist add and remove, fixing game page, not showing buttons on list of games, and adding helper components. --- .vscode/settings.json | 2 +- package.json | 34 +- pnpm-lock.yaml | 457 +++++++++--------- prisma/schema.prisma | 29 +- src/lib/apis/collection.ts | 0 src/lib/apis/wishlist.ts | 0 src/lib/components/AddToList.svelte | 138 ++++++ src/lib/components/WishlistButton.svelte | 0 src/lib/components/game/index.svelte | 99 +--- .../components/search/textSearch/index.svelte | 75 +-- src/lib/zodValidation.ts | 5 + .../(protected)/collection/+page.server.ts | 4 +- src/routes/(protected)/list/+layout.server.ts | 35 ++ src/routes/(protected)/list/+layout.svelte | 41 ++ .../(protected)/list/[id]/+page.server.ts | 126 +++++ src/routes/(protected)/list/[id]/+page.svelte | 24 + .../(protected)/wishlist/+page.server.ts | 161 ++++-- src/routes/(protected)/wishlist/+page.svelte | 138 +----- src/routes/+layout.svelte | 5 +- src/routes/api/wishlist/+server.ts | 33 ++ src/routes/api/wishlist/[id]/items/+server.ts | 0 .../api/wishlist/[id]/search/+server.ts | 74 +++ src/routes/auth/signin/+page.server.ts | 6 +- src/routes/auth/signup/+page.server.ts | 3 +- src/routes/game/[id]/+page.server.ts | 37 +- src/routes/game/[id]/+page.svelte | 88 +--- src/routes/search/+page.server.ts | 121 ++--- svelte.config.js | 1 + 28 files changed, 988 insertions(+), 748 deletions(-) create mode 100644 src/lib/apis/collection.ts create mode 100644 src/lib/apis/wishlist.ts create mode 100644 src/lib/components/AddToList.svelte create mode 100644 src/lib/components/WishlistButton.svelte create mode 100644 src/routes/(protected)/list/+layout.server.ts create mode 100644 src/routes/(protected)/list/+layout.svelte create mode 100644 src/routes/(protected)/list/[id]/+page.server.ts create mode 100644 src/routes/(protected)/list/[id]/+page.svelte create mode 100644 src/routes/api/wishlist/+server.ts create mode 100644 src/routes/api/wishlist/[id]/items/+server.ts create mode 100644 src/routes/api/wishlist/[id]/search/+server.ts diff --git a/.vscode/settings.json b/.vscode/settings.json index f995fd8..1c54db3 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,3 +1,3 @@ { - "cSpell.words": ["iconify", "kickstarter", "msrp"] + "cSpell.words": ["iconify", "kickstarter", "lucide", "msrp"] } diff --git a/package.json b/package.json index 931184a..11fafd7 100644 --- a/package.json +++ b/package.json @@ -22,18 +22,18 @@ "seed": "ts-node --esm prisma/seed.ts" }, "devDependencies": { - "@melt-ui/pp": "^0.0.7", - "@playwright/test": "^1.36.2", + "@melt-ui/pp": "^0.1.2", + "@playwright/test": "^1.37.0", "@sveltejs/adapter-auto": "^1.0.3", "@sveltejs/adapter-vercel": "^1.0.6", - "@sveltejs/kit": "^1.22.4", + "@sveltejs/kit": "^1.22.5", "@types/cookie": "^0.5.1", - "@types/node": "^18.17.1", + "@types/node": "^18.17.5", "@typescript-eslint/eslint-plugin": "^5.62.0", "@typescript-eslint/parser": "^5.62.0", - "autoprefixer": "^10.4.14", - "eslint": "^8.46.0", - "eslint-config-prettier": "^8.9.0", + "autoprefixer": "^10.4.15", + "eslint": "^8.47.0", + "eslint-config-prettier": "^8.10.0", "eslint-plugin-svelte": "^2.32.4", "just-clone": "^6.2.0", "just-debounce-it": "^3.2.0", @@ -44,18 +44,18 @@ "prettier": "^2.8.8", "prettier-plugin-svelte": "^2.10.1", "prisma": "^5.1.1", - "sass": "^1.64.2", - "svelte": "^4.1.2", - "svelte-check": "^3.4.6", + "sass": "^1.65.1", + "svelte": "^4.2.0", + "svelte-check": "^3.5.0", "svelte-preprocess": "^5.0.4", "svelte-sequential-preprocessor": "^2.0.1", - "sveltekit-flash-message": "^2.1.0", - "sveltekit-superforms": "^1.5.0", + "sveltekit-flash-message": "^2.1.3", + "sveltekit-superforms": "^1.5.1", "tailwindcss": "^3.3.3", "ts-node": "^10.9.1", "tslib": "^2.6.1", "typescript": "^5.1.6", - "vite": "^4.4.8", + "vite": "^4.4.9", "vitest": "^0.25.3", "zod": "^3.21.4" }, @@ -70,9 +70,9 @@ "@iconify-icons/line-md": "^1.2.23", "@iconify-icons/mdi": "^1.2.47", "@lucia-auth/adapter-mysql": "^2.0.0", - "@lucia-auth/adapter-prisma": "^3.0.0", + "@lucia-auth/adapter-prisma": "^3.0.1", "@lukeed/uuid": "^2.0.1", - "@melt-ui/svelte": "^0.27.3", + "@melt-ui/svelte": "^0.34.6", "@prisma/client": "5.1.1", "@types/feather-icons": "^4.29.1", "class-variance-authority": "^0.6.1", @@ -82,9 +82,9 @@ "iconify-icon": "^1.0.8", "just-kebab-case": "^4.2.0", "loader": "^2.1.1", - "lucia": "^2.0.0", + "lucia": "^2.3.0", "lucide-svelte": "^0.256.1", - "open-props": "^1.5.10", + "open-props": "^1.5.11", "radix-svelte": "^0.8.0", "svelte-french-toast": "^1.2.0", "svelte-lazy": "^1.2.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index bc1abfe..b67ce0f 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -19,16 +19,16 @@ dependencies: version: 1.2.47 '@lucia-auth/adapter-mysql': specifier: ^2.0.0 - version: 2.0.0(lucia@2.0.0) + version: 2.0.0(lucia@2.3.0) '@lucia-auth/adapter-prisma': - specifier: ^3.0.0 - version: 3.0.0(@prisma/client@5.1.1)(lucia@2.0.0) + specifier: ^3.0.1 + version: 3.0.1(@prisma/client@5.1.1)(lucia@2.3.0) '@lukeed/uuid': specifier: ^2.0.1 version: 2.0.1 '@melt-ui/svelte': - specifier: ^0.27.3 - version: 0.27.3(svelte@4.1.2) + specifier: ^0.34.6 + version: 0.34.6(svelte@4.2.0) '@prisma/client': specifier: 5.1.1 version: 5.1.1(prisma@5.1.1) @@ -57,29 +57,29 @@ dependencies: specifier: ^2.1.1 version: 2.1.1 lucia: - specifier: ^2.0.0 - version: 2.0.0 + specifier: ^2.3.0 + version: 2.3.0 lucide-svelte: specifier: ^0.256.1 - version: 0.256.1(svelte@4.1.2) + version: 0.256.1(svelte@4.2.0) open-props: - specifier: ^1.5.10 - version: 1.5.10 + specifier: ^1.5.11 + version: 1.5.11 radix-svelte: specifier: ^0.8.0 - version: 0.8.0(svelte@4.1.2) + version: 0.8.0(svelte@4.2.0) svelte-french-toast: specifier: ^1.2.0 - version: 1.2.0(svelte@4.1.2) + version: 1.2.0(svelte@4.2.0) svelte-lazy: specifier: ^1.2.1 - version: 1.2.1(svelte@4.1.2) + version: 1.2.1(svelte@4.2.0) svelte-lazy-loader: specifier: ^1.0.0 version: 1.0.0 svelte-legos: specifier: ^0.2.1 - version: 0.2.1(svelte@4.1.2) + version: 0.2.1(svelte@4.2.0) tailwind-merge: specifier: ^1.14.0 version: 1.14.0 @@ -92,44 +92,44 @@ dependencies: devDependencies: '@melt-ui/pp': - specifier: ^0.0.7 - version: 0.0.7(@melt-ui/svelte@0.27.3)(svelte@4.1.2) + specifier: ^0.1.2 + version: 0.1.2(@melt-ui/svelte@0.34.6)(svelte@4.2.0) '@playwright/test': - specifier: ^1.36.2 - version: 1.36.2 + specifier: ^1.37.0 + version: 1.37.0 '@sveltejs/adapter-auto': specifier: ^1.0.3 - version: 1.0.3(@sveltejs/kit@1.22.4) + version: 1.0.3(@sveltejs/kit@1.22.5) '@sveltejs/adapter-vercel': specifier: ^1.0.6 - version: 1.0.6(@sveltejs/kit@1.22.4) + version: 1.0.6(@sveltejs/kit@1.22.5) '@sveltejs/kit': - specifier: ^1.22.4 - version: 1.22.4(svelte@4.1.2)(vite@4.4.8) + specifier: ^1.22.5 + version: 1.22.5(svelte@4.2.0)(vite@4.4.9) '@types/cookie': specifier: ^0.5.1 version: 0.5.1 '@types/node': - specifier: ^18.17.1 - version: 18.17.1 + specifier: ^18.17.5 + version: 18.17.5 '@typescript-eslint/eslint-plugin': specifier: ^5.62.0 - version: 5.62.0(@typescript-eslint/parser@5.62.0)(eslint@8.46.0)(typescript@5.1.6) + version: 5.62.0(@typescript-eslint/parser@5.62.0)(eslint@8.47.0)(typescript@5.1.6) '@typescript-eslint/parser': specifier: ^5.62.0 - version: 5.62.0(eslint@8.46.0)(typescript@5.1.6) + version: 5.62.0(eslint@8.47.0)(typescript@5.1.6) autoprefixer: - specifier: ^10.4.14 - version: 10.4.14(postcss@8.4.27) + specifier: ^10.4.15 + version: 10.4.15(postcss@8.4.27) eslint: - specifier: ^8.46.0 - version: 8.46.0 + specifier: ^8.47.0 + version: 8.47.0 eslint-config-prettier: - specifier: ^8.9.0 - version: 8.9.0(eslint@8.46.0) + specifier: ^8.10.0 + version: 8.10.0(eslint@8.47.0) eslint-plugin-svelte: specifier: ^2.32.4 - version: 2.32.4(eslint@8.46.0)(svelte@4.1.2)(ts-node@10.9.1) + version: 2.32.4(eslint@8.47.0)(svelte@4.2.0)(ts-node@10.9.1) just-clone: specifier: ^6.2.0 version: 6.2.0 @@ -153,37 +153,37 @@ devDependencies: version: 2.8.8 prettier-plugin-svelte: specifier: ^2.10.1 - version: 2.10.1(prettier@2.8.8)(svelte@4.1.2) + version: 2.10.1(prettier@2.8.8)(svelte@4.2.0) prisma: specifier: ^5.1.1 version: 5.1.1 sass: - specifier: ^1.64.2 - version: 1.64.2 + specifier: ^1.65.1 + version: 1.65.1 svelte: - specifier: ^4.1.2 - version: 4.1.2 + specifier: ^4.2.0 + version: 4.2.0 svelte-check: - specifier: ^3.4.6 - version: 3.4.6(postcss-load-config@4.0.1)(postcss@8.4.27)(sass@1.64.2)(svelte@4.1.2) + specifier: ^3.5.0 + version: 3.5.0(postcss-load-config@4.0.1)(postcss@8.4.27)(sass@1.65.1)(svelte@4.2.0) svelte-preprocess: specifier: ^5.0.4 - version: 5.0.4(postcss-load-config@4.0.1)(postcss@8.4.27)(sass@1.64.2)(svelte@4.1.2)(typescript@5.1.6) + version: 5.0.4(postcss-load-config@4.0.1)(postcss@8.4.27)(sass@1.65.1)(svelte@4.2.0)(typescript@5.1.6) svelte-sequential-preprocessor: specifier: ^2.0.1 version: 2.0.1 sveltekit-flash-message: - specifier: ^2.1.0 - version: 2.1.0(@sveltejs/kit@1.22.4)(svelte@4.1.2) + specifier: ^2.1.3 + version: 2.1.3(@sveltejs/kit@1.22.5)(svelte@4.2.0) sveltekit-superforms: - specifier: ^1.5.0 - version: 1.5.0(@sveltejs/kit@1.22.4)(svelte@4.1.2)(zod@3.21.4) + specifier: ^1.5.1 + version: 1.5.1(@sveltejs/kit@1.22.5)(svelte@4.2.0)(zod@3.21.4) tailwindcss: specifier: ^3.3.3 version: 3.3.3(ts-node@10.9.1) ts-node: specifier: ^10.9.1 - version: 10.9.1(@types/node@18.17.1)(typescript@5.1.6) + version: 10.9.1(@types/node@18.17.5)(typescript@5.1.6) tslib: specifier: ^2.6.1 version: 2.6.1 @@ -191,11 +191,11 @@ devDependencies: specifier: ^5.1.6 version: 5.1.6 vite: - specifier: ^4.4.8 - version: 4.4.8(@types/node@18.17.1)(sass@1.64.2) + specifier: ^4.4.9 + version: 4.4.9(@types/node@18.17.5)(sass@1.65.1) vitest: specifier: ^0.25.3 - version: 0.25.8(sass@1.64.2) + version: 0.25.8(sass@1.65.1) zod: specifier: ^3.21.4 version: 3.21.4 @@ -1021,14 +1021,14 @@ packages: dev: true optional: true - /@eslint-community/eslint-utils@4.4.0(eslint@8.46.0): + /@eslint-community/eslint-utils@4.4.0(eslint@8.47.0): resolution: {integrity: sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: eslint: ^6.0.0 || ^7.0.0 || >=8.0.0 dependencies: - eslint: 8.46.0 - eslint-visitor-keys: 3.4.2 + eslint: 8.47.0 + eslint-visitor-keys: 3.4.3 dev: true /@eslint-community/regexpp@4.5.0: @@ -1041,8 +1041,8 @@ packages: engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0} dev: true - /@eslint/eslintrc@2.1.1: - resolution: {integrity: sha512-9t7ZA7NGGK8ckelF0PQCfcxIUzs1Md5rrO6U/c+FIQNanea5UZC0wqKXH4vHBccmu4ZJgZ2idtPeW7+Q2npOEA==} + /@eslint/eslintrc@2.1.2: + resolution: {integrity: sha512-+wvgpDsrB1YqAMdEUCcnTlpfVBH7Vqn6A/NT3D8WVXFIaKMlErPIZT3oCIAVCOtarRpMtelZLqJeU3t7WY6X6g==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dependencies: ajv: 6.12.6 @@ -1058,18 +1058,34 @@ packages: - supports-color dev: true - /@eslint/js@8.46.0: - resolution: {integrity: sha512-a8TLtmPi8xzPkCbp/OGFUo5yhRkHM2Ko9kOWP4znJr0WAhWyThaw3PnwX4vOTWOAMsV2uRt32PPDcEz63esSaA==} + /@eslint/js@8.47.0: + resolution: {integrity: sha512-P6omY1zv5MItm93kLM8s2vr1HICJH8v0dvddDhysbIuZ+vcjOHg5Zbkf1mTkcmi2JA9oBG2anOkRnW8WJTS8Og==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dev: true /@floating-ui/core@1.3.1: resolution: {integrity: sha512-Bu+AMaXNjrpjh41znzHqaz3r2Nr8hHuHZT6V2LBKMhyMl0FgKA62PNYbqnfgmzOhoWZj70Zecisbo4H1rotP5g==} + dev: false + + /@floating-ui/core@1.4.1: + resolution: {integrity: sha512-jk3WqquEJRlcyu7997NtR5PibI+y5bi+LS3hPmguVClypenMsCY3CBa3LAQnozRCtCrYWSEtAdiskpamuJRFOQ==} + dependencies: + '@floating-ui/utils': 0.1.1 /@floating-ui/dom@1.4.2: resolution: {integrity: sha512-VKmvHVatWnewmGGy+7Mdy4cTJX71Pli6v/Wjb5RQBuq5wjUYx+Ef+kRThi8qggZqDgD8CogCpqhRoVp3+yQk+g==} dependencies: '@floating-ui/core': 1.3.1 + dev: false + + /@floating-ui/dom@1.5.1: + resolution: {integrity: sha512-KwvVcPSXg6mQygvA1TjbN/gh///36kKtllIF8SUm0qpFj8+rvYrpvlYdL1JoA71SHpDqgSSdGOSoQ0Mp3uY5aw==} + dependencies: + '@floating-ui/core': 1.4.1 + '@floating-ui/utils': 0.1.1 + + /@floating-ui/utils@0.1.1: + resolution: {integrity: sha512-m0G6wlnhm/AX0H12IOWtK8gASEMffnX08RtKkCgTdHb9JpHKGloI7icFfLg9ZmQeavcvR0PKmzxClyuFPSjKWw==} /@fontsource/fira-mono@4.5.10: resolution: {integrity: sha512-bxUnRP8xptGRo8YXeY073DSpfK74XpSb0ZyRNpHV9WvLnJ7TwPOjZll8hTMin7zLC6iOp59pDZ8EQDj1gzgAQQ==} @@ -1152,7 +1168,7 @@ packages: '@jridgewell/resolve-uri': 3.1.0 '@jridgewell/sourcemap-codec': 1.4.15 - /@lucia-auth/adapter-mysql@2.0.0(lucia@2.0.0): + /@lucia-auth/adapter-mysql@2.0.0(lucia@2.3.0): resolution: {integrity: sha512-8a4JZ3VjDyRu/mAop2hEt/jOJO2HXwWIAid6a4wGiR8wgnlyOws9brRc+/wxQHSOlWUlrWemrfDvXLs5mMtkeQ==} peerDependencies: '@planetscale/database': ^1.0.0 @@ -1164,17 +1180,17 @@ packages: mysql2: optional: true dependencies: - lucia: 2.0.0 + lucia: 2.3.0 dev: false - /@lucia-auth/adapter-prisma@3.0.0(@prisma/client@5.1.1)(lucia@2.0.0): - resolution: {integrity: sha512-qrFA5IID4AulINQbLQLQPIXqE9+M3zjmN558VDhrS3Y7Fdn5dyObPbHijUWw7lGYgOrhxDox9UUG8oyZ3+D1MA==} + /@lucia-auth/adapter-prisma@3.0.1(@prisma/client@5.1.1)(lucia@2.3.0): + resolution: {integrity: sha512-JZNl+721M5ApjtNiH+WUYstiC8cffcI/Y9IzKsa0uUhQMIHl2ObCrgO0R3fgHnjWHBjhQoK36g/r/iSJIDppBA==} peerDependencies: '@prisma/client': ^4.2.0 || ^5.0.0 lucia: ^2.0.0 dependencies: '@prisma/client': 5.1.1(prisma@5.1.1) - lucia: 2.0.0 + lucia: 2.3.0 dev: false /@lukeed/csprng@1.1.0: @@ -1207,26 +1223,27 @@ packages: - supports-color dev: true - /@melt-ui/pp@0.0.7(@melt-ui/svelte@0.27.3)(svelte@4.1.2): - resolution: {integrity: sha512-O7gRJ1OXmLjZBR7jB1SV2O4WORn1jk+k06gxej3EXPYAJGcPg+EfKNw54G0/VhhMup1ZrwMsleUgoCOzus/JUw==} + /@melt-ui/pp@0.1.2(@melt-ui/svelte@0.34.6)(svelte@4.2.0): + resolution: {integrity: sha512-GZeqp7UWLNZUC2dJpREnZrWMR88vy27WO7C3cIBz4KW3/CFD19FjNkd3VbSRfcRryrMkdnEs9nu2VUa8/0u58w==} + engines: {pnpm: '>=8.6.3'} peerDependencies: - '@melt-ui/svelte': '>= 0.22.0' + '@melt-ui/svelte': '>= 0.29.0' svelte: ^3.55.0 || ^4.0.0 dependencies: - '@melt-ui/svelte': 0.27.3(svelte@4.1.2) - svelte: 4.1.2 + '@melt-ui/svelte': 0.34.6(svelte@4.2.0) + svelte: 4.2.0 dev: true - /@melt-ui/svelte@0.27.3(svelte@4.1.2): - resolution: {integrity: sha512-NKv0GCmWqhp7cxvpJUW90ouNSmjxgE7GWs75w0cJfBdxS85Eie6DW4rCmkC8MOw1q20wg8fiQzQ03FGig4BbhA==} + /@melt-ui/svelte@0.34.6(svelte@4.2.0): + resolution: {integrity: sha512-uH+s8QL5vxvb9//tULFupGSBhWTh+TvRMbIVVEae8BVlIyQrvYD5G61hoq0CiJ+Oieqgti3wnckLkaz20aYDIg==} peerDependencies: svelte: '>=3 <5' dependencies: - '@floating-ui/core': 1.3.1 - '@floating-ui/dom': 1.4.2 + '@floating-ui/core': 1.4.1 + '@floating-ui/dom': 1.5.1 focus-trap: 7.5.2 nanoid: 4.0.2 - svelte: 4.1.2 + svelte: 4.2.0 /@nodelib/fs.scandir@2.1.5: resolution: {integrity: sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==} @@ -1246,13 +1263,13 @@ packages: '@nodelib/fs.scandir': 2.1.5 fastq: 1.15.0 - /@playwright/test@1.36.2: - resolution: {integrity: sha512-2rVZeyPRjxfPH6J0oGJqE8YxiM1IBRyM8hyrXYK7eSiAqmbNhxwcLa7dZ7fy9Kj26V7FYia5fh9XJRq4Dqme+g==} + /@playwright/test@1.37.0: + resolution: {integrity: sha512-181WBLk4SRUyH1Q96VZl7BP6HcK0b7lbdeKisn3N/vnjitk+9HbdlFz/L5fey05vxaAhldIDnzo8KUoy8S3mmQ==} engines: {node: '>=16'} hasBin: true dependencies: - '@types/node': 18.17.1 - playwright-core: 1.36.2 + '@types/node': 18.17.5 + playwright-core: 1.37.0 optionalDependencies: fsevents: 2.3.2 dev: true @@ -1291,21 +1308,21 @@ packages: picomatch: 2.3.1 dev: true - /@sveltejs/adapter-auto@1.0.3(@sveltejs/kit@1.22.4): + /@sveltejs/adapter-auto@1.0.3(@sveltejs/kit@1.22.5): resolution: {integrity: sha512-hc7O12YQqvZ1CD4fo1gMJuPzBZvuoG5kwxb2RRoz4fVoB8B2vuPO2cY751Ln0G6T/HMrAf8kCqw6Pg+wbxcstw==} peerDependencies: '@sveltejs/kit': ^1.0.0 dependencies: - '@sveltejs/kit': 1.22.4(svelte@4.1.2)(vite@4.4.8) + '@sveltejs/kit': 1.22.5(svelte@4.2.0)(vite@4.4.9) import-meta-resolve: 2.2.0 dev: true - /@sveltejs/adapter-vercel@1.0.6(@sveltejs/kit@1.22.4): + /@sveltejs/adapter-vercel@1.0.6(@sveltejs/kit@1.22.5): resolution: {integrity: sha512-fo6aaEygPd/6B5Jms4Ff7R4jbADnppuLvKOWBNTGe5MGB7ZRUkl+gxHWMQx2av2knyEZkA6V8y5M6R3ML5yN4g==} peerDependencies: '@sveltejs/kit': ^1.0.0 dependencies: - '@sveltejs/kit': 1.22.4(svelte@4.1.2)(vite@4.4.8) + '@sveltejs/kit': 1.22.5(svelte@4.2.0)(vite@4.4.9) '@vercel/nft': 0.22.6 esbuild: 0.16.8 transitivePeerDependencies: @@ -1313,8 +1330,8 @@ packages: - supports-color dev: true - /@sveltejs/kit@1.22.4(svelte@4.1.2)(vite@4.4.8): - resolution: {integrity: sha512-Opkqw1QXk4Cc25b/heJP2D7mX+OUBFAq4MXKfET58svTTxdeiHFKzmnuRsSF3nmxESqrLjqPAgHpib+knNGzRw==} + /@sveltejs/kit@1.22.5(svelte@4.2.0)(vite@4.4.9): + resolution: {integrity: sha512-LHq+ECucoT6c6/tkrxIQtD8KVNhPFV4QQ+xOKTwBAs/Qdtff8P5gAzsIZiwEaaO6J6sYZoy5RP2VR6m8PSCgLA==} engines: {node: ^16.14 || >=18} hasBin: true requiresBuild: true @@ -1322,7 +1339,7 @@ packages: svelte: ^3.54.0 || ^4.0.0-next.0 vite: ^4.0.0 dependencies: - '@sveltejs/vite-plugin-svelte': 2.4.1(svelte@4.1.2)(vite@4.4.8) + '@sveltejs/vite-plugin-svelte': 2.4.1(svelte@4.2.0)(vite@4.4.9) '@types/cookie': 0.5.1 cookie: 0.5.0 devalue: 4.3.1 @@ -1333,14 +1350,14 @@ packages: sade: 1.8.1 set-cookie-parser: 2.6.0 sirv: 2.0.2 - svelte: 4.1.2 - undici: 5.22.0 - vite: 4.4.8(@types/node@18.17.1)(sass@1.64.2) + svelte: 4.2.0 + undici: 5.23.0 + vite: 4.4.9(@types/node@18.17.5)(sass@1.65.1) transitivePeerDependencies: - supports-color dev: true - /@sveltejs/vite-plugin-svelte-inspector@1.0.2(@sveltejs/vite-plugin-svelte@2.4.1)(svelte@4.1.2)(vite@4.4.8): + /@sveltejs/vite-plugin-svelte-inspector@1.0.2(@sveltejs/vite-plugin-svelte@2.4.1)(svelte@4.2.0)(vite@4.4.9): resolution: {integrity: sha512-Cy1dUMcYCnDVV/hPLXa43YZJ2jGKVW5rA0xuNL9dlmYhT0yoS1g7+FOFSRlgk0BXKk/Oc7grs+8BVA5Iz2fr8A==} engines: {node: ^14.18.0 || >= 16} peerDependencies: @@ -1348,30 +1365,30 @@ packages: svelte: ^3.54.0 || ^4.0.0-next.0 vite: ^4.0.0 dependencies: - '@sveltejs/vite-plugin-svelte': 2.4.1(svelte@4.1.2)(vite@4.4.8) + '@sveltejs/vite-plugin-svelte': 2.4.1(svelte@4.2.0)(vite@4.4.9) debug: 4.3.4 - svelte: 4.1.2 - vite: 4.4.8(@types/node@18.17.1)(sass@1.64.2) + svelte: 4.2.0 + vite: 4.4.9(@types/node@18.17.5)(sass@1.65.1) transitivePeerDependencies: - supports-color dev: true - /@sveltejs/vite-plugin-svelte@2.4.1(svelte@4.1.2)(vite@4.4.8): + /@sveltejs/vite-plugin-svelte@2.4.1(svelte@4.2.0)(vite@4.4.9): resolution: {integrity: sha512-bNNKvoRY89ptY7udeBSCmTdCVwkjmMcZ0j/z9J5MuedT8jPjq0zrknAo/jF1sToAza4NVaAgR9AkZoD9oJJmnA==} engines: {node: ^14.18.0 || >= 16} peerDependencies: svelte: ^3.54.0 || ^4.0.0-next.0 vite: ^4.0.0 dependencies: - '@sveltejs/vite-plugin-svelte-inspector': 1.0.2(@sveltejs/vite-plugin-svelte@2.4.1)(svelte@4.1.2)(vite@4.4.8) + '@sveltejs/vite-plugin-svelte-inspector': 1.0.2(@sveltejs/vite-plugin-svelte@2.4.1)(svelte@4.2.0)(vite@4.4.9) debug: 4.3.4 deepmerge: 4.3.1 kleur: 4.1.5 magic-string: 0.30.0 - svelte: 4.1.2 - svelte-hmr: 0.15.2(svelte@4.1.2) - vite: 4.4.8(@types/node@18.17.1)(sass@1.64.2) - vitefu: 0.2.4(vite@4.4.8) + svelte: 4.2.0 + svelte-hmr: 0.15.2(svelte@4.2.0) + vite: 4.4.9(@types/node@18.17.5)(sass@1.65.1) + vitefu: 0.2.4(vite@4.4.9) transitivePeerDependencies: - supports-color dev: true @@ -1413,8 +1430,8 @@ packages: resolution: {integrity: sha512-Hr5Jfhc9eYOQNPYO5WLDq/n4jqijdHNlDXjuAQkkt+mWdQR+XJToOHrsD4cPaMXpn6KO7y2+wM8AZEs8VpBLVA==} dev: true - /@types/node@18.17.1: - resolution: {integrity: sha512-xlR1jahfizdplZYRU59JlUx9uzF1ARa8jbhM11ccpCJya8kvos5jwdm2ZAgxSCwOl0fq21svP18EVwPBXMQudw==} + /@types/node@18.17.5: + resolution: {integrity: sha512-xNbS75FxH6P4UXTPUJp/zNPq6/xsfdJKussCWNOnz4aULWIRwMgP1LgaB5RiBnMX1DPCYenuqGZfnIAx5mbFLA==} /@types/pug@2.0.6: resolution: {integrity: sha512-SnHmG9wN1UVmagJOnyo/qkk0Z7gejYxOYYmaAwr5u2yFYfsupN3sg10kyzN8Hep/2zbHxCnsumxOoRIRMBwKCg==} @@ -1428,7 +1445,7 @@ packages: resolution: {integrity: sha512-txGIh+0eDFzKGC25zORnswy+br1Ha7hj5cMVwKIU7+s0U2AxxJru/jZSMU6OC9MJWP6+pc/hc6ZjyZShpsyY2g==} dev: false - /@typescript-eslint/eslint-plugin@5.62.0(@typescript-eslint/parser@5.62.0)(eslint@8.46.0)(typescript@5.1.6): + /@typescript-eslint/eslint-plugin@5.62.0(@typescript-eslint/parser@5.62.0)(eslint@8.47.0)(typescript@5.1.6): resolution: {integrity: sha512-TiZzBSJja/LbhNPvk6yc0JrX9XqhQ0hdh6M2svYfsHGejaKFIAGd9MQ+ERIMzLGlN/kZoYIgdxFV0PuljTKXag==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -1440,12 +1457,12 @@ packages: optional: true dependencies: '@eslint-community/regexpp': 4.5.0 - '@typescript-eslint/parser': 5.62.0(eslint@8.46.0)(typescript@5.1.6) + '@typescript-eslint/parser': 5.62.0(eslint@8.47.0)(typescript@5.1.6) '@typescript-eslint/scope-manager': 5.62.0 - '@typescript-eslint/type-utils': 5.62.0(eslint@8.46.0)(typescript@5.1.6) - '@typescript-eslint/utils': 5.62.0(eslint@8.46.0)(typescript@5.1.6) + '@typescript-eslint/type-utils': 5.62.0(eslint@8.47.0)(typescript@5.1.6) + '@typescript-eslint/utils': 5.62.0(eslint@8.47.0)(typescript@5.1.6) debug: 4.3.4 - eslint: 8.46.0 + eslint: 8.47.0 graphemer: 1.4.0 ignore: 5.2.1 natural-compare-lite: 1.4.0 @@ -1456,7 +1473,7 @@ packages: - supports-color dev: true - /@typescript-eslint/parser@5.62.0(eslint@8.46.0)(typescript@5.1.6): + /@typescript-eslint/parser@5.62.0(eslint@8.47.0)(typescript@5.1.6): resolution: {integrity: sha512-VlJEV0fOQ7BExOsHYAGrgbEiZoi8D+Bl2+f6V2RrXerRSylnp+ZBHmPvaIa8cz0Ajx7WO7Z5RqfgYg7ED1nRhA==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -1470,7 +1487,7 @@ packages: '@typescript-eslint/types': 5.62.0 '@typescript-eslint/typescript-estree': 5.62.0(typescript@5.1.6) debug: 4.3.4 - eslint: 8.46.0 + eslint: 8.47.0 typescript: 5.1.6 transitivePeerDependencies: - supports-color @@ -1484,7 +1501,7 @@ packages: '@typescript-eslint/visitor-keys': 5.62.0 dev: true - /@typescript-eslint/type-utils@5.62.0(eslint@8.46.0)(typescript@5.1.6): + /@typescript-eslint/type-utils@5.62.0(eslint@8.47.0)(typescript@5.1.6): resolution: {integrity: sha512-xsSQreu+VnfbqQpW5vnCJdq1Z3Q0U31qiWmRhr98ONQmcp/yhiPJFPq8MXiJVLiksmOKSjIldZzkebzHuCGzew==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -1495,9 +1512,9 @@ packages: optional: true dependencies: '@typescript-eslint/typescript-estree': 5.62.0(typescript@5.1.6) - '@typescript-eslint/utils': 5.62.0(eslint@8.46.0)(typescript@5.1.6) + '@typescript-eslint/utils': 5.62.0(eslint@8.47.0)(typescript@5.1.6) debug: 4.3.4 - eslint: 8.46.0 + eslint: 8.47.0 tsutils: 3.21.0(typescript@5.1.6) typescript: 5.1.6 transitivePeerDependencies: @@ -1530,19 +1547,19 @@ packages: - supports-color dev: true - /@typescript-eslint/utils@5.62.0(eslint@8.46.0)(typescript@5.1.6): + /@typescript-eslint/utils@5.62.0(eslint@8.47.0)(typescript@5.1.6): resolution: {integrity: sha512-n8oxjeb5aIbPFEtmQxQYOLI0i9n5ySBEY/ZEHHZqKQSFnxio1rv6dthascc9dLuwrL0RC5mPCxB7vnAVGAYWAQ==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 dependencies: - '@eslint-community/eslint-utils': 4.4.0(eslint@8.46.0) + '@eslint-community/eslint-utils': 4.4.0(eslint@8.47.0) '@types/json-schema': 7.0.12 '@types/semver': 7.5.0 '@typescript-eslint/scope-manager': 5.62.0 '@typescript-eslint/types': 5.62.0 '@typescript-eslint/typescript-estree': 5.62.0(typescript@5.1.6) - eslint: 8.46.0 + eslint: 8.47.0 eslint-scope: 5.1.1 semver: 7.3.8 transitivePeerDependencies: @@ -1555,7 +1572,7 @@ packages: engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dependencies: '@typescript-eslint/types': 5.62.0 - eslint-visitor-keys: 3.4.2 + eslint-visitor-keys: 3.4.3 dev: true /@vercel/nft@0.22.6: @@ -1701,15 +1718,15 @@ packages: resolution: {integrity: sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==} dev: false - /autoprefixer@10.4.14(postcss@8.4.27): - resolution: {integrity: sha512-FQzyfOsTlwVzjHxKEqRIAdJx9niO6VCBCoEwax/VLSoQF29ggECcPuBqUMZ+u8jCZOPSy8b8/8KnuFbp0SaFZQ==} + /autoprefixer@10.4.15(postcss@8.4.27): + resolution: {integrity: sha512-KCuPB8ZCIqFdA4HwKXsvz7j6gvSDNhDP7WnUjBleRkKjPdvCmHFuQ77ocavI8FT6NdvlBnE2UFr2H4Mycn8Vew==} engines: {node: ^10 || ^12 || >=14} hasBin: true peerDependencies: postcss: ^8.1.0 dependencies: - browserslist: 4.21.5 - caniuse-lite: 1.0.30001481 + browserslist: 4.21.10 + caniuse-lite: 1.0.30001520 fraction.js: 4.2.0 normalize-range: 0.1.2 picocolors: 1.0.0 @@ -1768,15 +1785,15 @@ packages: dependencies: fill-range: 7.0.1 - /browserslist@4.21.5: - resolution: {integrity: sha512-tUkiguQGW7S3IhB7N+c2MV/HZPSCPAAiYBZXLsBhFB/PCy6ZKKsZrmBayHV9fdGV/ARIfJ14NkxKzRDjvp7L6w==} + /browserslist@4.21.10: + resolution: {integrity: sha512-bipEBdZfVH5/pwrvqc+Ub0kUPVfGUhlKxbvfD+z1BDnPEO/X98ruXGA1WP5ASpAFKan7Qr6j736IacbZQuAlKQ==} engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7} hasBin: true dependencies: - caniuse-lite: 1.0.30001481 - electron-to-chromium: 1.4.372 - node-releases: 2.0.10 - update-browserslist-db: 1.0.11(browserslist@4.21.5) + caniuse-lite: 1.0.30001520 + electron-to-chromium: 1.4.490 + node-releases: 2.0.13 + update-browserslist-db: 1.0.11(browserslist@4.21.10) dev: true /browserslist@4.21.9: @@ -1784,9 +1801,9 @@ packages: engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7} hasBin: true dependencies: - caniuse-lite: 1.0.30001506 - electron-to-chromium: 1.4.438 - node-releases: 2.0.12 + caniuse-lite: 1.0.30001520 + electron-to-chromium: 1.4.490 + node-releases: 2.0.13 update-browserslist-db: 1.0.11(browserslist@4.21.9) dev: true @@ -1810,12 +1827,8 @@ packages: resolution: {integrity: sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA==} engines: {node: '>= 6'} - /caniuse-lite@1.0.30001481: - resolution: {integrity: sha512-KCqHwRnaa1InZBtqXzP98LPg0ajCVujMKjqKDhZEthIpAsJl/YEIa3YvXjGXPVqzZVguccuu7ga9KOE1J9rKPQ==} - dev: true - - /caniuse-lite@1.0.30001506: - resolution: {integrity: sha512-6XNEcpygZMCKaufIcgpQNZNf00GEqc7VQON+9Rd0K1bMYo8xhMZRAo5zpbnbMNizi4YNgIDAFrdykWsvY3H4Hw==} + /caniuse-lite@1.0.30001520: + resolution: {integrity: sha512-tahF5O9EiiTzwTUqAeFjIZbn4Dnqxzz7ktrgGlMYNLH43Ul26IgTMH/zvL3DG0lZxBYnlT04axvInszUsZULdA==} dev: true /canvas-confetti@1.6.0: @@ -2071,12 +2084,8 @@ packages: esutils: 2.0.3 dev: true - /electron-to-chromium@1.4.372: - resolution: {integrity: sha512-MrlFq/j+TYHOjeWsWGYfzevc25HNeJdsF6qaLFrqBTRWZQtWkb1myq/Q2veLWezVaa5OcSZ99CFwTT4aF4Mung==} - dev: true - - /electron-to-chromium@1.4.438: - resolution: {integrity: sha512-x94U0FhphEsHsOloCvlsujHCvoir0ZQ73ZAs/QN4PLx98uNvyEU79F75rq1db75Bx/atvuh7KPeuxelh+xfYJw==} + /electron-to-chromium@1.4.490: + resolution: {integrity: sha512-6s7NVJz+sATdYnIwhdshx/N/9O6rvMxmhVoDSDFdj6iA45gHR8EQje70+RYsF4GeB+k0IeNSBnP7yG9ZXJFr7A==} dev: true /emoji-regex@8.0.0: @@ -2157,16 +2166,16 @@ packages: engines: {node: '>=10'} dev: true - /eslint-config-prettier@8.9.0(eslint@8.46.0): - resolution: {integrity: sha512-+sbni7NfVXnOpnRadUA8S28AUlsZt9GjgFvABIRL9Hkn8KqNzOp+7Lw4QWtrwn20KzU3wqu1QoOj2m+7rKRqkA==} + /eslint-config-prettier@8.10.0(eslint@8.47.0): + resolution: {integrity: sha512-SM8AMJdeQqRYT9O9zguiruQZaN7+z+E4eAP9oiLNGKMtomwaB1E9dcgUD6ZAn/eQAb52USbvezbiljfZUhbJcg==} hasBin: true peerDependencies: eslint: '>=7.0.0' dependencies: - eslint: 8.46.0 + eslint: 8.47.0 dev: true - /eslint-plugin-svelte@2.32.4(eslint@8.46.0)(svelte@4.1.2)(ts-node@10.9.1): + /eslint-plugin-svelte@2.32.4(eslint@8.47.0)(svelte@4.2.0)(ts-node@10.9.1): resolution: {integrity: sha512-VJ12i2Iogug1jvhwxSlognnfGj76P5gks/V4pUD4SCSVQOp14u47MNP0zAG8AQR3LT0Fi1iUvIFnY4l9z5Rwbg==} engines: {node: ^14.17.0 || >=16.0.0} peerDependencies: @@ -2176,10 +2185,10 @@ packages: svelte: optional: true dependencies: - '@eslint-community/eslint-utils': 4.4.0(eslint@8.46.0) + '@eslint-community/eslint-utils': 4.4.0(eslint@8.47.0) '@jridgewell/sourcemap-codec': 1.4.15 debug: 4.3.4 - eslint: 8.46.0 + eslint: 8.47.0 esutils: 2.0.3 known-css-properties: 0.28.0 postcss: 8.4.27 @@ -2187,8 +2196,8 @@ packages: postcss-safe-parser: 6.0.0(postcss@8.4.27) postcss-selector-parser: 6.0.13 semver: 7.5.3 - svelte: 4.1.2 - svelte-eslint-parser: 0.32.2(svelte@4.1.2) + svelte: 4.2.0 + svelte-eslint-parser: 0.32.2(svelte@4.2.0) transitivePeerDependencies: - supports-color - ts-node @@ -2210,20 +2219,20 @@ packages: estraverse: 5.3.0 dev: true - /eslint-visitor-keys@3.4.2: - resolution: {integrity: sha512-8drBzUEyZ2llkpCA67iYrgEssKDUu68V8ChqqOfFupIaG/LCVPUT+CoGJpT77zJprs4T/W7p07LP7zAIMuweVw==} + /eslint-visitor-keys@3.4.3: + resolution: {integrity: sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dev: true - /eslint@8.46.0: - resolution: {integrity: sha512-cIO74PvbW0qU8e0mIvk5IV3ToWdCq5FYG6gWPHHkx6gNdjlbAYvtfHmlCMXxjcoVaIdwy/IAt3+mDkZkfvb2Dg==} + /eslint@8.47.0: + resolution: {integrity: sha512-spUQWrdPt+pRVP1TTJLmfRNJJHHZryFmptzcafwSvHsceV81djHOdnEeDmkdotZyLNjDhrOasNK8nikkoG1O8Q==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} hasBin: true dependencies: - '@eslint-community/eslint-utils': 4.4.0(eslint@8.46.0) + '@eslint-community/eslint-utils': 4.4.0(eslint@8.47.0) '@eslint-community/regexpp': 4.6.2 - '@eslint/eslintrc': 2.1.1 - '@eslint/js': 8.46.0 + '@eslint/eslintrc': 2.1.2 + '@eslint/js': 8.47.0 '@humanwhocodes/config-array': 0.11.10 '@humanwhocodes/module-importer': 1.0.1 '@nodelib/fs.walk': 1.2.8 @@ -2234,7 +2243,7 @@ packages: doctrine: 3.0.0 escape-string-regexp: 4.0.0 eslint-scope: 7.2.2 - eslint-visitor-keys: 3.4.2 + eslint-visitor-keys: 3.4.3 espree: 9.6.1 esquery: 1.5.0 esutils: 2.0.3 @@ -2271,7 +2280,7 @@ packages: dependencies: acorn: 8.10.0 acorn-jsx: 5.3.2(acorn@8.10.0) - eslint-visitor-keys: 3.4.2 + eslint-visitor-keys: 3.4.3 dev: true /esquery@1.5.0: @@ -2751,16 +2760,16 @@ packages: yallist: 4.0.0 dev: true - /lucia@2.0.0: - resolution: {integrity: sha512-WRBMoZIgTHH6y2bAEHZWgWcMH6tDsQ+wf45juUgmn3ycjipn/e6OGpWki4XSjEuRm50WXghH+2EF9LCjCHUsUw==} + /lucia@2.3.0: + resolution: {integrity: sha512-FS+WjvTh8xK/N2I5PBQ9xhF5+OJZo1g2w931ZlaJoXSRxsM1WTkMRAyxFAE3Azoe9vHqlKxRsw11ZiSv+yc3rA==} dev: false - /lucide-svelte@0.256.1(svelte@4.1.2): + /lucide-svelte@0.256.1(svelte@4.2.0): resolution: {integrity: sha512-Fk8kQ5Xal9lxvX7T4fkyo592so3zzBtwfAfCOtptEh68jOKery/DyMlhY5m/Bh0M0pvb87soakYchighTBzPLQ==} peerDependencies: svelte: '>=3 <5' dependencies: - svelte: 4.1.2 + svelte: 4.2.0 dev: false /magic-string@0.27.0: @@ -2922,12 +2931,8 @@ packages: hasBin: true dev: true - /node-releases@2.0.10: - resolution: {integrity: sha512-5GFldHPXVG/YZmFzJvKK2zDSzPKhEp0+ZR5SVaoSag9fsL5YgHbUHDfnG5494ISANDcK4KwPXAx2xqVEydmd7w==} - dev: true - - /node-releases@2.0.12: - resolution: {integrity: sha512-QzsYKWhXTWx8h1kIvqfnC++o0pEmpRQA/aenALsL2F4pqNVr7YzcdMlDij5WBnwftRbJCNJL/O7zdKaxKPHqgQ==} + /node-releases@2.0.13: + resolution: {integrity: sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ==} dev: true /nopt@5.0.0: @@ -2969,8 +2974,8 @@ packages: dependencies: wrappy: 1.0.2 - /open-props@1.5.10: - resolution: {integrity: sha512-iE+B7Zo0ytgeUNI38uHiBrxF5Nnv3uX8AzogBXzf7wqeNyG6oqQEEBs1gnAZdRF+h7IRO0zOGM5d9/huiNFR+w==} + /open-props@1.5.11: + resolution: {integrity: sha512-wwfcnYPVKmTruKcZL7vx3o7/PA2qfL6W2/MZCyebUhzLWHSDd/K5iFRqwrSh/RbNfITYCfNdUTbexHDJpFq+2A==} dev: false /optionator@0.9.3: @@ -3054,8 +3059,8 @@ packages: resolution: {integrity: sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==} engines: {node: '>= 6'} - /playwright-core@1.36.2: - resolution: {integrity: sha512-sQYZt31dwkqxOrP7xy2ggDfEzUxM1lodjhsQ3NMMv5uGTRDsLxU0e4xf4wwMkF2gplIxf17QMBCodSFgm6bFVQ==} + /playwright-core@1.37.0: + resolution: {integrity: sha512-1c46jhTH/myQw6sesrcuHVtLoSNfJv8Pfy9t3rs6subY7kARv0HRw5PpyfPYPpPtQvBOmgbE6K+qgYUpj81LAA==} engines: {node: '>=16'} hasBin: true dev: true @@ -3273,7 +3278,7 @@ packages: dependencies: lilconfig: 2.1.0 postcss: 8.4.27 - ts-node: 10.9.1(@types/node@18.17.1)(typescript@5.1.6) + ts-node: 10.9.1(@types/node@18.17.5)(typescript@5.1.6) yaml: 1.10.2 dev: true @@ -3291,7 +3296,7 @@ packages: dependencies: lilconfig: 2.0.6 postcss: 8.4.27 - ts-node: 10.9.1(@types/node@18.17.1)(typescript@5.1.6) + ts-node: 10.9.1(@types/node@18.17.5)(typescript@5.1.6) yaml: 2.1.3 /postcss-logical@6.2.0(postcss@8.4.27): @@ -3390,7 +3395,7 @@ packages: '@csstools/postcss-text-decoration-shorthand': 2.2.4(postcss@8.4.27) '@csstools/postcss-trigonometric-functions': 2.1.1(postcss@8.4.27) '@csstools/postcss-unset-value': 2.0.1(postcss@8.4.27) - autoprefixer: 10.4.14(postcss@8.4.27) + autoprefixer: 10.4.15(postcss@8.4.27) browserslist: 4.21.9 css-blank-pseudo: 5.0.2(postcss@8.4.27) css-has-pseudo: 5.0.2(postcss@8.4.27) @@ -3495,14 +3500,14 @@ packages: engines: {node: '>= 0.8.0'} dev: true - /prettier-plugin-svelte@2.10.1(prettier@2.8.8)(svelte@4.1.2): + /prettier-plugin-svelte@2.10.1(prettier@2.8.8)(svelte@4.2.0): resolution: {integrity: sha512-Wlq7Z5v2ueCubWo0TZzKc9XHcm7TDxqcuzRuGd0gcENfzfT4JZ9yDlCbEgxWgiPmLHkBjfOtpAWkcT28MCDpUQ==} peerDependencies: prettier: ^1.16.4 || ^2.0.0 svelte: ^3.2.0 || ^4.0.0-next.0 dependencies: prettier: 2.8.8 - svelte: 4.1.2 + svelte: 4.2.0 dev: true /prettier@2.8.8: @@ -3540,14 +3545,14 @@ packages: /queue-microtask@1.2.3: resolution: {integrity: sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==} - /radix-svelte@0.8.0(svelte@4.1.2): + /radix-svelte@0.8.0(svelte@4.2.0): resolution: {integrity: sha512-VweSd96EiLCml9wA6krPQFxyZfci+A7phAPl9J6QH4nivKroFV2EUSGo9wAnqM2u04nI2mxGKa+wfMhNy84GVg==} peerDependencies: svelte: ^3.58.0 dependencies: '@floating-ui/core': 1.3.1 '@floating-ui/dom': 1.4.2 - svelte: 4.1.2 + svelte: 4.2.0 dev: false /read-cache@1.0.0: @@ -3617,8 +3622,8 @@ packages: glob: 7.2.3 dev: true - /rollup@3.26.2: - resolution: {integrity: sha512-6umBIGVz93er97pMgQO08LuH3m6PUb3jlDUUGFsNJB6VgTCUaDFpupf5JfU30529m/UKOgmiX+uY6Sx8cOYpLA==} + /rollup@3.27.2: + resolution: {integrity: sha512-YGwmHf7h2oUHkVBT248x0yt6vZkYQ3/rvE5iQuVBh3WO8GcJ6BNeOkpoX1yMHIiBm18EMLjBPIoUDkhgnyxGOQ==} engines: {node: '>=14.18.0', npm: '>=8.0.0'} hasBin: true optionalDependencies: @@ -3654,8 +3659,8 @@ packages: rimraf: 2.7.1 dev: true - /sass@1.64.2: - resolution: {integrity: sha512-TnDlfc+CRnUAgLO9D8cQLFu/GIjJIzJCGkE7o4ekIGQOH7T3GetiRR/PsTWJUHhkzcSPrARkPI+gNWn5alCzDg==} + /sass@1.65.1: + resolution: {integrity: sha512-9DINwtHmA41SEd36eVPQ9BJKpn7eKDQmUHmpI0y5Zv2Rcorrh0zS+cFrt050hdNbmmCNKTW3hV5mWfuegNRsEA==} engines: {node: '>=14.0.0'} hasBin: true dependencies: @@ -3818,8 +3823,8 @@ packages: resolution: {integrity: sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==} engines: {node: '>= 0.4'} - /svelte-check@3.4.6(postcss-load-config@4.0.1)(postcss@8.4.27)(sass@1.64.2)(svelte@4.1.2): - resolution: {integrity: sha512-OBlY8866Zh1zHQTkBMPS6psPi7o2umTUyj6JWm4SacnIHXpWFm658pG32m3dKvKFL49V4ntAkfFHKo4ztH07og==} + /svelte-check@3.5.0(postcss-load-config@4.0.1)(postcss@8.4.27)(sass@1.65.1)(svelte@4.2.0): + resolution: {integrity: sha512-KHujbn4k17xKYLmtCwv0sKKM7uiHTYcQvXnvrCcNU6a7hcszh99zFTIoiu/Sp/ewAw5aJmillJ1Cs8gKLmcX4A==} hasBin: true peerDependencies: svelte: ^3.55.0 || ^4.0.0-next.0 || ^4.0.0 @@ -3830,8 +3835,8 @@ packages: import-fresh: 3.3.0 picocolors: 1.0.0 sade: 1.8.1 - svelte: 4.1.2 - svelte-preprocess: 5.0.4(postcss-load-config@4.0.1)(postcss@8.4.27)(sass@1.64.2)(svelte@4.1.2)(typescript@5.1.6) + svelte: 4.2.0 + svelte-preprocess: 5.0.4(postcss-load-config@4.0.1)(postcss@8.4.27)(sass@1.65.1)(svelte@4.2.0)(typescript@5.1.6) typescript: 5.1.6 transitivePeerDependencies: - '@babel/core' @@ -3845,7 +3850,7 @@ packages: - sugarss dev: true - /svelte-eslint-parser@0.32.2(svelte@4.1.2): + /svelte-eslint-parser@0.32.2(svelte@4.2.0): resolution: {integrity: sha512-Ok9D3A4b23iLQsONrjqtXtYDu5ZZ/826Blaw2LeFZVTg1pwofKDG4mz3/GYTax8fQ0plRGHI6j+d9VQYy5Lo/A==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -3855,44 +3860,44 @@ packages: optional: true dependencies: eslint-scope: 7.2.2 - eslint-visitor-keys: 3.4.2 + eslint-visitor-keys: 3.4.3 espree: 9.6.1 postcss: 8.4.27 postcss-scss: 4.0.6(postcss@8.4.27) - svelte: 4.1.2 + svelte: 4.2.0 dev: true - /svelte-french-toast@1.2.0(svelte@4.1.2): + /svelte-french-toast@1.2.0(svelte@4.2.0): resolution: {integrity: sha512-5PW+6RFX3xQPbR44CngYAP1Sd9oCq9P2FOox4FZffzJuZI2mHOB7q5gJBVnOiLF5y3moVGZ7u2bYt7+yPAgcEQ==} peerDependencies: svelte: ^3.57.0 || ^4.0.0 dependencies: - svelte: 4.1.2 - svelte-writable-derived: 3.1.0(svelte@4.1.2) + svelte: 4.2.0 + svelte-writable-derived: 3.1.0(svelte@4.2.0) dev: false - /svelte-hmr@0.15.2(svelte@4.1.2): + /svelte-hmr@0.15.2(svelte@4.2.0): resolution: {integrity: sha512-q/bAruCvFLwvNbeE1x3n37TYFb3mTBJ6TrCq6p2CoFbSTNhDE9oAtEfpy+wmc9So8AG0Tja+X0/mJzX9tSfvIg==} engines: {node: ^12.20 || ^14.13.1 || >= 16} peerDependencies: svelte: ^3.19.0 || ^4.0.0-next.0 dependencies: - svelte: 4.1.2 + svelte: 4.2.0 dev: true /svelte-lazy-loader@1.0.0: resolution: {integrity: sha512-AZD6R60vksyojn21FgXLglmBiBB9K5Dkdu0hdGrLbCaRCYT68IsWkZfRUqKhMx1IfzqWcZQ8X9y/f+Ih0oNQkQ==} dev: false - /svelte-lazy@1.2.1(svelte@4.1.2): + /svelte-lazy@1.2.1(svelte@4.2.0): resolution: {integrity: sha512-8L+GrU5p0ia/nLDeGDMTC+DtmbXlFcoaTPoSf8jIy1NoKicqSJXz5tjiu6GUsD7ra0RjgIvhQiLcdZYR9VECeA==} peerDependencies: svelte: 3.x dependencies: - svelte: 4.1.2 + svelte: 4.2.0 dev: false - /svelte-legos@0.2.1(svelte@4.1.2): + /svelte-legos@0.2.1(svelte@4.2.0): resolution: {integrity: sha512-M7IncWP2e8FaHzQN1DSzxLSoq/6aQYWZ93REZam9bYlvLEjdPGWLAYdpPNnnZtXlHco+o3zrgYTdwsyyS9beUQ==} peerDependencies: svelte: ^3.54.0 @@ -3900,10 +3905,10 @@ packages: canvas-confetti: 1.6.0 prism-svelte: 0.5.0 prismjs: 1.29.0 - svelte: 4.1.2 + svelte: 4.2.0 dev: false - /svelte-preprocess@5.0.4(postcss-load-config@4.0.1)(postcss@8.4.27)(sass@1.64.2)(svelte@4.1.2)(typescript@5.1.6): + /svelte-preprocess@5.0.4(postcss-load-config@4.0.1)(postcss@8.4.27)(sass@1.65.1)(svelte@4.2.0)(typescript@5.1.6): resolution: {integrity: sha512-ABia2QegosxOGsVlsSBJvoWeXy1wUKSfF7SWJdTjLAbx/Y3SrVevvvbFNQqrSJw89+lNSsM58SipmZJ5SRi5iw==} engines: {node: '>= 14.10.0'} requiresBuild: true @@ -3946,10 +3951,10 @@ packages: magic-string: 0.27.0 postcss: 8.4.27 postcss-load-config: 4.0.1(postcss@8.4.27)(ts-node@10.9.1) - sass: 1.64.2 + sass: 1.65.1 sorcery: 0.11.0 strip-indent: 3.0.0 - svelte: 4.1.2 + svelte: 4.2.0 typescript: 5.1.6 dev: true @@ -3957,20 +3962,20 @@ packages: resolution: {integrity: sha512-N5JqlBni6BzElxmuFrOPxOJnjsxh1cFDACLEVKs8OHBcx8ZNRO1p5SxuQex1m3qbLzAC8G99EHeWcxGkjyKjLQ==} engines: {node: '>=16'} dependencies: - svelte: 4.1.2 + svelte: 4.2.0 tslib: 2.6.1 dev: true - /svelte-writable-derived@3.1.0(svelte@4.1.2): + /svelte-writable-derived@3.1.0(svelte@4.2.0): resolution: {integrity: sha512-cTvaVFNIJ036vSDIyPxJYivKC7ZLtcFOPm1Iq6qWBDo1fOHzfk6ZSbwaKrxhjgy52Rbl5IHzRcWgos6Zqn9/rg==} peerDependencies: svelte: ^3.2.1 || ^4.0.0-next.1 dependencies: - svelte: 4.1.2 + svelte: 4.2.0 dev: false - /svelte@4.1.2: - resolution: {integrity: sha512-/evA8U6CgOHe5ZD1C1W3va9iJG7mWflcCdghBORJaAhD2JzrVERJty/2gl0pIPrJYBGZwZycH6onYf+64XXF9g==} + /svelte@4.2.0: + resolution: {integrity: sha512-kVsdPjDbLrv74SmLSUzAsBGquMs4MPgWGkGLpH+PjOYnFOziAvENVzgJmyOCV2gntxE32aNm8/sqNKD6LbIpeQ==} engines: {node: '>=16'} dependencies: '@ampproject/remapping': 2.2.1 @@ -3987,25 +3992,25 @@ packages: magic-string: 0.30.0 periscopic: 3.1.0 - /sveltekit-flash-message@2.1.0(@sveltejs/kit@1.22.4)(svelte@4.1.2): - resolution: {integrity: sha512-I9UOYsFpONLu9erXHG8CeHW1tQVZguRUDXV3NHbi6kVA4jPG12R2ypJBrcYW7UyZOLBp3Y3FdVyemkaAmfwr/w==} + /sveltekit-flash-message@2.1.3(@sveltejs/kit@1.22.5)(svelte@4.2.0): + resolution: {integrity: sha512-NFhQ3t2101AM9JO5Mgj38r69ykF4BOs1Ap3567DaM1RoAaNtXRXpAuEc/DQV78HZN/Fxzw8dxyTMdIC1HztUvA==} peerDependencies: '@sveltejs/kit': 1.x svelte: 3.x || 4.x dependencies: - '@sveltejs/kit': 1.22.4(svelte@4.1.2)(vite@4.4.8) - svelte: 4.1.2 + '@sveltejs/kit': 1.22.5(svelte@4.2.0)(vite@4.4.9) + svelte: 4.2.0 dev: true - /sveltekit-superforms@1.5.0(@sveltejs/kit@1.22.4)(svelte@4.1.2)(zod@3.21.4): - resolution: {integrity: sha512-c/2v6zN9rtIAsOfsd6rBV7Kf0lB2+/o6sAFaOuMrYPlTBro5lpbz3iN/3nM5D3EuLE2Xt/iDdZYpkQdH8rq4nQ==} + /sveltekit-superforms@1.5.1(@sveltejs/kit@1.22.5)(svelte@4.2.0)(zod@3.21.4): + resolution: {integrity: sha512-OqKzxuL1P29CFiK1CD00JRsvEsRPedvrR0qXmB4uqzXAIjOS+DpLjoEaa6Cnkd4H00fRa2161GcZNeEBue/D3A==} peerDependencies: '@sveltejs/kit': 1.x svelte: 3.x || 4.x zod: 3.x dependencies: - '@sveltejs/kit': 1.22.4(svelte@4.1.2)(vite@4.4.8) - svelte: 4.1.2 + '@sveltejs/kit': 1.22.5(svelte@4.2.0)(vite@4.4.9) + svelte: 4.2.0 zod: 3.21.4 dev: true @@ -4124,7 +4129,7 @@ packages: /ts-interface-checker@0.1.13: resolution: {integrity: sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==} - /ts-node@10.9.1(@types/node@18.17.1)(typescript@5.1.6): + /ts-node@10.9.1(@types/node@18.17.5)(typescript@5.1.6): resolution: {integrity: sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==} hasBin: true peerDependencies: @@ -4143,7 +4148,7 @@ packages: '@tsconfig/node12': 1.0.11 '@tsconfig/node14': 1.0.3 '@tsconfig/node16': 1.0.4 - '@types/node': 18.17.1 + '@types/node': 18.17.5 acorn: 8.8.2 acorn-walk: 8.2.0 arg: 4.1.3 @@ -4194,20 +4199,20 @@ packages: engines: {node: '>=14.17'} hasBin: true - /undici@5.22.0: - resolution: {integrity: sha512-fR9RXCc+6Dxav4P9VV/sp5w3eFiSdOjJYsbtWfd4s5L5C4ogyuVpdKIVHeW0vV1MloM65/f7W45nR9ZxwVdyiA==} + /undici@5.23.0: + resolution: {integrity: sha512-1D7w+fvRsqlQ9GscLBwcAJinqcZGHUKjbOmXdlE/v8BvEGXjeWAax+341q44EuTcHXXnfyKNbKRq4Lg7OzhMmg==} engines: {node: '>=14.0'} dependencies: busboy: 1.6.0 dev: true - /update-browserslist-db@1.0.11(browserslist@4.21.5): + /update-browserslist-db@1.0.11(browserslist@4.21.10): resolution: {integrity: sha512-dCwEFf0/oT85M1fHBg4F0jtLwJrutGoHSQXCh7u4o2t1drG+c0a9Flnqww6XUKSfQMPpJBRjU8d4RXB09qtvaA==} hasBin: true peerDependencies: browserslist: '>= 4.21.0' dependencies: - browserslist: 4.21.5 + browserslist: 4.21.10 escalade: 3.1.1 picocolors: 1.0.0 dev: true @@ -4235,8 +4240,8 @@ packages: /v8-compile-cache-lib@3.0.1: resolution: {integrity: sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==} - /vite@4.4.8(@types/node@18.17.1)(sass@1.64.2): - resolution: {integrity: sha512-LONawOUUjxQridNWGQlNizfKH89qPigK36XhMI7COMGztz8KNY0JHim7/xDd71CZwGT4HtSRgI7Hy+RlhG0Gvg==} + /vite@4.4.9(@types/node@18.17.5)(sass@1.65.1): + resolution: {integrity: sha512-2mbUn2LlUmNASWwSCNSJ/EG2HuSRTnVNaydp6vMCm5VIqJsjMfbIWtbH2kDuwUVW5mMUKKZvGPX/rqeqVvv1XA==} engines: {node: ^14.18.0 || >=16.0.0} hasBin: true peerDependencies: @@ -4263,16 +4268,16 @@ packages: terser: optional: true dependencies: - '@types/node': 18.17.1 + '@types/node': 18.17.5 esbuild: 0.18.11 postcss: 8.4.27 - rollup: 3.26.2 - sass: 1.64.2 + rollup: 3.27.2 + sass: 1.65.1 optionalDependencies: fsevents: 2.3.2 dev: true - /vitefu@0.2.4(vite@4.4.8): + /vitefu@0.2.4(vite@4.4.9): resolution: {integrity: sha512-fanAXjSaf9xXtOOeno8wZXIhgia+CZury481LsDaV++lSvcU2R9Ch2bPh3PYFyoHW+w9LqAeYRISVQjUIew14g==} peerDependencies: vite: ^3.0.0 || ^4.0.0 @@ -4280,10 +4285,10 @@ packages: vite: optional: true dependencies: - vite: 4.4.8(@types/node@18.17.1)(sass@1.64.2) + vite: 4.4.9(@types/node@18.17.5)(sass@1.65.1) dev: true - /vitest@0.25.8(sass@1.64.2): + /vitest@0.25.8(sass@1.65.1): resolution: {integrity: sha512-X75TApG2wZTJn299E/TIYevr4E9/nBo1sUtZzn0Ci5oK8qnpZAZyhwg0qCeMSakGIWtc6oRwcQFyFfW14aOFWg==} engines: {node: '>=v14.16.0'} hasBin: true @@ -4307,7 +4312,7 @@ packages: dependencies: '@types/chai': 4.3.4 '@types/chai-subset': 1.3.3 - '@types/node': 18.17.1 + '@types/node': 18.17.5 acorn: 8.8.1 acorn-walk: 8.2.0 chai: 4.3.7 @@ -4318,7 +4323,7 @@ packages: tinybench: 2.3.1 tinypool: 0.3.0 tinyspy: 1.0.2 - vite: 4.4.8(@types/node@18.17.1)(sass@1.64.2) + vite: 4.4.9(@types/node@18.17.5)(sass@1.65.1) transitivePeerDependencies: - less - lightningcss diff --git a/prisma/schema.prisma b/prisma/schema.prisma index 78807e1..a67265f 100644 --- a/prisma/schema.prisma +++ b/prisma/schema.prisma @@ -46,7 +46,8 @@ model User { receiveEmail Boolean @default(false) token String? @unique collection Collection? - wishlist Wishlist[] + wishlist Wishlist? + list List[] theme String @default("system") created_at DateTime @default(now()) @db.Timestamp(6) updated_at DateTime @updatedAt @db.Timestamp(6) @@ -101,7 +102,6 @@ model CollectionItem { model Wishlist { id String @id @default(cuid()) - name String user_id String @unique user User @relation(references: [id], fields: [user_id]) items WishlistItem[] @@ -123,6 +123,30 @@ model WishlistItem { @@map("wishlist_items") } +model List { + id String @id @default(cuid()) + name String + user_id String @unique + user User @relation(references: [id], fields: [user_id]) + items ListItem[] + + @@index([user_id]) + @@map("lists") +} + +model ListItem { + id String @id @default(cuid()) + list_id String @unique + list List @relation(references: [id], fields: [list_id], onDelete: Cascade) + game_id String @unique + game Game @relation(references: [id], fields: [game_id]) + created_at DateTime @default(now()) @db.Timestamp(6) + updated_at DateTime @updatedAt @db.Timestamp(6) + + @@index([game_id, list_id]) + @@map("list_items") +} + model Game { id String @id @default(cuid()) name String @@ -152,6 +176,7 @@ model Game { expansions Expansion[] collection_items CollectionItem[] wishlist_items WishlistItem[] + list_items ListItem[] external_id String @unique created_at DateTime @default(now()) @db.Timestamp(6) updated_at DateTime @updatedAt @db.Timestamp(6) diff --git a/src/lib/apis/collection.ts b/src/lib/apis/collection.ts new file mode 100644 index 0000000..e69de29 diff --git a/src/lib/apis/wishlist.ts b/src/lib/apis/wishlist.ts new file mode 100644 index 0000000..e69de29 diff --git a/src/lib/components/AddToList.svelte b/src/lib/components/AddToList.svelte new file mode 100644 index 0000000..c01b8a9 --- /dev/null +++ b/src/lib/components/AddToList.svelte @@ -0,0 +1,138 @@ + + +{#if in_wishlist} +
+ + +
+{:else} +
+ + +
+{/if} + +{#if in_collection} +
+ + +
+{:else} +
+ + +
+{/if} + +
+ + + {#if $open} +
+ {#each Object.entries(options) as [key, value]} +
+ {value} + {#if $isSelected(key)} +
+ +
+ {/if} +
+ {/each} +
+ {/if} +
+ + + \ No newline at end of file diff --git a/src/lib/components/WishlistButton.svelte b/src/lib/components/WishlistButton.svelte new file mode 100644 index 0000000..e69de29 diff --git a/src/lib/components/game/index.svelte b/src/lib/components/game/index.svelte index 8c965b3..f74bd0e 100644 --- a/src/lib/components/game/index.svelte +++ b/src/lib/components/game/index.svelte @@ -1,89 +1,18 @@
@@ -113,32 +42,6 @@
- -
-
- - -
-
- - -
-
- diff --git a/src/lib/components/search/textSearch/index.svelte b/src/lib/components/search/textSearch/index.svelte index 7e64830..1ed169e 100644 --- a/src/lib/components/search/textSearch/index.svelte +++ b/src/lib/components/search/textSearch/index.svelte @@ -1,32 +1,21 @@ + + + +
+ + + +
+ + + \ No newline at end of file diff --git a/src/routes/(protected)/list/[id]/+page.server.ts b/src/routes/(protected)/list/[id]/+page.server.ts new file mode 100644 index 0000000..6c8b491 --- /dev/null +++ b/src/routes/(protected)/list/[id]/+page.server.ts @@ -0,0 +1,126 @@ +import { fail, redirect } from '@sveltejs/kit'; +import { superValidate } from 'sveltekit-superforms/server'; +import prisma from '$lib/prisma.js'; +import { list_game_request_schema } from '$lib/zodValidation'; + +export async function load({ params, locals }) { + const session = await locals.auth.validate(); + if (!session) { + throw redirect(302, '/auth/signin'); + } + + try { + let wishlist = await prisma.wishlist.findUnique({ + where: { + id: params.id, + AND: { + user_id: session.userId + } + }, + include: { + items: { + include: { + game: { + select: { + id: true, + name: true, + thumb_url: true + } + } + } + } + } + }); + + return { + wishlist + }; + } catch (e) { + console.error(e); + return {}; + } +} + +export const actions = { + // Add game to a wishlist + add: async (event) => { + const { params, locals, request } = event; + const form = await superValidate(event, modifyListGameSchema); + + const session = await locals.auth.validate(); + if (!session) { + throw redirect(302, '/auth/signin'); + } + + let game = await prisma.game.findUnique({ + where: { + id: form.id + } + }); + + if (!game) { + // game = await prisma.game.create({ + // data: { + // name: form.name + // } + // }); + return fail(400, { + message: 'Game not found' + }); + } + + const wishlist = await prisma.wishlist.findUnique({ + where: { + id: params.id + } + }); + + if (wishlist?.user_id !== session.userId) { + return fail(401, { + message: 'Unauthorized' + }); + } + + if (!wishlist) { + throw redirect(302, '/404'); + } + + const wishlistItem = await prisma.wishlistItem.create({ + data: { + game_id: game.id, + wishlist_id: wishlist.id + } + }); + + if (!wishlistItem) { + return fail(500, { + message: 'Something went wrong' + }); + } + + return { + form + }; + }, + // Create new wishlist + create: async ({ params, locals, request }) => { + const session = await locals.auth.validate(); + if (!session) { + throw redirect(302, '/auth/signin'); + } + }, + // Delete a wishlist + delete: async ({ params, locals, request }) => { + const session = await locals.auth.validate(); + if (!session) { + throw redirect(302, '/auth/signin'); + } + }, + // Remove game from a wishlist + remove: async ({ params, locals, request }) => { + const session = await locals.auth.validate(); + if (!session) { + throw redirect(302, '/auth/signin'); + } + } +}; diff --git a/src/routes/(protected)/list/[id]/+page.svelte b/src/routes/(protected)/list/[id]/+page.svelte new file mode 100644 index 0000000..00ebcfd --- /dev/null +++ b/src/routes/(protected)/list/[id]/+page.svelte @@ -0,0 +1,24 @@ + + + + {`Wishlist ${wishlist.name} | Bored Game`} + + +

{wishlist.name}

+

Games on your wishlist:

+
+ {#if gamesItems.length > 0} + {#each gamesItems as game (game.id)} + + {/each} + {:else} +

Sorry no games found!

+ {/if} +
\ No newline at end of file diff --git a/src/routes/(protected)/wishlist/+page.server.ts b/src/routes/(protected)/wishlist/+page.server.ts index 8b785a7..195ad65 100644 --- a/src/routes/(protected)/wishlist/+page.server.ts +++ b/src/routes/(protected)/wishlist/+page.server.ts @@ -1,7 +1,8 @@ -import { redirect } from '@sveltejs/kit'; +import { error, redirect } from '@sveltejs/kit'; import { superValidate } from 'sveltekit-superforms/server'; import prisma from '$lib/prisma.js'; import { list_game_request_schema } from '$lib/zodValidation'; +import { modifyListGameSchema } from '$lib/config/zod-schemas.js'; export async function load({ params, locals }) { const session = await locals.auth.validate(); @@ -9,72 +10,98 @@ export async function load({ params, locals }) { throw redirect(302, '/auth/signin'); } + console.log('Wishlist load User id', session.user); + try { - let wishlists = await prisma.wishlist.findMany({ + let wishlist = await prisma.wishlist.findUnique({ where: { - user_id: session.userId + user_id: session?.user?.userId }, include: { - items: true + items: { + include: { + game: { + select: { + id: true, + name: true, + thumb_url: true + } + } + } + } } }); - if (wishlists.length === 0) { - const wishlist = await prisma.wishlist.create({ - data: { - user_id: session.userId, - name: 'My Wishlist' - } - }); - wishlists.push(wishlist); + if (!wishlist) { + throw redirect(302, '/404'); } + console.log('wishlist', wishlist); + return { - wishlists + games: wishlist?.items }; } catch (e) { console.error(e); } + redirect(302, '/404'); } export const actions = { // Add game to a wishlist add: async (event) => { const { params, locals, request } = event; - const form = await superValidate(event, list_game_request_schema); + const form = await superValidate(event, modifyListGameSchema); - const session = await locals.auth.validate(); - if (!session) { - throw redirect(302, '/auth/signin'); - } - - let game = await prisma.game.findUnique({ - where: { - id: form.id + try { + const session = await locals.auth.validate(); + if (!session) { + throw redirect(302, '/auth/signin'); } - }); - if (!game) { - game = await prisma.game.create({ - data: { - name: form.name + let game = await prisma.game.findUnique({ + where: { + id: form.data.id } }); - throw redirect(302, '/404'); - } - if (game) { - const wishlist = await prisma.wishlist.create({ - data: { - user_id: session.userId, - name: form.name + if (!game) { + // game = await prisma.game.create({ + // data: { + // name: form.name + // } + // }); + console.log('game not found'); + throw redirect(302, '/404'); + } + + if (game) { + const wishlist = await prisma.wishlist.findUnique({ + where: { + user_id: session.user.userId + } + }); + + if (!wishlist) { + console.log('Wishlist not found'); + return error(404, 'Wishlist not found'); } - }); - } - return { - form - }; + await prisma.wishlistItem.create({ + data: { + game_id: game.id, + wishlist_id: wishlist.id + } + }); + } + + return { + form + }; + } catch (e) { + console.error(e); + return error(500, 'Something went wrong'); + } }, // Create new wishlist create: async ({ params, locals, request }) => { @@ -91,10 +118,58 @@ export const actions = { } }, // Remove game from a wishlist - remove: async ({ params, locals, request }) => { - const session = await locals.auth.validate(); - if (!session) { - throw redirect(302, '/auth/signin'); + remove: async (event) => { + const { params, locals, request } = event; + const form = await superValidate(event, modifyListGameSchema); + + try { + const session = await locals.auth.validate(); + if (!session) { + throw redirect(302, '/auth/signin'); + } + + let game = await prisma.game.findUnique({ + where: { + id: form.data.id + } + }); + + if (!game) { + // game = await prisma.game.create({ + // data: { + // name: form.name + // } + // }); + console.log('game not found'); + throw redirect(302, '/404'); + } + + if (game) { + const wishlist = await prisma.wishlist.findUnique({ + where: { + user_id: session.user.userId + } + }); + + if (!wishlist) { + console.log('Wishlist not found'); + return error(404, 'Wishlist not found'); + } + + await prisma.wishlistItem.delete({ + where: { + wishlist_id: wishlist.id, + game_id: game.id + } + }); + } + + return { + form + }; + } catch (e) { + console.error(e); + return error(500, 'Something went wrong'); } } }; diff --git a/src/routes/(protected)/wishlist/+page.svelte b/src/routes/(protected)/wishlist/+page.svelte index 635939d..ce6e60b 100644 --- a/src/routes/(protected)/wishlist/+page.svelte +++ b/src/routes/(protected)/wishlist/+page.svelte @@ -1,134 +1,22 @@ - Your Wishlist | Bored Game + {`Your Wishlist | Bored Game`} -

Your Wishlist

-{#each wishlists as wishlist} -

{wishlist.name}

-{/each} - - - + \ No newline at end of file diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte index 759e737..2aae69e 100644 --- a/src/routes/+layout.svelte +++ b/src/routes/+layout.svelte @@ -11,7 +11,6 @@ import Header from '$lib/components/header/index.svelte'; import Footer from '$lib/components/footer.svelte'; import Loading from '$lib/components/loading.svelte'; - import Transition from '$lib/components/transition/index.svelte'; import Portal from '$lib/Portal.svelte'; import { boredState } from '$lib/stores/boredState'; import { collectionStore } from '$lib/stores/collectionStore'; @@ -123,9 +122,9 @@
- + - +