Merge branch '1.14.X'

# Conflicts:
#	package.json
#	server/server.js
This commit is contained in:
Louis Lam 2022-04-19 16:43:13 +08:00
commit 29d2d95c71
9 changed files with 112 additions and 83 deletions

View file

@ -1,15 +1,16 @@
let express = require("express");
const { allowDevAllOrigin } = require("../util-server");
const { R } = require("redbean-node");
const server = require("../server");
const apicache = require("../modules/apicache");
const Monitor = require("../model/monitor");
const dayjs = require("dayjs");
const { UP, flipStatus, log } = require("../../src/util");
const StatusPage = require("../model/status_page");
const { UptimeKumaServer } = require("../uptime-kuma-server");
let router = express.Router();
let cache = apicache.middleware;
const server = UptimeKumaServer.getInstance();
let io = server.io;
router.get("/api/entry-page", async (request, response) => {