From 6c86f85ff189d700a13e6dff79a8a204efd865c3 Mon Sep 17 00:00:00 2001 From: Jose Date: Thu, 24 Apr 2025 02:46:07 +0200 Subject: [PATCH] Remove WebServerVerticle and update API endpoints in settings.json; fix base URL formatting in multiple components --- .../contaminus/server/MainVerticle.java | 10 ---- .../contaminus/server/WebServerVerticle.java | 50 ------------------- frontend/public/config/settings.json | 4 +- frontend/src/components/HistoryCharts.jsx | 2 +- frontend/src/components/PollutionMap.jsx | 2 +- frontend/src/components/SideMenu.jsx | 2 +- frontend/src/components/SummaryCards.jsx | 2 +- frontend/vite.config.js | 7 +-- 8 files changed, 7 insertions(+), 72 deletions(-) delete mode 100644 backend/src/main/java/net/miarma/contaminus/server/WebServerVerticle.java diff --git a/backend/src/main/java/net/miarma/contaminus/server/MainVerticle.java b/backend/src/main/java/net/miarma/contaminus/server/MainVerticle.java index 4948383..4ffe5a8 100644 --- a/backend/src/main/java/net/miarma/contaminus/server/MainVerticle.java +++ b/backend/src/main/java/net/miarma/contaminus/server/MainVerticle.java @@ -85,16 +85,6 @@ public class MainVerticle extends AbstractVerticle { } }); - vertx.deployVerticle(new WebServerVerticle(), result -> { - if (result.succeeded()) { - Constants.LOGGER.info("šŸŸ¢ WebServerVerticle desplegado"); - Constants.LOGGER.info("\tšŸ”— WEB SERVER URL: " + configManager.getHost() - + ":" + configManager.getWebserverPort()); - } else { - Constants.LOGGER.error("šŸ”“ Error deploying WebServerVerticle: " + result.cause()); - } - }); - startPromise.complete(); } diff --git a/backend/src/main/java/net/miarma/contaminus/server/WebServerVerticle.java b/backend/src/main/java/net/miarma/contaminus/server/WebServerVerticle.java deleted file mode 100644 index 7767a61..0000000 --- a/backend/src/main/java/net/miarma/contaminus/server/WebServerVerticle.java +++ /dev/null @@ -1,50 +0,0 @@ -package net.miarma.contaminus.server; - -import java.nio.file.Path; -import java.nio.file.Paths; - -import io.vertx.core.AbstractVerticle; -import io.vertx.core.Promise; -import io.vertx.ext.web.Router; -import io.vertx.ext.web.handler.StaticHandler; -import net.miarma.contaminus.common.ConfigManager; -import net.miarma.contaminus.common.Constants; - -public class WebServerVerticle extends AbstractVerticle { - private ConfigManager configManager; - - public WebServerVerticle() { - configManager = ConfigManager.getInstance(); - } - - @Override - public void start(Promise startPromise) { - Constants.LOGGER.info("šŸ“” Iniciando WebServerVerticle..."); - - Router router = Router.router(vertx); - - Path webRootPath = Paths.get(configManager.getWebRoot()); - - if (webRootPath.isAbsolute()) { - Path basePath = Paths.get(System.getProperty("user.dir")); // Directorio actual - webRootPath = basePath.relativize(webRootPath); - } - - router.route("/*") - .handler( - StaticHandler.create(webRootPath.toString()) - .setCachingEnabled(false) - .setDefaultContentEncoding("UTF-8") - ); - - router.route("/dashboard/*").handler(ctx -> { - ctx.reroute("/index.html"); - }); - - vertx.createHttpServer() - .requestHandler(router) - .listen(configManager.getWebserverPort(), configManager.getHost()); - - startPromise.complete(); - } -} diff --git a/frontend/public/config/settings.json b/frontend/public/config/settings.json index 62af292..f000526 100644 --- a/frontend/public/config/settings.json +++ b/frontend/public/config/settings.json @@ -7,8 +7,8 @@ }, "appConfig": { "endpoints": { - "DATA_URL": "http://localhost:8081/api/v1", - "LOGIC_URL": "http://localhost:8082/api/v1", + "DATA_URL": "https://contaminus.miarma.net/api/raw/v1", + "LOGIC_URL": "https://contaminus.miarma.net/api/v1", "GET_GROUPS": "/groups", "GET_GROUP_BY_ID": "/groups/{0}", "GET_GROUP_DEVICES": "/groups/{0}/devices", diff --git a/frontend/src/components/HistoryCharts.jsx b/frontend/src/components/HistoryCharts.jsx index de94413..af6e3b4 100644 --- a/frontend/src/components/HistoryCharts.jsx +++ b/frontend/src/components/HistoryCharts.jsx @@ -48,7 +48,7 @@ const HistoryCharts = () => { const ENDPOINT = config.appConfig.endpoints.sensors; const reqConfig = { - baseUrl: `${BASE}/${ENDPOINT}`, + baseUrl: `${BASE}${ENDPOINT}`, params: {} } diff --git a/frontend/src/components/PollutionMap.jsx b/frontend/src/components/PollutionMap.jsx index 12e55ac..2101cdb 100644 --- a/frontend/src/components/PollutionMap.jsx +++ b/frontend/src/components/PollutionMap.jsx @@ -70,7 +70,7 @@ const PollutionMap = ({ deviceId }) => { let endp = ENDPOINT.replace('{0}', deviceId); const reqConfig = { - baseUrl: `${BASE}/${endp}`, + baseUrl: `${BASE}${endp}`, params: {} } diff --git a/frontend/src/components/SideMenu.jsx b/frontend/src/components/SideMenu.jsx index b720d72..89ed762 100644 --- a/frontend/src/components/SideMenu.jsx +++ b/frontend/src/components/SideMenu.jsx @@ -42,7 +42,7 @@ const SideMenu = ({ isOpen, onClose }) => { const ENDPOINT = config.appConfig.endpoints.GET_DEVICES; const reqConfig = { - baseUrl: `${BASE}/${ENDPOINT}`, + baseUrl: `${BASE}${ENDPOINT}`, params: {} } diff --git a/frontend/src/components/SummaryCards.jsx b/frontend/src/components/SummaryCards.jsx index 88aed6a..84ae672 100644 --- a/frontend/src/components/SummaryCards.jsx +++ b/frontend/src/components/SummaryCards.jsx @@ -45,7 +45,7 @@ const SummaryCards = ({ deviceId }) => { const endp = ENDPOINT.replace('{0}', deviceId); const reqConfig = { - baseUrl: `${BASE}/${endp}`, + baseUrl: `${BASE}${endp}`, params: {} } diff --git a/frontend/vite.config.js b/frontend/vite.config.js index 9e07a0f..421fae7 100644 --- a/frontend/vite.config.js +++ b/frontend/vite.config.js @@ -1,8 +1,6 @@ import { defineConfig } from 'vite' import react from '@vitejs/plugin-react' import cleanPlugin from 'vite-plugin-clean' -import path from 'path' -import os from 'os' // https://vite.dev/config/ export default defineConfig({ @@ -19,10 +17,7 @@ export default defineConfig({ "chartjs": ["chart.js"] } } - }, - outDir: path.join( - os.platform() === 'win32' ? os.homedir() + '\\.contaminus\\webroot' : os.homedir() + '/.config/contaminus/webroot' - ), + } }, publicDir: 'public', })