{file.file_name}
+{file.fileName}
- })
+ })
- Solicitud #{data.request_id} - {getTipoSolicitud(data.request_type)}
+ Solicitud #{data.requestId} - {getTipoSolicitud(data.type)}
- Estado: {getEstadoSolicitud(data.request_status)}
+ Estado: {getEstadoSolicitud(data.status)}
@@ -147,7 +147,7 @@ const SolicitudCard = ({ data, onAccept, onReject, onDelete, editable = true, on
diff --git a/src/context/AuthContext.jsx b/src/context/AuthContext.jsx
index 18b369b..c01156b 100644
--- a/src/context/AuthContext.jsx
+++ b/src/context/AuthContext.jsx
@@ -8,8 +8,12 @@ export const AuthProvider = ({ children }) => {
const axios = createAxiosInstance();
const { config } = useConfig();
- const [user, setUser] = useState(() => JSON.parse(localStorage.getItem("user")) || null);
const [token, setToken] = useState(() => localStorage.getItem("token"));
+ const [identity, setIdentity] = useState(() => {
+ const stored = localStorage.getItem("identity");
+ return stored ? JSON.parse(stored) : null;
+ });
+
const [authStatus, setAuthStatus] = useState("checking");
const [error, setError] = useState(null);
@@ -21,7 +25,7 @@ export const AuthProvider = ({ children }) => {
return;
}
- const BASE_URL = config.apiConfig.baseUrl;
+ const BASE_URL = config.apiConfig.coreUrl;
const VALIDATE_URL = `${BASE_URL}${config.apiConfig.endpoints.auth.validateToken}`;
const checkAuth = async () => {
@@ -29,6 +33,7 @@ export const AuthProvider = ({ children }) => {
const res = await axios.get(VALIDATE_URL, {
headers: { Authorization: `Bearer ${token}` },
});
+
if (res.status === 200) {
setAuthStatus("authenticated");
} else {
@@ -45,53 +50,70 @@ export const AuthProvider = ({ children }) => {
const login = async (formData) => {
setError(null);
+
const BASE_URL = config.apiConfig.baseUrl;
const LOGIN_URL = `${BASE_URL}${config.apiConfig.endpoints.auth.login}`;
-
+
try {
const res = await axios.post(LOGIN_URL, formData);
- const { token, member, tokenTime } = res.data.data;
-
+
+ const { token, user, account, metadata } = res.data;
+
+ const identity = {
+ user,
+ account,
+ metadata,
+ };
+
localStorage.setItem("token", token);
- localStorage.setItem("user", JSON.stringify(member));
- localStorage.setItem("tokenTime", tokenTime);
-
+ localStorage.setItem("identity", JSON.stringify(identity));
+
setToken(token);
- setUser(member);
+ setIdentity(identity);
setAuthStatus("authenticated");
} catch (err) {
console.error("Error al iniciar sesión:", err);
-
+
let message = "Ha ocurrido un error inesperado.";
-
+
if (err.response) {
const { status, data } = err.response;
-
+
if (status === 400) {
message = "Usuario o contraseña incorrectos.";
} else if (status === 403) {
- message = "Tu cuenta está inactiva o ha sido suspendida.";
+ message = "Tu cuenta está inactiva o suspendida.";
} else if (status === 404) {
message = "Usuario no encontrado.";
} else if (data?.message) {
message = data.message;
}
}
-
+
setError(message);
throw new Error(message);
}
};
const logout = () => {
- localStorage.clear();
- setUser(null);
+ localStorage.removeItem("token");
+ localStorage.removeItem("identity");
+ setIdentity(null);
setToken(null);
setAuthStatus("unauthenticated");
};
return (
-
+
{children}
);
diff --git a/src/hooks/useData.js b/src/hooks/useData.js
index a1c5dd5..3ed4b36 100644
--- a/src/hooks/useData.js
+++ b/src/hooks/useData.js
@@ -30,9 +30,9 @@ export const useData = (config) => {
headers: getAuthHeaders(),
params: current.params,
});
- setData(response.data.data);
+ setData(response.data);
} catch (err) {
- setError(err.response?.data?.message || err.message);
+ setError(err.response?.data);
} finally {
setLoading(false);
}
@@ -45,18 +45,11 @@ export const useData = (config) => {
}, [config, fetchData]);
const getData = async (url, params = {}) => {
- try {
- const response = await axios.get(url, {
- headers: getAuthHeaders(),
- params,
- });
- return { data: response.data.data, error: null };
- } catch (err) {
- return {
- data: null,
- error: err.response?.data?.message || err.message,
- };
- }
+ const response = await axios.get(url, {
+ headers: getAuthHeaders(),
+ params,
+ });
+ return response.data;
};
const postData = async (endpoint, payload) => {
@@ -66,37 +59,33 @@ export const useData = (config) => {
};
const response = await axios.post(endpoint, payload, { headers });
await fetchData();
- return response.data.data;
+ return response.data;
};
const postDataValidated = async (endpoint, payload) => {
try {
- const headers = {
- Authorization: `Bearer ${localStorage.getItem("token")}`,
- ...(payload instanceof FormData ? {} : { "Content-Type": "application/json" }),
- };
- const response = await axios.post(endpoint, payload, { headers });
- return { data: response.data.data, errors: null };
+ const response = await axios.post(endpoint, payload, {
+ headers: {
+ Authorization: `Bearer ${localStorage.getItem("token")}`,
+ "Content-Type": "application/json",
+ },
+ });
+
+ return { ok: true };
} catch (err) {
- const raw = err.response?.data?.message;
- let parsed = {};
-
- try {
- parsed = JSON.parse(raw);
- } catch {
- return { data: null, errors: { general: raw || err.message } };
- }
-
- return { data: null, errors: parsed };
+ return {
+ ok: false,
+ errors: err.response?.data?.errors || {}
+ };
}
- };
+ };
const putData = async (endpoint, payload) => {
const response = await axios.put(endpoint, payload, {
headers: getAuthHeaders(),
});
await fetchData();
- return response.data.data;
+ return response.data;
};
const deleteData = async (endpoint) => {
@@ -104,7 +93,7 @@ export const useData = (config) => {
headers: getAuthHeaders(),
});
await fetchData();
- return response.data.data;
+ return response.data;
};
const deleteDataWithBody = async (endpoint, payload) => {
@@ -113,7 +102,7 @@ export const useData = (config) => {
data: payload,
});
await fetchData();
- return response.data.data;
+ return response.data;
};
return {
diff --git a/src/hooks/useRequestCount.js b/src/hooks/useRequestCount.js
index 887f0ad..6f302ca 100644
--- a/src/hooks/useRequestCount.js
+++ b/src/hooks/useRequestCount.js
@@ -12,7 +12,7 @@ const useRequestCount = () => {
const fetchCount = async () => {
try {
const res = await axios.get(
- config.apiConfig.baseUrl + config.apiConfig.endpoints.requests.countPending,
+ config.apiConfig.baseUrl + config.apiConfig.endpoints.requests.count,
{
headers: {
Authorization: `Bearer ${localStorage.getItem('token')}`,
@@ -20,7 +20,7 @@ const useRequestCount = () => {
},
}
);
- setCount(res.data.data.count);
+ setCount(res.data.count);
} catch (err) {
console.error('❌ Error al obtener el número de solicitudes:', err.message);
}
diff --git a/src/pages/Anuncios.jsx b/src/pages/Anuncios.jsx
index 41a4a90..9ff9ea5 100644
--- a/src/pages/Anuncios.jsx
+++ b/src/pages/Anuncios.jsx
@@ -25,9 +25,9 @@ const Anuncios = () => {
if (configLoading) return handleEditSubmit(a, id)}
- onDelete={() => handleDelete(anuncio.announce_id)}
+ onDelete={() => handleDelete(anuncio.announceId)}
error={error}
onClearError={() => setError(null)}
/>
diff --git a/src/pages/Documentacion.jsx b/src/pages/Documentacion.jsx
index 31d53bb..23870d8 100644
--- a/src/pages/Documentacion.jsx
+++ b/src/pages/Documentacion.jsx
@@ -19,9 +19,8 @@ const Documentacion = () => {
const reqConfig = {
baseUrl: config.apiConfig.coreUrl + config.apiConfig.endpoints.files.all,
- uploadUrl: config.apiConfig.coreUrl + config.apiConfig.endpoints.files.upload,
params: {
- _sort: 'uploaded_at',
+ _sort: 'uploadedAt',
_order: 'desc'
}
};
@@ -40,22 +39,22 @@ const DocumentacionContent = ({ reqConfig }) => {
const handleSelectFiles = async (files) => {
const file = files[0];
- if (!file || !reqConfig?.uploadUrl) return;
+ if (!file || !reqConfig?.baseUrl) return;
- const file_name = file.name;
- const mime_type = file.type || "application/octet-stream";
- const uploaded_by = JSON.parse(localStorage.getItem("user"))?.user_id;
+ const fileName = file.name;
+ const mimeType = file.type || "application/octet-stream";
+ const uploadedBy = JSON.parse(localStorage.getItem("identity"))?.user?.userId;
const context = 1;
const formData = new FormData();
formData.append("file", file);
- formData.append("file_name", file_name);
- formData.append("mime_type", mime_type);
- formData.append("uploaded_by", uploaded_by);
+ formData.append("fileName", fileName);
+ formData.append("mimeType", mimeType);
+ formData.append("uploadedBy", uploadedBy);
formData.append("context", context);
try {
- await postData(reqConfig.uploadUrl, formData);
+ await postData(reqConfig.baseUrl, formData);
fileUploadRef.current?.resetSelectedFiles();
} catch (err) {
console.error("Error al subir archivo:", err);
@@ -100,8 +99,8 @@ const DocumentacionContent = ({ reqConfig }) => {
variant="danger"
onClick={async () => {
try {
- await deleteDataWithBody(`${reqConfig.baseUrl}/${deleteTarget.file_id}`, {
- file_path: deleteTarget.file_path
+ await deleteDataWithBody(`${reqConfig.baseUrl}/${deleteTarget.fileId}`, {
+ filePath: deleteTarget.filePath
});
setDeleteTarget(null);
} catch (err) {
diff --git a/src/pages/Gastos.jsx b/src/pages/Gastos.jsx
index fe7f8a5..e13244c 100644
--- a/src/pages/Gastos.jsx
+++ b/src/pages/Gastos.jsx
@@ -30,7 +30,7 @@ const Gastos = () => {
const reqConfig = {
baseUrl: `${config.apiConfig.baseUrl}${config.apiConfig.endpoints.expenses.all}`,
params: {
- _sort: 'created_at',
+ _sort: 'createdAt',
_order: 'desc',
},
};
@@ -84,7 +84,7 @@ const GastosContent = ({ reqConfig }) => {
const handleCreate = () => {
setCreatingGasto(true);
setTempGasto({
- expense_id: null,
+ expenseId: null,
concept: '',
amount: 0.0,
supplier: '',
@@ -160,7 +160,7 @@ const GastosContent = ({ reqConfig }) => {
)}
renderCard={(gasto) => (
{
rawUrl: config.apiConfig.baseUrl + config.apiConfig.endpoints.incomes.all,
membersUrl: config.apiConfig.baseUrl + config.apiConfig.endpoints.members.all,
params: {
- _sort: 'created_at',
+ _sort: 'createdAt',
_order: 'desc'
}
};
@@ -98,16 +98,16 @@ const IngresosContent = ({ reqConfig }) => {
searchFn: (ingreso, term) => {
const normalized = term.toLowerCase();
return ingreso.concept?.toLowerCase().includes(normalized) ||
- String(ingreso.member_number).includes(normalized) ||
- ingreso.display_name?.toLowerCase().includes(normalized);
+ String(ingreso.memberNumber).includes(normalized) ||
+ ingreso.displayName?.toLowerCase().includes(normalized);
}
});
const handleCreate = () => {
setCreatingIngreso(true);
setTempIngreso({
- income_id: null,
- member_number: 0,
+ incomeId: null,
+ memberNumber: 0,
concept: '',
amount: 0.0,
frequency: CONSTANTS.PAYMENT_FREQUENCY_YEARLY,
@@ -183,10 +183,10 @@ const IngresosContent = ({ reqConfig }) => {
)}
renderCard={(income) => (
handleEditSubmit(data, id)}
- onDelete={() => handleDelete(income.income_id)}
+ onDelete={() => handleDelete(income.incomeId)}
error={error}
onClearError={() => setError(null)}
/>
diff --git a/src/pages/ListaEspera.jsx b/src/pages/ListaEspera.jsx
index 8a85ee4..db7475b 100644
--- a/src/pages/ListaEspera.jsx
+++ b/src/pages/ListaEspera.jsx
@@ -23,10 +23,10 @@ const ListaEspera = () => {
if (configLoading) return
{dataError}
; @@ -117,7 +113,7 @@ const ListaEsperaContent = ({ reqConfig }) => {-
- })
+ })
@@ -293,21 +293,21 @@ const PerfilContent = ({ config }) => {
- {`@${usuario.user_name}`}
- Te uniste el {parseDate(usuario.created_at)}
+ {`@${identity.account.username}`}
+ Te uniste el {parseDate(identity.metadata.createdAt)}
No hay pagos registrados.
}
{incomes.map(income => (
-
@@ -331,7 +331,7 @@ const PerfilContent = ({ config }) => {
{mappedRequests.map(request => (
-
@@ -432,7 +432,7 @@ const PerfilContent = ({ config }) => {
>
{incomes.map((income) => (
-
diff --git a/src/pages/Solicitudes.jsx b/src/pages/Solicitudes.jsx
index 54f834e..04de347 100644
--- a/src/pages/Solicitudes.jsx
+++ b/src/pages/Solicitudes.jsx
@@ -49,30 +49,28 @@ const SolicitudesContent = ({ reqConfig }) => {
searchFn: (entry, term) => {
const normalized = term.toLowerCase();
return (
- entry.pre_display_name?.toLowerCase().includes(normalized) ||
- entry.pre_dni?.toLowerCase().includes(normalized) ||
- entry.pre_email?.toLowerCase().includes(normalized) ||
- String(entry.pre_phone).includes(normalized)
+ entry.preDisplayName?.toLowerCase().includes(normalized) ||
+ entry.preDni?.toLowerCase().includes(normalized) ||
+ entry.preEmail?.toLowerCase().includes(normalized) ||
+ String(entry.prePhone).includes(normalized)
);
},
- sortFn: (a, b) => a.request_status - b.request_status
+ sortFn: (a, b) => a.status - b.status
});
const handleAccept = async (entry) => {
- const url = reqConfig.acceptUrl.replace(":request_id", entry.request_id);
+ const url = reqConfig.acceptUrl.replace(":requestId", entry.requestId);
try {
await putData(url, {});
- console.log("✅ Solicitud aceptada:", entry.request_id);
} catch (err) {
console.error("❌ Error al aceptar solicitud:", err.message);
}
};
const handleReject = async (entry) => {
- const url = reqConfig.rejectUrl.replace(":request_id", entry.request_id);
+ const url = reqConfig.rejectUrl.replace(":requestId", entry.requestId);
try {
await putData(url, {});
- console.log("🛑 Solicitud rechazada:", entry.request_id);
} catch (err) {
console.error("❌ Error al rechazar solicitud:", err.message);
}
@@ -107,7 +105,7 @@ const SolicitudesContent = ({ reqConfig }) => {
items={filtered}
renderCard={(entry) => (