From 1f0958a0d1922f10d55deb6bb033b618a46ca12b Mon Sep 17 00:00:00 2001
From: dumbmoron <log@riseup.net>
Date: Sat, 13 Jul 2024 13:17:03 +0000
Subject: [PATCH] web/settings: move to state folder

---
 web/src/components/buttons/SettingsButton.svelte      | 2 +-
 web/src/components/buttons/SettingsToggle.svelte      | 2 +-
 web/src/components/save/Omnibox.svelte                | 2 +-
 web/src/components/settings/LanguageAutoToggle.svelte | 4 ++--
 web/src/components/settings/LanguageDropdown.svelte   | 2 +-
 web/src/lib/api.ts                                    | 2 +-
 web/src/lib/{ => state}/settings.ts                   | 6 +++---
 web/src/lib/state/theme.ts                            | 2 +-
 web/src/routes/+layout.svelte                         | 2 +-
 web/src/routes/+layout.ts                             | 2 +-
 web/src/routes/settings/+layout.svelte                | 2 +-
 web/src/routes/settings/advanced/debug/+page.svelte   | 2 +-
 12 files changed, 15 insertions(+), 15 deletions(-)
 rename web/src/lib/{ => state}/settings.ts (92%)

diff --git a/web/src/components/buttons/SettingsButton.svelte b/web/src/components/buttons/SettingsButton.svelte
index ca3be280..871c2fa0 100644
--- a/web/src/components/buttons/SettingsButton.svelte
+++ b/web/src/components/buttons/SettingsButton.svelte
@@ -6,7 +6,7 @@
         Value extends CobaltSettings[Context][Id]
     "
 >
-    import settings, { updateSetting } from "$lib/settings";
+    import settings, { updateSetting } from "$lib/state/settings";
     import type { CobaltSettings } from "$lib/types/settings";
 
     export let settingContext: Context;
diff --git a/web/src/components/buttons/SettingsToggle.svelte b/web/src/components/buttons/SettingsToggle.svelte
index 8995da90..1e37aa3e 100644
--- a/web/src/components/buttons/SettingsToggle.svelte
+++ b/web/src/components/buttons/SettingsToggle.svelte
@@ -5,7 +5,7 @@
         Id extends keyof CobaltSettings[Context]
     "
 >
-    import settings, { updateSetting } from "$lib/settings";
+    import settings, { updateSetting } from "$lib/state/settings";
     import type { CobaltSettings } from "$lib/types/settings";
 
     import Toggle from "$components/misc/Toggle.svelte";
diff --git a/web/src/components/save/Omnibox.svelte b/web/src/components/save/Omnibox.svelte
index bbe98070..b8ba01b1 100644
--- a/web/src/components/save/Omnibox.svelte
+++ b/web/src/components/save/Omnibox.svelte
@@ -12,7 +12,7 @@
     import ActionButton from "$components/buttons/ActionButton.svelte";
     import SettingsButton from "$components/buttons/SettingsButton.svelte";
 
-    import { updateSetting } from "$lib/settings";
+    import { updateSetting } from "$lib/state/settings";
     import type { DownloadModeOption } from "$lib/types/settings";
 
     import IconSparkles from "$lib/icons/Sparkles.svelte";
diff --git a/web/src/components/settings/LanguageAutoToggle.svelte b/web/src/components/settings/LanguageAutoToggle.svelte
index 0de00d62..aa896c9f 100644
--- a/web/src/components/settings/LanguageAutoToggle.svelte
+++ b/web/src/components/settings/LanguageAutoToggle.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
-    import settings from "$lib/settings";
+    import settings from "$lib/state/settings";
     import { device } from "$lib/device";
-    import { locale, locales } from "$lib/i18n/translations";
+    import { locale } from "$lib/i18n/translations";
 
     import SettingsToggle from "$components/buttons/SettingsToggle.svelte";
 
diff --git a/web/src/components/settings/LanguageDropdown.svelte b/web/src/components/settings/LanguageDropdown.svelte
index eb84f677..3cc0ac17 100644
--- a/web/src/components/settings/LanguageDropdown.svelte
+++ b/web/src/components/settings/LanguageDropdown.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import settings, { updateSetting } from "$lib/settings";
+    import settings, { updateSetting } from "$lib/state/settings";
     import { t, locale, locales } from "$lib/i18n/translations";
 
     import languages from "$i18n/languages.json";
diff --git a/web/src/lib/api.ts b/web/src/lib/api.ts
index d1008377..2b7274bc 100644
--- a/web/src/lib/api.ts
+++ b/web/src/lib/api.ts
@@ -1,5 +1,5 @@
 import { get } from 'svelte/store';
-import settings from "$lib/settings";
+import settings from "$lib/state/settings";
 import type { CobaltAPIResponse } from "$lib/types/api";
 
 const apiURL = "https://api.cobalt.tools";
diff --git a/web/src/lib/settings.ts b/web/src/lib/state/settings.ts
similarity index 92%
rename from web/src/lib/settings.ts
rename to web/src/lib/state/settings.ts
index a2dad5f7..41f0cc68 100644
--- a/web/src/lib/settings.ts
+++ b/web/src/lib/state/settings.ts
@@ -1,10 +1,10 @@
 import { derived, readable, type Updater } from 'svelte/store';
 import { merge } from 'ts-deepmerge';
 
-import type { RecursivePartial } from './types/generic';
-import type { CobaltSettings } from './types/settings';
+import type { RecursivePartial } from '../types/generic';
+import type { CobaltSettings } from '../types/settings';
 
-import defaultSettings from './settings/defaults';
+import defaultSettings from '../settings/defaults';
 
 type PartialSettings = RecursivePartial<CobaltSettings>;
 type PartialSettingsWithSchema = RecursivePartial<CobaltSettings> & { schemaVersion: number };
diff --git a/web/src/lib/state/theme.ts b/web/src/lib/state/theme.ts
index c97fd5d1..10574fb6 100644
--- a/web/src/lib/state/theme.ts
+++ b/web/src/lib/state/theme.ts
@@ -1,6 +1,6 @@
 import { readable, derived, type Readable } from 'svelte/store';
 
-import settings from '$lib/settings';
+import settings from '$lib/state/settings';
 import { themeOptions } from '$lib/types/settings';
 
 type Theme = typeof themeOptions[number];
diff --git a/web/src/routes/+layout.svelte b/web/src/routes/+layout.svelte
index 35306b81..22cd0663 100644
--- a/web/src/routes/+layout.svelte
+++ b/web/src/routes/+layout.svelte
@@ -2,7 +2,7 @@
     import "@fontsource/ibm-plex-mono/400.css";
     import "@fontsource/ibm-plex-mono/500.css";
 
-    import settings from "$lib/settings";
+    import settings from "$lib/state/settings";
     import { device, app } from "$lib/device";
     import currentTheme, { statusBarColors } from "$lib/state/theme";
 
diff --git a/web/src/routes/+layout.ts b/web/src/routes/+layout.ts
index 91e55ac2..c62761f5 100644
--- a/web/src/routes/+layout.ts
+++ b/web/src/routes/+layout.ts
@@ -16,7 +16,7 @@ export const load: Load = async ({ url }) => {
 
     if (browser) {
         const device = (await import('$lib/device')).device;
-        const settings = get((await import('$lib/settings')).default);
+        const settings = get((await import('$lib/state/settings')).default);
         const deviceLanguage = device.prefers.language;
         const settingsLanguage = settings.appearance.language;
 
diff --git a/web/src/routes/settings/+layout.svelte b/web/src/routes/settings/+layout.svelte
index 804cebff..67e0a611 100644
--- a/web/src/routes/settings/+layout.svelte
+++ b/web/src/routes/settings/+layout.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
     import { page } from "$app/stores";
 
-    import settings from "$lib/settings";
+    import settings from "$lib/state/settings";
 
     import { t } from "$lib/i18n/translations";
 
diff --git a/web/src/routes/settings/advanced/debug/+page.svelte b/web/src/routes/settings/advanced/debug/+page.svelte
index 621985d5..9dd63bd9 100644
--- a/web/src/routes/settings/advanced/debug/+page.svelte
+++ b/web/src/routes/settings/advanced/debug/+page.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
     import { device, app } from "$lib/device";
     import { version } from "$lib/version";
-    import settings, { storedSettings } from "$lib/settings";
+    import settings, { storedSettings } from "$lib/state/settings";
 
     import { goto } from "$app/navigation";
     import { defaultSettingsPage } from "$lib/settings/defaults";