diff --git a/backend/src/main.ts b/backend/src/main.ts index b08dc0c..718c548 100644 --- a/backend/src/main.ts +++ b/backend/src/main.ts @@ -7,7 +7,7 @@ async function bootstrap() { app.setGlobalPrefix('api'); app.enableCors(); app.useGlobalPipes(new ValidationPipe({ transform: true, whitelist: true })); - await app.listen(process.env.PORT ?? 3000); - console.log(`Server running on http://localhost:${process.env.PORT ?? 3000}`); + await app.listen(process.env.PORT ?? 3001); + console.log(`Server running on http://localhost:${process.env.PORT ?? 3001}`); } bootstrap(); diff --git a/frontend/src/api/index.ts b/frontend/src/api/index.ts index 4a64a37..de9165e 100644 --- a/frontend/src/api/index.ts +++ b/frontend/src/api/index.ts @@ -1,7 +1,7 @@ import axios from 'axios'; const api = axios.create({ - baseURL: import.meta.env.PROD ? '/api' : `http://localhost:${import.meta.env.VITE_API_PORT || 3002}/api`, + baseURL: '/api', timeout: 10000, }); diff --git a/frontend/vite.config.ts b/frontend/vite.config.ts index f2f9c6e..8f64208 100644 --- a/frontend/vite.config.ts +++ b/frontend/vite.config.ts @@ -4,6 +4,15 @@ import react from '@vitejs/plugin-react' // https://vite.dev/config/ export default defineConfig({ plugins: [react()], + server: { + port: 3000, + proxy: { + '/api': { + target: 'http://localhost:3001', + changeOrigin: true, + }, + }, + }, optimizeDeps: { include: [ 'dayjs',