refactor: clean up code

Voxelum · Nov 2, 2020 · 9f5d731 · 9f5d731
1 parent f48f62e
commit 9f5d731
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 11 deletions.
diff --git a/src/main/service/InstanceResourceService.ts b/src/main/service/InstanceResourceService.ts
@@ -157,7 +157,7 @@ export default class InstanceResourceService extends Service {
                     }
                 }
             });
-            this.log(`Mount on instance mods: ${basePath}`);
+            this.log(`Mounted on instance mods: ${basePath}`);
         }
     }
 
@@ -197,7 +197,7 @@ export default class InstanceResourceService extends Service {
                     }
                 }
             });
-            this.log(`Mount on instance resource packs: ${basePath}`);
+            this.log(`Mounted on instance resource packs: ${basePath}`);
         }
     }
 

diff --git a/src/renderer/windows/main/components/SideBar.vue b/src/renderer/windows/main/components/SideBar.vue
@@ -142,12 +142,7 @@ export default defineComponent({
     const { show } = useDialog('task');
     const { updateStatus } = useUpdateInfo();
 
-    const data = reactive({
-      taskDialog: false,
-    });
-
     return {
-      ...toRefs(data),
       updateStatus,
       activeTasksCount,
       showTaskDialog: show,

diff --git a/src/renderer/windows/main/pages/CurseforgeProjectPageFiles.vue b/src/renderer/windows/main/pages/CurseforgeProjectPageFiles.vue
@@ -26,7 +26,7 @@
       :estimate-size="56"
       :extra-props="{ getFileStatus: getFileStatus, install: install, download: download, modpack: type === 'modpacks' }"
     ></virtual-list>
-    <v-dialog v-model="isConfirmDialogShown">
+    <v-dialog v-model="isConfirmDialogShown" persistent>
       <add-instance-stepper :show="isConfirmDialogShown" :initial-template="initialTemplate" @quit="isConfirmDialogShown = false" />
     </v-dialog>
   </v-card>

diff --git a/src/renderer/windows/main/pages/InstancesPageAddInstanceStepper.vue b/src/renderer/windows/main/pages/InstancesPageAddInstanceStepper.vue
@@ -306,7 +306,15 @@
         </v-layout>
       </v-stepper-content>
       <v-stepper-content step="3">
-        <task-focus :value="importTask" />
+        <task-focus v-if="!error" :value="importTask" />
+        <div v-else> {{ error }} </div>
+        <v-btn
+          flat
+          :disabled="creating"
+          @click="quit"
+        >
+          {{ $t('cancel') }}
+        </v-btn>
       </v-stepper-content>
     </v-stepper-items>
   </v-stepper>
@@ -453,6 +461,7 @@ export default defineComponent({
       step: 1,
       valid: false,
       javaValid: true,
+      error: undefined as any,
     });
 
     const importTask: Ref<Promise<string> | null> = ref(null);
@@ -514,6 +523,8 @@ export default defineComponent({
         init();
         router.replace('/');
         data.template = undefined;
+      } catch (e) {
+        data.error = e;
       } finally {
         data.creating = false;
       }

diff --git a/src/renderer/windows/main/pages/SaveViewPage.vue b/src/renderer/windows/main/pages/SaveViewPage.vue
@@ -53,8 +53,8 @@
             name="transition-list"
           >
             <save-view-page-preview-card
-              v-for="(s, index) of saves"
-              :key="index"
+              v-for="s of saves"
+              :key="s.path"
               :source="s"
               :delete-save="startDelete"
               :export-save="doExport"