From b9a6088f50e1680fbab3c7fa3ef4a03cfaf3caca Mon Sep 17 00:00:00 2001 From: Nelson Chan Date: Fri, 30 Jul 2021 14:54:40 +0800 Subject: [PATCH 01/77] WIP: Add login page, nav bar buttons --- src/icon.js | 4 +-- src/layouts/Layout.vue | 10 ++++++ src/main.js | 7 ++-- src/pages/Login.vue | 78 ++++++++++++++++++++++++++++++++++++++++++ src/pages/Settings.vue | 6 ---- 5 files changed, 95 insertions(+), 10 deletions(-) create mode 100644 src/pages/Login.vue diff --git a/src/icon.js b/src/icon.js index d8ea36d61..7911e9cc4 100644 --- a/src/icon.js +++ b/src/icon.js @@ -1,10 +1,10 @@ import { library } from "@fortawesome/fontawesome-svg-core" -import { faCog, faEdit, faList, faPause, faPlay, faPlus, faTachometerAlt, faTrash } from "@fortawesome/free-solid-svg-icons" +import { faCog, faEdit, faList, faPause, faPlay, faPlus, faSignInAlt, faSignOutAlt, faTachometerAlt, faTrash } from "@fortawesome/free-solid-svg-icons" //import { fa } from '@fortawesome/free-regular-svg-icons' import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome" // Add Free Font Awesome Icons here // https://fontawesome.com/v5.15/icons?d=gallery&p=2&s=solid&m=free -library.add(faCog, faTachometerAlt, faEdit, faPlus, faPause, faPlay, faTrash, faList) +library.add(faCog, faTachometerAlt, faEdit, faPlus, faPause, faPlay, faTrash, faList, faSignInAlt, faSignOutAlt) export { FontAwesomeIcon } diff --git a/src/layouts/Layout.vue b/src/layouts/Layout.vue index 8e725500a..2f5b1cb88 100644 --- a/src/layouts/Layout.vue +++ b/src/layouts/Layout.vue @@ -23,6 +23,16 @@ Settings +
  • + + Login + +
    • +
  • + + Logout + +
    • diff --git a/src/main.js b/src/main.js index 6eb296dc2..8621b898a 100644 --- a/src/main.js +++ b/src/main.js @@ -13,6 +13,7 @@ import Dashboard from "./pages/Dashboard.vue"; import DashboardHome from "./pages/DashboardHome.vue"; import Details from "./pages/Details.vue"; import EditMonitor from "./pages/EditMonitor.vue"; +import Login from "./pages/Login.vue"; import Settings from "./pages/Settings.vue"; import Setup from "./pages/Setup.vue"; @@ -57,9 +58,11 @@ const routes = [ }, ], }, - + { + path: "/login", + component: Login, + }, ], - }, { path: "/setup", diff --git a/src/pages/Login.vue b/src/pages/Login.vue new file mode 100644 index 000000000..4b08de066 --- /dev/null +++ b/src/pages/Login.vue @@ -0,0 +1,78 @@ + + + + + diff --git a/src/pages/Settings.vue b/src/pages/Settings.vue index d1d3599ba..d2695edf9 100644 --- a/src/pages/Settings.vue +++ b/src/pages/Settings.vue @@ -53,12 +53,6 @@ - -
    - -
    From d953ba7c60ab6da17358308d56b8ada93a8b7004 Mon Sep 17 00:00:00 2001 From: LouisLam Date: Sat, 11 Sep 2021 03:12:25 +0800 Subject: [PATCH 02/77] update to 1.6.1 --- package.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index e1c405cf3..342a73cd1 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "uptime-kuma", - "version": "1.6.0", + "version": "1.6.1", "license": "MIT", "repository": { "type": "git", @@ -19,11 +19,11 @@ "build": "vite build", "vite-preview-dist": "vite preview --host", "build-docker": "npm run build-docker-debian && npm run build-docker-alpine", - "build-docker-alpine": "docker buildx build -f dockerfile-alpine --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma:alpine -t louislam/uptime-kuma:1-alpine -t louislam/uptime-kuma:1.6.0-alpine --target release . --push", - "build-docker-debian": "docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma -t louislam/uptime-kuma:1 -t louislam/uptime-kuma:1.6.0 -t louislam/uptime-kuma:debian -t louislam/uptime-kuma:1-debian -t louislam/uptime-kuma:1.6.0-debian --target release . --push", + "build-docker-alpine": "docker buildx build -f dockerfile-alpine --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma:alpine -t louislam/uptime-kuma:1-alpine -t louislam/uptime-kuma:1.6.1-alpine --target release . --push", + "build-docker-debian": "docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma -t louislam/uptime-kuma:1 -t louislam/uptime-kuma:1.6.1 -t louislam/uptime-kuma:debian -t louislam/uptime-kuma:1-debian -t louislam/uptime-kuma:1.6.1-debian --target release . --push", "build-docker-nightly": "docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma:nightly --target nightly . --push", "build-docker-nightly-amd64": "docker buildx build --platform linux/amd64 -t louislam/uptime-kuma:nightly-amd64 --target nightly . --push --progress plain", - "setup": "git checkout 1.6.0 && npm install --legacy-peer-deps && node node_modules/esbuild/install.js && npm run build && npm prune", + "setup": "git checkout 1.6.1 && npm install --legacy-peer-deps && node node_modules/esbuild/install.js && npm run build && npm prune", "update-version": "node extra/update-version.js", "mark-as-nightly": "node extra/mark-as-nightly.js", "reset-password": "node extra/reset-password.js", From 0969be5981b3672d35f4fb9d230d4bc1a3f0fd74 Mon Sep 17 00:00:00 2001 From: LouisLam Date: Sat, 11 Sep 2021 15:08:56 +0800 Subject: [PATCH 03/77] Revert "WIP: Add login page, nav bar buttons" This reverts commit b9a6088f50e1680fbab3c7fa3ef4a03cfaf3caca. --- src/icon.js | 4 +-- src/layouts/Layout.vue | 10 ------ src/main.js | 7 ++-- src/pages/Login.vue | 78 ------------------------------------------ src/pages/Settings.vue | 6 ++++ 5 files changed, 10 insertions(+), 95 deletions(-) delete mode 100644 src/pages/Login.vue diff --git a/src/icon.js b/src/icon.js index 7911e9cc4..d8ea36d61 100644 --- a/src/icon.js +++ b/src/icon.js @@ -1,10 +1,10 @@ import { library } from "@fortawesome/fontawesome-svg-core" -import { faCog, faEdit, faList, faPause, faPlay, faPlus, faSignInAlt, faSignOutAlt, faTachometerAlt, faTrash } from "@fortawesome/free-solid-svg-icons" +import { faCog, faEdit, faList, faPause, faPlay, faPlus, faTachometerAlt, faTrash } from "@fortawesome/free-solid-svg-icons" //import { fa } from '@fortawesome/free-regular-svg-icons' import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome" // Add Free Font Awesome Icons here // https://fontawesome.com/v5.15/icons?d=gallery&p=2&s=solid&m=free -library.add(faCog, faTachometerAlt, faEdit, faPlus, faPause, faPlay, faTrash, faList, faSignInAlt, faSignOutAlt) +library.add(faCog, faTachometerAlt, faEdit, faPlus, faPause, faPlay, faTrash, faList) export { FontAwesomeIcon } diff --git a/src/layouts/Layout.vue b/src/layouts/Layout.vue index 2f5b1cb88..8e725500a 100644 --- a/src/layouts/Layout.vue +++ b/src/layouts/Layout.vue @@ -23,16 +23,6 @@ Settings -
  • - - Login - -
    • -
  • - - Logout - -
    • diff --git a/src/main.js b/src/main.js index 8621b898a..6eb296dc2 100644 --- a/src/main.js +++ b/src/main.js @@ -13,7 +13,6 @@ import Dashboard from "./pages/Dashboard.vue"; import DashboardHome from "./pages/DashboardHome.vue"; import Details from "./pages/Details.vue"; import EditMonitor from "./pages/EditMonitor.vue"; -import Login from "./pages/Login.vue"; import Settings from "./pages/Settings.vue"; import Setup from "./pages/Setup.vue"; @@ -58,11 +57,9 @@ const routes = [ }, ], }, - { - path: "/login", - component: Login, - }, + ], + }, { path: "/setup", diff --git a/src/pages/Login.vue b/src/pages/Login.vue deleted file mode 100644 index 4b08de066..000000000 --- a/src/pages/Login.vue +++ /dev/null @@ -1,78 +0,0 @@ - - - - - diff --git a/src/pages/Settings.vue b/src/pages/Settings.vue index d2695edf9..d1d3599ba 100644 --- a/src/pages/Settings.vue +++ b/src/pages/Settings.vue @@ -53,6 +53,12 @@
    + +
    + +
    From 4b0a8087a21188eb2973ea0f0ef5d98ef9608632 Mon Sep 17 00:00:00 2001 From: LouisLam Date: Sat, 11 Sep 2021 16:22:30 +0800 Subject: [PATCH 04/77] do not connect to socket io for status page --- src/main.js | 5 + src/mixins/socket.js | 333 +++++++++++++++++++++------------------ src/pages/StatusPage.vue | 36 +++++ 3 files changed, 222 insertions(+), 152 deletions(-) create mode 100644 src/pages/StatusPage.vue diff --git a/src/main.js b/src/main.js index 21793faa8..a4129db8f 100644 --- a/src/main.js +++ b/src/main.js @@ -20,6 +20,7 @@ import EditMonitor from "./pages/EditMonitor.vue"; import Settings from "./pages/Settings.vue"; import Setup from "./pages/Setup.vue"; import List from "./pages/List.vue"; +import StatusPage from "./pages/StatusPage.vue"; import { appName } from "./util.ts"; @@ -94,6 +95,10 @@ const routes = [ path: "/setup", component: Setup, }, + { + path: "/status-page", + component: StatusPage, + }, ] const router = createRouter({ diff --git a/src/mixins/socket.js b/src/mixins/socket.js index 9771db0d2..5ffdf752d 100644 --- a/src/mixins/socket.js +++ b/src/mixins/socket.js @@ -4,6 +4,10 @@ const toast = useToast() let socket; +const noSocketIOPage = [ + "/status-page", +]; + export default { data() { @@ -14,6 +18,8 @@ export default { firstConnect: true, connected: false, connectCount: 0, + initedSocketIO: false, + }, remember: (localStorage.remember !== "0"), allowLoginDialog: false, // Allowed to show login dialog, but "loggedIn" have to be true too. This exists because prevent the login dialog show 0.1s in first before the socket server auth-ed. @@ -31,162 +37,177 @@ export default { created() { window.addEventListener("resize", this.onResize); - - let protocol = (location.protocol === "https:") ? "wss://" : "ws://"; - - let wsHost; - const env = process.env.NODE_ENV || "production"; - if (env === "development" || localStorage.dev === "dev") { - wsHost = protocol + location.hostname + ":3001"; - } else { - wsHost = protocol + location.host; - } - - socket = io(wsHost, { - transports: ["websocket"], - }); - - socket.on("info", (info) => { - this.info = info; - }); - - socket.on("setup", (monitorID, data) => { - this.$router.push("/setup") - }); - - socket.on("autoLogin", (monitorID, data) => { - this.loggedIn = true; - this.storage().token = "autoLogin"; - this.allowLoginDialog = false; - }); - - socket.on("monitorList", (data) => { - // Add Helper function - Object.entries(data).forEach(([monitorID, monitor]) => { - monitor.getUrl = () => { - try { - return new URL(monitor.url); - } catch (_) { - return null; - } - }; - }); - this.monitorList = data; - }); - - socket.on("notificationList", (data) => { - this.notificationList = data; - }); - - socket.on("heartbeat", (data) => { - if (! (data.monitorID in this.heartbeatList)) { - this.heartbeatList[data.monitorID] = []; - } - - this.heartbeatList[data.monitorID].push(data) - - // Add to important list if it is important - // Also toast - if (data.important) { - - if (data.status === 0) { - toast.error(`[${this.monitorList[data.monitorID].name}] [DOWN] ${data.msg}`, { - timeout: false, - }); - } else if (data.status === 1) { - toast.success(`[${this.monitorList[data.monitorID].name}] [Up] ${data.msg}`, { - timeout: 20000, - }); - } else { - toast(`[${this.monitorList[data.monitorID].name}] ${data.msg}`); - } - - if (! (data.monitorID in this.importantHeartbeatList)) { - this.importantHeartbeatList[data.monitorID] = []; - } - - this.importantHeartbeatList[data.monitorID].unshift(data) - } - }); - - socket.on("heartbeatList", (monitorID, data, overwrite = false) => { - if (! (monitorID in this.heartbeatList) || overwrite) { - this.heartbeatList[monitorID] = data; - } else { - this.heartbeatList[monitorID] = data.concat(this.heartbeatList[monitorID]) - } - }); - - socket.on("avgPing", (monitorID, data) => { - this.avgPingList[monitorID] = data - }); - - socket.on("uptime", (monitorID, type, data) => { - this.uptimeList[`${monitorID}_${type}`] = data - }); - - socket.on("certInfo", (monitorID, data) => { - this.certInfoList[monitorID] = JSON.parse(data) - }); - - socket.on("importantHeartbeatList", (monitorID, data, overwrite) => { - if (! (monitorID in this.importantHeartbeatList) || overwrite) { - this.importantHeartbeatList[monitorID] = data; - } else { - this.importantHeartbeatList[monitorID] = data.concat(this.importantHeartbeatList[monitorID]) - } - }); - - socket.on("connect_error", (err) => { - console.error(`Failed to connect to the backend. Socket.io connect_error: ${err.message}`); - this.connectionErrorMsg = `Cannot connect to the socket server. [${err}] Reconnecting...`; - this.socket.connected = false; - this.socket.firstConnect = false; - }); - - socket.on("disconnect", () => { - console.log("disconnect") - this.connectionErrorMsg = "Lost connection to the socket server. Reconnecting..."; - this.socket.connected = false; - }); - - socket.on("connect", () => { - console.log("connect") - this.socket.connectCount++; - this.socket.connected = true; - - // Reset Heartbeat list if it is re-connect - if (this.socket.connectCount >= 2) { - this.clearData() - } - - let token = this.storage().token; - - if (token) { - if (token !== "autoLogin") { - this.loginByToken(token) - } else { - - // Timeout if it is not actually auto login - setTimeout(() => { - if (! this.loggedIn) { - this.allowLoginDialog = true; - this.$root.storage().removeItem("token"); - } - }, 5000); - - } - } else { - this.allowLoginDialog = true; - } - - this.socket.firstConnect = false; - }); - + this.initSocketIO(); }, methods: { + initSocketIO(bypass = false) { + // No need to re-init + if (this.socket.initedSocketIO) { + return; + } + + // No need to connect to the socket.io for status page + if (! bypass && noSocketIOPage.includes(location.pathname)) { + return; + } + + this.socket.initedSocketIO = true; + + let protocol = (location.protocol === "https:") ? "wss://" : "ws://"; + + let wsHost; + const env = process.env.NODE_ENV || "production"; + if (env === "development" || localStorage.dev === "dev") { + wsHost = protocol + location.hostname + ":3001"; + } else { + wsHost = protocol + location.host; + } + + socket = io(wsHost, { + transports: ["websocket"], + }); + + socket.on("info", (info) => { + this.info = info; + }); + + socket.on("setup", (monitorID, data) => { + this.$router.push("/setup") + }); + + socket.on("autoLogin", (monitorID, data) => { + this.loggedIn = true; + this.storage().token = "autoLogin"; + this.allowLoginDialog = false; + }); + + socket.on("monitorList", (data) => { + // Add Helper function + Object.entries(data).forEach(([monitorID, monitor]) => { + monitor.getUrl = () => { + try { + return new URL(monitor.url); + } catch (_) { + return null; + } + }; + }); + this.monitorList = data; + }); + + socket.on("notificationList", (data) => { + this.notificationList = data; + }); + + socket.on("heartbeat", (data) => { + if (! (data.monitorID in this.heartbeatList)) { + this.heartbeatList[data.monitorID] = []; + } + + this.heartbeatList[data.monitorID].push(data) + + // Add to important list if it is important + // Also toast + if (data.important) { + + if (data.status === 0) { + toast.error(`[${this.monitorList[data.monitorID].name}] [DOWN] ${data.msg}`, { + timeout: false, + }); + } else if (data.status === 1) { + toast.success(`[${this.monitorList[data.monitorID].name}] [Up] ${data.msg}`, { + timeout: 20000, + }); + } else { + toast(`[${this.monitorList[data.monitorID].name}] ${data.msg}`); + } + + if (! (data.monitorID in this.importantHeartbeatList)) { + this.importantHeartbeatList[data.monitorID] = []; + } + + this.importantHeartbeatList[data.monitorID].unshift(data) + } + }); + + socket.on("heartbeatList", (monitorID, data, overwrite = false) => { + if (! (monitorID in this.heartbeatList) || overwrite) { + this.heartbeatList[monitorID] = data; + } else { + this.heartbeatList[monitorID] = data.concat(this.heartbeatList[monitorID]) + } + }); + + socket.on("avgPing", (monitorID, data) => { + this.avgPingList[monitorID] = data + }); + + socket.on("uptime", (monitorID, type, data) => { + this.uptimeList[`${monitorID}_${type}`] = data + }); + + socket.on("certInfo", (monitorID, data) => { + this.certInfoList[monitorID] = JSON.parse(data) + }); + + socket.on("importantHeartbeatList", (monitorID, data, overwrite) => { + if (! (monitorID in this.importantHeartbeatList) || overwrite) { + this.importantHeartbeatList[monitorID] = data; + } else { + this.importantHeartbeatList[monitorID] = data.concat(this.importantHeartbeatList[monitorID]) + } + }); + + socket.on("connect_error", (err) => { + console.error(`Failed to connect to the backend. Socket.io connect_error: ${err.message}`); + this.connectionErrorMsg = `Cannot connect to the socket server. [${err}] Reconnecting...`; + this.socket.connected = false; + this.socket.firstConnect = false; + }); + + socket.on("disconnect", () => { + console.log("disconnect") + this.connectionErrorMsg = "Lost connection to the socket server. Reconnecting..."; + this.socket.connected = false; + }); + + socket.on("connect", () => { + console.log("connect") + this.socket.connectCount++; + this.socket.connected = true; + + // Reset Heartbeat list if it is re-connect + if (this.socket.connectCount >= 2) { + this.clearData() + } + + let token = this.storage().token; + + if (token) { + if (token !== "autoLogin") { + this.loginByToken(token) + } else { + + // Timeout if it is not actually auto login + setTimeout(() => { + if (! this.loggedIn) { + this.allowLoginDialog = true; + this.$root.storage().removeItem("token"); + } + }, 5000); + + } + } else { + this.allowLoginDialog = true; + } + + this.socket.firstConnect = false; + }); + + }, + storage() { return (this.remember) ? localStorage : sessionStorage; }, @@ -336,6 +357,14 @@ export default { localStorage.remember = (this.remember) ? "1" : "0" }, + // Reconnect the socket io, if status-page to dashboard + "$route.fullPath"(newValue, oldValue) { + if (noSocketIOPage.includes(newValue)) { + return; + } + this.initSocketIO(); + }, + }, } diff --git a/src/pages/StatusPage.vue b/src/pages/StatusPage.vue new file mode 100644 index 000000000..7cb493ad2 --- /dev/null +++ b/src/pages/StatusPage.vue @@ -0,0 +1,36 @@ + + + From 3e25f0e9d9470ef26219a48549704092109f4fd0 Mon Sep 17 00:00:00 2001 From: LouisLam Date: Sat, 11 Sep 2021 19:40:03 +0800 Subject: [PATCH 05/77] [Status Page] WIP: Checkpoint --- server/server.js | 29 ++++++++++-- server/util-server.js | 12 +++++ src/icon.js | 4 +- src/layouts/Layout.vue | 11 +++++ src/mixins/socket.js | 8 ++-- src/mixins/theme.js | 16 +++++-- src/pages/StatusPage.vue | 97 +++++++++++++++++++++++++++++++++++++--- 7 files changed, 159 insertions(+), 18 deletions(-) diff --git a/server/server.js b/server/server.js index 2949c4be7..aec4528da 100644 --- a/server/server.js +++ b/server/server.js @@ -26,7 +26,7 @@ console.log("Importing this project modules"); debug("Importing Monitor"); const Monitor = require("./model/monitor"); debug("Importing Settings"); -const { getSettings, setSettings, setting, initJWTSecret } = require("./util-server"); +const { getSettings, setSettings, setting, initJWTSecret, allowDevAllOrigin } = require("./util-server"); debug("Importing Notification"); const { Notification } = require("./notification"); @@ -127,7 +127,9 @@ let indexHTML = fs.readFileSync("./dist/index.html").toString(); console.log("Adding route") + // *************************** // Normal Router here + // *************************** // Robots.txt app.get("/robots.txt", async (_request, response) => { @@ -147,7 +149,28 @@ let indexHTML = fs.readFileSync("./dist/index.html").toString(); app.use("/", express.static("dist")); - // Universal Route Handler, must be at the end + // *************************** + // Public API + // *************************** + + // Status Page Config + app.get("/api/status-page/config", async (_request, response) => { + allowDevAllOrigin(response); + let config = getSettings("statusPage"); + + if (! config.statusPageTheme) { + config.statusPageTheme = "light"; + } + + response.json(config); + }); + + // Status Page Polling Data + app.get("/api/status-page", async (_request, response) => { + allowDevAllOrigin(response); + }); + + // Universal Route Handler, must be at the end of all express route. app.get("*", async (_request, response) => { response.send(indexHTML); }); @@ -172,7 +195,7 @@ let indexHTML = fs.readFileSync("./dist/index.html").toString(); }); // *************************** - // Public API + // Public Socket API // *************************** socket.on("loginByToken", async (token, callback) => { diff --git a/server/util-server.js b/server/util-server.js index a2fef0656..67bf13020 100644 --- a/server/util-server.js +++ b/server/util-server.js @@ -5,6 +5,7 @@ const { debug } = require("../src/util"); const passwordHash = require("./password-hash"); const dayjs = require("dayjs"); const { Resolver } = require("dns"); +const { allowAllOrigin } = require("./util-server"); /** * Init or reset JWT secret @@ -271,3 +272,14 @@ exports.getTotalClientInRoom = (io, roomName) => { return 0; } } + +exports.allowDevAllOrigin = (res) => { + if (process.env.NODE_ENV === "development") { + exports.allowAllOrigin(res); + } +} + +exports.allowAllOrigin = (res) => { + res.header("Access-Control-Allow-Origin", "*"); + res.header("Access-Control-Allow-Headers", "Origin, X-Requested-With, Content-Type, Accept"); +} diff --git a/src/icon.js b/src/icon.js index 58583f0f8..7e7c7dd67 100644 --- a/src/icon.js +++ b/src/icon.js @@ -1,10 +1,10 @@ import { library } from "@fortawesome/fontawesome-svg-core" -import { faCog, faEdit, faPlus, faPause, faPlay, faTachometerAlt, faTrash, faList, faArrowAltCircleUp, faEye, faEyeSlash } from "@fortawesome/free-solid-svg-icons" +import { faCog, faEdit, faPlus, faPause, faPlay, faTachometerAlt, faTrash, faList, faArrowAltCircleUp, faEye, faEyeSlash, faCheckCircle, faStream } from "@fortawesome/free-solid-svg-icons" //import { fa } from '@fortawesome/free-regular-svg-icons' import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome" // Add Free Font Awesome Icons here // https://fontawesome.com/v5.15/icons?d=gallery&p=2&s=solid&m=free -library.add(faCog, faEdit, faPlus, faPause, faPlay, faTachometerAlt, faTrash, faList, faArrowAltCircleUp, faEye, faEyeSlash); +library.add(faCog, faEdit, faPlus, faPause, faPlay, faTachometerAlt, faTrash, faList, faArrowAltCircleUp, faEye, faEyeSlash, faCheckCircle, faStream); export { FontAwesomeIcon } diff --git a/src/layouts/Layout.vue b/src/layouts/Layout.vue index 467ae53a2..b7b8688b3 100644 --- a/src/layouts/Layout.vue +++ b/src/layouts/Layout.vue @@ -18,6 +18,11 @@
      +
    • + + {{ $t("Status Page") }} + +
    • {{ $t("Dashboard") }} @@ -128,6 +133,12 @@ export default { From 934685637a6344af80dc627c138bb68e257a7fad Mon Sep 17 00:00:00 2001 From: LouisLam Date: Sat, 11 Sep 2021 23:43:07 +0800 Subject: [PATCH 06/77] [Status Page] WIP: Checkpoint --- db/patch-monitor-public.sql | 6 ++++ server/database.js | 1 + server/server.js | 31 ++++++++++++++++++-- src/assets/app.scss | 48 ++++++++++++++++++++++++++++++ src/components/HeartbeatBar.vue | 19 ++++++++++-- src/components/MonitorList.vue | 52 +-------------------------------- src/layouts/Layout.vue | 2 +- src/pages/StatusPage.vue | 39 +++++++++++++------------ 8 files changed, 123 insertions(+), 75 deletions(-) create mode 100644 db/patch-monitor-public.sql diff --git a/db/patch-monitor-public.sql b/db/patch-monitor-public.sql new file mode 100644 index 000000000..d554547cd --- /dev/null +++ b/db/patch-monitor-public.sql @@ -0,0 +1,6 @@ +BEGIN TRANSACTION; + +alter table monitor + add public BOOLEAN default 0 not null; + +COMMIT; diff --git a/server/database.js b/server/database.js index e0bb0c9b8..0b6332e2e 100644 --- a/server/database.js +++ b/server/database.js @@ -30,6 +30,7 @@ class Database { static patchList = { "patch-setting-value-type.sql": true, "patch-improve-performance.sql": true, + "patch-monitor-public.sql": true, } /** diff --git a/server/server.js b/server/server.js index aec4528da..78e24eae4 100644 --- a/server/server.js +++ b/server/server.js @@ -165,9 +165,36 @@ let indexHTML = fs.readFileSync("./dist/index.html").toString(); response.json(config); }); - // Status Page Polling Data - app.get("/api/status-page", async (_request, response) => { + // Status Page - Monitor List + app.get("/api/status-page/monitor-list", async (_request, response) => { allowDevAllOrigin(response); + + const monitorList = {}; + let list = await R.find("monitor", " public = 1 ORDER BY weight DESC, name ", [ + ]); + + for (let monitor of list) { + monitorList[monitor.id] = await monitor.toJSON(); + } + + response.json(monitorList); + }); + + // Status Page Polling Data + app.get("/api/status-page/heartbeat", async (_request, response) => { + allowDevAllOrigin(response); + + const monitorList = {}; + let list = await R.find("", " ", [ + ]) + + for (let monitor of list) { + monitorList[monitor.id] = await monitor.toJSON(); + } + + response.json({ + monitorList: monitorList, + }); }); // Universal Route Handler, must be at the end of all express route. diff --git a/src/assets/app.scss b/src/assets/app.scss index 581645735..f25e4c467 100644 --- a/src/assets/app.scss +++ b/src/assets/app.scss @@ -255,6 +255,18 @@ h2 { background-color: $dark-bg; } + .monitor-list { + .item { + &:hover { + background-color: $dark-bg2; + } + + &.active { + background-color: $dark-bg2; + } + } + } + @media (max-width: 550px) { .table-shadow-box { tbody { @@ -288,3 +300,39 @@ h2 { transform: translateY(50px); opacity: 0; } + +.monitor-list { + &.scrollbar { + min-height: calc(100vh - 240px); + max-height: calc(100vh - 30px); + overflow-y: auto; + position: sticky; + top: 10px; + } + + .item { + display: block; + text-decoration: none; + padding: 13px 15px 10px 15px; + border-radius: 10px; + transition: all ease-in-out 0.15s; + + &.disabled { + opacity: 0.3; + } + + .info { + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + } + + &:hover { + background-color: $highlight-white; + } + + &.active { + background-color: #cdf8f4; + } + } +} diff --git a/src/components/HeartbeatBar.vue b/src/components/HeartbeatBar.vue index fb6086d00..4dc2c712c 100644 --- a/src/components/HeartbeatBar.vue +++ b/src/components/HeartbeatBar.vue @@ -25,6 +25,10 @@ export default { type: Number, required: true, }, + heartbeatList: { + type: Array, + default: null, + } }, data() { return { @@ -38,8 +42,15 @@ export default { }, computed: { + /** + * If heartbeatList is null, get it from $root.heartbeatList + */ beatList() { - return this.$root.heartbeatList[this.monitorId] + if (this.heartbeatList === null) { + return this.$root.heartbeatList[this.monitorId]; + } else { + return this.heartbeatList; + } }, shortBeatList() { @@ -118,8 +129,10 @@ export default { window.removeEventListener("resize", this.resize); }, beforeMount() { - if (! (this.monitorId in this.$root.heartbeatList)) { - this.$root.heartbeatList[this.monitorId] = []; + if (this.heartbeatList === null) { + if (! (this.monitorId in this.$root.heartbeatList)) { + this.$root.heartbeatList[this.monitorId] = []; + } } }, diff --git a/src/components/MonitorList.vue b/src/components/MonitorList.vue index e72155891..5dae04d06 100644 --- a/src/components/MonitorList.vue +++ b/src/components/MonitorList.vue @@ -1,5 +1,5 @@ From 35aca46b68b071ab97c7bad15b66067c9640ca89 Mon Sep 17 00:00:00 2001 From: LouisLam Date: Mon, 13 Sep 2021 19:21:39 +0800 Subject: [PATCH 08/77] [status page] checkpoint --- src/assets/app.scss | 14 ++++ src/components/GroupList.vue | 96 +++++++++++++++++++++++++ src/icon.js | 4 +- src/main.js | 5 +- src/mixins/public.js | 7 ++ src/pages/StatusPage.vue | 134 +++++++++++++++++++++-------------- 6 files changed, 203 insertions(+), 57 deletions(-) create mode 100644 src/components/GroupList.vue create mode 100644 src/mixins/public.js diff --git a/src/assets/app.scss b/src/assets/app.scss index f25e4c467..4b6b481f4 100644 --- a/src/assets/app.scss +++ b/src/assets/app.scss @@ -301,6 +301,20 @@ h2 { opacity: 0; } +.slide-fade-right-enter-active { + transition: all 0.2s $easing-in; +} + +.slide-fade-right-leave-active { + transition: all 0.2s $easing-in; +} + +.slide-fade-right-enter-from, +.slide-fade-right-leave-to { + transform: translateX(50px); + opacity: 0; +} + .monitor-list { &.scrollbar { min-height: calc(100vh - 240px); diff --git a/src/components/GroupList.vue b/src/components/GroupList.vue new file mode 100644 index 000000000..4d145670f --- /dev/null +++ b/src/components/GroupList.vue @@ -0,0 +1,96 @@ + + + + + diff --git a/src/icon.js b/src/icon.js index 7e7c7dd67..308c03c49 100644 --- a/src/icon.js +++ b/src/icon.js @@ -1,10 +1,10 @@ import { library } from "@fortawesome/fontawesome-svg-core" -import { faCog, faEdit, faPlus, faPause, faPlay, faTachometerAlt, faTrash, faList, faArrowAltCircleUp, faEye, faEyeSlash, faCheckCircle, faStream } from "@fortawesome/free-solid-svg-icons" +import { faCog, faEdit, faPlus, faPause, faPlay, faTachometerAlt, faTrash, faList, faArrowAltCircleUp, faEye, faEyeSlash, faCheckCircle, faStream, faSave } from "@fortawesome/free-solid-svg-icons" //import { fa } from '@fortawesome/free-regular-svg-icons' import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome" // Add Free Font Awesome Icons here // https://fontawesome.com/v5.15/icons?d=gallery&p=2&s=solid&m=free -library.add(faCog, faEdit, faPlus, faPause, faPlay, faTachometerAlt, faTrash, faList, faArrowAltCircleUp, faEye, faEyeSlash, faCheckCircle, faStream); +library.add(faCog, faEdit, faPlus, faPause, faPlay, faTachometerAlt, faTrash, faList, faArrowAltCircleUp, faEye, faEyeSlash, faCheckCircle, faStream, faSave); export { FontAwesomeIcon } diff --git a/src/main.js b/src/main.js index a4129db8f..73a37de25 100644 --- a/src/main.js +++ b/src/main.js @@ -13,6 +13,8 @@ import socket from "./mixins/socket"; import theme from "./mixins/theme"; import mobile from "./mixins/mobile"; import datetime from "./mixins/datetime"; +import publicMixin from "./mixins/public"; + import Dashboard from "./pages/Dashboard.vue"; import DashboardHome from "./pages/DashboardHome.vue"; import Details from "./pages/Details.vue"; @@ -140,7 +142,8 @@ const app = createApp({ socket, theme, mobile, - datetime + datetime, + publicMixin, ], data() { return { diff --git a/src/mixins/public.js b/src/mixins/public.js new file mode 100644 index 000000000..07e0333fa --- /dev/null +++ b/src/mixins/public.js @@ -0,0 +1,7 @@ +export default { + data() { + return { + publicGroupList: [], + } + } +} diff --git a/src/pages/StatusPage.vue b/src/pages/StatusPage.vue index 87d230926..f59c72c11 100644 --- a/src/pages/StatusPage.vue +++ b/src/pages/StatusPage.vue @@ -2,58 +2,61 @@

      Uptime Kuma

      -
      - +
      +
      + - + + + Go to Dashboard + +
      - - - Go to Dashboard - +
      + + + + + + +
      All Systems Operational
      -
      - -
      - -
      -
      - {{ $t("No Monitors") }} +
      +
      +
      - -
      -
      -
      -
      - - {{ item.name }} -
      -
      -
      - -
      +
      +
      +
      -
      @@ -61,12 +64,8 @@ @@ -164,4 +185,9 @@ footer { text-align: center; font-size: 14px; } + +.btn-add-group { + height: 100%; + width: 100%; +} From 9da2a01a746166c983f7b5557a8818d18f181bcf Mon Sep 17 00:00:00 2001 From: LouisLam Date: Tue, 14 Sep 2021 14:12:27 +0800 Subject: [PATCH 09/77] [status page] checkpoint --- package.json | 1 + src/assets/app.scss | 18 ++++++++++++++++++ src/components/GroupList.vue | 1 + src/icon.js | 4 ++-- src/mixins/public.js | 13 +++++++++++++ src/pages/StatusPage.vue | 34 +++++++++++++++++++++++++++++----- 6 files changed, 64 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index 5d34b09c5..da223f523 100644 --- a/package.json +++ b/package.json @@ -73,6 +73,7 @@ "vue": "^3.2.8", "vue-chart-3": "^0.5.7", "vue-confirm-dialog": "^1.0.2", + "vue-contenteditable": "^3.0.4", "vue-i18n": "^9.1.7", "vue-multiselect": "^3.0.0-alpha.2", "vue-qrcode": "^1.0.0", diff --git a/src/assets/app.scss b/src/assets/app.scss index 4b6b481f4..ee917e34f 100644 --- a/src/assets/app.scss +++ b/src/assets/app.scss @@ -350,3 +350,21 @@ h2 { } } } + +.alert-success { + color: #122f21; + background-color: $primary; + border-color: $primary; +} + +.alert-info { + color: #055160; + background-color: #cff4fc; + border-color: #cff4fc; +} + +.alert-danger { + color: #842029; + background-color: #f8d7da; + border-color: #f8d7da; +} diff --git a/src/components/GroupList.vue b/src/components/GroupList.vue index 4d145670f..4e46096f0 100644 --- a/src/components/GroupList.vue +++ b/src/components/GroupList.vue @@ -22,6 +22,7 @@ group="same-group" :disabled="!editMode" :animation="100" + item-key="id" >