diff --git a/src/components/Ingresos/IngresoCard.jsx b/src/components/Ingresos/IngresoCard.jsx index 24bb717..fb794bd 100644 --- a/src/components/Ingresos/IngresoCard.jsx +++ b/src/components/Ingresos/IngresoCard.jsx @@ -160,7 +160,7 @@ const IngresoCard = ({ {editable && !createMode && !editMode && ( } > {({ closeDropdown }) => ( diff --git a/src/components/Solicitudes/SolicitudCard.jsx b/src/components/Solicitudes/SolicitudCard.jsx index 37be2f9..efe706b 100644 --- a/src/components/Solicitudes/SolicitudCard.jsx +++ b/src/components/Solicitudes/SolicitudCard.jsx @@ -98,10 +98,10 @@ const renderDescripcionSolicitud = (data, onProfile) => { case 2: return data.status === 1 - ? `La solicitud de añadir colaborador de ${m?.displayName ?? data.name} ha sido aceptada.` + ? `La solicitud de añadir colaborador de ${data.name} ha sido aceptada.` : data.status === 2 - ? `La solicitud de añadir colaborador de ${m?.displayName ?? data.name} ha sido rechazada.` - : `${m?.displayName ?? data.name} quiere añadir un colaborador.`; + ? `La solicitud de añadir colaborador de ${data.name} ha sido rechazada.` + : `${data.name} quiere añadir un colaborador.`; case 3: return data.status === 1 diff --git a/src/css/AnuncioCard.css b/src/css/AnuncioCard.css index a7dab60..556116b 100644 --- a/src/css/AnuncioCard.css +++ b/src/css/AnuncioCard.css @@ -6,7 +6,7 @@ } .anuncio-card:hover { - transform: translateY(-5px); + /*transform: translateY(-5px);*/ box-shadow: 0 0.75rem 1.5rem var(--shadow-color); } diff --git a/src/css/Footer.css b/src/css/Footer.css index 73c399c..6e9e3e4 100644 --- a/src/css/Footer.css +++ b/src/css/Footer.css @@ -125,7 +125,7 @@ } .contact-info a:hover { - transform: translateX(8px); + /*transform: translateX(8px);*/ color: var(--secondary-color); } diff --git a/src/css/IngresoCard.css b/src/css/IngresoCard.css index 6624a93..68bb6f3 100644 --- a/src/css/IngresoCard.css +++ b/src/css/IngresoCard.css @@ -14,7 +14,7 @@ } .ingreso-card:hover { - transform: translateY(-5px); + /*transform: translateY(-5px);*/ box-shadow: 0 0.75rem 1.5rem var(--shadow-color); } diff --git a/src/css/Perfil.css b/src/css/Perfil.css index 88c0c97..92e7cbe 100644 --- a/src/css/Perfil.css +++ b/src/css/Perfil.css @@ -10,7 +10,7 @@ } .perfil-card:hover { - transform: translateY(-3px); + /*transform: translateY(-3px);*/ box-shadow: 0 0.5rem 1rem var(--shadow-color); } diff --git a/src/css/SocioCard.css b/src/css/SocioCard.css index fffdc0b..e3c0ea1 100644 --- a/src/css/SocioCard.css +++ b/src/css/SocioCard.css @@ -10,7 +10,7 @@ } .socio-card:hover { - transform: translateY(-5px); + /*transform: translateY(-5px);*/ box-shadow: 0 0.75rem 1.5rem var(--shadow-color); } diff --git a/src/css/SolicitudCard.css b/src/css/SolicitudCard.css index 5437aa0..8a20565 100644 --- a/src/css/SolicitudCard.css +++ b/src/css/SolicitudCard.css @@ -10,7 +10,7 @@ } .solicitud-card:hover { - transform: translateY(-5px); + /*transform: translateY(-5px);*/ box-shadow: 0 0.75rem 1.5rem var(--shadow-color); } diff --git a/src/hooks/useSessionRenewal.jsx b/src/hooks/useSessionRenewal.jsx index 4566619..ab187e0 100644 --- a/src/hooks/useSessionRenewal.jsx +++ b/src/hooks/useSessionRenewal.jsx @@ -32,7 +32,7 @@ const useSessionRenewal = () => { clearInterval(interval); logout(); } - }, 10000); // revisa cada 10 segundos + }, 10000); return () => clearInterval(interval); }, [alreadyWarned, logout]); @@ -50,7 +50,7 @@ const useSessionRenewal = () => { try { const response = await axios.get( - `${config.apiConfig.baseUrl}${config.apiConfig.endpoints.auth.refreshToken}`, + `${config.apiConfig.coreUrl}${config.apiConfig.endpoints.auth.refreshToken}`, null, { headers: { @@ -59,7 +59,7 @@ const useSessionRenewal = () => { } ); - const newToken = response.data.data.token; + const newToken = response.data.token; localStorage.setItem("token", newToken); setShowModal(false); setAlreadyWarned(false); diff --git a/src/pages/Ingresos.jsx b/src/pages/Ingresos.jsx index d0ae287..ee1dcf6 100644 --- a/src/pages/Ingresos.jsx +++ b/src/pages/Ingresos.jsx @@ -210,7 +210,7 @@ const IngresosContent = ({ reqConfig }) => { setSearchTerm(""); setDeleteTargetId(null); } catch (err) { - console.log(err); + console.error(err); } }} > diff --git a/src/pages/Perfil.jsx b/src/pages/Perfil.jsx index 27290a7..6545f90 100644 --- a/src/pages/Perfil.jsx +++ b/src/pages/Perfil.jsx @@ -69,11 +69,8 @@ const Perfil = () => { const reqConfig = { baseUrl: `${config.apiConfig.baseUrl}${config.apiConfig.endpoints.users.me}`, - myIncomesUrl: buildUrl(config.apiConfig.baseUrl, config.apiConfig.endpoints.incomes.mine), requestUrl: buildUrl(config.apiConfig.baseUrl, config.apiConfig.endpoints.requests.all), - myRequestsUrl: buildUrl(config.apiConfig.baseUrl, config.apiConfig.endpoints.requests.mine), changePasswordUrl: buildUrl(config.apiConfig.coreUrl, config.apiConfig.endpoints.auth.changePassword), - loginValidateUrl: buildUrl(config.apiConfig.coreUrl, config.apiConfig.endpoints.auth.loginValidate), }; return ( @@ -426,6 +423,7 @@ const PerfilContent = ({ config }) => { type: CONSTANTS.REQUEST_TYPE_ADD_COLLABORATOR, status: CONSTANTS.REQUEST_PENDING, userId: identity.user.userId, + name: identity.user.displayName, metadata: { displayName: formData.displayName, username: formData.username, @@ -468,12 +466,7 @@ const PerfilContent = ({ config }) => { variant="warning" onClick={async () => { try { - await postData(config.requestUrl, { - type: CONSTANTS.REQUEST_TYPE_REMOVE_COLLABORATOR, - status: CONSTANTS.REQUEST_PENDING, - requestedBy: identity.user.userId - }); - + sendSimpleRequest(CONSTANTS.REQUEST_TYPE_REMOVE_COLLABORATOR); setFeedbackModal({ title: "Solicitud enviada", message: "Se ha solicitado la eliminación del colaborador.",