From 4d3023a641dd3c9e3875acaeadb79db75294cdbd Mon Sep 17 00:00:00 2001 From: KoloMl Date: Sun, 16 Feb 2025 15:47:41 +0400 Subject: [PATCH 01/45] Display nulls and undefined values in the storage inspector properly --- src/components/debugging/StorageViewer.svelte | 35 ++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) diff --git a/src/components/debugging/StorageViewer.svelte b/src/components/debugging/StorageViewer.svelte index fdccae6..145e16b 100644 --- a/src/components/debugging/StorageViewer.svelte +++ b/src/components/debugging/StorageViewer.svelte @@ -55,6 +55,39 @@ ? findDeepObject(targetStorage, path) : null; } + + /** + * Helper function to resolve type, including the null. + * @param {*} value Value to resolve type from. + * @return {string} Type of the value, including "null" for null. + */ + function resolveType(value) { + /** @type {string} */ + let typeName = typeof value; + + if (typeName === 'object' && value === null) { + typeName = 'null'; + } + + return typeName; + } + + /** + * Helper function to resolve value, including values like null or undefined. + * @param {*} value Value to resolve. + * @return {string} String representation of the value. + */ + function resolveValue(value) { + if (value === null) { + return "null"; + } + + if (value === undefined) { + return "undefined"; + } + + return value?.toString() ?? ''; + } @@ -77,7 +110,7 @@ {:else} - {key}: {typeof targetObject[key]} = {targetObject[key]} + {key}: {resolveType(targetObject[key])} = {resolveValue(targetObject[key])} {/if} {/each} From 062b04ca8ae03f5fe6a28de74e5aedf2a507b498 Mon Sep 17 00:00:00 2001 From: KoloMl Date: Sun, 16 Feb 2025 15:50:37 +0400 Subject: [PATCH 02/45] Renamed debug storage to TS --- src/stores/{debug.js => debug.ts} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/stores/{debug.js => debug.ts} (100%) diff --git a/src/stores/debug.js b/src/stores/debug.ts similarity index 100% rename from src/stores/debug.js rename to src/stores/debug.ts From d1a69437d1cf5bec044f291e03d44df8492a4f01 Mon Sep 17 00:00:00 2001 From: KoloMl Date: Sun, 16 Feb 2025 15:59:13 +0400 Subject: [PATCH 03/45] Converting debug store to TS --- src/stores/debug.ts | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/stores/debug.ts b/src/stores/debug.ts index 1fd7da9..14630ef 100644 --- a/src/stores/debug.ts +++ b/src/stores/debug.ts @@ -1,12 +1,15 @@ -import { writable } from "svelte/store"; +import { type Writable, writable } from "svelte/store"; + +// todo: Maybe this could be dynamically resolved using map of entities and not currently existing list of all settings +// classes. For now it's just generic record. +type StorageContents = Record; /** * This is readable version of storages. Any changes made to these objects will not be sent to the local storage. - * @type {Writable>} */ -export const storagesCollection = writable({}); +export const storagesCollection: Writable = writable({}); -chrome.storage.local.get(storages => { +void chrome.storage.local.get(null, storages => { storagesCollection.set(storages); }); From 461fce5c055c594bc6ab9b6dfec7964c5bdcace0 Mon Sep 17 00:00:00 2001 From: KoloMl Date: Sun, 16 Feb 2025 16:01:31 +0400 Subject: [PATCH 04/45] Renaming profiles store to TS --- ...aintenance-profiles-store.js => maintenance-profiles-store.ts} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/stores/{maintenance-profiles-store.js => maintenance-profiles-store.ts} (100%) diff --git a/src/stores/maintenance-profiles-store.js b/src/stores/maintenance-profiles-store.ts similarity index 100% rename from src/stores/maintenance-profiles-store.js rename to src/stores/maintenance-profiles-store.ts From 729d0281edeb5cedd68f4ec6644606ec410dfa1e Mon Sep 17 00:00:00 2001 From: KoloMl Date: Sun, 16 Feb 2025 16:03:24 +0400 Subject: [PATCH 05/45] Converting profiles store to TS --- src/stores/maintenance-profiles-store.ts | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/src/stores/maintenance-profiles-store.ts b/src/stores/maintenance-profiles-store.ts index 80ae1df..32baef1 100644 --- a/src/stores/maintenance-profiles-store.ts +++ b/src/stores/maintenance-profiles-store.ts @@ -1,28 +1,23 @@ -import { writable } from "svelte/store"; +import { type Writable, writable } from "svelte/store"; import MaintenanceProfile from "$entities/MaintenanceProfile"; import MaintenanceSettings from "$lib/extension/settings/MaintenanceSettings"; /** * Store for working with maintenance profiles in the Svelte popup. - * - * @type {import('svelte/store').Writable} */ -export const maintenanceProfilesStore = writable([]); +export const maintenanceProfilesStore: Writable = writable([]); /** * Store for the active maintenance profile ID. - * - * @type {import('svelte/store').Writable} */ -export const activeProfileStore = writable(null); +export const activeProfileStore: Writable = writable(null); const maintenanceSettings = new MaintenanceSettings(); /** * Active profile ID stored locally. Used to reset active profile once the existing profile was removed. - * @type {string|null} */ -let lastActiveProfileId = null; +let lastActiveProfileId: string|null = null; Promise.allSettled([ // Read the initial values from the storages first From f27157a0c56ad947cdb2f15f0bcfe9befeca087f Mon Sep 17 00:00:00 2001 From: KoloMl Date: Sun, 16 Feb 2025 16:04:14 +0400 Subject: [PATCH 06/45] Converting misc preferences store to TS --- src/stores/{misc-preferences.js => misc-preferences.ts} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/stores/{misc-preferences.js => misc-preferences.ts} (100%) diff --git a/src/stores/misc-preferences.js b/src/stores/misc-preferences.ts similarity index 100% rename from src/stores/misc-preferences.js rename to src/stores/misc-preferences.ts From 2104922951e4f72dae781c5fb2a61680243829f8 Mon Sep 17 00:00:00 2001 From: KoloMl Date: Sun, 16 Feb 2025 16:05:02 +0400 Subject: [PATCH 07/45] Renaming search preferences store to TS --- src/stores/{search-preferences.js => search-preferences.ts} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/stores/{search-preferences.js => search-preferences.ts} (100%) diff --git a/src/stores/search-preferences.js b/src/stores/search-preferences.ts similarity index 100% rename from src/stores/search-preferences.js rename to src/stores/search-preferences.ts From 0b4ff96fc1549c3606fcadc8b5d31b79fa212a01 Mon Sep 17 00:00:00 2001 From: KoloMl Date: Sun, 16 Feb 2025 16:07:52 +0400 Subject: [PATCH 08/45] Adding type for suggestion position, converting store to TS --- src/lib/extension/settings/SearchSettings.ts | 4 +++- src/stores/search-preferences.ts | 7 +++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/lib/extension/settings/SearchSettings.ts b/src/lib/extension/settings/SearchSettings.ts index d0d4f99..373c613 100644 --- a/src/lib/extension/settings/SearchSettings.ts +++ b/src/lib/extension/settings/SearchSettings.ts @@ -1,8 +1,10 @@ import CacheableSettings from "$lib/extension/base/CacheableSettings"; +export type SuggestionsPosition = "start" | "end"; + interface SearchSettingsFields { suggestProperties: boolean; - suggestPropertiesPosition: "start" | "end"; + suggestPropertiesPosition: SuggestionsPosition; } export default class SearchSettings extends CacheableSettings { diff --git a/src/stores/search-preferences.ts b/src/stores/search-preferences.ts index a64eac7..58a8227 100644 --- a/src/stores/search-preferences.ts +++ b/src/stores/search-preferences.ts @@ -1,10 +1,9 @@ -import { writable } from "svelte/store"; -import SearchSettings from "$lib/extension/settings/SearchSettings"; +import { type Writable, writable } from "svelte/store"; +import SearchSettings, { type SuggestionsPosition } from "$lib/extension/settings/SearchSettings"; export const searchPropertiesSuggestionsEnabled = writable(false); -/** @type {import('svelte/store').Writable<"start"|"end">} */ -export const searchPropertiesSuggestionsPosition = writable('start'); +export const searchPropertiesSuggestionsPosition: Writable = writable('start'); const searchSettings = new SearchSettings(); From 5392a17db5c3d9db65d904f3ccea482862bff18a Mon Sep 17 00:00:00 2001 From: KoloMl Date: Sun, 16 Feb 2025 16:08:34 +0400 Subject: [PATCH 09/45] Renaming tag groups store to TS --- src/stores/{tag-groups-store.js => tag-groups-store.ts} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/stores/{tag-groups-store.js => tag-groups-store.ts} (100%) diff --git a/src/stores/tag-groups-store.js b/src/stores/tag-groups-store.ts similarity index 100% rename from src/stores/tag-groups-store.js rename to src/stores/tag-groups-store.ts From 8a3ef6b049e7ea812bb46b06dbad69458b15b7d5 Mon Sep 17 00:00:00 2001 From: KoloMl Date: Sun, 16 Feb 2025 16:09:16 +0400 Subject: [PATCH 10/45] Converting tag groups store to TS --- src/stores/tag-groups-store.ts | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/stores/tag-groups-store.ts b/src/stores/tag-groups-store.ts index 3d9eae2..7dd7717 100644 --- a/src/stores/tag-groups-store.ts +++ b/src/stores/tag-groups-store.ts @@ -1,8 +1,7 @@ -import { writable } from "svelte/store"; +import { type Writable, writable } from "svelte/store"; import TagGroup from "$entities/TagGroup"; -/** @type {import('svelte/store').Writable} */ -export const tagGroupsStore = writable([]); +export const tagGroupsStore: Writable = writable([]); TagGroup .readAll() From 09e912ffff1f5aae3ad6f10729e22978f2094cb7 Mon Sep 17 00:00:00 2001 From: KoloMl Date: Sun, 16 Feb 2025 16:12:48 +0400 Subject: [PATCH 11/45] Moving all preferences-related stores to preferences dir --- src/routes/preferences/misc/+page.svelte | 2 +- src/routes/preferences/search/+page.svelte | 2 +- src/routes/preferences/tags/+page.svelte | 2 +- .../{maintenance-preferences.ts => preferences/maintenance.ts} | 0 src/stores/{misc-preferences.ts => preferences/misc.ts} | 0 src/stores/{search-preferences.ts => preferences/search.ts} | 0 6 files changed, 3 insertions(+), 3 deletions(-) rename src/stores/{maintenance-preferences.ts => preferences/maintenance.ts} (100%) rename src/stores/{misc-preferences.ts => preferences/misc.ts} (100%) rename src/stores/{search-preferences.ts => preferences/search.ts} (100%) diff --git a/src/routes/preferences/misc/+page.svelte b/src/routes/preferences/misc/+page.svelte index 7620d88..e49ac36 100644 --- a/src/routes/preferences/misc/+page.svelte +++ b/src/routes/preferences/misc/+page.svelte @@ -4,7 +4,7 @@ import FormContainer from "$components/ui/forms/FormContainer.svelte"; import FormControl from "$components/ui/forms/FormControl.svelte"; import CheckboxField from "$components/ui/forms/CheckboxField.svelte"; - import { fullScreenViewerEnabled } from "$stores/misc-preferences"; + import { fullScreenViewerEnabled } from "$stores/preferences/misc"; diff --git a/src/routes/preferences/search/+page.svelte b/src/routes/preferences/search/+page.svelte index 7c43bd1..a555450 100644 --- a/src/routes/preferences/search/+page.svelte +++ b/src/routes/preferences/search/+page.svelte @@ -6,7 +6,7 @@ import { searchPropertiesSuggestionsEnabled, searchPropertiesSuggestionsPosition - } from "$stores/search-preferences"; + } from "$stores/preferences/search"; import CheckboxField from "$components/ui/forms/CheckboxField.svelte"; import SelectField from "$components/ui/forms/SelectField.svelte"; diff --git a/src/routes/preferences/tags/+page.svelte b/src/routes/preferences/tags/+page.svelte index a7cfc7f..6e9f26a 100644 --- a/src/routes/preferences/tags/+page.svelte +++ b/src/routes/preferences/tags/+page.svelte @@ -4,7 +4,7 @@ import FormControl from "$components/ui/forms/FormControl.svelte"; import Menu from "$components/ui/menu/Menu.svelte"; import MenuItem from "$components/ui/menu/MenuItem.svelte"; - import { stripBlacklistedTagsEnabled } from "$stores/maintenance-preferences"; + import { stripBlacklistedTagsEnabled } from "$stores/preferences/maintenance"; diff --git a/src/stores/maintenance-preferences.ts b/src/stores/preferences/maintenance.ts similarity index 100% rename from src/stores/maintenance-preferences.ts rename to src/stores/preferences/maintenance.ts diff --git a/src/stores/misc-preferences.ts b/src/stores/preferences/misc.ts similarity index 100% rename from src/stores/misc-preferences.ts rename to src/stores/preferences/misc.ts diff --git a/src/stores/search-preferences.ts b/src/stores/preferences/search.ts similarity index 100% rename from src/stores/search-preferences.ts rename to src/stores/preferences/search.ts From 16f60ef9b5725907e14803903ad5d2df90ea3f62 Mon Sep 17 00:00:00 2001 From: KoloMl Date: Sun, 16 Feb 2025 16:19:25 +0400 Subject: [PATCH 12/45] Moving and renaming entities storages to entities dir --- src/routes/+page.svelte | 4 ++-- src/routes/features/groups/+page.svelte | 4 ++-- src/routes/features/groups/[id]/+page.svelte | 4 ++-- src/routes/features/groups/[id]/delete/+page.svelte | 4 ++-- src/routes/features/groups/[id]/edit/+page.svelte | 4 ++-- src/routes/features/groups/[id]/export/+page.svelte | 4 ++-- src/routes/features/groups/import/+page.svelte | 4 ++-- src/routes/features/maintenance/+page.svelte | 4 ++-- src/routes/features/maintenance/[id]/+page.svelte | 4 ++-- .../features/maintenance/[id]/delete/+page.svelte | 4 ++-- .../features/maintenance/[id]/edit/+page.svelte | 4 ++-- .../features/maintenance/[id]/export/+page.svelte | 4 ++-- src/routes/features/maintenance/import/+page.svelte | 4 ++-- .../maintenance-profiles.ts} | 6 +++--- src/stores/entities/tag-groups.ts | 11 +++++++++++ src/stores/tag-groups-store.ts | 11 ----------- 16 files changed, 40 insertions(+), 40 deletions(-) rename src/stores/{maintenance-profiles-store.ts => entities/maintenance-profiles.ts} (89%) create mode 100644 src/stores/entities/tag-groups.ts delete mode 100644 src/stores/tag-groups-store.ts diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte index 3619048..514140b 100644 --- a/src/routes/+page.svelte +++ b/src/routes/+page.svelte @@ -1,13 +1,13 @@ diff --git a/src/routes/features/groups/[id]/+page.svelte b/src/routes/features/groups/[id]/+page.svelte index 47c96b3..c10af17 100644 --- a/src/routes/features/groups/[id]/+page.svelte +++ b/src/routes/features/groups/[id]/+page.svelte @@ -4,7 +4,7 @@ import GroupView from "$components/features/GroupView.svelte"; import Menu from "$components/ui/menu/Menu.svelte"; import MenuItem from "$components/ui/menu/MenuItem.svelte"; - import { tagGroupsStore } from "$stores/tag-groups-store"; + import { tagGroups } from "$stores/entities/tag-groups"; const groupId = $page.params.id; /** @type {import('$entities/TagGroup').default|null} */ @@ -15,7 +15,7 @@ } $: { - group = $tagGroupsStore.find(group => group.id === groupId) || null; + group = $tagGroups.find(group => group.id === groupId) || null; if (!group) { console.warn(`Group ${groupId} not found.`); diff --git a/src/routes/features/groups/[id]/delete/+page.svelte b/src/routes/features/groups/[id]/delete/+page.svelte index 638d106..84a0506 100644 --- a/src/routes/features/groups/[id]/delete/+page.svelte +++ b/src/routes/features/groups/[id]/delete/+page.svelte @@ -3,10 +3,10 @@ import { page } from "$app/stores"; import Menu from "$components/ui/menu/Menu.svelte"; import MenuItem from "$components/ui/menu/MenuItem.svelte"; - import { tagGroupsStore } from "$stores/tag-groups-store"; + import { tagGroups } from "$stores/entities/tag-groups"; const groupId = $page.params.id; - const targetGroup = $tagGroupsStore.find(group => group.id === groupId); + const targetGroup = $tagGroups.find(group => group.id === groupId); if (!targetGroup) { void goto('/features/groups'); diff --git a/src/routes/features/groups/[id]/edit/+page.svelte b/src/routes/features/groups/[id]/edit/+page.svelte index e769a63..85c2077 100644 --- a/src/routes/features/groups/[id]/edit/+page.svelte +++ b/src/routes/features/groups/[id]/edit/+page.svelte @@ -10,7 +10,7 @@ import MenuItem from "$components/ui/menu/MenuItem.svelte"; import TagsEditor from "$components/tags/TagsEditor.svelte"; import TagGroup from "$entities/TagGroup"; - import { tagGroupsStore } from "$stores/tag-groups-store"; + import { tagGroups } from "$stores/entities/tag-groups"; const groupId = $page.params.id; /** @type {TagGroup|null} */ @@ -26,7 +26,7 @@ if (groupId === 'new') { targetGroup = new TagGroup(crypto.randomUUID(), {}); } else { - targetGroup = $tagGroupsStore.find(group => group.id === groupId) || null; + targetGroup = $tagGroups.find(group => group.id === groupId) || null; if (targetGroup) { groupName = targetGroup.settings.name; diff --git a/src/routes/features/groups/[id]/export/+page.svelte b/src/routes/features/groups/[id]/export/+page.svelte index 739bd9d..c583fa5 100644 --- a/src/routes/features/groups/[id]/export/+page.svelte +++ b/src/routes/features/groups/[id]/export/+page.svelte @@ -7,11 +7,11 @@ import MenuItem from "$components/ui/menu/MenuItem.svelte"; import TagGroup from "$entities/TagGroup"; import EntitiesTransporter from "$lib/extension/EntitiesTransporter"; - import { tagGroupsStore } from "$stores/tag-groups-store"; + import { tagGroups } from "$stores/entities/tag-groups"; const groupId = $page.params.id; const groupTransporter = new EntitiesTransporter(TagGroup); - const group = $tagGroupsStore.find(group => group.id === groupId); + const group = $tagGroups.find(group => group.id === groupId); /** @type {string} */ let rawExportedGroup; diff --git a/src/routes/features/groups/import/+page.svelte b/src/routes/features/groups/import/+page.svelte index 5fa1712..c2cf41b 100644 --- a/src/routes/features/groups/import/+page.svelte +++ b/src/routes/features/groups/import/+page.svelte @@ -7,7 +7,7 @@ import MenuItem from "$components/ui/menu/MenuItem.svelte"; import TagGroup from "$entities/TagGroup"; import EntitiesTransporter from "$lib/extension/EntitiesTransporter"; - import { tagGroupsStore } from "$stores/tag-groups-store"; + import { tagGroups } from "$stores/entities/tag-groups"; const groupTransporter = new EntitiesTransporter(TagGroup); @@ -46,7 +46,7 @@ } if (candidateGroup) { - existingGroup = $tagGroupsStore.find(group => group.id === candidateGroup?.id) ?? null; + existingGroup = $tagGroups.find(group => group.id === candidateGroup?.id) ?? null; } } diff --git a/src/routes/features/maintenance/+page.svelte b/src/routes/features/maintenance/+page.svelte index 36c9eb7..05a4352 100644 --- a/src/routes/features/maintenance/+page.svelte +++ b/src/routes/features/maintenance/+page.svelte @@ -2,12 +2,12 @@ import Menu from "$components/ui/menu/Menu.svelte"; import MenuItem from "$components/ui/menu/MenuItem.svelte"; import MenuRadioItem from "$components/ui/menu/MenuRadioItem.svelte"; - import { activeProfileStore, maintenanceProfilesStore } from "$stores/maintenance-profiles-store"; + import { activeProfileStore, maintenanceProfiles } from "$stores/entities/maintenance-profiles"; /** @type {import('$entities/MaintenanceProfile').default[]} */ let profiles = []; - $: profiles = $maintenanceProfilesStore.sort((a, b) => a.settings.name.localeCompare(b.settings.name)); + $: profiles = $maintenanceProfiles.sort((a, b) => a.settings.name.localeCompare(b.settings.name)); function resetActiveProfile() { $activeProfileStore = null; diff --git a/src/routes/features/maintenance/[id]/+page.svelte b/src/routes/features/maintenance/[id]/+page.svelte index c9e49d2..c775d46 100644 --- a/src/routes/features/maintenance/[id]/+page.svelte +++ b/src/routes/features/maintenance/[id]/+page.svelte @@ -3,7 +3,7 @@ import MenuItem from "$components/ui/menu/MenuItem.svelte"; import { page } from "$app/stores"; import { goto } from "$app/navigation"; - import { activeProfileStore, maintenanceProfilesStore } from "$stores/maintenance-profiles-store"; + import { activeProfileStore, maintenanceProfiles } from "$stores/entities/maintenance-profiles"; import ProfileView from "$components/features/ProfileView.svelte"; import MenuCheckboxItem from "$components/ui/menu/MenuCheckboxItem.svelte"; @@ -16,7 +16,7 @@ } $: { - const resolvedProfile = $maintenanceProfilesStore.find(profile => profile.id === profileId); + const resolvedProfile = $maintenanceProfiles.find(profile => profile.id === profileId); if (resolvedProfile) { profile = resolvedProfile; diff --git a/src/routes/features/maintenance/[id]/delete/+page.svelte b/src/routes/features/maintenance/[id]/delete/+page.svelte index 5e59699..683741c 100644 --- a/src/routes/features/maintenance/[id]/delete/+page.svelte +++ b/src/routes/features/maintenance/[id]/delete/+page.svelte @@ -3,10 +3,10 @@ import Menu from "$components/ui/menu/Menu.svelte"; import MenuItem from "$components/ui/menu/MenuItem.svelte"; import { page } from "$app/stores"; - import { maintenanceProfilesStore } from "$stores/maintenance-profiles-store"; + import { maintenanceProfiles } from "$stores/entities/maintenance-profiles"; const profileId = $page.params.id; - const targetProfile = $maintenanceProfilesStore.find(profile => profile.id === profileId); + const targetProfile = $maintenanceProfiles.find(profile => profile.id === profileId); if (!targetProfile) { void goto('/features/maintenance'); diff --git a/src/routes/features/maintenance/[id]/edit/+page.svelte b/src/routes/features/maintenance/[id]/edit/+page.svelte index b57f7f8..021f324 100644 --- a/src/routes/features/maintenance/[id]/edit/+page.svelte +++ b/src/routes/features/maintenance/[id]/edit/+page.svelte @@ -7,7 +7,7 @@ import FormContainer from "$components/ui/forms/FormContainer.svelte"; import { page } from "$app/stores"; import { goto } from "$app/navigation"; - import { maintenanceProfilesStore } from "$stores/maintenance-profiles-store"; + import { maintenanceProfiles } from "$stores/entities/maintenance-profiles"; import MaintenanceProfile from "$entities/MaintenanceProfile"; /** @type {string} */ @@ -23,7 +23,7 @@ if (profileId === 'new') { targetProfile = new MaintenanceProfile(crypto.randomUUID(), {}); } else { - const maybeExistingProfile = $maintenanceProfilesStore.find(profile => profile.id === profileId); + const maybeExistingProfile = $maintenanceProfiles.find(profile => profile.id === profileId); if (maybeExistingProfile) { targetProfile = maybeExistingProfile; diff --git a/src/routes/features/maintenance/[id]/export/+page.svelte b/src/routes/features/maintenance/[id]/export/+page.svelte index 6c0a15f..028a69b 100644 --- a/src/routes/features/maintenance/[id]/export/+page.svelte +++ b/src/routes/features/maintenance/[id]/export/+page.svelte @@ -1,7 +1,7 @@
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?.()}