Merge branch 'dev' of github.com:Tria-plc/edr-platform into importhandover

apps/edr-freight-web/backoffice/package.json

@@ -4,7 +4,7 @@
   "private": true,
   "type": "module",
   "scripts": {
-    "dev": "vite --port 5183",
+    "dev": "vite --port 5183 --clearScreen false",
     "prebuild": "node -e \"const fs=require('fs'); fs.rmSync('dist',{recursive:true,force:true});\"",
     "build": "vite build",
     "preview": "vite preview --port 5183",

apps/edr-freight-web/backoffice/src/constants/apiConfig.ts

@@ -1,5 +1,11 @@
+<<<<<<< HEAD
 export const API_BASE_URL = 'https://edrfreightapi.triaplc.com';
 //export const API_BASE_URL = 'http://localhost:3001';
+=======
+export const API_BASE_URL = import.meta.env.VITE_BASE_API_URL;
+
+// export const API_BASE_URL = 'http://localhost:3001';
+>>>>>>> 8616f6dcdfa44089be2fd7b6a9867b20e320b305
 
 /**
  * URL that streams an uploaded file through the API by its UUID. Routes the