Przeglądaj źródła

Prevent page load until user login is verified.

Lee Morgan 1 rok temu
rodzic
commit
c13d3a8d5f
3 zmienionych plików z 19 dodań i 5 usunięć
  1. 1 1
      views/index.html
  2. 18 2
      views/index.js
  3. 0 2
      views/js/pages/login.js

+ 1 - 1
views/index.html

@@ -69,7 +69,7 @@
         <button id="registerToLogin" class="link">Log In</button>
     </div>
 
-    <div id="loginPage" class="page">
+    <div id="loginPage" class="page" style="display:none">
         <form id="loginForm" class="standardForm">
             <h1>Log In</h1>
 

+ 18 - 2
views/index.js

@@ -9,7 +9,6 @@ import editWorkoutPage from "./js/pages/editWorkout.js";
 const notifier = document.getElementById("notifier");
 const pageElements = document.querySelectorAll(".page");
 
-loginPage.render();
 
 window.notify = (type, message)=>{
     notifier.className = "";
@@ -39,6 +38,24 @@ window.changePage = (page, data)=>{
     }
 }
 
+fetch("/user", {
+    method: "GET",
+    header: {
+        "Content-Type": "application/json"
+    }
+})
+    .then(r=>r.json())
+    .then((response)=>{
+        if(response.error){
+            changePage("login");
+        }else{
+            changePage("home");
+        }
+    })
+    .catch((err)=>{
+        changePage("login");
+    });
+
 if("serviceWorker" in navigator){
     window.addEventListener("load", ()=>{
         navigator.serviceWorker.register("/serviceWorker.js")
@@ -67,7 +84,6 @@ installBtn.addEventListener("click", async ()=>{
         deferredPrompt.prompt();
         const {outcome} = await deferredPrompt.userChoice;
         deferredPrompt = null;
-        console.log(outcome); //accepted
         if(outcome === "accepted") installBtn.style.display = "none";
     }
 });

+ 0 - 2
views/js/pages/login.js

@@ -4,8 +4,6 @@ export default {
     render: function(){
         document.getElementById("loginEmail").focus();
 
-        this.checkUser();
-
         if(!this.rendered){
             this.buttons();
             this.createSubmit();