소스 검색

Update frontend to give the choice of a spreadsheet from square.

Lee Morgan 5 년 전
부모
커밋
d3f00cb305
6개의 변경된 파일18개의 추가작업 그리고 2개의 파일을 삭제
  1. 4 0
      controllers/recipeData.js
  2. 1 0
      routes.js
  3. 5 1
      views/dashboardPage/bundle.js
  4. 1 0
      views/dashboardPage/js/dashboard.js
  5. 4 1
      views/dashboardPage/js/sidebars/newRecipe.js
  6. 3 0
      views/dashboardPage/modal.ejs

+ 4 - 0
controllers/recipeData.js

@@ -228,6 +228,10 @@ module.exports = {
             });
     },
 
+    spreadsheetUpSquare: function(req, res){
+        console.log("butt stuff");
+    },
+
     spreadsheetTemplate: function(req, res){
         res.locals.merchant
             .populate("inventory.ingredient")

+ 1 - 0
routes.js

@@ -41,6 +41,7 @@ module.exports = function(app){
     app.put("/recipe/update", session, recipeData.updateRecipe);
     app.delete("/recipe/remove/:id", session, recipeData.removeRecipe);
     app.post("/recipes/create/spreadsheet", session, upload.single("recipes"), recipeData.createFromSpreadsheet);
+    app.post("/recipes/create/spreadsheet/square", session, upload.single("recipes"), recipeData.spreadsheetUpSquare);
     app.get("/recipes/download/spreadsheet", session, recipeData.spreadsheetTemplate);
 
     //Orders

+ 5 - 1
views/dashboardPage/bundle.js

@@ -1312,6 +1312,7 @@ controller = {
                 content.style.display = "flex";
                 document.getElementById("modalSpreadsheetTitle").innerText = "recipes";
                 document.getElementById("spreadsheetDownload").href = "/recipes/download/spreadsheet";
+                document.getElementById("spreadsheetRecipeIsSquare").parentElement.style.display = "flex";
                 content.onsubmit = newRecipe.submitSpreadsheet;
                 break;
             case "orderSpreadsheet":
@@ -2174,6 +2175,9 @@ let newRecipe = {
         event.preventDefault();
         controller.closeModal();
 
+        let checkbox = document.getElementById("spreadsheetRecipeIsSquare");
+        let route = (checkbox.checked === true) ? "/recipes/create/spreadsheet/square": "/recipes/create/spreadsheet";
+
         const file = document.getElementById("spreadsheetInput").files[0];
         let data = new FormData();
         data.append("recipes", file);
@@ -2181,7 +2185,7 @@ let newRecipe = {
         let loader = document.getElementById("loaderContainer");
         loader.style.display = "flex";
 
-        fetch("/recipes/create/spreadsheet", {
+        fetch(route, {
             method: "post",
             body: data
         })

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

@@ -202,6 +202,7 @@ controller = {
                 content.style.display = "flex";
                 document.getElementById("modalSpreadsheetTitle").innerText = "recipes";
                 document.getElementById("spreadsheetDownload").href = "/recipes/download/spreadsheet";
+                document.getElementById("spreadsheetRecipeIsSquare").parentElement.style.display = "flex";
                 content.onsubmit = newRecipe.submitSpreadsheet;
                 break;
             case "orderSpreadsheet":

+ 4 - 1
views/dashboardPage/js/sidebars/newRecipe.js

@@ -115,6 +115,9 @@ let newRecipe = {
         event.preventDefault();
         controller.closeModal();
 
+        let checkbox = document.getElementById("spreadsheetRecipeIsSquare");
+        let route = (checkbox.checked === true) ? "/recipes/create/spreadsheet/square": "/recipes/create/spreadsheet";
+
         const file = document.getElementById("spreadsheetInput").files[0];
         let data = new FormData();
         data.append("recipes", file);
@@ -122,7 +125,7 @@ let newRecipe = {
         let loader = document.getElementById("loaderContainer");
         loader.style.display = "flex";
 
-        fetch("/recipes/create/spreadsheet", {
+        fetch(route, {
             method: "post",
             body: data
         })

+ 3 - 0
views/dashboardPage/modal.ejs

@@ -9,6 +9,9 @@
             <form id="modalSpreadsheetUpload" class="modalSpreadsheetUpload" method="post">
                 <h3>Choose a file to upload your <span id="modalSpreadsheetTitle"></span></h3>
                 <input id="spreadsheetInput" class="fileUpload" name="file" type="file">
+                <label id="" style="display:none;">
+                    <input id="spreadsheetRecipeIsSquare" type="checkbox">Square Items?
+                </label>
                 <input type="hidden" name="type">
                 <input class="button" type="submit" value="SUBMIT">
                 <a id="spreadsheetDownload">download template</a>