From 6304116edb7f5e3c7b67c15e0b1740d34c513155 Mon Sep 17 00:00:00 2001 From: Philipp Dormann Date: Tue, 6 Apr 2021 22:16:24 +0200 Subject: [PATCH 1/4] wip on virtuallist --- .prettierrc | 7 + .vscode/extensions.json | 14 -- package.json | 6 +- src/components/cards/CardsOverview.svelte | 255 +++++++++++++--------- 4 files changed, 165 insertions(+), 117 deletions(-) create mode 100644 .prettierrc delete mode 100644 .vscode/extensions.json diff --git a/.prettierrc b/.prettierrc new file mode 100644 index 00000000..85a4eeae --- /dev/null +++ b/.prettierrc @@ -0,0 +1,7 @@ +{ + "svelteSortOrder": "options-styles-scripts-markup", + "svelteStrictMode": true, + "svelteBracketNewLine": false, + "svelteAllowShorthand": false, + "svelteIndentScriptAndStyle": false +} \ No newline at end of file diff --git a/.vscode/extensions.json b/.vscode/extensions.json deleted file mode 100644 index 01c0070f..00000000 --- a/.vscode/extensions.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "recommendations": [ - "2gua.rainbow-brackets", - "christian-kohler.npm-intellisense", - "remimarsal.prettier-now", - "svelte.svelte-vscode", - "lokalise.i18n-ally", - "fivethree.vscode-svelte-snippets", - "voorjaar.windicss-intellisense" - ], - "unwantedRecommendations": [ - "antfu.i18n-ally" - ] -} \ No newline at end of file diff --git a/package.json b/package.json index bc4024db..dde8cc58 100644 --- a/package.json +++ b/package.json @@ -10,13 +10,13 @@ }, "license": "CC-BY-NC-SA-4.0", "devDependencies": { - "check-password-strength": "2.0.2", "@odit/lfk-client-js": "0.10.1", "@odit/license-exporter": "0.0.11", "@sveltejs/vite-plugin-svelte": "1.0.0-next.5", "@types/html-minifier": "4.0.0", "auto-changelog": "2.2.1", "autoprefixer": "10.2.5", + "check-password-strength": "2.0.2", "csvtojson": "2.0.10", "gridjs": "3.4.0", "html-minifier": "4.0.0", @@ -28,6 +28,7 @@ "svelte-i18n": "3.3.9", "svelte-preprocess": "4.7.0", "svelte-select": "3.17.0", + "svelte-tiny-virtual-list": "^1.1.5", "tailwindcss": "2.0.4", "tinro": "0.6.1", "toastify-js": "1.10.0", @@ -52,5 +53,8 @@ "hooks": { "after:bump": "npx auto-changelog --commit-limit false -p -u --hide-credit && git add CHANGELOG.md && node versionbuilder.js && git add index.html && node order.js && git add src/locales" } + }, + "dependencies": { + "svelte-infinite-loading": "^1.3.6" } } diff --git a/src/components/cards/CardsOverview.svelte b/src/components/cards/CardsOverview.svelte index d5cabea8..48433970 100644 --- a/src/components/cards/CardsOverview.svelte +++ b/src/components/cards/CardsOverview.svelte @@ -1,5 +1,6 @@ + + {#if store.state.jwtinfo.userdetails.permissions.includes('CARD:UPDATE')} + {rendered.length}
@@ -122,106 +164,115 @@ - {#each current_cards as card} - {#if card.code - .toLowerCase() - .includes( - searchvalue.toLowerCase() - ) || card.runner?.firstname - .toLowerCase() - .includes( - searchvalue.toLowerCase() - ) || card.runner?.middlename - .toLowerCase() - .includes( - searchvalue.toLowerCase() - ) || card.runner?.lastname - .toLowerCase() - .includes( - searchvalue.toLowerCase() - ) || should_display_based_on_id(card.id)} - - - - - + +
+
+ {#each filtered_cards as card, index} + {#if card.code + .toLowerCase() + .includes( + searchvalue.toLowerCase() + ) || card.runner?.firstname + .toLowerCase() + .includes( + searchvalue.toLowerCase() + ) || card.runner?.middlename + .toLowerCase() + .includes( + searchvalue.toLowerCase() + ) || card.runner?.lastname + .toLowerCase() + .includes( + searchvalue.toLowerCase() + ) || should_display_based_on_id(card.id)} +
+ + + + - {#if active_deletes[card.id] === true} - - {:else} - - {/if} - - {/if} - {/each} + {#if active_deletes[card.id] === true} + + {:else} + + {/if} + + {/if} + {/each} + +
- - -
{card.code}
- 		-
- {#if card.runner} - {card.runner.firstname} - {card.runner.middlename || ''} - {card.runner.lastname} - {:else}{$_('non-blanko')}{/if} -
- 		-
- {#if card.enabled} - {$_('enabled')} - {:else} - {$_('disabled')} - {/if} -
-
+ + +
{card.code}
+ 		+
+ {#if card.runner} + {card.runner.firstname} + {card.runner.middlename || ''} + {card.runner.lastname} + {:else}{$_('non-blanko')}{/if} +
+ 		+
+ {#if card.enabled} + {$_('enabled')} + {:else} + {$_('disabled')} + {/if} +
+ 		- - - - - {#if store.state.jwtinfo.userdetails.permissions.includes('CARD:DELETE')} - - {/if} -
+ + + + + {#if store.state.jwtinfo.userdetails.permissions.includes('CARD:DELETE')} + + {/if} +
From 4cad86cf852468428d77103d052c6974b17c34c3 Mon Sep 17 00:00:00 2001 From: Philipp Dormann Date: Wed, 7 Apr 2021 18:19:58 +0200 Subject: [PATCH 2/4] fixed height table --- src/components/cards/CardsOverview.svelte | 33 ++++++++++------------- 1 file changed, 14 insertions(+), 19 deletions(-) diff --git a/src/components/cards/CardsOverview.svelte b/src/components/cards/CardsOverview.svelte index 48433970..1817ecf4 100644 --- a/src/components/cards/CardsOverview.svelte +++ b/src/components/cards/CardsOverview.svelte @@ -58,7 +58,6 @@ } // ----------------- export let wrapperHeight = "500px"; - export let wrapperWidth = "1000px"; let scrollTop = 0; $: rendered = filtered_cards; let innerHeight = 0; @@ -78,15 +77,16 @@ {#if store.state.jwtinfo.userdetails.permissions.includes('CARD:UPDATE')} @@ -163,14 +163,11 @@ - - -
-
+ style="height: {wrapperHeight}; width:100%" + bind:this={ele} + > {#each filtered_cards as card, index} {#if card.code .toLowerCase() @@ -271,8 +268,6 @@ {/if} {/each} -
-
From 1376788016e767f006661f8c9e6747781f2dce55 Mon Sep 17 00:00:00 2001 From: Philipp Dormann Date: Wed, 7 Apr 2021 18:38:52 +0200 Subject: [PATCH 3/4] updated virtual scroll list --- src/components/cards/CardsOverview.svelte | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/components/cards/CardsOverview.svelte b/src/components/cards/CardsOverview.svelte index 1817ecf4..ed659a12 100644 --- a/src/components/cards/CardsOverview.svelte +++ b/src/components/cards/CardsOverview.svelte @@ -14,16 +14,17 @@ export let current_cards = []; $: filtered_cards = current_cards.filter(function (c) { if ( - c.code.toLowerCase().includes(searchvalue.toLowerCase()) || - c.runner?.firstname.toLowerCase().includes(searchvalue.toLowerCase()) || - c.runner?.middlename.toLowerCase().includes(searchvalue.toLowerCase()) || - c.runner?.lastname.toLowerCase().includes(searchvalue.toLowerCase()) || + c.code.toLowerCase().includes(searchvalue_lowercase) || + c.runner?.firstname.toLowerCase().includes(searchvalue_lowercase) || + c.runner?.middlename.toLowerCase().includes(searchvalue_lowercase) || + c.runner?.lastname.toLowerCase().includes(searchvalue_lowercase) || should_display_based_on_id(c.id) ) { return true; } }); $: searchvalue = ""; + $: searchvalue_lowercase = searchvalue.toLowerCase(); $: active_deletes = []; $: cards_show = current_cards.some((r) => r.is_selected === true); $: generate_cards = current_cards.filter((r) => r.is_selected === true); @@ -57,7 +58,6 @@ edit_modal_open = true; } // ----------------- - export let wrapperHeight = "500px"; let scrollTop = 0; $: rendered = filtered_cards; let innerHeight = 0; @@ -121,7 +121,6 @@ table thead, table tbody tr { bind:cards_show bind:generate_cards /> - {rendered.length}
@@ -165,7 +164,7 @@ table thead, table tbody tr { {#each filtered_cards as card, index} From 37970d2be6b6502701914e41e5bfe2c418438480 Mon Sep 17 00:00:00 2001 From: Philipp Dormann Date: Wed, 7 Apr 2021 18:59:46 +0200 Subject: [PATCH 4/4] pre-merge fixes ref #110 --- .prettierrc | 7 ------- .vscode/extensions.json | 14 ++++++++++++++ package.json | 10 +++------- 3 files changed, 17 insertions(+), 14 deletions(-) delete mode 100644 .prettierrc create mode 100644 .vscode/extensions.json diff --git a/.prettierrc b/.prettierrc deleted file mode 100644 index 85a4eeae..00000000 --- a/.prettierrc +++ /dev/null @@ -1,7 +0,0 @@ -{ - "svelteSortOrder": "options-styles-scripts-markup", - "svelteStrictMode": true, - "svelteBracketNewLine": false, - "svelteAllowShorthand": false, - "svelteIndentScriptAndStyle": false -} \ No newline at end of file diff --git a/.vscode/extensions.json b/.vscode/extensions.json new file mode 100644 index 00000000..01c0070f --- /dev/null +++ b/.vscode/extensions.json @@ -0,0 +1,14 @@ +{ + "recommendations": [ + "2gua.rainbow-brackets", + "christian-kohler.npm-intellisense", + "remimarsal.prettier-now", + "svelte.svelte-vscode", + "lokalise.i18n-ally", + "fivethree.vscode-svelte-snippets", + "voorjaar.windicss-intellisense" + ], + "unwantedRecommendations": [ + "antfu.i18n-ally" + ] +} \ No newline at end of file diff --git a/package.json b/package.json index dde8cc58..7e5732ee 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@odit/lfk-frontend", - "version": "0.8.4", + "version": "0.12.1", "scripts": { "i18n-order": "node order.js", "dev": "vite", @@ -10,13 +10,13 @@ }, "license": "CC-BY-NC-SA-4.0", "devDependencies": { + "check-password-strength": "2.0.2", "@odit/lfk-client-js": "0.10.1", "@odit/license-exporter": "0.0.11", "@sveltejs/vite-plugin-svelte": "1.0.0-next.5", "@types/html-minifier": "4.0.0", "auto-changelog": "2.2.1", "autoprefixer": "10.2.5", - "check-password-strength": "2.0.2", "csvtojson": "2.0.10", "gridjs": "3.4.0", "html-minifier": "4.0.0", @@ -28,7 +28,6 @@ "svelte-i18n": "3.3.9", "svelte-preprocess": "4.7.0", "svelte-select": "3.17.0", - "svelte-tiny-virtual-list": "^1.1.5", "tailwindcss": "2.0.4", "tinro": "0.6.1", "toastify-js": "1.10.0", @@ -53,8 +52,5 @@ "hooks": { "after:bump": "npx auto-changelog --commit-limit false -p -u --hide-credit && git add CHANGELOG.md && node versionbuilder.js && git add index.html && node order.js && git add src/locales" } - }, - "dependencies": { - "svelte-infinite-loading": "^1.3.6" } -} +} \ No newline at end of file