merge: merge branch 'db_setting' into main resolving conflicts in favor of db_setting

vite.config.ts

@@ -1,29 +1,29 @@
-import { defineConfig } from 'vite';
-import { resolve } from 'path';
-
-const proxyTarget = process.env.VITE_DEV_PROXY_TARGET || 'http://localhost:3000';
-
-export default defineConfig({
-  server: {
-    port: 8080,
-    host: true, // Listen on all local IPs
-    proxy: {
-      '/api': {
-        target: proxyTarget,
-        changeOrigin: true,
-      },
-      '/uploads': {
-        target: proxyTarget,
-        changeOrigin: true,
-      }
-    }
-  },
-  build: {
-    rollupOptions: {
-      input: {
-        main: resolve(__dirname, 'index.html'),
-        map_editor: resolve(__dirname, 'map_editor.html'),
-      }
-    }
-  }
-});
+import { defineConfig } from 'vite';
+import { resolve } from 'path';
+
+const proxyTarget = process.env.VITE_DEV_PROXY_TARGET || 'http://localhost:3000';
+
+export default defineConfig({
+  server: {
+    port: 8080,
+    host: true, // Listen on all local IPs
+    proxy: {
+      '/api': {
+        target: proxyTarget,
+        changeOrigin: true,
+      },
+      '/uploads': {
+        target: proxyTarget,
+        changeOrigin: true,
+      }
+    }
+  },
+  build: {
+    rollupOptions: {
+      input: {
+        main: resolve(__dirname, 'index.html'),
+        map_editor: resolve(__dirname, 'map_editor.html'),
+      }
+    }
+  }
+});