Compare commits

..

No commits in common. "d9480e2d14246c4461cffa1442dff0094518de90" and "92699f9a837d5bce6c57f63fd6ecda25c3502a03" have entirely different histories.

4 changed files with 4 additions and 7 deletions

View file

@ -2,7 +2,7 @@
const ENV_VARIABLES = {
MODE: process.env.MODE || "production",
VITE_BACKEND_URL: process.env.VITE_BACKEND_URL || "",
IMG_URL: typeof import.meta !== "undefined" ? import.meta.env.VITE_IMG_URL || "http://localhost" : process.env.VITE_IMG_URL || "http://localhost",
IMG_URL: process.env.MODE == "development" ? process.env.VITE_BACKEND_URL : process.env.IMG_URL,
BACKEND_URL: process.env.SITE_URL != undefined ? `${process.env.SITE_URL}${process.env.USE_PORTS ? `:${process.env.BACKEND_PORT}`:''}` : process.env.VITE_BACKEND_URL || '',
FRONTEND_URL: process.env.SITE_URL != undefined ? `${process.env.SITE_URL}${process.env.USE_PORTS ? `:${process.env.PORT}`:''}` : ''
};

View file

@ -27,8 +27,7 @@
"noUnusedLocals": true,
"noUnusedParameters": true,
"noFallthroughCasesInSwitch": true,
"esModuleInterop": true,
"types": ["vite/client"]
"esModuleInterop": true
},
// "exclude": [
// // "src/components/GiftTemplate/**/*",

View file

@ -7,8 +7,6 @@ services:
context: ./client
dockerfile: Dockerfile
container_name: frontend
environment:
VITE_IMG_URL: http://localhost
ports:
- "5173:5173"
restart: always
@ -56,7 +54,7 @@ services:
image: mongo
container_name: mongo
ports:
- "27019:27017"
- "27017:27017"
tty: true
volumes:
- mongodb_data:/data/db

View file

@ -10,7 +10,7 @@ services:
- VITE_BACKEND_URL=
# Define empty VITE_BACKEND_SOCKET_URL so it will default to window.location.host
- VITE_BACKEND_SOCKET_URL=
- VITE_IMG_URL=https://evalsa.etsmtl.ca
- IMG_URL: https://evalsa.etsmtl.ca
ports:
- "5173:5173"
restart: always