ric/uptime-kuma
1
0
Fork 0
mirror of https://github.com/louislam/uptime-kuma.git synced 2025-03-04 16:35:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'master' into ip-version

Browse source
This commit is contained in:
lucas_nz 2023-10-14 23:35:13 +13:00 • committed by GitHub
commit 537ab442a5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 33 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
package.json
View file

@ -21,6 +21,7 @@
"start": "npm run start-server", "start": "npm run start-server",
"start-server": "node server/server.js", "start-server": "node server/server.js",
"start-server-dev": "cross-env NODE_ENV=development node server/server.js", "start-server-dev": "cross-env NODE_ENV=development node server/server.js",
"start-server-dev:watch": "cross-env NODE_ENV=development node --watch server/server.js",
"build": "vite build --config ./config/vite.config.js", "build": "vite build --config ./config/vite.config.js",
"test": "node test/prepare-test-server.js && npm run test-backend", "test": "node test/prepare-test-server.js && npm run test-backend",
"test-with-build": "npm run build && npm test", "test-with-build": "npm run build && npm test",

2
server/monitor-types/real-browser-monitor-type.js
View file

@ -49,8 +49,6 @@ if (process.platform === "win32") {
]; ];
} }
log.debug("chrome", allowedList);
/** /**
* Is the executable path allowed? * Is the executable path allowed?
* @param {string} executablePath Path to executable * @param {string} executablePath Path to executable

6
src/layouts/Layout.vue
View file

@ -370,12 +370,16 @@ main {
padding: 9px 15px; padding: 9px 15px;
width: 48px; width: 48px;
box-shadow: 2px 2px 30px rgba(0, 0, 0, 0.2); box-shadow: 2px 2px 30px rgba(0, 0, 0, 0.2);
z-index: 100;
.dark & {
box-shadow: 2px 2px 30px rgba(0, 0, 0, 0.5);
}
} }
@media (max-width: 770px) { @media (max-width: 770px) {
.clear-all-toast-btn { .clear-all-toast-btn {
bottom: 72px; bottom: 72px;
z-index: 100;
} }
} }

16
src/util.js
View file

@ -147,13 +147,25 @@ class Logger {
console.warn(timePart, modulePart, levelPart, msg); console.warn(timePart, modulePart, levelPart, msg);
} }
else if (level === "ERROR") { else if (level === "ERROR") {
let msgPart = exports.CONSOLE_STYLE_FgRed + msg + exports.CONSOLE_STYLE_Reset; let msgPart;
if (typeof msg === "string") {
msgPart = exports.CONSOLE_STYLE_FgRed + msg + exports.CONSOLE_STYLE_Reset;
}
else {
msgPart = msg;
}
console.error(timePart, modulePart, levelPart, msgPart); console.error(timePart, modulePart, levelPart, msgPart);
} }
else if (level === "DEBUG") { else if (level === "DEBUG") {
if (exports.isDev) { if (exports.isDev) {
timePart = exports.CONSOLE_STYLE_FgGray + now + exports.CONSOLE_STYLE_Reset; timePart = exports.CONSOLE_STYLE_FgGray + now + exports.CONSOLE_STYLE_Reset;
let msgPart = exports.CONSOLE_STYLE_FgGray + msg + exports.CONSOLE_STYLE_Reset; let msgPart;
if (typeof msg === "string") {
msgPart = exports.CONSOLE_STYLE_FgGray + msg + exports.CONSOLE_STYLE_Reset;
}
else {
msgPart = msg;
}
console.debug(timePart, modulePart, levelPart, msgPart); console.debug(timePart, modulePart, levelPart, msgPart);
} }
} }

16
src/util.ts
View file

@ -208,13 +208,23 @@ class Logger {
} else if (level === "WARN") { } else if (level === "WARN") {
console.warn(timePart, modulePart, levelPart, msg); console.warn(timePart, modulePart, levelPart, msg);
} else if (level === "ERROR") { } else if (level === "ERROR") {
let msgPart = CONSOLE_STYLE_FgRed + msg + CONSOLE_STYLE_Reset; let msgPart :string;
if (typeof msg === "string") {
msgPart = CONSOLE_STYLE_FgRed + msg + CONSOLE_STYLE_Reset;
} else {
msgPart = msg;
}
console.error(timePart, modulePart, levelPart, msgPart); console.error(timePart, modulePart, levelPart, msgPart);
} else if (level === "DEBUG") { } else if (level === "DEBUG") {
if (isDev) { if (isDev) {
timePart = CONSOLE_STYLE_FgGray + now + CONSOLE_STYLE_Reset; timePart = CONSOLE_STYLE_FgGray + now + CONSOLE_STYLE_Reset;
let msgPart = CONSOLE_STYLE_FgGray + msg + CONSOLE_STYLE_Reset; let msgPart :string;
console.debug(timePart, modulePart, levelPart, msgPart ); if (typeof msg === "string") {
msgPart = CONSOLE_STYLE_FgGray + msg + CONSOLE_STYLE_Reset;
} else {
msgPart = msg;
}
console.debug(timePart, modulePart, levelPart, msgPart);
} }
} else { } else {
console.log(timePart, modulePart, msg); console.log(timePart, modulePart, msg);