Merge pull request #2 from Saibamen/import-export

Separate import and export. Fix ESLint
3 years ago · db9e97d859
parent d313966d80 7199bb5ead
commit db9e97d859
18 changed files with 26 additions and 34 deletions
--- a/src/languages/da-DK.js
+++ b/src/languages/da-DK.js
@ -120,7 +120,6 @@ export default {
    enableDefaultNotificationDescription: "For hver ny overvåger aktiveres denne underretning som standard. Du kan stadig deaktivere underretningen separat for hver skærm.",
    "Default enabled": "Standard aktiveret",
    "Also apply to existing monitors": "Anvend også på eksisterende overvågere",
-    "Import/Export Backup": " Importér/Eksportér sikkerhedskopi",
    Export: "Eksport",
    Import: "Import",
    backupDescription: "Du kan sikkerhedskopiere alle Overvågere og alle underretninger til en JSON-fil.",
--- a/src/languages/de-DE.js
+++ b/src/languages/de-DE.js
@ -113,7 +113,6 @@ export default {
    "Create your admin account": "Erstelle dein Admin Konto",
    "Repeat Password": "Wiederhole das Passwort",
    "Resource Record Type": "Resource Record Type",
-    "Import/Export Backup": "Import/Export Backup",
    "Export": "Export",
    "Import": "Import",
    respTime: "Antw. Zeit (ms)",
@ -132,7 +131,7 @@ export default {
    importHandleDescription: "Wähle 'Vorhandene überspringen' aus, wenn jeder Monitor oder Benachrichtigung mit demselben Namen übersprungen werden soll. 'Überschreiben' löscht jeden vorhandenen Monitor sowie Benachrichtigungen.",
    "Skip existing": "Vorhandene überspringen",
    "Overwrite": "Überschreiben",
-    "Import Options": "Import Optionen",
+    "Options": "Optionen",
    confirmImportMsg: "Möchtest du das Backup wirklich importieren? Bitte stelle sicher, dass die richtige Import Option ausgewählt ist.",
    "Keep both": "Beide behalten",
    twoFAVerifyLabel: "Bitte trage deinen Token ein um zu verifizieren das 2FA funktioniert",
--- a/src/languages/en.js
+++ b/src/languages/en.js
@ -117,7 +117,8 @@ export default {
    "Last Result": "Last Result",
    "Create your admin account": "Create your admin account",
    "Repeat Password": "Repeat Password",
-    "Import/Export Backup": "Import/Export Backup",
+    "Import Backup": "Import Backup",
+    "Export Backup": "Export Backup",
    Export: "Export",
    Import: "Import",
    respTime: "Resp. Time (ms)",
@ -137,7 +138,7 @@ export default {
    "Clear all statistics": "Clear all Statistics",
    "Skip existing": "Skip existing",
    "Overwrite": "Overwrite",
-    "Import Options": "Import Options",
+    "Options": "Options",
    "Keep both": "Keep both",
    "Verify Token": "Verify Token",
    "Setup 2FA": "Setup 2FA",
@ -149,5 +150,4 @@ export default {
    Inactive: "Inactive",
    Token: "Token",
    "Show URI": "Show URI",
-    "Clear all statistics": "Clear all Statistics"
 }
--- a/src/languages/es-ES.js
+++ b/src/languages/es-ES.js
@ -120,7 +120,6 @@ export default {
    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.",
--- a/src/languages/et-EE.js
+++ b/src/languages/et-EE.js
@ -113,7 +113,6 @@ export default {
    clearEventsMsg: "Kas soovid seire kõik sündmused kustutada?",
    clearHeartbeatsMsg: "Kas soovid seire kõik tuksed kustutada?",
    confirmClearStatisticsMsg: "Kas soovid KÕIK statistika kustutada?",
-    "Import/Export Backup": "Impordi/Ekspordi varukoopia",
    Export: "Eksport",
    Import: "Import",
    "Default enabled": "Kasuta vaikimisi",
--- a/src/languages/fr-FR.js
+++ b/src/languages/fr-FR.js
@ -120,7 +120,6 @@ export default {
    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.",
--- a/src/languages/it-IT.js
+++ b/src/languages/it-IT.js
@ -118,7 +118,6 @@ export default {
    Heartbeats: "Controlli",
    "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.",
-    "Import/Export Backup": "Import/Export Backup",
    Export: "Export",
    Import: "Import",
    "Default enabled": "Default enabled",
--- a/src/languages/ja.js
+++ b/src/languages/ja.js
@ -120,7 +120,6 @@ export default {
    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.",
--- a/src/languages/ko-KR.js
+++ b/src/languages/ko-KR.js
@ -120,7 +120,6 @@ export default {
    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.",
--- a/src/languages/nl-NL.js
+++ b/src/languages/nl-NL.js
@ -120,7 +120,6 @@ export default {
    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.",
--- a/src/languages/pl.js
+++ b/src/languages/pl.js
@ -120,7 +120,6 @@ export default {
    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.",
--- a/src/languages/ru-RU.js
+++ b/src/languages/ru-RU.js
@ -120,7 +120,6 @@ export default {
    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.",
--- a/src/languages/sr-latn.js
+++ b/src/languages/sr-latn.js
@ -120,7 +120,6 @@ export default {
    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.",
--- a/src/languages/sr.js
+++ b/src/languages/sr.js
@ -120,7 +120,6 @@ export default {
    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.",
--- a/src/languages/sv-SE.js
+++ b/src/languages/sv-SE.js
@ -120,7 +120,6 @@ export default {
    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.",
--- a/src/languages/zh-CN.js
+++ b/src/languages/zh-CN.js
@ -120,7 +120,6 @@ export default {
    enableDefaultNotificationDescription: "新的监控项将默认启用，你也可以在每个监控项中分别设置",
    "Default enabled": "默认开启",
    "Also apply to existing monitors": "应用到所有监控项",
-    "Import/Export Backup": "导入/导出备份",
    Export: "导出",
    Import: "导入",
    backupDescription: "你可以将所有的监控项和消息通知备份到一个 JSON 文件中",
--- a/src/languages/zh-HK.js
+++ b/src/languages/zh-HK.js
@ -120,7 +120,6 @@ export default {
    enableDefaultNotificationDescription: "新增監測器時這個通知會預設啟用，當然每個監測器亦可分別控制開關。",
    "Default enabled": "預設通知",
    "Also apply to existing monitors": "同時取用至目前所有監測器",
-    "Import/Export Backup": "匯入/匯出 備份",
    Export: "匯出",
    Import: "匯入",
    backupDescription: "您可以備份所有監測器及所有通知。",
--- a/src/pages/Settings.vue
+++ b/src/pages/Settings.vue
@ -128,46 +128,54 @@
                                <button class="btn btn-primary me-2" type="button" @click="$refs.TwoFADialog.show()">{{ $t("2FA Settings") }}</button>
                            </div>

-                            <h2 class="mt-5 mb-2">{{ $t("Import/Export Backup") }}</h2>
+                            <h2 class="mt-5 mb-2">{{ $t("Export Backup") }}</h2>

                            <p>
                                {{ $t("backupDescription") }} <br />
                                ({{ $t("backupDescription2") }}) <br />
                            </p>

-                            <div class="input-group mb-2">
-                                <button class="btn btn-outline-primary" @click="downloadBackup">{{ $t("Export") }}</button>
-                                <button type="button" class="btn btn-outline-primary" :disabled="processing" @click="confirmImport">
-                                    <div v-if="processing" class="spinner-border spinner-border-sm me-1"></div>
-                                    {{ $t("Import") }}
-                                </button>
-                                <input id="importBackup" type="file" class="form-control" accept="application/json">
+                            <div class="d-flex mb-2 justify-content-center">
+                                <button class="btn btn-primary" @click="downloadBackup">{{ $t("Export") }}</button>
                            </div>

-                            <label class="form-label">{{ $t("Import Options") }}:</label>
+                            <p><strong>{{ $t("backupDescription3") }}</strong></p>
+
+                            <h2 class="mt-5 mb-2">{{ $t("Import Backup") }}</h2>
+
+                            <label class="form-label">{{ $t("Options") }}:</label>
                            <br>
                            <div class="form-check form-check-inline">
-                                <input v-model="importHandle" class="form-check-input" type="radio" name="radioImportHandle" id="radioKeep" value="keep">
+                                <input id="radioKeep" v-model="importHandle" class="form-check-input" type="radio" name="radioImportHandle" value="keep">
                                <label class="form-check-label" for="radioKeep">{{ $t("Keep both") }}</label>
                            </div>
                            <div class="form-check form-check-inline">
-                                <input v-model="importHandle" class="form-check-input" type="radio" name="radioImportHandle" id="radioSkip" value="skip">
+                                <input id="radioSkip" v-model="importHandle" class="form-check-input" type="radio" name="radioImportHandle" value="skip">
                                <label class="form-check-label" for="radioSkip">{{ $t("Skip existing") }}</label>
                            </div>
                            <div class="form-check form-check-inline">
-                                <input v-model="importHandle" class="form-check-input" type="radio" name="radioImportHandle" id="radioOverwrite" value="overwrite">
+                                <input id="radioOverwrite" v-model="importHandle" class="form-check-input" type="radio" name="radioImportHandle" value="overwrite">
                                <label class="form-check-label" for="radioOverwrite">{{ $t("Overwrite") }}</label>
                            </div>
                            <div class="form-text mb-2">
                                {{ $t("importHandleDescription") }}
                            </div>

+                            <div class="mb-2">
+                                <input id="importBackup" type="file" class="form-control" accept="application/json">
+                            </div>
+
+                            <div class="input-group mb-2 justify-content-end">
+                                <button type="button" class="btn btn-outline-primary" :disabled="processing" @click="confirmImport">
+                                    <div v-if="processing" class="spinner-border spinner-border-sm me-1"></div>
+                                    {{ $t("Import") }}
+                                </button>
+                            </div>
+
                            <div v-if="importAlert" class="alert alert-danger mt-3" style="padding: 6px 16px;">
                                {{ importAlert }}
                            </div>

-                            <p><strong>{{ $t("backupDescription3") }}</strong></p>
-
                            <h2 class="mt-5 mb-2">{{ $t("Advanced") }}</h2>

                            <div class="mb-3">