Merge my-feature-branch into develop with resolved conflicts

backend/run.py

@@ -34,5 +34,5 @@ async def main():
         logger.error(f"Application crashed: {e}", exc_info=True)
 
 if __name__ == "__main__":
-    # Запускаем в основном потоке
+    # Запускаем в основном пото
     asyncio.run(main())

docker/frontend/Dockerfile

@@ -23,4 +23,4 @@ EXPOSE 5173
 
 # Запускаем Vite сервер
 ENV HOST=0.0.0.0
-CMD ["npm", "run", "dev", "--", "--host"]
+CMD ["npm", "run", "dev"]

frontend/src/plugins/axios.ts

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 import axios from 'axios'
 
 const axiosInstance = axios.create({
@@ -35,3 +36,6 @@ axiosInstance.interceptors.response.use(
 )
 
 export default axiosInstance 
+=======
+ 
+>>>>>>> my-feature-branch

frontend/vite.config.ts

@@ -2,27 +2,24 @@
 
 import { defineConfig } from 'vite';
 import vue from '@vitejs/plugin-vue';
-import { fileURLToPath, URL } from 'node:url';
+import path from 'path';
 
 // https://vitejs.dev/config/
 export default defineConfig({
   plugins: [vue()],
   resolve: {
     alias: {
-      '@': fileURLToPath(new URL('./src', import.meta.url))
+      '@': path.resolve(__dirname, './src'),
-    }
+    },
+  },
+  optimizeDeps: {
+    include: ['axios']
   },
   server: {
     host: true,
     port: 5173,
     watch: {
       usePolling: true
-    },
-    proxy: {
-      '/api': {
-        target: 'http://backend:8000',
-        changeOrigin: true
-      }
     }
   }
 });