Ver Fonte

Change errors on render from undefined to null for better handling on frontend

Lee Morgan há 6 anos atrás
pai
commit
28570e6c62

+ 3 - 3
controllers/renderer.js

@@ -18,7 +18,7 @@ module.exports = {
             error = req.session.error;
             req.session.error = undefined;
         }else{
-            error = undefined;
+            error = null;
         }
 
         return res.render("landingPage/landing", {error: error});
@@ -150,7 +150,7 @@ module.exports = {
             errorMessage = req.session.error;
             req.session.error = undefined;
         }else{
-            errorMessage = undefined;
+            errorMessage = null;
         }
         
         Ingredient.find()
@@ -196,7 +196,7 @@ module.exports = {
             errorMessage = req.session.error;
             req.session.error = undefined;
         }else{
-            errorMessage = undefined;
+            errorMessage = null;
         }
 
         Ingredient.find()

+ 1 - 7
views/landingPage/landing.ejs

@@ -42,13 +42,7 @@
             </div>
         </div>
 
-        <script>
-                <% if(locals.error){ %>
-                    let error = <%- JSON.stringify(error) %>;
-                <% }else{ %>
-                    let error = undefined;
-                <% } %>
-        </script>
+        <script>let error = <%- JSON.stringify(error) %>;</script>
         <script src="https://unpkg.com/axios/dist/axios.min.js"></script>
         <script src="../shared/validation.js"></script>
         <script src="/landingPage/public.js"></script>

+ 1 - 7
views/merchantSetupPage/merchantSetup.ejs

@@ -114,16 +114,10 @@
             <button id="previous" onclick="createRecipesObj.changeRecipe(-1)">Previous Recipe</button>
         </div>
 
-        <script>
-            <% if(locals.error){ %>
-                let error = <%- JSON.stringify(error) %>;
-            <% }else{ %>
-                let error = undefined;
-            <% } %>
-        </script>
         <script>
             let ingredients = <%- JSON.stringify(ingredients) %>;
             let recipes = <%- JSON.stringify(recipes) %>;
+            let error = <%- JSON.stringify(error) %>;
         </script>
         <script src="https://unpkg.com/axios/dist/axios.min.js"></script>
         <script src="/shared/validation.js"></script>