diff --git a/package-lock.json b/package-lock.json index 98d351db4..7148c8604 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11299,22 +11299,6 @@ "smart-buffer": "^4.1.0" } }, - "node_modules/node-abi": { - "version": "3.62.0", - "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.62.0.tgz", - "integrity": "sha512-CPMcGa+y33xuL1E0TcNIu4YyaZCxnnvkVaEXrsosR3FxN+fV8xvb7Mzpb7IgKler10qeMkE6+Dp8qJhpzdq35g==", - "dependencies": { - "semver": "^7.3.5" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/node-abort-controller": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/node-abort-controller/-/node-abort-controller-3.1.1.tgz", - "integrity": "sha512-AGK2yQKIjRuqnc6VkX2Xj5d+QW8xZ87pa1UK6yA6ouUyuxfHuMP6umE5QK7UmTeOAymo+Zx1Fxiuw9rVx8taHQ==" - }, "node_modules/node-cloudflared-tunnel": { "version": "1.0.10", "resolved": "https://registry.npmjs.org/node-cloudflared-tunnel/-/node-cloudflared-tunnel-1.0.10.tgz", diff --git a/package.json b/package.json index 6e1f90332..a74e4677e 100644 --- a/package.json +++ b/package.json @@ -49,7 +49,7 @@ "build-docker-nightly-local": "npm run build && docker build -f docker/dockerfile -t louislam/uptime-kuma:nightly2 --target nightly .", "build-docker-pr-test": "docker buildx build -f docker/dockerfile --platform linux/amd64,linux/arm64 -t louislam/uptime-kuma:pr-test2 --target pr-test2 . --push", "upload-artifacts": "docker buildx build -f docker/dockerfile --platform linux/amd64 -t louislam/uptime-kuma:upload-artifact --build-arg VERSION --build-arg GITHUB_TOKEN --target upload-artifact . --progress plain", - "setup": "npm ci --production && npm run download-dist", + "setup": "git checkout 1.23.13 && npm ci --production && npm run download-dist", "download-dist": "node extra/download-dist.js", "mark-as-nightly": "node extra/mark-as-nightly.js", "reset-password": "node extra/reset-password.js", diff --git a/server/server.js b/server/server.js index f9b1df652..05a7a701d 100644 --- a/server/server.js +++ b/server/server.js @@ -283,16 +283,6 @@ let needSetup = false; const statusPageRouter = require("./routers/status-page-router"); app.use(statusPageRouter); - app.get("/api/incident-reports", async (req, res) => { - try { - const incidentReports = await R.findAll("incident"); - res.json(incidentReports); - } catch (error) { - console.error(error); - res.status(500).json({ error: "Failed to fetch incident reports" }); - } - }); - // Universal Route Handler, must be at the end of all express routes. app.get("*", async (_request, response) => { if (_request.originalUrl.startsWith("/upload/")) { @@ -672,6 +662,16 @@ let needSetup = false; } }); + socket.on("fetchIncidentReports", async () => { + try { + const incidentReports = await R.findAll("incident"); + socket.emit("incidentReports", incidentReports); + } catch (error) { + console.error(error); + socket.emit("incidentReportsError", { error: "Failed to fetch incident reports" }); + } + }); + // *************************** // Auth Only API // *************************** @@ -729,7 +729,9 @@ let needSetup = false; }); } }); + socket.on("incidentReports", async (monitor,callback) => { + }); // Edit a monitor socket.on("editMonitor", async (monitor, callback) => { try { diff --git a/src/pages/ListIncidents.vue b/src/pages/ListIncidents.vue index f83d18204..60745c6ac 100644 --- a/src/pages/ListIncidents.vue +++ b/src/pages/ListIncidents.vue @@ -1,6 +1,6 @@