refactor(locales): move available locales to settings, update types

VChet · Oct 13, 2024 · 22b2d7c · 22b2d7c
1 parent ed5dfad
commit 22b2d7c
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 10 deletions.
diff --git a/src/store/settings.ts b/src/store/settings.ts
@@ -1,5 +1,5 @@
 import { ref } from "vue";
-import { createGlobalState, useStorage } from "@vueuse/core";
+import { createGlobalState, useLocalStorage } from "@vueuse/core";
 import type { RouteRecordName } from "vue-router";
 import dayjs from "dayjs";
 import { useRegisterSW } from "virtual:pwa-register/vue";
@@ -9,20 +9,31 @@ import { i18n } from "@/main";
 import { useEventsStore } from "./events";
 import type { Day } from "@/classes/Day";
 
-function getDayJSLocaleData(locale: string): ILocale {
+type LocaleCode = "en" | "ru";
+interface SettingsStore {
+  locale: LocaleCode
+  onboarding: boolean
+}
+
+function getDayJSLocaleData(locale: LocaleCode): ILocale {
   switch (locale) {
     case "ru": return tamrielRu;
     case "en": default: return tamrielEn;
   }
 }
 
 export const useSettingsStore = createGlobalState(() => {
-  const settings = useStorage("settings", {
+  const availableLocales: { code: LocaleCode, label: string }[] = [
+    { code: "en", label: "English" },
+    { code: "ru", label: "Русский" }
+  ];
+
+  const settings = useLocalStorage<SettingsStore>("settings", {
     locale: "en",
     onboarding: false
-  }, localStorage, { mergeDefaults: true });
+  }, { mergeDefaults: true });
 
-  async function setLocale(locale: string): Promise<void> {
+  async function setLocale(locale: LocaleCode): Promise<void> {
     const { setEventsData } = useEventsStore();
 
     dayjs.locale(getDayJSLocaleData(locale));
@@ -37,6 +48,7 @@ export const useSettingsStore = createGlobalState(() => {
   const selectedDay = ref<Day | null>(null);
 
   return {
+    availableLocales,
     settings,
     setLocale,
 

diff --git a/src/views/SettingsView.vue b/src/views/SettingsView.vue
@@ -47,11 +47,7 @@ import CommonHeader from "@/components/CommonHeader.vue";
 const commitHash = import.meta.env.VITE_GIT_COMMIT_HASH;
 const commitDate = composeCommitDate(import.meta.env.VITE_GIT_COMMIT_DATE);
 
-const availableLocales = [
-  { code: "en", label: "English" },
-  { code: "ru", label: "Русский" }
-];
-const { settings, setLocale, needRefresh, updateServiceWorker } = useSettingsStore();
+const { availableLocales, settings, setLocale, needRefresh, updateServiceWorker } = useSettingsStore();
 const locale = ref(settings.value.locale);
 watch(locale, setLocale);
 </script>