alu/tra-analysis
1
0
Fork 0
mirror of https://github.com/titanscouting/tra-analysis.git synced 2024-11-10 06:54:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

last-ditch effort to make js not multithread everything

Browse Source
This commit is contained in:
Jacob Levine 2019-02-09 13:01:14 -06:00
parent 807c66dd3a
commit 0b0d36d660
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
website/public/profile/scripts.js
View File

@ -23,9 +23,13 @@ window.onload = function() {
storageBucket: "titanscoutandroid.appspot.com", storageBucket: "titanscoutandroid.appspot.com",
messagingSenderId: "1097635313476" messagingSenderId: "1097635313476"
}; };
//eventually find a less-jank way to do this tho
firebase.initializeApp(config); firebase.initializeApp(config);
setTimeout(function(){
user = firebase.auth().currentUser user = firebase.auth().currentUser
resolve(user) resolve(user)
},10)
}); });
promise1.then(function(user) { promise1.then(function(user) {
if (user != null) { if (user != null) {

9
website/public/stats/scripts.js
View File

@ -23,12 +23,15 @@ window.onload = function() {
storageBucket: "titanscoutandroid.appspot.com", storageBucket: "titanscoutandroid.appspot.com",
messagingSenderId: "1097635313476" messagingSenderId: "1097635313476"
}; };
//eventually find a less-jank way to do this tho
firebase.initializeApp(config); firebase.initializeApp(config);
setTimeout(function(){
user = firebase.auth().currentUser user = firebase.auth().currentUser
resolve(null) resolve(user)
},10)
}); });
promise1.then(function(a) { promise1.then(function(user) {
user=firebase.auth().currentUser
if (user != null) { if (user != null) {
if (user.displayName != null) { if (user.displayName != null) {
document.getElementById('status').innerHTML = "You are signed in as: " + user.displayName; document.getElementById('status').innerHTML = "You are signed in as: " + user.displayName;