From 67d41ecf03d621d3bd224a64579d1e1e633ddd2c Mon Sep 17 00:00:00 2001 From: KoloMl Date: Sun, 16 Feb 2025 18:02:03 +0400 Subject: [PATCH 01/14] Migration to Svelte 5 (using the migration script) --- src/components/debugging/StorageViewer.svelte | 36 ++++++++++------- src/components/features/GroupView.svelte | 14 ++++--- src/components/features/ProfileView.svelte | 10 ++++- src/components/tags/TagsColorContainer.svelte | 33 +++++++++------ src/components/tags/TagsEditor.svelte | 25 +++++++----- src/components/ui/forms/CheckboxField.svelte | 17 +++++--- src/components/ui/forms/FormContainer.svelte | 10 ++++- src/components/ui/forms/FormControl.svelte | 13 ++++-- src/components/ui/forms/SelectField.svelte | 31 +++++++++----- .../ui/forms/TagCategorySelectField.svelte | 14 +++++-- src/components/ui/forms/TextField.svelte | 18 ++++++--- src/components/ui/menu/Menu.svelte | 10 ++++- .../ui/menu/MenuCheckboxItem.svelte | 40 +++++++++++-------- src/components/ui/menu/MenuItem.svelte | 33 +++++++++------ src/components/ui/menu/MenuRadioItem.svelte | 40 +++++++++++-------- src/routes/+layout.svelte | 9 ++++- src/routes/+page.svelte | 4 +- src/routes/features/groups/+page.svelte | 8 +++- src/routes/features/groups/[id]/+page.svelte | 8 ++-- .../features/groups/[id]/edit/+page.svelte | 8 ++-- .../features/groups/[id]/export/+page.svelte | 6 +-- .../features/groups/import/+page.svelte | 8 ++-- src/routes/features/maintenance/+page.svelte | 8 +++- .../features/maintenance/[id]/+page.svelte | 14 ++++--- .../maintenance/[id]/edit/+page.svelte | 4 +- .../maintenance/[id]/export/+page.svelte | 6 +-- .../features/maintenance/import/+page.svelte | 8 ++-- .../debug/storage/[...path]/+page.svelte | 12 +++--- 28 files changed, 287 insertions(+), 160 deletions(-) diff --git a/src/components/debugging/StorageViewer.svelte b/src/components/debugging/StorageViewer.svelte index 145e16b..b217caf 100644 --- a/src/components/debugging/StorageViewer.svelte +++ b/src/components/debugging/StorageViewer.svelte @@ -1,25 +1,33 @@
diff --git a/src/components/features/ProfileView.svelte b/src/components/features/ProfileView.svelte index 59efe3f..2fb3b64 100644 --- a/src/components/features/ProfileView.svelte +++ b/src/components/features/ProfileView.svelte @@ -1,6 +1,12 @@ diff --git a/src/components/tags/TagsColorContainer.svelte b/src/components/tags/TagsColorContainer.svelte index 84d1bf4..3c6a237 100644 --- a/src/components/tags/TagsColorContainer.svelte +++ b/src/components/tags/TagsColorContainer.svelte @@ -1,61 +1,68 @@
- + {@render children?.()}
diff --git a/src/components/features/GroupView.svelte b/src/components/features/GroupView.svelte index 5f17999..ff1a245 100644 --- a/src/components/features/GroupView.svelte +++ b/src/components/features/GroupView.svelte @@ -1,63 +1,63 @@
- Group Name: -
{group.settings.name}
+ Group Name: +
{group.settings.name}
{#if sortedTagsList.length} -
- Tags: - -
- {#each sortedTagsList as tagName} - {tagName} - {/each} -
-
-
+
+ Tags: + +
+ {#each sortedTagsList as tagName} + {tagName} + {/each} +
+
+
{/if} {#if sortedPrefixes.length} -
- Prefixes: - -
- {#each sortedPrefixes as prefixName} - {prefixName}* - {/each} -
-
-
+
+ Prefixes: + +
+ {#each sortedPrefixes as prefixName} + {prefixName}* + {/each} +
+
+
{/if} diff --git a/src/components/features/ProfileView.svelte b/src/components/features/ProfileView.svelte index 2fb3b64..20f95a7 100644 --- a/src/components/features/ProfileView.svelte +++ b/src/components/features/ProfileView.svelte @@ -1,42 +1,42 @@
- Profile: -
{profile.settings.name}
+ Profile: +
{profile.settings.name}
- Tags: -
- {#each sortedTagsList as tagName} - {tagName} - {/each} -
+ Tags: +
+ {#each sortedTagsList as tagName} + {tagName} + {/each} +
diff --git a/src/components/layout/Footer.svelte b/src/components/layout/Footer.svelte index d20e91d..b321b9e 100644 --- a/src/components/layout/Footer.svelte +++ b/src/components/layout/Footer.svelte @@ -1,32 +1,32 @@ diff --git a/src/components/layout/Header.svelte b/src/components/layout/Header.svelte index 032366e..ab23562 100644 --- a/src/components/layout/Header.svelte +++ b/src/components/layout/Header.svelte @@ -1,28 +1,28 @@
- Furbooru Tagging Assistant + Furbooru Tagging Assistant
diff --git a/src/components/tags/TagsColorContainer.svelte b/src/components/tags/TagsColorContainer.svelte index 3c6a237..3b743cb 100644 --- a/src/components/tags/TagsColorContainer.svelte +++ b/src/components/tags/TagsColorContainer.svelte @@ -1,69 +1,69 @@
- {@render children?.()} + {@render children?.()}
diff --git a/src/components/tags/TagsEditor.svelte b/src/components/tags/TagsEditor.svelte index 16c8ab3..711ff77 100644 --- a/src/components/tags/TagsEditor.svelte +++ b/src/components/tags/TagsEditor.svelte @@ -1,113 +1,113 @@
- {#each uniqueTags.values() as tagName} -
- {tagName} - x -
- {/each} - + {#each uniqueTags.values() as tagName} +
+ {tagName} + x +
+ {/each} +
diff --git a/src/components/ui/forms/CheckboxField.svelte b/src/components/ui/forms/CheckboxField.svelte index a4f7101..6324a00 100644 --- a/src/components/ui/forms/CheckboxField.svelte +++ b/src/components/ui/forms/CheckboxField.svelte @@ -1,19 +1,18 @@ - + {@render children?.()} diff --git a/src/components/ui/forms/FormContainer.svelte b/src/components/ui/forms/FormContainer.svelte index 394839d..6b35146 100644 --- a/src/components/ui/forms/FormContainer.svelte +++ b/src/components/ui/forms/FormContainer.svelte @@ -1,19 +1,19 @@
- {@render children?.()} + {@render children?.()}
diff --git a/src/components/ui/forms/FormControl.svelte b/src/components/ui/forms/FormControl.svelte index ed8c5d6..eb432f8 100644 --- a/src/components/ui/forms/FormControl.svelte +++ b/src/components/ui/forms/FormControl.svelte @@ -1,34 +1,34 @@ diff --git a/src/components/ui/forms/SelectField.svelte b/src/components/ui/forms/SelectField.svelte index 45581db..dcfb7c0 100644 --- a/src/components/ui/forms/SelectField.svelte +++ b/src/components/ui/forms/SelectField.svelte @@ -1,49 +1,44 @@ - + {#each Object.entries(optionPairs) as [value, label]} + + {/each} diff --git a/src/components/ui/forms/TagCategorySelectField.svelte b/src/components/ui/forms/TagCategorySelectField.svelte index 1c0413d..86088be 100644 --- a/src/components/ui/forms/TagCategorySelectField.svelte +++ b/src/components/ui/forms/TagCategorySelectField.svelte @@ -1,86 +1,86 @@ - + diff --git a/src/components/ui/forms/TextField.svelte b/src/components/ui/forms/TextField.svelte index 4af2e0c..4e10256 100644 --- a/src/components/ui/forms/TextField.svelte +++ b/src/components/ui/forms/TextField.svelte @@ -1,24 +1,21 @@ - + diff --git a/src/components/ui/menu/Menu.svelte b/src/components/ui/menu/Menu.svelte index 2e386c3..0889cc2 100644 --- a/src/components/ui/menu/Menu.svelte +++ b/src/components/ui/menu/Menu.svelte @@ -1,46 +1,46 @@ diff --git a/src/components/ui/menu/MenuCheckboxItem.svelte b/src/components/ui/menu/MenuCheckboxItem.svelte index 068dcc7..278779d 100644 --- a/src/components/ui/menu/MenuCheckboxItem.svelte +++ b/src/components/ui/menu/MenuCheckboxItem.svelte @@ -1,45 +1,41 @@ - - {@render children?.()} + + {@render children?.()} diff --git a/src/components/ui/menu/MenuItem.svelte b/src/components/ui/menu/MenuItem.svelte index 0c19775..aa5a29d 100644 --- a/src/components/ui/menu/MenuItem.svelte +++ b/src/components/ui/menu/MenuItem.svelte @@ -1,50 +1,48 @@ - - {#if icon} - - {/if} - {@render children?.()} + + {#if icon} + + {/if} + {@render children?.()} diff --git a/src/components/ui/menu/MenuRadioItem.svelte b/src/components/ui/menu/MenuRadioItem.svelte index e45b62d..f76c0e3 100644 --- a/src/components/ui/menu/MenuRadioItem.svelte +++ b/src/components/ui/menu/MenuRadioItem.svelte @@ -1,45 +1,39 @@ - - {@render children?.()} + + {@render children?.()} diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte index 4e9e931..9d1f851 100644 --- a/src/routes/+layout.svelte +++ b/src/routes/+layout.svelte @@ -1,26 +1,27 @@
- {@render children?.()} + {@render children?.()}