conflict
test-org/trust-module-frontend/pipeline/pr-main Build succeeded
test-org/trust-module-frontend/pipeline/pr-main Build succeeded
commit
cf38b25678
|
|
@ -25,7 +25,8 @@
|
||||||
"@mui/material": "^6.4.7",
|
"@mui/material": "^6.4.7",
|
||||||
"@mui/icons-material": "^6.4.8",
|
"@mui/icons-material": "^6.4.8",
|
||||||
"reactflow": "^11.11.4",
|
"reactflow": "^11.11.4",
|
||||||
"vite-plugin-svgr": "^4.3.0"
|
"vite-plugin-svgr": "^4.3.0",
|
||||||
|
"react-scripts": "^5.0.1"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@eslint/js": "^9.17.0",
|
"@eslint/js": "^9.17.0",
|
||||||
|
|
|
||||||
|
|
@ -92,15 +92,15 @@ const PrometheusChart = ({ metricName }) => {
|
||||||
else if (range <= 86400) step = 120;
|
else if (range <= 86400) step = 120;
|
||||||
else step = 300;
|
else step = 300;
|
||||||
|
|
||||||
const response = await axios.get('http://192.168.2.39:3000/metrics', {
|
const response = await axios.get(`${import.meta.env.VITE_BACK_URL}/metrics`, {
|
||||||
params: { metric: metricName, start, end, step },
|
params: {
|
||||||
|
metric: metricName,
|
||||||
|
start,
|
||||||
|
end,
|
||||||
|
step
|
||||||
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
/*
|
|
||||||
const response = await axios.get(`${process.env.REACT_APP_BACK_URL}/metrics`, {
|
|
||||||
params: { metric: metricName, start, end, step },
|
|
||||||
}); */
|
|
||||||
|
|
||||||
const result = response.data;
|
const result = response.data;
|
||||||
let metrics = Array.isArray(result) ? result : result.data || [];
|
let metrics = Array.isArray(result) ? result : result.data || [];
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -17,8 +17,7 @@ const LoginModal = ({ onLogin, onClose }) => {
|
||||||
|
|
||||||
try {
|
try {
|
||||||
// Отправляем данные на бэкенд
|
// Отправляем данные на бэкенд
|
||||||
console.log("Отправляем данные:", { username, password });
|
const response = await fetch(`${import.meta.env.VITE_BACK_URL}/auth/login`, {
|
||||||
const response = await fetch('http://192.168.2.43:3000/auth/login', {
|
|
||||||
method: 'POST',
|
method: 'POST',
|
||||||
headers: {
|
headers: {
|
||||||
'Content-Type': 'application/json',
|
'Content-Type': 'application/json',
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue