From 1559b015afd8247920fb69db0fb9c0df70772159 Mon Sep 17 00:00:00 2001
From: Hayden <hay-kot@pm.me>
Date: Sat, 9 Jan 2021 12:56:20 -0900
Subject: [PATCH] fixed backup bug + removed console.logs

---
 frontend/src/api/backup.js                    |  3 +-
 frontend/src/api/migration.js                 |  1 -
 .../src/components/Settings/Backup/index.vue  | 22 ++++++++++--
 .../components/Settings/Migration/index.vue   |  1 +
 .../src/components/Settings/Theme/index.vue   |  2 --
 .../src/components/UI/SuccessFailureAlert.vue | 34 +++++++++++++++++++
 frontend/src/pages/MealPlanThisWeekPage.vue   |  1 -
 frontend/src/pages/SettingsPage.vue           |  2 --
 8 files changed, 56 insertions(+), 10 deletions(-)
 create mode 100644 frontend/src/components/UI/SuccessFailureAlert.vue

diff --git a/frontend/src/api/backup.js b/frontend/src/api/backup.js
index e6971151e..1ec026a83 100644
--- a/frontend/src/api/backup.js
+++ b/frontend/src/api/backup.js
@@ -19,8 +19,9 @@ export default {
   },
 
   async import(fileName) {
-    apiReq.post(backupURLs.importBackup(fileName));
+    let response = await apiReq.post(backupURLs.importBackup(fileName));
     store.dispatch("requestRecentRecipes");
+    return response;
   },
 
   async delete(fileName) {
diff --git a/frontend/src/api/migration.js b/frontend/src/api/migration.js
index 9c4d4da91..7b8ba1610 100644
--- a/frontend/src/api/migration.js
+++ b/frontend/src/api/migration.js
@@ -12,7 +12,6 @@ export default {
   async migrateChowdown(repoURL) {
     let postBody = { url: repoURL };
     let response = await apiReq.post(migrationURLs.chowdownURL, postBody);
-    console.log(response);
     store.dispatch("requestRecentRecipes");
     return response.data;
   },
diff --git a/frontend/src/components/Settings/Backup/index.vue b/frontend/src/components/Settings/Backup/index.vue
index b12789371..5d62b4674 100644
--- a/frontend/src/components/Settings/Backup/index.vue
+++ b/frontend/src/components/Settings/Backup/index.vue
@@ -24,7 +24,7 @@
             :items="availableTemplates"
             v-model="selectedTemplate"
           ></v-combobox>
-        </v-col>
+        </v-col>0
         <v-col dense cols="12" sm="12" md="2">
           <v-btn block color="accent" @click="createBackup" width="165">
             Backup Recipes
@@ -56,16 +56,28 @@
           </v-btn>
         </v-col>
       </v-row>
+      <SuccessFailureAlert
+        success-header="Successfully Imported"
+        :success="successfulImports"
+        failed-header="Failed Imports"
+        :failed="failedImports"
+      />
     </v-card-text>
   </v-card>
 </template>
 
 <script>
 import api from "../../../api";
+import SuccessFailureAlert from "../../UI/SuccessFailureAlert";
 
 export default {
+  components: {
+    SuccessFailureAlert,
+  },
   data() {
     return {
+      failedImports: [],
+      successfulImports: [],
       backupLoading: false,
       backupTag: null,
       selectedBackup: null,
@@ -83,11 +95,15 @@ export default {
       this.availableBackups = response.imports;
       this.availableTemplates = response.templates;
     },
-    importBackup() {
+    async importBackup() {
       if (this.$refs.form.validate()) {
         this.backupLoading = true;
 
-        api.backups.import(this.selectedBackup);
+        let response = await api.backups.import(this.selectedBackup);
+        console.log(response.data);
+        this.failedImports = response.data.failed;
+        this.successfulImports = response.data.successful;
+
         this.backupLoading = false;
       }
     },
diff --git a/frontend/src/components/Settings/Migration/index.vue b/frontend/src/components/Settings/Migration/index.vue
index 4ba279771..19fa41653 100644
--- a/frontend/src/components/Settings/Migration/index.vue
+++ b/frontend/src/components/Settings/Migration/index.vue
@@ -40,6 +40,7 @@
 
 <script>
 import api from "../../../api";
+// import SuccessFailureAlert from "../../UI/SuccessFailureAlert";
 // import TimePicker from "./Webhooks/TimePicker";
 export default {
   data() {
diff --git a/frontend/src/components/Settings/Theme/index.vue b/frontend/src/components/Settings/Theme/index.vue
index c5c63b7d8..bfe12f212 100644
--- a/frontend/src/components/Settings/Theme/index.vue
+++ b/frontend/src/components/Settings/Theme/index.vue
@@ -150,7 +150,6 @@ export default {
     this.availableThemes = await api.themes.requestAll();
     this.selectedTheme = this.$store.getters.getActiveTheme;
     this.selectedDarkMode = this.$store.getters.getDarkMode;
-    console.log(this.selectedDarkMode);
   },
 
   methods: {
@@ -201,7 +200,6 @@ export default {
     },
 
     setStoresDarkMode() {
-      console.log(this.selectedDarkMode);
       this.$store.commit("setDarkMode", this.selectedDarkMode);
     },
     /**
diff --git a/frontend/src/components/UI/SuccessFailureAlert.vue b/frontend/src/components/UI/SuccessFailureAlert.vue
new file mode 100644
index 000000000..784ed2e82
--- /dev/null
+++ b/frontend/src/components/UI/SuccessFailureAlert.vue
@@ -0,0 +1,34 @@
+<template>
+  <div>
+    <v-alert v-if="success[0]" outlined dense type="success">
+      <h4>{{ successHeader }}</h4>
+      <v-list dense>
+        <v-list-item v-for="success in this.success" :key="success">
+          {{ success }}
+        </v-list-item>
+      </v-list>
+    </v-alert>
+    <v-alert v-if="failed[0]" outlined dense type="error">
+      <h4>{{ failedHeader }}</h4>
+      <v-list dense>
+        <v-list-item v-for="fail in this.failed" :key="fail">
+          {{ fail }}
+        </v-list-item>
+      </v-list>
+    </v-alert>
+  </div>
+</template>
+
+<script>
+export default {
+  props: {
+    successHeader: String,
+    success: Array,
+    failedHeader: String,
+    failed: Array,
+  },
+};
+</script>
+
+<style>
+</style>
\ No newline at end of file
diff --git a/frontend/src/pages/MealPlanThisWeekPage.vue b/frontend/src/pages/MealPlanThisWeekPage.vue
index 1f9148c60..4f2f6cf45 100644
--- a/frontend/src/pages/MealPlanThisWeekPage.vue
+++ b/frontend/src/pages/MealPlanThisWeekPage.vue
@@ -55,7 +55,6 @@ export default {
   },
   async mounted() {
     this.mealPlan = await api.mealPlans.thisWeek();
-    console.log(this.mealPlan);
   },
   methods: {
     getOrder(index) {
diff --git a/frontend/src/pages/SettingsPage.vue b/frontend/src/pages/SettingsPage.vue
index c3e5ffd8d..440bfdcc5 100644
--- a/frontend/src/pages/SettingsPage.vue
+++ b/frontend/src/pages/SettingsPage.vue
@@ -56,7 +56,6 @@ export default {
   computed: {
     newVersion() {
       if ((this.latestVersion != null) & (this.latestVersion != this.version)) {
-        console.log("New Version Avaiable");
         return true;
       } else {
         return false;
@@ -68,7 +67,6 @@ export default {
       let response = await axios.get(
         "https://api.github.com/repos/hay-kot/mealie/releases/latest"
       );
-      console.log(response);
       this.latestVersion = response.data.tag_name;
     },
   },