@inzombieland/nuxt-common 1.16.21 → 1.16.23

package/dist/module.json

@@ -1,6 +1,6 @@
 {
   "name": "@inzombieland/nuxt-common",
-  "version": "1.16.21",
+  "version": "1.16.23",
   "configKey": "nuxt-common",
   "builder": {
     "@nuxt/module-builder": "0.6.0",

package/dist/module.mjs

@@ -2,7 +2,7 @@ import { fileURLToPath } from 'node:url';
 import { defineNuxtModule, createResolver, addServerHandler, addImportsDir, addPlugin, addComponent } from '@nuxt/kit';
 
 const name = "@inzombieland/nuxt-common";
-const version = "1.16.21";
+const version = "1.16.23";
 
 const module = defineNuxtModule({
   meta: {

package/dist/runtime/AppProvider.vue

@@ -15,7 +15,7 @@ import "@vant/touch-emulator"
 
 const theme = ref("")
 const appPreferencesTheme = useLocalStorage("app-preferences-theme", JSON.stringify({ value: "" }))
-const locale = useLocalStorage("locale", "en")
+const locale = useLocalStorage("app-preferences-locale", JSON.stringify({ value: "en" }))
 const user = useUser()
 const activeSessions = useActiveSessions()
 const { fetchActiveSessions, logout } = useUserActions()
@@ -52,10 +52,12 @@ onMounted(() => {
 		appPreferencesTheme,
 		newThemeValue => {
 			try {
-				const { value } = JSON.parse(newThemeValue)
-				theme.value = value
+				if (newThemeValue) {
+					const { value } = JSON.parse(newThemeValue)
+					theme.value = value
+				}
 			} catch (error) {
-				console.error(`Error parsing theme storage object:`, error)
+				console.error(`Error parsing app preferences theme:`, error)
 			}
 
 			if (!theme.value) {
@@ -83,7 +85,13 @@ onMounted(() => {
 	watch(
 		locale,
 		locale => {
-			setLocale(locale as "en" | "ru")
+			try {
+				const { value } = JSON.parse(locale)
+				setLocale(value)
+			} catch (error) {
+				console.error(`Error parsing app preferences locale:`, error)
+				setLocale("en")
+			}
 		},
 		{ immediate: true }
 	)

package/dist/runtime/api/user-actions.mjs

@@ -134,8 +134,8 @@ export const changeLocale = async (body) => {
   if (typeof window !== "undefined") {
     const localeCookie = useCookie("locale", { maxAge: 60 * 60 * 24 * 365 });
     localeCookie.value = body.locale;
-    const locale = useLocalStorage("locale", "en");
-    locale.value = body.locale;
+    const locale = useLocalStorage("app-preferences-locale", JSON.stringify({ value: "" }));
+    locale.value = JSON.stringify({ value: body.locale });
   }
 };
 export const changeAvatar = async (body) => {

package/dist/runtime/packages/api/index.mjs

@@ -31,7 +31,7 @@ export function initApiFetch($fetch, config) {
   if (typeof window !== "undefined") {
     const loggedIn = useLocalStorage("lin", "no");
     const theme = useLocalStorage("app-preferences-theme", JSON.stringify({ value: "" }));
-    const locale = useLocalStorage("locale", "en");
+    const locale = useLocalStorage("app-preferences-locale", JSON.stringify({ value: "en" }));
     const cometServerURL = config.cometServerURL;
     let cometClient;
     bus.subscribe("user:onUpdated", (user) => {
@@ -52,19 +52,32 @@ export function initApiFetch($fetch, config) {
           theme.value = JSON.stringify({ value: user.theme });
         }
       } catch (error) {
-        console.error(`Error parsing theme storage object:`, error);
+        console.error(`Error parsing app preferences theme:`, error);
       }
-      if (user && user.locale !== locale.value) {
-        locale.value = user.locale;
+      try {
+        const { value } = JSON.parse(locale.value);
+        if (user && user.locale !== value) {
+          locale.value = JSON.stringify({ value: user.locale });
+        }
+      } catch (error) {
+        console.error(`Error parsing app preferences locale:`, error);
       }
     });
     watch(
       locale,
       (locale2) => {
-        if (locale2 === "ru") {
-          VantLocale.use(locale2, ruRU);
-          VarletLocale.add("en-US", VarletLocale.enUS);
-        } else {
+        try {
+          const { value } = JSON.parse(locale2);
+          if (value === "en") {
+            VantLocale.use(locale2, enUS);
+            VarletLocale.add("en-US", VarletLocale.enUS);
+          }
+          if (value === "ru") {
+            VantLocale.use(locale2, ruRU);
+            VarletLocale.add("en-US", VarletLocale.enUS);
+          }
+        } catch (error) {
+          console.error(`Error parsing app preferences locale:`, error);
           VantLocale.use(locale2, enUS);
           VarletLocale.add("en-US", VarletLocale.enUS);
         }

package/dist/runtime/packages/api/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@inzombieland/api",
-  "version": "1.16.21",
+  "version": "1.16.23",
   "type": "module",
   "license": "ISC",
   "main": "./index.mjs",

package/dist/runtime/plugin.mjs

@@ -1,10 +1,8 @@
-import { useLocalStorage } from "@vueuse/core";
 import { addRouteMiddleware, defineNuxtPlugin } from "#app";
 import { useRequestHeaders, useRuntimeConfig, useState } from "#imports";
 import { fetch, getUser } from "./api/index.mjs";
 import { authMiddleware, guestMiddleware, localeMiddleware } from "./middleware/index.mjs";
 import { flush, setToken, setUser } from "./packages/api/api-client.mjs";
-import bus from "./packages/api/bus.mjs";
 const useAuth = () => {
   return useState("auth", () => null);
 };
@@ -28,10 +26,6 @@ export default defineNuxtPlugin(async (nuxtApp) => {
   }
   nuxtApp.hook("app:beforeMount", () => {
     auth.value = null;
-    bus.subscribe("user:onUpdated", (value) => {
-      const loggedIn = useLocalStorage("lin", "no");
-      loggedIn.value = value ? "yes" : "no";
-    });
   });
   addRouteMiddleware("auth", authMiddleware, { global: false });
   addRouteMiddleware("guest", guestMiddleware, { global: false });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@inzombieland/nuxt-common",
-  "version": "1.16.21",
+  "version": "1.16.23",
   "license": "ISC",
   "type": "module",
   "exports": {