Переглянути джерело

Update add ingredients sidebar to working state

Lee Morgan 6 роки тому
батько
коміт
08faed3b70

+ 9 - 9
views/dashboardPage/bundle.js

@@ -556,11 +556,10 @@ module.exports = {
                             []
                         );
 
-                        this.populateAddIngredients();
+                        this.populateAddIngredients(true);
                     }
                 })
                 .catch((err)=>{
-                    console.log(err);
                     banner.createError("UNABLE TO RETRIEVE DATA");
                 })
                 .finally(()=>{
@@ -571,7 +570,7 @@ module.exports = {
         }
     },
 
-    populateAddIngredients: function(){
+    populateAddIngredients: function(newRequest = false){
         let addIngredientsDiv = document.getElementById("addIngredientList");
         let categoryTemplate = document.getElementById("addIngredientsCategory");
         let ingredientTemplate = document.getElementById("addIngredientsIngredient");
@@ -600,9 +599,11 @@ module.exports = {
             }
         }
 
-        let myIngredients = document.getElementById("myIngredients");
-        while(myIngredients.children.length > 0){
-            myIngredients.removeChild(myIngredients.firstChild);
+        if(newRequest){
+            let myIngredients = document.getElementById("myIngredients");
+            while(myIngredients.children.length > 0){
+                myIngredients.removeChild(myIngredients.firstChild);
+            }
         }
 
         document.getElementById("addIngredientsBtn").onclick = ()=>{this.submit()};
@@ -688,6 +689,7 @@ module.exports = {
                 break;
             }
         }
+        
         this.populateAddIngredients();
     },
 
@@ -742,7 +744,6 @@ module.exports = {
                 }
             })
             .catch((err)=>{
-                console.log(err);
                 banner.createError("SOMETHING WENT WRONG. PLEASE REFRESH THE PAGE");
             })
             .finally(()=>{
@@ -1371,7 +1372,6 @@ module.exports = {
                 }
             })
             .catch((err)=>{
-                console.log(err);
                 banner.createError("SOMETHING WENT WRONG. PLEASE REFRESH THE PAGE");
             })
             .finally(()=>{
@@ -1521,7 +1521,7 @@ module.exports = {
     },
 
     sort: function(){
-        let sortType = document.getElementById("ingredientSelect");
+        let sortType = document.getElementById("ingredientSelect").value;
         
         if(sortType === ""){
             return;

+ 8 - 7
views/dashboardPage/js/addIngredients.js

@@ -34,11 +34,10 @@ module.exports = {
                             []
                         );
 
-                        this.populateAddIngredients();
+                        this.populateAddIngredients(true);
                     }
                 })
                 .catch((err)=>{
-                    console.log(err);
                     banner.createError("UNABLE TO RETRIEVE DATA");
                 })
                 .finally(()=>{
@@ -49,7 +48,7 @@ module.exports = {
         }
     },
 
-    populateAddIngredients: function(){
+    populateAddIngredients: function(newRequest = false){
         let addIngredientsDiv = document.getElementById("addIngredientList");
         let categoryTemplate = document.getElementById("addIngredientsCategory");
         let ingredientTemplate = document.getElementById("addIngredientsIngredient");
@@ -78,9 +77,11 @@ module.exports = {
             }
         }
 
-        let myIngredients = document.getElementById("myIngredients");
-        while(myIngredients.children.length > 0){
-            myIngredients.removeChild(myIngredients.firstChild);
+        if(newRequest){
+            let myIngredients = document.getElementById("myIngredients");
+            while(myIngredients.children.length > 0){
+                myIngredients.removeChild(myIngredients.firstChild);
+            }
         }
 
         document.getElementById("addIngredientsBtn").onclick = ()=>{this.submit()};
@@ -166,6 +167,7 @@ module.exports = {
                 break;
             }
         }
+        
         this.populateAddIngredients();
     },
 
@@ -220,7 +222,6 @@ module.exports = {
                 }
             })
             .catch((err)=>{
-                console.log(err);
                 banner.createError("SOMETHING WENT WRONG. PLEASE REFRESH THE PAGE");
             })
             .finally(()=>{

+ 0 - 1
views/dashboardPage/js/ingredientDetails.js

@@ -152,7 +152,6 @@ module.exports = {
                 }
             })
             .catch((err)=>{
-                console.log(err);
                 banner.createError("SOMETHING WENT WRONG. PLEASE REFRESH THE PAGE");
             })
             .finally(()=>{

+ 1 - 1
views/dashboardPage/js/ingredients.js

@@ -98,7 +98,7 @@ module.exports = {
     },
 
     sort: function(){
-        let sortType = document.getElementById("ingredientSelect");
+        let sortType = document.getElementById("ingredientSelect").value;
         
         if(sortType === ""){
             return;