makes server settings overwrite local

amir20 · Oct 26, 2023 · 821cd3b · 821cd3b
1 parent a3756a0
commit 821cd3b
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 12 deletions.
diff --git a/assets/auto-imports.d.ts b/assets/auto-imports.d.ts
@@ -363,7 +363,7 @@ declare global {
 // for type re-export
 declare global {
   // @ts-ignore
-  export type { Component, ComponentPublicInstance, ComputedRef, InjectionKey, PropType, Ref, VNode } from 'vue'
+  export type { Component, ComponentPublicInstance, ComputedRef, ExtractDefaultPropTypes, ExtractPropTypes, ExtractPublicPropTypes, InjectionKey, PropType, Ref, VNode, WritableComputedRef } from 'vue'
 }
 // for vue template auto import
 import { UnwrapRef } from 'vue'

diff --git a/assets/composables/eventsource.ts b/assets/composables/eventsource.ts
@@ -85,7 +85,7 @@ export function useLogStream() {
     console.debug(`Connecting to ${containerId} with params`, params);
 
     es = new EventSource(
-      `${config.base}/api/logs/stream/${container.value.host}/${containerId}?${new URLSearchParams(params).toString()}`,
+      withBase(`/api/logs/stream/${container.value.host}/${containerId}?${new URLSearchParams(params).toString()}`),
     );
     es.addEventListener("container-stopped", () => {
       close();
@@ -118,7 +118,7 @@ export function useLogStream() {
 
     const logs = await (
       await fetch(
-        `${config.base}/api/logs/${container.value.host}/${containerId}?${new URLSearchParams(params).toString()}`,
+        withBase(`/api/logs/${container.value.host}/${containerId}?${new URLSearchParams(params).toString()}`),
       )
     ).text();
     if (logs) {

diff --git a/assets/modules/router.ts b/assets/modules/router.ts
@@ -8,7 +8,7 @@ export const install = (app: App) => {
   const routes = setupLayouts(pages);
 
   const router = createRouter({
-    history: createWebHistory(`${config.base}/`),
+    history: createWebHistory(withBase("/")),
     routes,
   });
 

diff --git a/assets/pages/login.vue b/assets/pages/login.vue
@@ -49,14 +49,14 @@ let password = $ref("");
 let form: HTMLFormElement | undefined = $ref();
 
 async function onLogin() {
-  const response = await fetch(`${config.base}/api/validateCredentials`, {
+  const response = await fetch(withBase("/api/validateCredentials"), {
     body: new FormData(form),
     method: "post",
   });
 
   if (response.status == 200) {
     error = false;
-    window.location.href = `${config.base}/`;
+    window.location.href = withBase("/");
   } else {
     error = true;
   }

diff --git a/assets/stores/config.ts b/assets/stores/config.ts
@@ -16,7 +16,7 @@ interface Config {
     name: string;
     avatar: string;
   };
-  settings?: Settings;
+  serverSettings?: Settings;
 }
 
 const pageConfig = JSON.parse(text);

diff --git a/assets/stores/container.ts b/assets/stores/container.ts
@@ -34,7 +34,7 @@ export const useContainerStore = defineStore("container", () => {
   function connect() {
     es?.close();
     ready.value = false;
-    es = new EventSource(`${config.base}/api/events/stream`);
+    es = new EventSource(withBase("/api/events/stream"));
     es.addEventListener("error", (e) => {
       if (es?.readyState === EventSource.CLOSED) {
         showToast(

diff --git a/assets/stores/settings.ts b/assets/stores/settings.ts
@@ -28,11 +28,10 @@ export const DEFAULT_SETTINGS: Settings = {
   softWrap: true,
   collapseNav: false,
   automaticRedirect: true,
-  ...config.settings,
 };
 
 export const settings = useStorage(DOZZLE_SETTINGS_KEY, DEFAULT_SETTINGS);
-settings.value = { ...DEFAULT_SETTINGS, ...settings.value };
+settings.value = { ...DEFAULT_SETTINGS, ...settings.value, ...config.serverSettings };
 
 watch(settings, (value) => {
   fetch(withBase("/api/profile/settings"), {

diff --git a/internal/web/index.go b/internal/web/index.go
@@ -86,9 +86,9 @@ func (h *handler) executeTemplate(w http.ResponseWriter, req *http.Request) {
 		}
 		config["user"] = user
 		if settings, err := profile.LoadUserSettings(user); err == nil {
-			config["settings"] = settings
+			config["serverSettings"] = settings
 		} else {
-			config["settings"] = struct{}{}
+			config["serverSettings"] = struct{}{}
 		}
 	}