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

This commit is contained in:
hagiye
2026-06-30 16:53:54 +03:00
77 changed files with 2814 additions and 2740 deletions

View File

@@ -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",

View File

@@ -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

View File

@@ -4,7 +4,7 @@
"private": true,
"type": "module",
"scripts": {
"dev": "vite --port 5173",
"dev": "vite --port 5173 --clearScreen false",
"build": "tsc -b && vite build",
"preview": "vite preview --port 5173",
"lint": "eslint src",

View File

@@ -1,5 +1,9 @@
<<<<<<< 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;
>>>>>>> 8616f6dcdfa44089be2fd7b6a9867b20e320b305
/**
* URL that streams an uploaded file through the API by its UUID. Routes the
@@ -12,4 +16,3 @@ export function fileViewUrl(fileId: string, download = false): string {
const base = `${API_BASE_URL}/api/files/${fileId}`;
return download ? `${base}?download=1` : base;
}