diff --git a/website/public/profile/scripts.js b/website/public/profile/scripts.js index 1fadb7e3..dbec65a0 100644 --- a/website/public/profile/scripts.js +++ b/website/public/profile/scripts.js @@ -23,9 +23,13 @@ window.onload = function() { storageBucket: "titanscoutandroid.appspot.com", messagingSenderId: "1097635313476" }; + //eventually find a less-jank way to do this tho firebase.initializeApp(config); - user = firebase.auth().currentUser - resolve(user) + setTimeout(function(){ + user = firebase.auth().currentUser + resolve(user) + },10) + }); promise1.then(function(user) { if (user != null) { diff --git a/website/public/stats/scripts.js b/website/public/stats/scripts.js index b536edd7..dbec65a0 100644 --- a/website/public/stats/scripts.js +++ b/website/public/stats/scripts.js @@ -23,12 +23,15 @@ window.onload = function() { storageBucket: "titanscoutandroid.appspot.com", messagingSenderId: "1097635313476" }; + //eventually find a less-jank way to do this tho firebase.initializeApp(config); - user = firebase.auth().currentUser - resolve(null) + setTimeout(function(){ + user = firebase.auth().currentUser + resolve(user) + },10) + }); - promise1.then(function(a) { - user=firebase.auth().currentUser + promise1.then(function(user) { if (user != null) { if (user.displayName != null) { document.getElementById('status').innerHTML = "You are signed in as: " + user.displayName;