Merge remote-tracking branch 'chakflying/tls-expiry' into tls-expiry

# Conflicts:
#	server/model/monitor.js
#	src/pages/Details.vue

server/model/monitor.js

@@ -6,8 +6,7 @@ var timezone = require('dayjs/plugin/timezone')
 dayjs.extend(utc)
 dayjs.extend(timezone)
 const axios = require("axios");
-const {UP, DOWN, PENDING} = require("../util");
+const {debug, UP, DOWN, PENDING} = require("../util");
-const {debug} = require("../util");
 const {tcping, ping, checkCertificate} = require("../util-server");
 const {R} = require("redbean-node");
 const {BeanModel} = require("redbean-node/dist/bean-model");