Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
2dcd44a384 |
@@ -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
|
||||
scp core/target/core-*.jar root@159.69.155.167:/root/transfer
|
||||
scp huertos/target/huertos-*.jar root@159.69.155.167:/root/transfer
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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) {
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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) {
|
||||
@@ -147,8 +145,6 @@ const SociosContent = ({ reqConfig }) => {
|
||||
console.log(updatedSocio);
|
||||
try {
|
||||
await putData(`${reqConfig.baseUrl}/${userId}`, updatedSocio, true);
|
||||
setSearchTerm("");
|
||||
setFilters({...filters, todos: true});
|
||||
} catch (err) {
|
||||
if (err?.status === 422 && err?.errors) {
|
||||
setFieldErrors(err.errors);
|
||||
|
||||
Reference in New Issue
Block a user