From c602ce82b8eb23c879b1a9d7c82287ea129933ee Mon Sep 17 00:00:00 2001
From: Michael Mayer <michael@liquidbytes.net>
Date: Sat, 16 Nov 2019 17:48:51 +0100
Subject: [PATCH] Fix upload page

Signed-off-by: Michael Mayer <michael@liquidbytes.net>
---
 frontend/src/pages/library/upload.vue | 14 ++++++++------
 internal/api/import.go                |  4 ++--
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/frontend/src/pages/library/upload.vue b/frontend/src/pages/library/upload.vue
index fed9a90f9..8a748a725 100644
--- a/frontend/src/pages/library/upload.vue
+++ b/frontend/src/pages/library/upload.vue
@@ -30,6 +30,8 @@
 
 <script>
     import Event from "pubsub-js";
+    import Api from "common/api";
+    import Alert from "common/alert";
 
     export default {
         name: 'p-tab-upload',
@@ -66,7 +68,7 @@
                     return
                 }
 
-                this.$alert.info("Uploading photos...");
+                Alert.info("Uploading photos...");
 
                 Event.publish("ajax.start");
 
@@ -79,7 +81,7 @@
 
                         formData.append('files', file);
 
-                        await this.$api.post('upload/' + ctx.started,
+                        await Api.post('upload/' + ctx.started,
                             formData,
                             {
                                 headers: {
@@ -89,7 +91,7 @@
                         ).then(function () {
                             ctx.completed = Math.round((ctx.current / ctx.total) * 100);
                         }).catch(function () {
-                            this.$alert.error("Upload failed");
+                            Alert.error("Upload failed");
                         });
                     }
                 }
@@ -98,12 +100,12 @@
                     this.indexing = true;
                     const ctx = this;
 
-                    this.$api.post('import/upload/' + this.started).then(function () {
-                        this.$alert.success("Upload complete");
+                    Api.post('import/upload/' + this.started).then(function () {
+                        Alert.success("Upload complete");
                         ctx.busy = false;
                         ctx.indexing = false;
                     }).catch(function () {
-                        this.$alert.error("Failure while importing uploaded files");
+                        Alert.error("Failure while importing uploaded files");
                         ctx.busy = false;
                         ctx.indexing = false;
                     });
diff --git a/internal/api/import.go b/internal/api/import.go
index 06d71a036..c072be3d6 100644
--- a/internal/api/import.go
+++ b/internal/api/import.go
@@ -56,9 +56,9 @@ func Import(router *gin.RouterGroup, conf *config.Config) {
 
 		elapsed := int(time.Since(start).Seconds())
 
-		event.Success(fmt.Sprintf("completed import in %d s", elapsed))
+		event.Success(fmt.Sprintf("import completed in %d s", elapsed))
 		event.Publish("import.completed", event.Data{"path": path, "seconds": elapsed})
 
-		c.JSON(http.StatusOK, gin.H{"message": fmt.Sprintf("completed import in %d s", elapsed)})
+		c.JSON(http.StatusOK, gin.H{"message": fmt.Sprintf("import completed in %d s", elapsed)})
 	})
 }