From 6920686981e8f57dd1324250d11a9d41f222ee88 Mon Sep 17 00:00:00 2001 From: Zhe Li Date: Fri, 7 Aug 2020 11:34:14 +0800 Subject: [PATCH] add qr image import support --- _locales/en/messages.json | 12 +++ sass/import.scss | 2 +- src/components/Import.vue | 9 ++ src/components/Import/QrImport.vue | 154 +++++++++++++++++++++++++++++ 4 files changed, 176 insertions(+), 1 deletion(-) create mode 100644 src/components/Import/QrImport.vue diff --git a/_locales/en/messages.json b/_locales/en/messages.json index 31089c61a..6c023f80a 100644 --- a/_locales/en/messages.json +++ b/_locales/en/messages.json @@ -209,10 +209,22 @@ "message": "Import Backup File", "description": "Import backup file." }, + "import_backup_qr": { + "message": "Import QR Image Backup", + "description": "Import qr image backup." + }, "import_backup_code": { "message": "Import Text Backup", "description": "Import backup code." }, + "import_backup_qr_partly_failed": { + "message": "Import successfuly, but some QR image cannot be recognized.", + "description": "Import successfuly, but some QR image cannot be recognized." + }, + "import_backup_qr_in_batches": { + "message": "You can select multiple files to import backup in batches.", + "description": "You can select multiple image files to import backup in batches." + }, "show_all_entries": { "message": "Show all entries", "description": "Show all entries." diff --git a/sass/import.scss b/sass/import.scss index b2f415e96..6e9db175a 100644 --- a/sass/import.scss +++ b/sass/import.scss @@ -11,7 +11,7 @@ p { } #import { - width: 600px; + width: 900px; position: relative; margin: 0 auto; } diff --git a/src/components/Import.vue b/src/components/Import.vue index 2a9eb3bcb..deceeb6c1 100644 --- a/src/components/Import.vue +++ b/src/components/Import.vue @@ -9,6 +9,13 @@ v-model="importType" /> + + import Vue from "vue"; import FileImport from "./Import/FileImport.vue"; +import QrImport from "./Import/QrImport.vue"; import TextImport from "./Import/TextImport.vue"; export default Vue.extend({ @@ -48,6 +56,7 @@ export default Vue.extend({ }, components: { FileImport, + QrImport, TextImport }, mounted() { diff --git a/src/components/Import/QrImport.vue b/src/components/Import/QrImport.vue new file mode 100644 index 000000000..fbbb6efb8 --- /dev/null +++ b/src/components/Import/QrImport.vue @@ -0,0 +1,154 @@ + +