Add banner to landing page and register page.

Remove old landing page.

controllers/renderer.js

@@ -10,13 +10,11 @@ module.exports = {
     GET - Shows the public landing page
     */
     landingPage: function(req, res){
-        
         return res.render("otherPages/landing", {banner: res.locals.banner});
     },
 
     //GET: Renders the login page
     loginPage: function(req, res){  
-        console.log(res.locals.banner);      
         return res.render("otherPages/login", {banner: res.locals.banner});
     },
 

routes.js

@@ -23,7 +23,6 @@ module.exports = function(app){
     app.get("/dashboard", session, renderer.displayDashboard);
     app.get("/resetpassword/*", renderer.displayPassReset);
     
-
     //Merchant
     app.post("/merchant/create/none", merchantData.createMerchantNone);
     app.put("/merchant/ingredients/update", session, merchantData.updateMerchantIngredient); //also updates some data in ingredients

views/landingPage/controller.js

@@ -1,53 +0,0 @@
-let controller = {
-    publicStrand: document.getElementById("publicStrand"),
-    loginStrand: document.getElementById("loginStrand"),
-    registerStrand: document.getElementById("registerStrand"),
-
-    onStart: function(){
-        if(error){
-            let bannerContainer = document.getElementById("bannerContainer");
-            let banner = document.getElementById("banner").content.children[0].cloneNode(true);
-            banner.children[0].style.backgroundColor = "rgb(200, 0, 0)";
-            banner.children[0].children[0].style.display = "block";
-            banner.children[1].innerText = error;
-            bannerContainer.appendChild(banner);
-
-            let timer = setTimeout(()=>{
-                bannerContainer.removeChild(banner);
-            }, 10000);
-
-            banner.children[2].addEventListener("click", ()=>{
-                bannerContainer.removeChild(banner);
-                clearTimeout(timer);
-            });
-        }
-
-        if(success){
-            let bannerContainer = document.getElementById("bannerContainer");
-            let banner = document.getElementById("banner").content.children[0].cloneNode(true);
-            banner.children[0].style.backgroundColor = "rgb(0, 145, 55)";
-            banner.children[0].children[2].style.display = "block";
-            banner.children[1].innerText = success;
-            bannerContainer.appendChild(banner);
-
-            let timer = setTimeout(()=>{
-                bannerContainer.removeChild(banner);
-            }, 10000);
-
-            banner.children[2].addEventListener("click", ()=>{
-                bannerContainer.removeChild(banner);
-                clearTimeout(timer);
-            });
-        }
-
-        publicObj.display();
-    },
-
-    clearScreen: function(){
-        this.publicStrand.style.display = "none";
-        this.loginStrand.style.display = "none";
-        this.registerStrand.style.display = "none";
-    }
-}
-
-controller.onStart();

views/landingPage/login.js

@@ -1,14 +0,0 @@
-let loginObj = {
-    display: function(username){
-        controller.clearScreen();
-        controller.loginStrand.style.display = "flex";
-
-        document.getElementById("goToRegister").addEventListener("click", ()=>{registerObj.display()});
-    },
-
-    cancel: function(){
-        event.preventDefault();
-        
-        publicObj.display();
-    },
-}

views/landingPage/public.js

@@ -1,6 +0,0 @@
-let publicObj = {
-    display: function(){
-        controller.clearScreen();
-        controller.publicStrand.style.display = "flex";
-    }
-}

views/landingPage/register.js

@@ -1,48 +0,0 @@
-let registerObj = {
-    display: function(){
-        controller.clearScreen();
-        controller.registerStrand.style.display = "flex";
-
-        document.getElementById("checkAgree").checked = false;
-        document.getElementById("regButton").classList = "buttonDisabled";
-    },
-
-    agreement: function(){
-        let checkbox = document.getElementById("checkAgree");
-        let button = document.getElementById("regButton");
-
-        if(checkbox.checked){
-            button.classList = "button";
-        }else{
-            button.classList = "buttonDisabled";
-        }
-    },
-
-    submit: function(){
-        event.preventDefault();
-
-        let form = document.querySelector("#registerStrand form");
-        let checkbox = document.getElementById("checkAgree");
-
-        if(!checkbox.checked){
-            banner.createError("Please agree to the Privacy Policy and Terms and Conditions to continue");
-            return;
-        }
-
-        let pass = document.getElementById("regPass").value;
-        let confirmPass = document.getElementById("regConfirmPass").value;
-        if(pass !== confirmPass){
-            banner.createError("Your passwords do not match");
-            return;
-        }
-
-        if(checkbox.checked){
-            document.getElementById("loaderContainer").style.display = "flex";
-            form.action = "merchant/create/none";
-            form.method = "post";
-            form.submit();
-        }else{
-            banner.createError("Please agree to the Privacy Policy and Terms and Conditions to continue");
-        }
-    }
-}

views/otherPages/landing.ejs

@@ -28,7 +28,9 @@
             </div>
         </div>
 
-        <div id="banner" class="banner" style="display:none;"></div>
+        <% if(banner !== undefined){ %>
+            <% include ./banner.ejs %>
+        <% } %>
 
         <div class="main-background">
             <div class="logo-text">
@@ -62,9 +64,10 @@
         <% include ../shared/loader %>
 
         <script>
-            let banner = <%- JSON.stringify(banner) %>;
-
-            console.log(banner);
+            setTimeout(()=>{
+                let banner = document.getElementById("banner");
+                if(banner !== null) banner.style.display = "none";
+            }, 10000)
         </script>
     </body>
 </html>

views/otherPages/register.ejs

@@ -16,6 +16,10 @@
             </a>
         </div>
 
+        <% if(banner !== undefined){ %>
+            <% include ./banner.ejs %>
+        <% } %>
+
         <form action="/register" method="post">
             <h1> Join The Subline </h1>
 
@@ -56,5 +60,12 @@
         </form>
 
         <% include ../shared/footer %>
+
+        <script>
+            setTimeout(()=>{
+                let banner = document.getElementById("banner");
+                if(banner !== null) banner.style.display = "none";
+            }, 10000)
+        </script>
     </body>
 </html>