Skip to content

Commit 32faa40

Browse files
committed
back to render
1 parent d4db732 commit 32faa40

File tree

5 files changed

+25
-35
lines changed

5 files changed

+25
-35
lines changed

client/src/utils/api.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import axios from 'axios';
22

33
const API = axios.create({
4-
baseURL: '/api',
4+
baseURL: import.meta.env.VITE_API_URL || '/api',
55
});
66

77
// Request interceptor to inject token
@@ -16,4 +16,4 @@ API.interceptors.request.use((config) => {
1616
return config;
1717
});
1818

19-
export default API;
19+
export default API;

client/vercel.json

Lines changed: 0 additions & 8 deletions
This file was deleted.

client/vite.config.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ export default defineConfig({
55
plugins: [react()],
66
server: {
77
proxy: {
8-
'/api': 'https://store-management-js3x.onrender.com/',
8+
'/api': 'http://localhost:5000',
99
},
1010
},
1111
test: {
1212
globals: true,
1313
environment: 'jsdom',
1414
setupFiles: './src/test/setup.js',
1515
},
16-
});
16+
});

server/app.js

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,33 @@
11
const express = require('express');
22
const cors = require('cors');
3+
const path = require('path');
34
require('dotenv').config();
45

56
const app = express();
67

7-
app.use(cors());
8+
app.use(cors({
9+
origin: 'https://store-management-copy-frontend.onrender.com', // your frontend URL
10+
}));
811
app.use(express.json());
912

10-
app.get('/', (req, res) => {
11-
res.send('API is running...');
12-
});
13+
// -------------------------- DEPLOYMENT ---------------------------
14+
const __dirname1 = path.resolve();
1315

16+
if (process.env.NODE_ENV === "production") {
17+
app.use(express.static(path.join(__dirname1, "client", "dist"))); // Vite builds to dist
18+
19+
// SPA fallback route
20+
app.get('/{*any}', (req, res) => {
21+
res.sendFile(path.join(__dirname1, 'client', 'dist', 'index.html'));
22+
});
23+
} else {
24+
app.get("/", (req, res) => {
25+
res.send("API is running successfully");
26+
});
27+
}
28+
// -------------------------- DEPLOYMENT ---------------------------
29+
30+
// Routes
1431
const authRoutes = require('./routes/authRoutes');
1532
const inventoryRoutes = require('./routes/inventoryRoutes');
1633
const salesRoutes = require('./routes/salesRoutes');

server/vercel.json

Lines changed: 0 additions & 19 deletions
This file was deleted.

0 commit comments

Comments
 (0)