1.23.14 to 2.0.0 (#4886)

src/components/settings/APIKeys.vue

@@ -1,5 +1,12 @@
 <template>
     <div>
+        <div
+            v-if="settings.disableAuth"
+            class="mt-5 d-flex align-items-center justify-content-center my-3"
+        >
+            {{ $t("apiKeysDisabledMsg") }}
+        </div>
+        <div v-else>
             <div class="add-btn">
                 <button class="btn btn-primary me-2" type="button" @click="$refs.apiKeyDialog.show()">
                     <font-awesome-icon icon="plus" /> {{ $t("Add API Key") }}
@@ -7,7 +14,10 @@
             </div>
 
             <div>
-            <span v-if="Object.keys(keyList).length === 0" class="d-flex align-items-center justify-content-center my-3">
+                <span
+                    v-if="Object.keys(keyList).length === 0"
+                    class="d-flex align-items-center justify-content-center my-3"
+                >
                     {{ $t("No API Keys") }}
                 </span>
 
@@ -18,9 +28,7 @@
                     :class="item.status"
                 >
                     <div class="left-part">
-                    <div
+                        <div class="circle"></div>
-                        class="circle"
-                    ></div>
                         <div class="info">
                             <div class="title">{{ item.name }}</div>
                             <div class="status">
@@ -30,7 +38,8 @@
                                 {{ $t("Created") }}: {{ item.createdDate }}
                             </div>
                             <div class="date">
-                            {{ $t("Expires") }}: {{ item.expires || $t("Never") }}
+                                {{ $t("Expires") }}:
+                                {{ item.expires || $t("Never") }}
                             </div>
                         </div>
                     </div>
@@ -52,6 +61,7 @@
                     </div>
                 </div>
             </div>
+        </div>
 
         <div class="text-center mt-3" style="font-size: 13px;">
             <a href="https://github.com/louislam/uptime-kuma/wiki/API-Keys" target="_blank">{{ $t("Learn More") }}</a>
@@ -88,6 +98,9 @@ export default {
             let result = Object.values(this.$root.apiKeyList);
             return result;
         },
+        settings() {
+            return this.$parent.$parent.$parent.settings;
+        },
     },
 
     methods: {
@@ -126,7 +139,9 @@ export default {
          * @returns {void}
          */
         disableKey() {
-            this.$root.getSocket().emit("disableAPIKey", this.selectedKeyID, (res) => {
+            this.$root
+                .getSocket()
+                .emit("disableAPIKey", this.selectedKeyID, (res) => {
                     this.$root.toastRes(res);
                 });
         },
@@ -146,22 +161,22 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-    @import "../../assets/vars.scss";
+@import "../../assets/vars.scss";
 
-    .mobile {
+.mobile {
     .item {
         flex-direction: column;
         align-items: flex-start;
         margin-bottom: 20px;
     }
-    }
+}
 
-    .add-btn {
+.add-btn {
     padding-top: 20px;
     padding-bottom: 20px;
-    }
+}
 
-    .item {
+.item {
     display: flex;
     align-items: center;
     gap: 10px;
@@ -231,9 +246,9 @@ export default {
             width: 310px;
         }
     }
-    }
+}
 
-    .date {
+.date {
     margin-top: 5px;
     display: block;
     font-size: 14px;
@@ -246,13 +261,13 @@ export default {
         color: white;
         background-color: rgba(255, 255, 255, 0.1);
     }
-    }
+}
 
-    .dark {
+.dark {
     .item {
         &:hover {
             background-color: $dark-bg2;
         }
     }
-    }
+}
 </style>

src/lang/en.json

@@ -954,5 +954,6 @@
     "threemaSenderIdentity": "Gateway-ID",
     "threemaSenderIdentityFormat": "8 characters, usually starts with *",
     "threemaApiAuthenticationSecret": "Gateway-ID Secret",
-    "threemaBasicModeInfo": "Note: This integration uses Threema Gateway in basic mode (server-based encryption). Further details can be found {0}."
+    "threemaBasicModeInfo": "Note: This integration uses Threema Gateway in basic mode (server-based encryption). Further details can be found {0}.",
+    "apiKeysDisabledMsg": "API keys are disabled because authentication is disabled."
 }

src/util.js

@@ -8,11 +8,14 @@
 // Backend uses the compiled file util.js
 // Frontend uses util.ts
 */
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.sleep = exports.flipStatus = exports.badgeConstants = exports.CONSOLE_STYLE_BgGray = exports.CONSOLE_STYLE_BgWhite = exports.CONSOLE_STYLE_BgCyan = exports.CONSOLE_STYLE_BgMagenta = exports.CONSOLE_STYLE_BgBlue = exports.CONSOLE_STYLE_BgYellow = exports.CONSOLE_STYLE_BgGreen = exports.CONSOLE_STYLE_BgRed = exports.CONSOLE_STYLE_BgBlack = exports.CONSOLE_STYLE_FgPink = exports.CONSOLE_STYLE_FgBrown = exports.CONSOLE_STYLE_FgViolet = exports.CONSOLE_STYLE_FgLightBlue = exports.CONSOLE_STYLE_FgLightGreen = exports.CONSOLE_STYLE_FgOrange = exports.CONSOLE_STYLE_FgGray = exports.CONSOLE_STYLE_FgWhite = exports.CONSOLE_STYLE_FgCyan = exports.CONSOLE_STYLE_FgMagenta = exports.CONSOLE_STYLE_FgBlue = exports.CONSOLE_STYLE_FgYellow = exports.CONSOLE_STYLE_FgGreen = exports.CONSOLE_STYLE_FgRed = exports.CONSOLE_STYLE_FgBlack = exports.CONSOLE_STYLE_Hidden = exports.CONSOLE_STYLE_Reverse = exports.CONSOLE_STYLE_Blink = exports.CONSOLE_STYLE_Underscore = exports.CONSOLE_STYLE_Dim = exports.CONSOLE_STYLE_Bright = exports.CONSOLE_STYLE_Reset = exports.MIN_INTERVAL_SECOND = exports.MAX_INTERVAL_SECOND = exports.SQL_DATETIME_FORMAT_WITHOUT_SECOND = exports.SQL_DATETIME_FORMAT = exports.SQL_DATE_FORMAT = exports.STATUS_PAGE_MAINTENANCE = exports.STATUS_PAGE_PARTIAL_DOWN = exports.STATUS_PAGE_ALL_UP = exports.STATUS_PAGE_ALL_DOWN = exports.MAINTENANCE = exports.PENDING = exports.UP = exports.DOWN = exports.appName = exports.isNode = exports.isDev = void 0;
 exports.intHash = exports.localToUTC = exports.utcToLocal = exports.utcToISODateTime = exports.isoToUTCDateTime = exports.parseTimeFromTimeObject = exports.parseTimeObject = exports.getMaintenanceRelativeURL = exports.getMonitorRelativeURL = exports.genSecret = exports.getCryptoRandomInt = exports.getRandomInt = exports.getRandomArbitrary = exports.TimeLogger = exports.polyfill = exports.log = exports.debug = exports.ucfirst = void 0;
-const dayjs = require("dayjs");
+const dayjs_1 = __importDefault(require("dayjs"));
 exports.isDev = process.env.NODE_ENV === "development";
 exports.isNode = typeof process !== "undefined" && ((_a = process === null || process === void 0 ? void 0 : process.versions) === null || _a === void 0 ? void 0 : _a.node);
 exports.appName = "Uptime Kuma";
@@ -152,11 +155,11 @@ class Logger {
         module = module.toUpperCase();
         level = level.toUpperCase();
         let now;
-        if (dayjs.tz) {
+        if (dayjs_1.default.tz) {
-            now = dayjs.tz(new Date()).format();
+            now = dayjs_1.default.tz(new Date()).format();
         }
         else {
-            now = dayjs().format();
+            now = (0, dayjs_1.default)().format();
         }
         const levelColor = consoleLevelColors[level];
         const moduleColor = consoleModuleColors[intHash(module, consoleModuleColors.length)];
@@ -257,11 +260,11 @@ function polyfill() {
 exports.polyfill = polyfill;
 class TimeLogger {
     constructor() {
-        this.startTime = dayjs().valueOf();
+        this.startTime = (0, dayjs_1.default)().valueOf();
     }
     print(name) {
         if (exports.isDev && process.env.TIMELOGGER === "1") {
-            console.log(name + ": " + (dayjs().valueOf() - this.startTime) + "ms");
+            console.log(name + ": " + ((0, dayjs_1.default)().valueOf() - this.startTime) + "ms");
         }
     }
 }
@@ -373,19 +376,19 @@ function parseTimeFromTimeObject(obj) {
 }
 exports.parseTimeFromTimeObject = parseTimeFromTimeObject;
 function isoToUTCDateTime(input) {
-    return dayjs(input).utc().format(exports.SQL_DATETIME_FORMAT);
+    return (0, dayjs_1.default)(input).utc().format(exports.SQL_DATETIME_FORMAT);
 }
 exports.isoToUTCDateTime = isoToUTCDateTime;
 function utcToISODateTime(input) {
-    return dayjs.utc(input).toISOString();
+    return dayjs_1.default.utc(input).toISOString();
 }
 exports.utcToISODateTime = utcToISODateTime;
 function utcToLocal(input, format = exports.SQL_DATETIME_FORMAT) {
-    return dayjs.utc(input).local().format(format);
+    return dayjs_1.default.utc(input).local().format(format);
 }
 exports.utcToLocal = utcToLocal;
 function localToUTC(input, format = exports.SQL_DATETIME_FORMAT) {
-    return dayjs(input).utc().format(format);
+    return (0, dayjs_1.default)(input).utc().format(format);
 }
 exports.localToUTC = localToUTC;
 function intHash(str, length = 10) {

src/util.ts

@@ -9,7 +9,7 @@
 // Frontend uses util.ts
 */
 
-import * as dayjs from "dayjs";
+import dayjs from "dayjs";
 
 // For loading dayjs plugins, don't remove event though it is not used in this file
 // eslint-disable-next-line @typescript-eslint/no-unused-vars

tsconfig.json

@@ -12,7 +12,8 @@
         "removeComments": true,
         "preserveConstEnums": true,
         "sourceMap": false,
-        "strict": true
+        "strict": true,
+        "esModuleInterop": true
     },
     "files": [
         "./src/util.ts"