Add entities package

backend/pom.xml

@@ -20,6 +20,13 @@
 	 <version>4.5.13</version>
 	</dependency>
 	
+	<!-- Vert.X Web Client -->
+	<dependency>
+	 <groupId>io.vertx</groupId>
+	 <artifactId>vertx-web-client</artifactId>
+	 <version>4.5.13</version>
+	</dependency>
+	
 	<!-- Vert.X MQTT -->
     <dependency>
         <groupId>io.vertx</groupId>

backend/src/main/java/net/miarma/contaminus/common/entities/Actuator.java

@@ -0,0 +1,5 @@
+package net.miarma.contaminus.common.entities;
+
+public class Actuator {
+
+}

backend/src/main/java/net/miarma/contaminus/common/entities/COValue.java

@@ -0,0 +1,5 @@
+package net.miarma.contaminus.common.entities;
+
+public class COValue {
+
+}

backend/src/main/java/net/miarma/contaminus/common/entities/Device.java

@@ -0,0 +1,5 @@
+package net.miarma.contaminus.common.entities;
+
+public class Device {
+
+}

backend/src/main/java/net/miarma/contaminus/common/entities/GpsValue.java

@@ -0,0 +1,5 @@
+package net.miarma.contaminus.common.entities;
+
+public class GpsValue {
+
+}

backend/src/main/java/net/miarma/contaminus/common/entities/Group.java

@@ -0,0 +1,5 @@
+package net.miarma.contaminus.common.entities;
+
+public class Group {
+
+}

backend/src/main/java/net/miarma/contaminus/common/entities/Sensor.java

@@ -0,0 +1,5 @@
+package net.miarma.contaminus.common.entities;
+
+public class Sensor {
+
+}

backend/src/main/java/net/miarma/contaminus/common/entities/WeatherValue.java

@@ -0,0 +1,5 @@
+package net.miarma.contaminus.common.entities;
+
+public class WeatherValue {
+
+}

backend/src/main/java/net/miarma/contaminus/server/DatabaseVerticle.java

@@ -25,7 +25,7 @@ public class DatabaseVerticle extends AbstractVerticle {
     private EventBus eventBus;
 	private Gson gson = new GsonBuilder()
 			.registerTypeAdapter(LocalDateTime.class, new LocalDateTimeSerializer())
-	        .create();;
+	        .create();
 
 
     @SuppressWarnings("unused")

backend/src/main/java/net/miarma/contaminus/util/RestClientUtil.java

@@ -0,0 +1,139 @@
+package net.miarma.contaminus.util;
+
+import java.util.Map;
+
+import com.google.gson.Gson;
+
+import io.vertx.core.Promise;
+import io.vertx.core.buffer.Buffer;
+import io.vertx.core.json.JsonObject;
+import io.vertx.ext.web.client.HttpRequest;
+import io.vertx.ext.web.client.WebClient;
+
+public class RestClientUtil {
+	
+	public WebClient client;
+	private Gson gson;
+	
+	public RestClientUtil(WebClient client) {
+		gson = new Gson();
+		this.client = client;
+	}
+
+	/**
+	 * Get request utility
+	 * 
+	 * @param <T>       Type of result enveloped in JSON response
+	 * @param port      Port
+	 * @param host      Host address
+	 * @param resource  URI where resource is provided
+	 * @param classType Type of result enveloped in JSON response
+	 * @param promise   Promise to be executed on call finish
+	 */
+	public <T> void getRequest(Integer port, String host, String resource, Class<T> classType, Promise<T> promise) {
+		client.getAbs(host + ":" + port + "/" + resource).send(elem -> {
+			if (elem.succeeded()) {
+				promise.complete(gson.fromJson(elem.result().bodyAsString(), classType));
+			} else {
+				promise.fail(elem.cause());
+			}
+		});
+
+	}
+
+	/**
+	 * Get request utility
+	 * 
+	 * @param <T>       Type of result enveloped in JSON response
+	 * @param port      Port
+	 * @param host      Host address
+	 * @param resource  URI where resource is provided
+	 * @param classType Type of result enveloped in JSON response
+	 * @param promise   Promise to be executed on call finish
+	 * @param params    Map with key-value entries for call parameters
+	 */
+	public <T> void getRequestWithParams(Integer port, String host, String resource, Class<T> classType,
+			Promise<T> promise, Map<String, String> params) {
+		HttpRequest<Buffer> httpRequest = client.getAbs(host + ":" + port + "/" + resource);
+
+		params.forEach((key, value) -> {
+			httpRequest.addQueryParam(key, value);
+		});
+
+		httpRequest.send(elem -> {
+			if (elem.succeeded()) {
+				promise.complete(gson.fromJson(elem.result().bodyAsString(), classType));
+			} else {
+				promise.fail(elem.cause());
+			}
+		});
+
+	}
+
+	/**
+	 * Post request utility
+	 * 
+	 * @param <B>       Type of body enveloped in JSON request
+	 * @param <T>       Type of result enveloped in JSON response
+	 * @param port      Port
+	 * @param host      Host address
+	 * @param resource  URI where resource is provided
+	 * @param classType Type of result enveloped in JSON response
+	 * @param promise   Promise to be executed on call finish
+	 */
+	public <B, T> void postRequest(Integer port, String host, String resource, Object body, Class<T> classType,
+			Promise<T> promise) {
+		JsonObject jsonBody = new JsonObject(gson.toJson(body));
+		client.postAbs(host + ":" + port + "/" + resource).sendJsonObject(jsonBody, elem -> {
+			if (elem.succeeded()) {
+				Gson gson = new Gson();
+				promise.complete(gson.fromJson(elem.result().bodyAsString(), classType));
+			} else {
+				promise.fail(elem.cause());
+			}
+		});
+	}
+
+	/**
+	 * Put request utility
+	 * 
+	 * @param <B>       Type of body enveloped in JSON request
+	 * @param <T>       Type of result enveloped in JSON response
+	 * @param port      Port
+	 * @param host      Host address
+	 * @param resource  URI where resource is provided
+	 * @param classType Type of result enveloped in JSON response
+	 * @param promise   Promise to be executed on call finish
+	 */
+	public <B, T> void putRequest(Integer port, String host, String resource, Object body, Class<T> classType,
+			Promise<T> promise) {
+		JsonObject jsonBody = new JsonObject(gson.toJson(body));
+		client.putAbs(host + ":" + port + "/" + resource).sendJsonObject(jsonBody, elem -> {
+			if (elem.succeeded()) {
+				Gson gson = new Gson();
+				promise.complete(gson.fromJson(elem.result().bodyAsString(), classType));
+			} else {
+				promise.fail(elem.cause());
+			}
+		});
+	}
+
+	/**
+	 * Delete request utility
+	 * 
+	 * @param port      Port
+	 * @param host      Host address
+	 * @param resource  URI where resource is provided
+	 * @param promise   Promise to be executed on call finish
+	 */
+	public void deleteRequest(Integer port, String host, String resource, Promise<String> promise) {
+		client.deleteAbs(host + ":" + port + "/" + resource).send(elem -> {
+			if (elem.succeeded()) {
+				promise.complete(elem.result().bodyAsString());
+			} else {
+				promise.fail(elem.cause());
+			}
+		});
+
+	}
+}

backend/src/main/resources/webroot/index.html

@@ -15,7 +15,7 @@
     <meta name="twitter:image" content="https://contaminus.miarma.net/logo.png" />
     <link rel="shortcut icon" href="/images/favicon.ico" type="image/x-icon">
     <title>ContaminUS</title>
-    <script type="module" crossorigin src="/assets/index-ByqS16T9.js"></script>
+    <script type="module" crossorigin src="/assets/index-75wHSipM.js"></script>
     <link rel="modulepreload" crossorigin href="/assets/react-vendors-DbHEDQBy.js">
     <link rel="modulepreload" crossorigin href="/assets/leaflet-DYDK0jU3.js">
     <link rel="modulepreload" crossorigin href="/assets/chartjs-C6LAl0aW.js">

frontend/src/components/SummaryCards.jsx

@@ -8,7 +8,7 @@ import { DataProvider } from '../contexts/DataContext';
 import { useData } from '../contexts/DataContext';
 
 import { useConfig } from '../contexts/ConfigContext';
-import { timestampToTime } from '../util/date.js';
+import { timestampToTime, formatTime } from '../util/date.js';
 
 /**
  * SummaryCards.jsx
@@ -83,7 +83,7 @@ const SummaryCardsContent = () => {
         CardsData[1].status = "Humedad actual";
         CardsData[2].content = coData.carbonMonoxide + " ppm";
         CardsData[2].status = "Nivel de CO actual";
-        CardsData[3].content = lastTime.slice(0, 5);
+        CardsData[3].content = formatTime(lastTime);
         CardsData[3].status = "Día " + lastDate.toLocaleDateString();
 
     }

frontend/src/util/date.js

@@ -8,4 +8,12 @@ const timestampToDate = (timestamp) => {
     return date.toLocaleDateString();
 }
 
-export { timestampToTime, timestampToDate };
+const formatTime = (date) => {
+    if (date.length === 8) {
+        return date.slice(0,5);
+    } else {
+        return `0${date.slice(0,3)}`;
+    }
+}
+
+export { timestampToTime, timestampToDate, formatTime };