Pārlūkot izejas kodu

Remove choice of pos when registering

Lee Morgan 6 gadi atpakaļ
vecāks
revīzija
31892eae77

+ 0 - 1
controllers/merchantData.js

@@ -4,7 +4,6 @@ const bcrypt = require("bcryptjs");
 const Error = require("../models/error");
 const Merchant = require("../models/merchant");
 const Recipe = require("../models/recipe");
-const Ingredient = require("../models/ingredient");
 const InventoryAdjustment = require("../models/inventoryAdjustment");
 
 const token = "b48068eb-411a-918e-ea64-52007147e42c";

+ 0 - 2
views/landingPage/controller.js

@@ -1,7 +1,6 @@
 let controller = {
     publicStrand: document.querySelector("#publicStrand"),
     loginStrand: document.querySelector("#loginStrand"),
-    posChoiceStrand: document.querySelector("#posChoiceStrand"),
 
     onStart: function(){
         if(error){
@@ -14,7 +13,6 @@ let controller = {
     clearScreen: function(){
         this.publicStrand.style.display = "none";
         this.loginStrand.style.display = "none";
-        this.posChoiceStrand.style.display = "none";
     }
 }
 

+ 1 - 15
views/landingPage/landing.ejs

@@ -12,7 +12,7 @@
 
         <div id="publicStrand">
             <button onclick="loginObj.display()">Login</button>
-            <button onclick="posChoiceObj.display()">Register</button>
+            <a href="/merchant/new/clover">Register</a>
         </div>
 
         <div id="loginStrand">
@@ -29,25 +29,11 @@
             </form>
         </div>
 
-        <div id="posChoiceStrand">
-            <h1>Choose your POS System</h1>
-            <div class="cards">
-                <a href="/merchant/new/clover">
-                    <img src="../shared/images/clover-logo.jpeg">
-                </a>
-                <a href="/merchant/new/none">
-                    <img src="../shared/images/logo.png">
-                    <p>None</p>
-                </a>
-            </div>
-        </div>
-
         <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>
         <script src="/landingPage/login.js"></script>
-        <script src="/landingPage/posChoice.js"></script>
         <script src="/landingPage/controller.js"></script>
     </body>
 </html>

+ 17 - 1
views/landingPage/posChoice.js

@@ -3,4 +3,20 @@ let posChoiceObj = {
         controller.clearScreen();
         controller.posChoiceStrand.style.display = "flex";
     }
-}
+}
+
+/////
+//EJS for posChoiceStrand
+/////
+/* <div id="posChoiceStrand">
+    <h1>Choose your POS System</h1>
+    <div class="cards">
+        <a href="/merchant/new/clover">
+            <img src="../shared/images/clover-logo.jpeg">
+        </a>
+        <a href="/merchant/new/none">
+            <img src="../shared/images/logo.png">
+            <p>None</p>
+        </a>
+    </div>
+</div> */