Просмотр исходного кода

Bug fix. Update style on landing page for clarity

Lee Morgan 6 лет назад
Родитель
Сommit
e2e832152a
3 измененных файлов с 9 добавлено и 6 удалено
  1. 1 1
      controllers/merchantData.js
  2. 8 4
      views/landingPage/landing.ejs
  3. 0 1
      views/shared/shared.css

+ 1 - 1
controllers/merchantData.js

@@ -79,7 +79,7 @@ module.exports = {
                 axios.get(`${process.env.CLOVER_ADDRESS}/v3/merchants/${req.session.merchantId}/items?access_token=${req.session.accessToken}`)
                     .then((response)=>{
                         let recipes = [];
-                        for(let i = 0; i < response.data.elements.length; i++){}
+                        for(let i = 0; i < response.data.elements.length; i++){
                             let recipe = new Recipe({
                                 posId: response.data.elements[i].id,
                                 merchant: merchant,

+ 8 - 4
views/landingPage/landing.ejs

@@ -47,8 +47,6 @@
             <form onsubmit="registerObj.submit()">
                 <h1> Join Subline </h1>
 
-                <a class="button buttonWithBorder" href="/cloverlogin"> Sign Up with Clover </a>
-
                 <label id="nameLabel">Restaurant Name
                     <input class="input" id="regName" name="name" type="text" required>
                 </label>
@@ -80,6 +78,10 @@
 
                 <input id="regButton" class="buttonDisabled" type="submit" value="Sign Up with Email">
 
+                <h1>OR</h1>
+
+                <a class="button buttonWithBorder" href="/cloverlogin"> Sign Up with Clover </a>
+
                 <h3 class="link" style="margin-top: 30px;" onclick="loginObj.display()"> Already have an account? Please Sign In </h3>
 
             </form>
@@ -88,8 +90,6 @@
         <div id="loginStrand">
             <form action="/login" method="post">
                 <h1> Welcome Back </h1>
-
-                <a class="button buttonWithBorder" href="/cloverlogin"> Sign In with Clover </a>
         
                 <label>Email
                     <input type="text" name="email" type="email" required>
@@ -101,6 +101,10 @@
         
                 <input id="signIn" type="submit" value="Sign In with Email">
 
+                <h1>OR</h1>
+
+                <a class="button buttonWithBorder" href="/cloverlogin"> Sign In with Clover </a>
+
                 <h3 class="link" style="margin-top: 30px;" onclick="registerObj.display()"> New Here? Please Sign Up </h3>
             </form>
         </div>

+ 0 - 1
views/shared/shared.css

@@ -163,7 +163,6 @@ form{
         border: rgb(255, 99, 107) solid 2px;
         color: rgb(255, 99, 107);
         margin: 0;
-        margin-top: 18px;
         margin-bottom: 12px;
         padding-top: 14px;
         padding-bottom: 14px;