diff --git a/backend/build-upload.sh b/backend/build-upload.sh index 891f88f..acb949d 100755 --- a/backend/build-upload.sh +++ b/backend/build-upload.sh @@ -6,5 +6,5 @@ cd .. cd huertos/ || exit mvn clean package cd .. -scp core/target/core-*.jar root@huertosbellavista.es:/root/transfer -scp huertos/target/huertos-*.jar root@huertosbellavista.es:/root/transfer \ No newline at end of file +scp core/target/core-*.jar root@159.69.155.167:/root/transfer +scp huertos/target/huertos-*.jar root@159.69.155.167:/root/transfer \ No newline at end of file diff --git a/backend/huertos/src/main/java/es/huertosbellavista/backend/huertos/controller/MemberController.java b/backend/huertos/src/main/java/es/huertosbellavista/backend/huertos/controller/MemberController.java index 41ba36e..a73b37f 100644 --- a/backend/huertos/src/main/java/es/huertosbellavista/backend/huertos/controller/MemberController.java +++ b/backend/huertos/src/main/java/es/huertosbellavista/backend/huertos/controller/MemberController.java @@ -4,7 +4,7 @@ import es.huertosbellavista.backend.huertos.dto.DropdownDto; import es.huertosbellavista.backend.huertos.dto.MemberDto; import es.huertosbellavista.backend.huertos.dto.MemberProfileDto; import es.huertosbellavista.backend.huertos.dto.WaitlistCensoredDto; -import net.miarma.backend.huertos.dto.*; +import es.huertosbellavista.backend.huertos.dto.*; import es.huertosbellavista.backend.huertos.dto.view.VIncomesWithInfoDto; import es.huertosbellavista.backend.huertos.security.HuertosPrincipal; import es.huertosbellavista.backend.huertos.service.MemberService; diff --git a/backend/huertos/src/main/java/es/huertosbellavista/backend/huertos/controller/RequestController.java b/backend/huertos/src/main/java/es/huertosbellavista/backend/huertos/controller/RequestController.java index 7722477..efd0630 100644 --- a/backend/huertos/src/main/java/es/huertosbellavista/backend/huertos/controller/RequestController.java +++ b/backend/huertos/src/main/java/es/huertosbellavista/backend/huertos/controller/RequestController.java @@ -3,7 +3,7 @@ package es.huertosbellavista.backend.huertos.controller; import es.huertosbellavista.backend.huertos.dto.RequestCountDto; import es.huertosbellavista.backend.huertos.dto.RequestDto; import es.huertosbellavista.backend.huertos.dto.RequestWithMetadataDto; -import net.miarma.backend.huertos.dto.*; +import es.huertosbellavista.backend.huertos.dto.*; import es.huertosbellavista.backend.huertos.mapper.RequestMapper; import es.huertosbellavista.backend.huertos.mapper.RequestWithMetadataMapper; import es.huertosbellavista.backend.huertos.model.Request; diff --git a/backend/huertos/src/main/java/es/huertosbellavista/backend/huertos/service/MemberService.java b/backend/huertos/src/main/java/es/huertosbellavista/backend/huertos/service/MemberService.java index cb6d160..c841f2e 100644 --- a/backend/huertos/src/main/java/es/huertosbellavista/backend/huertos/service/MemberService.java +++ b/backend/huertos/src/main/java/es/huertosbellavista/backend/huertos/service/MemberService.java @@ -178,7 +178,8 @@ .toList(); return plotMembers.stream() - .anyMatch(dto -> dto.metadata().getType().equals((byte)3)); + .anyMatch(dto -> dto.metadata().getType().equals((byte)3) || + dto.metadata().getType().equals((byte)0)); } public Boolean hasGreenhouse(Integer memberNumber) { diff --git a/frontend/public/config/settings.prod.json b/frontend/public/config/settings.prod.json index c2d2629..1994e86 100644 --- a/frontend/public/config/settings.prod.json +++ b/frontend/public/config/settings.prod.json @@ -1,7 +1,7 @@ { "apiConfig": { - "baseUrl": "https://api.miarma.net/v2/huertos", - "coreUrl": "https://api.miarma.net/v2/core", + "baseUrl": "https://api.huertosbellavista.es/v2/huertos", + "coreUrl": "https://api.huertosbellavista.es/v2/core", "endpoints": { "auth": { "login": "/auth/login", diff --git a/frontend/src/components/Socios/SocioCard.jsx b/frontend/src/components/Socios/SocioCard.jsx index a3f9dcc..241c64b 100644 --- a/frontend/src/components/Socios/SocioCard.jsx +++ b/frontend/src/components/Socios/SocioCard.jsx @@ -146,7 +146,7 @@ const SocioCard = ({ identity, isNew = false, onCreate, onUpdate, onDelete, onCa if (!(createMode || editMode)) return; const latestNumber = import.meta.env.MODE === 'production' ? - await getData("https://api.miarma.net/v2/huertos/users/latest-number", {}, false) + await getData("https://api.huertosbellavista.es/v2/huertos/users/latest-number", {}, false) : await getData("http://localhost:8081/v2/huertos/users/latest-number", {}, false); const nuevoNumero = latestNumber + 1; diff --git a/frontend/src/components/Solicitudes/NewUserForm.jsx b/frontend/src/components/Solicitudes/NewUserForm.jsx index 4a6609d..89d9307 100644 --- a/frontend/src/components/Solicitudes/NewUserForm.jsx +++ b/frontend/src/components/Solicitudes/NewUserForm.jsx @@ -28,7 +28,7 @@ const NewUserForm = ({ onSubmit, userType, plotNumber, fieldErrors }) => { try { const latestNumber = import.meta.env.MODE === 'production' ? - await getData("https://api.miarma.net/v2/huertos/users/latest-number", {}, false) + await getData("https://api.huertosbellavista.es/v2/huertos/users/latest-number", {}, false) : await getData("http://localhost:8081/v2/huertos/users/latest-number", {}, false); setForm((prev) => ({ ...prev, diff --git a/frontend/src/hooks/useData.js b/frontend/src/hooks/useData.js index 4171f0d..9ad7365 100644 --- a/frontend/src/hooks/useData.js +++ b/frontend/src/hooks/useData.js @@ -79,7 +79,7 @@ export const useData = (config, onError) => { headers: getAuthHeaders(), params: current.params, }); - setData([...response.data]); + setData(response.data); } catch (err) { const error = handleAxiosError(err); setError(error); diff --git a/frontend/src/pages/Socios.jsx b/frontend/src/pages/Socios.jsx index 1069b9d..4a2f841 100644 --- a/frontend/src/pages/Socios.jsx +++ b/frontend/src/pages/Socios.jsx @@ -133,8 +133,6 @@ const SociosContent = ({ reqConfig }) => { setCreatingSocio(false); setTempSocio(null); setFieldErrors(null); - setSearchTerm(""); - setFilters({...filters, todos: true}); } catch (err) { setTempSocio({ ...newSocio }); if (err?.status === 422 && err?.errors) { @@ -146,9 +144,7 @@ const SociosContent = ({ reqConfig }) => { const handleEditSubmit = async (updatedSocio, userId) => { console.log(updatedSocio); try { - await putData(`${reqConfig.baseUrl}/${userId}`, updatedSocio, true); - setSearchTerm(""); - setFilters({...filters, todos: true}); + await putData(`${reqConfig.baseUrl}/${userId}`, updatedSocio, true); } catch (err) { if (err?.status === 422 && err?.errors) { setFieldErrors(err.errors);