Fix login again. Other minor fixes.

views/landingPage/controller.js

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

views/landingPage/landing.ejs

@@ -46,7 +46,9 @@
         <div id="registerStrand">
             <form onsubmit="basicInfoObj.submit()">
                 <h1> Please Sign Up </h1>
+
                 <h3 class="link" onclick="loginObj.display()"> Or Register with Clover </h3>
+
                 <label id="nameLabel">Restaurant Name
                     <input class="input" id="regName" type="text">
                 </label>
@@ -63,52 +65,40 @@
                     <input type="password" id="regConfirmPass" type="password" required>
                 </label>
         
-                <!-- <input type="submit" value="Continue"> -->
                 <div id="agreement">
                     <label class="container">
                         <input type="checkbox">
+
                         <span class="checkmark"></span>
         
                         <p style="padding-top: 5px; padding-left: 7px;">I agree to the 
                             <a class="link" href="/information">Privacy Policy</a> and the 
-                            <a class="link" href="/information">Terms and Conditions</a></p>
+                            <a class="link" href="/information">Terms and Conditions</a>
+                        </p>
                     </label>   
-                </div> 
-                    <input id="regButton" class="buttonDisabled" type="submit" value="Register">
+                </div>
+
+                <input id="regButton" class="buttonDisabled" type="submit" value="Register">
             </form>
         </div>
 
         <div id="loginStrand">
-            <form onsubmit="basicInfoObj.submit()">
+            <form action="/login" method="post">
                 <h1> Please Sign In </h1>
+
                 <h3 class="link" onclick="registerObj.display()"> New Here? Please Sign Up </h3>
         
                 <label>Email
-                    <input type="text" id="regEmail" type="email" required>
+                    <input type="text" name="email" type="email" required>
                 </label>
         
                 <label>Password
-                    <input type="password" id="regPass" type="password" required>
+                    <input type="password" name="password" required>
                 </label>
         
-                <input id="signIn" class="buttonDisabled" type="submit" value="Sign In">
+                <input id="signIn" type="submit" value="Sign In">
             </form>
         </div>
-    
-        <div id="posChoiceStrand">
-            <h1>Choose your POS System</h1>
-
-            <div class="cards">
-                <a href="/cloverlogin">
-                    <img src="../shared/images/clover-logo.jpeg" alt="Clover">
-                </a>
-
-                <a href="/merchant/new/none">
-                    <img src="../shared/images/logo.png" alt="None">
-                    <p>None</p>
-                </a>
-            </div>
-        </div>
 
         <% include ../shared/footer %>
 

views/shared/header.css

@@ -1,5 +0,0 @@
-.button-join {
-    font-size: medium;
-    color:white;
-    text-decoration: blink;
-}

views/shared/header.ejs

@@ -1,5 +1,3 @@
-<link rel="stylesheet" href="/header.css">
-
 <div class="header">
     <a class="logo" href="http://www.thesubline.com" >
         <img src="/shared/images/logo.png" alt="Subline">

views/shared/shared.css

@@ -306,6 +306,12 @@ strand-selector{
         text-decoration: none;
     }
 
+    .button-join {
+        font-size: medium;
+        color:white;
+        text-decoration: blink;
+    }
+
 /* Banner partial */
 .banner{
     width: 100%;