Updates to the code and also added shell script

VidyasagarMSC · Jun 18, 2020 · c3ef47a · c3ef47a
1 parent 7798001
commit c3ef47a
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -112,4 +112,6 @@ dist
 .yarn/cache
 .yarn/unplugged
 .yarn/build-state.yml
-.pnp.*
+.pnp.*
+
+deploy.sh
diff --git a/backend/server.js b/backend/server.js
@@ -48,13 +48,18 @@ var upload = multer({
     if (err) {
       next(err);
     }
-    if (req.files.length > 1) {
+    if (req.files.length === 0) {
       res.send(
-        "Successfully uploaded " + req.files.length + " files to Object Storage"
+        "Upload an image..."
       );
     }
-    else{
+    else if (req.files.length > 1){
     res.send(
+      "Successfully uploaded " + req.files.length + " files to Object Storage"
+    );
+    }
+    else {
+      res.send(
       "Successfully uploaded " + req.files.length + " file to Object Storage"
     );
     }

diff --git a/frontend/public/js/index.js b/frontend/public/js/index.js
@@ -126,15 +126,16 @@ function readResults(){
     success: function (response) {
       console.log(response);
       var data = JSON.parse(response.data);
-      //console.log(data);
+      console.log(data);
       //var matched = $("#column-multiline footer").length;
       $("p.card-footer-item").each(function (index) {
         //console.log( index + ": " + $( this ).text() );
         var id = $(this).attr("id");
         //console.log(id);
         var value = "results/" + id.toString() + ".json";
         //console.log(value);
-        if(data[value] !== undefined) {
+        console.log(Object.keys(data).length);
+        if (Object.keys(data).length !== 0 && data[value] !== undefined) {
         var result = data[value].images[0].classifiers[0].classes.sort(
           function (a, b) {
             return b.score - a.score;
@@ -165,6 +166,7 @@ function readResults(){
         }
       });
       toggleTable();
+      $('.loader-wrapper').removeClass('is-active');
     },
     error: function (data) {
       $("p.error").text(data.statusText + ":" + "Check logs for more info");
@@ -194,9 +196,19 @@ function readResults(){
       url: "/items",
       success: function (response) {
         $("#column-multiline").empty();
-        //console.log(response);
+        console.log(response);
+        if(response.data.includes("error") ) {
+          showNotification("An error occurred, check your backend.", "is-danger");
+          $('.loader-wrapper').removeClass('is-active');
+          return false;
+        }
         var data = JSON.parse(response.data);
         console.log(data);
+
+        if(Object.keys(data).length === 0) {
+          $('.loader-wrapper').removeClass('is-active');
+          return false;
+        }
         //var matched = $("#column-multiline footer").length;
         //var imageElem = document.createElement('img');
         // Just use the toString() method from your buffer instance