Merge branch 'master' into 2fa

src/languages/de-DE.js

@@ -123,7 +123,7 @@ export default {
     enableDefaultNotificationDescription: "Für jeden neuen Monitor wird diese Benachrichtigung standardmäßig aktiviert. Die Benachrichtigung kann weiterhin für jeden Monitor separat deaktiviert werden.",
     Create: "Erstellen",
     "Auto Get": "Auto Get",
-    backupDescription: "Es können alle Monitore und alle Benachrichtigungen in einer JSON-Datei gesichert werden.",
+    backupDescription: "Es können alle Monitore und Benachrichtigungen in einer JSON-Datei gesichert werden.",
     backupDescription2: "PS: Verlaufs- und Ereignisdaten sind nicht enthalten.",
     backupDescription3: "Sensible Daten wie Benachrichtigungstoken sind in der Exportdatei enthalten, bitte bewahre sie sorgfältig auf.",
     alertNoFile: "Bitte wähle eine Datei zum importieren aus.",
@@ -141,5 +141,6 @@ export default {
     Active: "Aktiv",
     Inactive: "Inaktiv",
     Token: "Token",
-    "Show URI": "URI Anzeigen"
+    "Show URI": "URI Anzeigen",
+    "Clear all statistics": "Lösche alle Statistiken"
 }

src/languages/en.js

@@ -141,5 +141,6 @@ export default {
     Active: "Active",
     Inactive: "Inactive",
     Token: "Token",
-    "Show URI": "Show URI"
+    "Show URI": "Show URI",
+    "Clear all statistics": "Clear all Statistics"
 }

src/languages/zh-CN.js

@@ -13,7 +13,7 @@ export default {
     pauseDashboardHome: "暂停",
     deleteMonitorMsg: "确定要删除此监控吗？",
     deleteNotificationMsg: "确定要删除此消息通知吗？这将对所有监控生效。",
-    resoverserverDescription: "默认服务器 Cloudflare，可以修改为任意你想要使用的DNS服务器",
+    resoverserverDescription: "可自定义要使用的DNS服务器",
     rrtypeDescription: "选择要监控的资源记录类型",
     pauseMonitorMsg: "确定要暂停吗？",
     Settings: "设置",
@@ -109,23 +109,23 @@ export default {
     "Repeat Password": "重复密码",
     respTime: "Resp. Time (ms)",
     notAvailableShort: "N/A",
-    Create: "Create",
-    clearEventsMsg: "Are you sure want to delete all events for this monitor?",
-    clearHeartbeatsMsg: "Are you sure want to delete all heartbeats for this monitor?",
-    confirmClearStatisticsMsg: "Are you sure want to delete ALL statistics?",
-    "Clear Data": "Clear Data",
-    Events: "Events",
-    Heartbeats: "Heartbeats",
-    "Auto Get": "Auto Get",
-    enableDefaultNotificationDescription: "For every new monitor this notification will be enabled by default. You can still disable the notification separately for each monitor.",
-    "Default enabled": "Default enabled",
-    "Also apply to existing monitors": "Also apply to existing monitors",
-    "Import/Export Backup": "Import/Export Backup",
-    Export: "Export",
-    Import: "Import",
-    backupDescription: "You can backup all monitors and all notifications into a JSON file.",
-    backupDescription2: "PS: History and event data is not included.",
-    backupDescription3: "Sensitive data such as notification tokens is included in the export file, please keep it carefully.",
-    alertNoFile: "Please select a file to import.",
-    alertWrongFileType: "Please select a JSON file."
+    Create: "创建",
+    clearEventsMsg: "确定要删除此监控项的所有事件吗？",
+    clearHeartbeatsMsg: "确定要删除此监控项的所有状态吗？",
+    confirmClearStatisticsMsg: "确定要删除所有统计信息吗？",
+    "Clear Data": "清除数据",
+    Events: "事件",
+    Heartbeats: "心跳",
+    "Auto Get": "自动获取",
+    enableDefaultNotificationDescription: "新的监控项将默认启用，你也可以在每个监控项中分别设置",
+    "Default enabled": "默认开启",
+    "Also apply to existing monitors": "应用到所有监控项",
+    "Import/Export Backup": "导入/导出备份",
+    Export: "导出",
+    Import: "导入",
+    backupDescription: "你可以将所有的监控项和消息通知备份到一个 JSON 文件中",
+    backupDescription2: "注意: 不包括历史状态和事件数据",
+    backupDescription3: "导出的文件中可能包含敏感信息，如消息通知的 Token 信息，请小心存放！",
+    alertNoFile: "请选择一个文件导入",
+    alertWrongFileType: "请选择一个 JSON 格式的文件"
 }

src/mixins/socket.js

@@ -32,12 +32,14 @@ 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 = ":3001"
+            wsHost = protocol + location.hostname + ":3001";
         } else {
-            wsHost = ""
+            wsHost = protocol + location.host;
         }
 
         socket = io(wsHost, {

src/pages/Settings.vue

@@ -155,7 +155,7 @@
                                 <button v-if="settings.disableAuth" class="btn btn-outline-primary me-1" @click="enableAuth">{{ $t("Enable Auth") }}</button>
                                 <button v-if="! settings.disableAuth" class="btn btn-primary me-1" @click="confirmDisableAuth">{{ $t("Disable Auth") }}</button>
                                 <button v-if="! settings.disableAuth" class="btn btn-danger me-1" @click="$root.logout">{{ $t("Logout") }}</button>
-                                <button class="btn btn-outline-danger me-1" @click="confirmClearStatistics">{{ $t("Clear all Statistics") }}</button>
+                                <button class="btn btn-outline-danger me-1" @click="confirmClearStatistics">{{ $t("Clear all statistics") }}</button>
                             </div>
                         </template>
                     </div>
@@ -394,7 +394,7 @@ export default {
                 notificationList: this.$root.notificationList,
                 monitorList: monitorList,
             }
-            exportData = JSON.stringify(exportData);
+            exportData = JSON.stringify(exportData, null, 4);
             let downloadItem = document.createElement("a");
             downloadItem.setAttribute("href", "data:application/json;charset=utf-8," + encodeURI(exportData));
             downloadItem.setAttribute("download", fileName);