From f7732d4b83913bac420cb43d2686f0574dc8645d Mon Sep 17 00:00:00 2001 From: hay-kot Date: Sat, 20 Mar 2021 19:28:04 -0800 Subject: [PATCH] import groups and users --- .../components/Admin/Backup/ImportDialog.vue | 42 +++-- .../components/Admin/Backup/ImportOptions.vue | 62 ++++++++ .../Backup/ImportSummaryDialog/index.vue | 69 +++++---- .../components/Admin/Backup/NewBackupCard.vue | 80 +++++----- frontend/src/locales/messages/en.json | 4 +- frontend/src/store/modules/userSettings.js | 2 +- mealie/app.py | 2 +- mealie/db/models/users.py | 6 +- mealie/routes/backup_routes.py | 17 ++- mealie/schema/backup.py | 39 +++-- mealie/schema/restore.py | 31 ++-- mealie/services/backups/imports.py | 143 +++++++++++++----- 12 files changed, 326 insertions(+), 171 deletions(-) create mode 100644 frontend/src/components/Admin/Backup/ImportOptions.vue diff --git a/frontend/src/components/Admin/Backup/ImportDialog.vue b/frontend/src/components/Admin/Backup/ImportDialog.vue index 0749a5aab..4f2a1be32 100644 --- a/frontend/src/components/Admin/Backup/ImportDialog.vue +++ b/frontend/src/components/Admin/Backup/ImportDialog.vue @@ -25,24 +25,7 @@ - - - +