Merge branch 'main' into development

Author: TVATDCI

backend/app.js

@@ -1,3 +1,5 @@
+import path from "path";
+import { fileURLToPath } from "url";
 import express from "express";
 import dotenv from "dotenv";
 // Import cors to allow requests from any origin
@@ -34,12 +36,28 @@ dotenv.config({
 connectDB();
 //#Initialize middleware
 const app = express();
-//#Also use the cors middleware for cross-origin requests.In this case, frontend requests!
-app.use(cors());
-
-// Middleware to parse the body but only with tester like Postman or others
 app.use(express.json());
-// CORS middleware to allow requests from any origin eg. frontend!
+
+//#Enable CORS to allow requests from frontend or other origins.
+const allowedOrigins = [
+  process.env.FRONTEND_URL || "http://localhost:5173",
+  process.env.FRONTEND_URL_PROD || "https://your-frontend.onrender.com",
+];
+
+app.use(
+  cors({
+    origin: (origin, callback) => {
+      if (!origin) return callback(null, true);
+      if (allowedOrigins.includes(origin)) {
+        callback(null, true);
+      } else {
+        console.error(`Blocked by CORS: ${origin}`);
+        callback(new Error("Not allowed by CORS"));
+      }
+    },
+    credentials: true,
+  })
+);
 
 //#Profile routes for user profile management
 app.use("/profile", userProfileRoutes);

frontend/package-lock.json

@@ -2,7 +2,7 @@
 import { getStoredToken } from "./auth";
 
 // Central API_BASE_URL for all API calls!
-const API_BASE_URL = import.meta.env.VITE_API_BASE_URL;
+const API_BASE_URL = import.meta.env.VITE_API_BASE_URL || "/api";
 // Check if the environment variable is set
 if (!API_BASE_URL) {
   console.error(

frontend/src/components/utils/api.js

@@ -1,7 +1,28 @@
-import { defineConfig } from "vite";
+import { defineConfig, loadEnv } from "vite";
 import react from "@vitejs/plugin-react";
+import path from "path";
 
-// https://vite.dev/config/
-export default defineConfig({
-  plugins: [react()],
+export default defineConfig(({ mode }) => {
+  const env = loadEnv(mode, path.dirname(new URL(import.meta.url).pathname));
+  console.log("VITE_RENDER_BACKEND_URL:", env.VITE_RENDER_BACKEND_URL);
+  console.log("VITE_API_BASE_URL:", env.VITE_API_BASE_URL);
+  console.log("VITE_FRONTEND_URL:", env.VITE_FRONTEND_URL);
+  console.log("VITE_FRONTEND_URL_PROD:", env.VITE_FRONTEND_URL_PROD);
+  console.log("NODE_ENV:", env.NODE_ENV);
+  console.log("MONGO_URL:", env.MONGO_URL);
+  console.log("Loaded environment variables for mode:", mode);
+  console.log("Loaded environment", env);
+
+  return {
+    plugins: [react()],
+    server: {
+      proxy: {
+        "/api": {
+          target: env.VITE_RENDER_BACKEND_URL || "http://localhost:5000",
+          changeOrigin: true,
+          rewrite: (path) => path.replace(/^\/api/, ""),
+        },
+      },
+    },
+  };
 });