From ee71a9b6c605c5e8379b0dc2d38c5d5222b0db85 Mon Sep 17 00:00:00 2001 From: Bradley Shellnut Date: Tue, 2 Aug 2022 22:37:21 -0700 Subject: [PATCH] Starting merge of advanced search into main text search. --- package.json | 8 +- pnpm-lock.yaml | 110 +++++++++--------- .../components/search/textSearch/index.svelte | 17 +-- src/routes/index.svelte | 2 +- 4 files changed, 64 insertions(+), 73 deletions(-) diff --git a/package.json b/package.json index 41c4220..c40e690 100644 --- a/package.json +++ b/package.json @@ -17,11 +17,11 @@ "@rgossiaux/svelte-headlessui": "1.0.2", "@rgossiaux/svelte-heroicons": "^0.1.2", "@sveltejs/adapter-auto": "1.0.0-next.64", - "@sveltejs/kit": "1.0.0-next.401", + "@sveltejs/kit": "1.0.0-next.402", "@types/cookie": "^0.5.1", "@types/node": "^18.6.3", - "@typescript-eslint/eslint-plugin": "^5.31.0", - "@typescript-eslint/parser": "^5.31.0", + "@typescript-eslint/eslint-plugin": "^5.32.0", + "@typescript-eslint/parser": "^5.32.0", "carbon-components-svelte": "^0.67.4", "carbon-icons-svelte": "^11.2.0", "eslint": "^8.21.0", @@ -30,7 +30,7 @@ "just-debounce-it": "^3.0.1", "prettier": "^2.7.1", "prettier-plugin-svelte": "^2.7.0", - "sass": "^1.54.0", + "sass": "^1.54.1", "svelte": "^3.49.0", "svelte-check": "^2.8.0", "svelte-preprocess": "^4.10.7", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 97e807c..83fb736 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -9,12 +9,12 @@ specifiers: '@rgossiaux/svelte-headlessui': 1.0.2 '@rgossiaux/svelte-heroicons': ^0.1.2 '@sveltejs/adapter-auto': 1.0.0-next.64 - '@sveltejs/kit': 1.0.0-next.401 + '@sveltejs/kit': 1.0.0-next.402 '@types/cookie': ^0.5.1 '@types/feather-icons': ^4.7.0 '@types/node': ^18.6.3 - '@typescript-eslint/eslint-plugin': ^5.31.0 - '@typescript-eslint/parser': ^5.31.0 + '@typescript-eslint/eslint-plugin': ^5.32.0 + '@typescript-eslint/parser': ^5.32.0 carbon-components-svelte: ^0.67.4 carbon-icons-svelte: ^11.2.0 cookie: ^0.5.0 @@ -25,7 +25,7 @@ specifiers: just-debounce-it: ^3.0.1 prettier: ^2.7.1 prettier-plugin-svelte: ^2.7.0 - sass: ^1.54.0 + sass: ^1.54.1 svelte: ^3.49.0 svelte-check: ^2.8.0 svelte-preprocess: ^4.10.7 @@ -49,11 +49,11 @@ devDependencies: '@rgossiaux/svelte-headlessui': 1.0.2_svelte@3.49.0 '@rgossiaux/svelte-heroicons': 0.1.2_svelte@3.49.0 '@sveltejs/adapter-auto': 1.0.0-next.64 - '@sveltejs/kit': 1.0.0-next.401_svelte@3.49.0+vite@3.0.4 + '@sveltejs/kit': 1.0.0-next.402_svelte@3.49.0+vite@3.0.4 '@types/cookie': 0.5.1 '@types/node': 18.6.3 - '@typescript-eslint/eslint-plugin': 5.31.0_jnss7dz76sznncvpyatba5hbxa - '@typescript-eslint/parser': 5.31.0_qugx7qdu5zevzvxaiqyxfiwquq + '@typescript-eslint/eslint-plugin': 5.32.0_iosr3hrei2tubxveewluhu5lhy + '@typescript-eslint/parser': 5.32.0_qugx7qdu5zevzvxaiqyxfiwquq carbon-components-svelte: 0.67.4 carbon-icons-svelte: 11.2.0 eslint: 8.21.0 @@ -62,13 +62,13 @@ devDependencies: just-debounce-it: 3.0.1 prettier: 2.7.1 prettier-plugin-svelte: 2.7.0_o3ioganyptcsrh6x4hnxvjkpqi - sass: 1.54.0 + sass: 1.54.1 svelte: 3.49.0 - svelte-check: 2.8.0_sass@1.54.0+svelte@3.49.0 - svelte-preprocess: 4.10.7_qqyngjnvpp2z5rj6eppfx7s47e + svelte-check: 2.8.0_sass@1.54.1+svelte@3.49.0 + svelte-preprocess: 4.10.7_4rm3dya3yiyrh2c36qahwx3qae tslib: 2.4.0 typescript: 4.7.4 - vite: 3.0.4_sass@1.54.0 + vite: 3.0.4_sass@1.54.1 packages: @@ -268,8 +268,8 @@ packages: - supports-color dev: true - /@sveltejs/kit/1.0.0-next.401_svelte@3.49.0+vite@3.0.4: - resolution: {integrity: sha512-VrpFtSSu1ADRVWWDxLl218GKf9l+TA7tNCCAmVFAuJdj5zVxPgJflu4Dh1p5C4efKP+x1v6W5nvxmNkbZLPoag==} + /@sveltejs/kit/1.0.0-next.402_svelte@3.49.0+vite@3.0.4: + resolution: {integrity: sha512-F0Mm+bTGOnl+vWKab5uwXsY+5YypC/uveGE0wKyYSE9a/pFQD20WwrvRKePGhUCepiHc7S82jxVZRwjCsToaNQ==} engines: {node: '>=16.9'} hasBin: true requiresBuild: true @@ -281,7 +281,7 @@ packages: chokidar: 3.5.3 sade: 1.8.1 svelte: 3.49.0 - vite: 3.0.4_sass@1.54.0 + vite: 3.0.4_sass@1.54.1 transitivePeerDependencies: - diff-match-patch - supports-color @@ -305,7 +305,7 @@ packages: magic-string: 0.26.2 svelte: 3.49.0 svelte-hmr: 0.14.12_svelte@3.49.0 - vite: 3.0.4_sass@1.54.0 + vite: 3.0.4_sass@1.54.1 transitivePeerDependencies: - supports-color dev: true @@ -336,8 +336,8 @@ packages: '@types/node': 18.6.3 dev: true - /@typescript-eslint/eslint-plugin/5.31.0_jnss7dz76sznncvpyatba5hbxa: - resolution: {integrity: sha512-VKW4JPHzG5yhYQrQ1AzXgVgX8ZAJEvCz0QI6mLRX4tf7rnFfh5D8SKm0Pq6w5PyNfAWJk6sv313+nEt3ohWMBQ==} + /@typescript-eslint/eslint-plugin/5.32.0_iosr3hrei2tubxveewluhu5lhy: + resolution: {integrity: sha512-CHLuz5Uz7bHP2WgVlvoZGhf0BvFakBJKAD/43Ty0emn4wXWv5k01ND0C0fHcl/Im8Td2y/7h44E9pca9qAu2ew==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: '@typescript-eslint/parser': ^5.0.0 @@ -347,10 +347,10 @@ packages: typescript: optional: true dependencies: - '@typescript-eslint/parser': 5.31.0_qugx7qdu5zevzvxaiqyxfiwquq - '@typescript-eslint/scope-manager': 5.31.0 - '@typescript-eslint/type-utils': 5.31.0_qugx7qdu5zevzvxaiqyxfiwquq - '@typescript-eslint/utils': 5.31.0_qugx7qdu5zevzvxaiqyxfiwquq + '@typescript-eslint/parser': 5.32.0_qugx7qdu5zevzvxaiqyxfiwquq + '@typescript-eslint/scope-manager': 5.32.0 + '@typescript-eslint/type-utils': 5.32.0_qugx7qdu5zevzvxaiqyxfiwquq + '@typescript-eslint/utils': 5.32.0_qugx7qdu5zevzvxaiqyxfiwquq debug: 4.3.4 eslint: 8.21.0 functional-red-black-tree: 1.0.1 @@ -363,8 +363,8 @@ packages: - supports-color dev: true - /@typescript-eslint/parser/5.31.0_qugx7qdu5zevzvxaiqyxfiwquq: - resolution: {integrity: sha512-UStjQiZ9OFTFReTrN+iGrC6O/ko9LVDhreEK5S3edmXgR396JGq7CoX2TWIptqt/ESzU2iRKXAHfSF2WJFcWHw==} + /@typescript-eslint/parser/5.32.0_qugx7qdu5zevzvxaiqyxfiwquq: + resolution: {integrity: sha512-IxRtsehdGV9GFQ35IGm5oKKR2OGcazUoiNBxhRV160iF9FoyuXxjY+rIqs1gfnd+4eL98OjeGnMpE7RF/NBb3A==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 @@ -373,9 +373,9 @@ packages: typescript: optional: true dependencies: - '@typescript-eslint/scope-manager': 5.31.0 - '@typescript-eslint/types': 5.31.0 - '@typescript-eslint/typescript-estree': 5.31.0_typescript@4.7.4 + '@typescript-eslint/scope-manager': 5.32.0 + '@typescript-eslint/types': 5.32.0 + '@typescript-eslint/typescript-estree': 5.32.0_typescript@4.7.4 debug: 4.3.4 eslint: 8.21.0 typescript: 4.7.4 @@ -383,16 +383,16 @@ packages: - supports-color dev: true - /@typescript-eslint/scope-manager/5.31.0: - resolution: {integrity: sha512-8jfEzBYDBG88rcXFxajdVavGxb5/XKXyvWgvD8Qix3EEJLCFIdVloJw+r9ww0wbyNLOTYyBsR+4ALNGdlalLLg==} + /@typescript-eslint/scope-manager/5.32.0: + resolution: {integrity: sha512-KyAE+tUON0D7tNz92p1uetRqVJiiAkeluvwvZOqBmW9z2XApmk5WSMV9FrzOroAcVxJZB3GfUwVKr98Dr/OjOg==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dependencies: - '@typescript-eslint/types': 5.31.0 - '@typescript-eslint/visitor-keys': 5.31.0 + '@typescript-eslint/types': 5.32.0 + '@typescript-eslint/visitor-keys': 5.32.0 dev: true - /@typescript-eslint/type-utils/5.31.0_qugx7qdu5zevzvxaiqyxfiwquq: - resolution: {integrity: sha512-7ZYqFbvEvYXFn9ax02GsPcEOmuWNg+14HIf4q+oUuLnMbpJ6eHAivCg7tZMVwzrIuzX3QCeAOqKoyMZCv5xe+w==} + /@typescript-eslint/type-utils/5.32.0_qugx7qdu5zevzvxaiqyxfiwquq: + resolution: {integrity: sha512-0gSsIhFDduBz3QcHJIp3qRCvVYbqzHg8D6bHFsDMrm0rURYDj+skBK2zmYebdCp+4nrd9VWd13egvhYFJj/wZg==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: eslint: '*' @@ -401,7 +401,7 @@ packages: typescript: optional: true dependencies: - '@typescript-eslint/utils': 5.31.0_qugx7qdu5zevzvxaiqyxfiwquq + '@typescript-eslint/utils': 5.32.0_qugx7qdu5zevzvxaiqyxfiwquq debug: 4.3.4 eslint: 8.21.0 tsutils: 3.21.0_typescript@4.7.4 @@ -410,13 +410,13 @@ packages: - supports-color dev: true - /@typescript-eslint/types/5.31.0: - resolution: {integrity: sha512-/f/rMaEseux+I4wmR6mfpM2wvtNZb1p9hAV77hWfuKc3pmaANp5dLAZSiE3/8oXTYTt3uV9KW5yZKJsMievp6g==} + /@typescript-eslint/types/5.32.0: + resolution: {integrity: sha512-EBUKs68DOcT/EjGfzywp+f8wG9Zw6gj6BjWu7KV/IYllqKJFPlZlLSYw/PTvVyiRw50t6wVbgv4p9uE2h6sZrQ==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dev: true - /@typescript-eslint/typescript-estree/5.31.0_typescript@4.7.4: - resolution: {integrity: sha512-3S625TMcARX71wBc2qubHaoUwMEn+l9TCsaIzYI/ET31Xm2c9YQ+zhGgpydjorwQO9pLfR/6peTzS/0G3J/hDw==} + /@typescript-eslint/typescript-estree/5.32.0_typescript@4.7.4: + resolution: {integrity: sha512-ZVAUkvPk3ITGtCLU5J4atCw9RTxK+SRc6hXqLtllC2sGSeMFWN+YwbiJR9CFrSFJ3w4SJfcWtDwNb/DmUIHdhg==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: typescript: '*' @@ -424,8 +424,8 @@ packages: typescript: optional: true dependencies: - '@typescript-eslint/types': 5.31.0 - '@typescript-eslint/visitor-keys': 5.31.0 + '@typescript-eslint/types': 5.32.0 + '@typescript-eslint/visitor-keys': 5.32.0 debug: 4.3.4 globby: 11.1.0 is-glob: 4.0.3 @@ -436,16 +436,16 @@ packages: - supports-color dev: true - /@typescript-eslint/utils/5.31.0_qugx7qdu5zevzvxaiqyxfiwquq: - resolution: {integrity: sha512-kcVPdQS6VIpVTQ7QnGNKMFtdJdvnStkqS5LeALr4rcwx11G6OWb2HB17NMPnlRHvaZP38hL9iK8DdE9Fne7NYg==} + /@typescript-eslint/utils/5.32.0_qugx7qdu5zevzvxaiqyxfiwquq: + resolution: {integrity: sha512-W7lYIAI5Zlc5K082dGR27Fczjb3Q57ECcXefKU/f0ajM5ToM0P+N9NmJWip8GmGu/g6QISNT+K6KYB+iSHjXCQ==} 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 - '@typescript-eslint/scope-manager': 5.31.0 - '@typescript-eslint/types': 5.31.0 - '@typescript-eslint/typescript-estree': 5.31.0_typescript@4.7.4 + '@typescript-eslint/scope-manager': 5.32.0 + '@typescript-eslint/types': 5.32.0 + '@typescript-eslint/typescript-estree': 5.32.0_typescript@4.7.4 eslint: 8.21.0 eslint-scope: 5.1.1 eslint-utils: 3.0.0_eslint@8.21.0 @@ -454,11 +454,11 @@ packages: - typescript dev: true - /@typescript-eslint/visitor-keys/5.31.0: - resolution: {integrity: sha512-ZK0jVxSjS4gnPirpVjXHz7mgdOsZUHzNYSfTw2yPa3agfbt9YfqaBiBZFSSxeBWnpWkzCxTfUpnzA3Vily/CSg==} + /@typescript-eslint/visitor-keys/5.32.0: + resolution: {integrity: sha512-S54xOHZgfThiZ38/ZGTgB2rqx51CMJ5MCfVT2IplK4Q7hgzGfe0nLzLCcenDnc/cSjP568hdeKfeDcBgqNHD/g==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dependencies: - '@typescript-eslint/types': 5.31.0 + '@typescript-eslint/types': 5.32.0 eslint-visitor-keys: 3.3.0 dev: true @@ -2010,8 +2010,8 @@ packages: rimraf: 2.7.1 dev: true - /sass/1.54.0: - resolution: {integrity: sha512-C4zp79GCXZfK0yoHZg+GxF818/aclhp9F48XBu/+bm9vXEVAYov9iU3FBVRMq3Hx3OA4jfKL+p2K9180mEh0xQ==} + /sass/1.54.1: + resolution: {integrity: sha512-GHJJr31Me32RjjUBagyzx8tzjKBUcDwo5239XANIRBq0adDu5iIG0aFO0i/TBb/4I9oyxkEv44nq/kL1DxdDhA==} engines: {node: '>=12.0.0'} hasBin: true dependencies: @@ -2127,7 +2127,7 @@ packages: engines: {node: '>= 0.4'} dev: true - /svelte-check/2.8.0_sass@1.54.0+svelte@3.49.0: + /svelte-check/2.8.0_sass@1.54.1+svelte@3.49.0: resolution: {integrity: sha512-HRL66BxffMAZusqe5I5k26mRWQ+BobGd9Rxm3onh7ZVu0nTk8YTKJ9vu3LVPjUGLU9IX7zS+jmwPVhJYdXJ8vg==} hasBin: true peerDependencies: @@ -2140,7 +2140,7 @@ packages: picocolors: 1.0.0 sade: 1.8.1 svelte: 3.49.0 - svelte-preprocess: 4.10.7_qqyngjnvpp2z5rj6eppfx7s47e + svelte-preprocess: 4.10.7_4rm3dya3yiyrh2c36qahwx3qae typescript: 4.7.4 transitivePeerDependencies: - '@babel/core' @@ -2164,7 +2164,7 @@ packages: svelte: 3.49.0 dev: true - /svelte-preprocess/4.10.7_qqyngjnvpp2z5rj6eppfx7s47e: + /svelte-preprocess/4.10.7_4rm3dya3yiyrh2c36qahwx3qae: resolution: {integrity: sha512-sNPBnqYD6FnmdBrUmBCaqS00RyCsCpj2BG58A1JBswNF7b0OKviwxqVrOL/CKyJrLSClrSeqQv5BXNg2RUbPOw==} engines: {node: '>= 9.11.2'} requiresBuild: true @@ -2209,7 +2209,7 @@ packages: '@types/sass': 1.43.1 detect-indent: 6.1.0 magic-string: 0.25.9 - sass: 1.54.0 + sass: 1.54.1 sorcery: 0.10.0 strip-indent: 3.0.0 svelte: 3.49.0 @@ -2305,7 +2305,7 @@ packages: resolution: {integrity: sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==} dev: true - /vite/3.0.4_sass@1.54.0: + /vite/3.0.4_sass@1.54.1: resolution: {integrity: sha512-NU304nqnBeOx2MkQnskBQxVsa0pRAH5FphokTGmyy8M3oxbvw7qAXts2GORxs+h/2vKsD+osMhZ7An6yK6F1dA==} engines: {node: ^14.18.0 || >=16.0.0} hasBin: true @@ -2328,7 +2328,7 @@ packages: postcss: 8.4.14 resolve: 1.22.1 rollup: 2.77.2 - sass: 1.54.0 + sass: 1.54.1 optionalDependencies: fsevents: 2.3.2 dev: true diff --git a/src/lib/components/search/textSearch/index.svelte b/src/lib/components/search/textSearch/index.svelte index dcaa239..c4b3be7 100644 --- a/src/lib/components/search/textSearch/index.svelte +++ b/src/lib/components/search/textSearch/index.svelte @@ -17,7 +17,9 @@ gameStore.addAll(responseData?.games); } - export const showButton = false; + export let showButton: boolean = false; + export let advancedSearch: boolean = false; + console.log('showButton', showButton); let submitting = $boredState?.loading; let name = ''; @@ -45,24 +47,13 @@