From 45a4387c689660ee88d8bf3ef9a11e88970dc9cd Mon Sep 17 00:00:00 2001 From: Jacob Levine Date: Tue, 12 Feb 2019 20:20:30 -0600 Subject: [PATCH 01/13] started teams page --- website/public/profile/scripts.js | 9 ++--- website/public/team/index.html | 56 +++++++++++++++++++---------- website/public/team/scripts.js | 58 ++++++++++++++++++++++++++++++- 3 files changed, 100 insertions(+), 23 deletions(-) diff --git a/website/public/profile/scripts.js b/website/public/profile/scripts.js index 7ebfc566..6b762887 100644 --- a/website/public/profile/scripts.js +++ b/website/public/profile/scripts.js @@ -52,14 +52,14 @@ window.onload = function() { function signout() { var user = firebase.auth().currentUser; - firebase.auth().signOut() - window.location.href = '../'; + firebase.auth().signOut().then( + window.location.href = '../'); } function deleteAccount() { try { - firebase.auth().currentUser.delete() - window.location.href = '../'; + firebase.auth().currentUser.delete().then( + window.location.href = '../'); } catch (error) { if (error.code == 'auth/requires-recent-login') { alert("Please sign in again to delete your account.") @@ -68,6 +68,7 @@ function deleteAccount() { } } + function updun() { var user = firebase.auth().currentUser; user.updateProfile({ diff --git a/website/public/team/index.html b/website/public/team/index.html index 7b47e18c..99a63791 100644 --- a/website/public/team/index.html +++ b/website/public/team/index.html @@ -1,30 +1,50 @@ - + + + + <meta charset="utf-8"> - <title><meta charset="utf-8"> <title>titanscout + - - -
- × - Profile - Team - Scout Matches - Torunament Stats + + + + +
+ + + +

TitanScout- Your Teams

+

Loading...

+ + +

Team Membership

+
+
+ + +
+
+ + +
-
- - - -

TitanScout- Your Teams

-

Loading...

-
- + +
+
+ + diff --git a/website/public/team/scripts.js b/website/public/team/scripts.js index 3a741a5c..26ab23af 100644 --- a/website/public/team/scripts.js +++ b/website/public/team/scripts.js @@ -3,6 +3,9 @@ function openNav() { document.getElementById("mySidenav").style.width = "250px"; document.getElementById("main").style.marginLeft = "250px"; document.body.style.backgroundColor = "rgba(0,0,0,0.4)"; + for (var i = 0; i < document.getElementsByClassName("btn").length; i++) { + document.getElementsByClassName("btn")[i].style.backgroundColor="rgba(0,0,0,.2)" + } } /* Set the width of the side navigation to 0 and the left margin of the page content to 0, and the background color of body to white */ @@ -10,6 +13,9 @@ function closeNav() { document.getElementById("mySidenav").style.width = "0"; document.getElementById("main").style.marginLeft = "0"; document.body.style.backgroundColor = "white"; + for (var i = 0; i < document.getElementsByClassName("btn").length; i++) { + document.getElementsByClassName("btn")[i].style.backgroundColor="buttonface" + } } window.onload = function() { @@ -22,12 +28,12 @@ window.onload = function() { storageBucket: "titanscoutandroid.appspot.com", messagingSenderId: "1097635313476" }; - //eventually find a less-jank way to do this tho firebase.initializeApp(config); firebase.auth().onAuthStateChanged(function(user) { if (user != null) { if (user.displayName != null) { document.getElementById('status').innerHTML = "You are signed in as: " + user.displayName; + document.getElementById('newDN').innerHTML = user.displayName; } else if (user.email != null) { document.getElementById('status').innerHTML = "You are signed in as: " + user.email; } else if (user.phoneNumber != null) { @@ -35,8 +41,58 @@ window.onload = function() { } else { document.getElementById('status').innerHTML = "You are signed in."; } + if (user.email != null) { + document.getElementById('newEM').innerHTML = user.email; + } } else { window.location.replace('../'); } + teamAssoc=firebase.firestore().collections('UserAssociations').doc(user.uid); + teamAssoc.get().then(function(doc){ + if(doc.exists)}{ + list=doc.data() + teamNums=Object.keys(list) + document.getElementById(teammem).innerHTML = "" + for i in teamNums(){ + document.getElementById(teammem).innerHTML +=""+i+""+list.i+"" + } + }else { + document.getElementById(teammem).innerHTML = "You are not part of any teams" + } + }) }); } +function cnt(tn) { + firebase.firestore().collection("UserAssociations").doc(user.id).set({tn : 'captain'} , { merge: true }).then( + teamAssoc=firebase.firestore().collections('UserAssociations').doc(user.uid); + teamAssoc.get().then(function(doc){ + if(doc.exists)}{ + list=doc.data() + teamNums=Object.keys(list) + document.getElementById(teammem).innerHTML = "" + for i in teamNums(){ + document.getElementById(teammem).innerHTML +=""+i+""+list.i+"" + } + }else { + document.getElementById(teammem).innerHTML = "You are not part of any teams" + } + }) + ) +} +function signout() { + var user = firebase.auth().currentUser; + firebase.auth().signOut().then( + window.location.href = '../'); +} + +function deleteAccount() { + try { + firebase.auth().currentUser.delete().then( + window.location.href = '../'); + } catch (error) { + if (error.code == 'auth/requires-recent-login') { + alert("Please sign in again to delete your account.") + window.location.href = '../'; + } + } +} From dd5da3b1e84c83de00749fc6989e6607228e6ab0 Mon Sep 17 00:00:00 2001 From: Jacob Levine Date: Tue, 12 Feb 2019 20:34:05 -0600 Subject: [PATCH 02/13] fix typos --- website/public/team/index.html | 18 ++++--- website/public/team/scripts.js | 88 ++++++++++++++++++---------------- 2 files changed, 55 insertions(+), 51 deletions(-) diff --git a/website/public/team/index.html b/website/public/team/index.html index 99a63791..f082f9bb 100644 --- a/website/public/team/index.html +++ b/website/public/team/index.html @@ -3,16 +3,14 @@ - - <meta charset="utf-8"> - <title>titanscout - - - - - - - + titanscout + + + + + + + diff --git a/website/public/team/scripts.js b/website/public/team/scripts.js index 26ab23af..46617800 100644 --- a/website/public/team/scripts.js +++ b/website/public/team/scripts.js @@ -4,7 +4,7 @@ function openNav() { document.getElementById("main").style.marginLeft = "250px"; document.body.style.backgroundColor = "rgba(0,0,0,0.4)"; for (var i = 0; i < document.getElementsByClassName("btn").length; i++) { - document.getElementsByClassName("btn")[i].style.backgroundColor="rgba(0,0,0,.2)" + document.getElementsByClassName("btn")[i].style.backgroundColor = "rgba(0,0,0,.2)" } } @@ -14,7 +14,7 @@ function closeNav() { document.getElementById("main").style.marginLeft = "0"; document.body.style.backgroundColor = "white"; for (var i = 0; i < document.getElementsByClassName("btn").length; i++) { - document.getElementsByClassName("btn")[i].style.backgroundColor="buttonface" + document.getElementsByClassName("btn")[i].style.backgroundColor = "buttonface" } } @@ -30,65 +30,71 @@ window.onload = function() { }; firebase.initializeApp(config); firebase.auth().onAuthStateChanged(function(user) { - if (user != null) { - if (user.displayName != null) { - document.getElementById('status').innerHTML = "You are signed in as: " + user.displayName; - document.getElementById('newDN').innerHTML = user.displayName; - } else if (user.email != null) { - document.getElementById('status').innerHTML = "You are signed in as: " + user.email; - } else if (user.phoneNumber != null) { - document.getElementById('status').innerHTML = "You are signed in as: " + user.phoneNumber; - } else { - document.getElementById('status').innerHTML = "You are signed in."; - } - if (user.email != null) { - document.getElementById('newEM').innerHTML = user.email; - } - } else { - window.location.replace('../'); - } - teamAssoc=firebase.firestore().collections('UserAssociations').doc(user.uid); - teamAssoc.get().then(function(doc){ - if(doc.exists)}{ - list=doc.data() - teamNums=Object.keys(list) - document.getElementById(teammem).innerHTML = "" - for i in teamNums(){ - document.getElementById(teammem).innerHTML +=""+i+""+list.i+"" + if (user != null) { + if (user.displayName != null) { + document.getElementById('status').innerHTML = "You are signed in as: " + user.displayName; + document.getElementById('newDN').innerHTML = user.displayName; + } else if (user.email != null) { + document.getElementById('status').innerHTML = "You are signed in as: " + user.email; + } else if (user.phoneNumber != null) { + document.getElementById('status').innerHTML = "You are signed in as: " + user.phoneNumber; + } else { + document.getElementById('status').innerHTML = "You are signed in."; } - }else { - document.getElementById(teammem).innerHTML = "You are not part of any teams" + if (user.email != null) { + document.getElementById('newEM').innerHTML = user.email; + } + } else { + window.location.replace('../'); } - }) + teamAssoc = firebase.firestore().collections('UserAssociations').doc(user.uid); + teamAssoc.get().then(function(doc) { + if (doc.exists) + } { + list = doc.data() + teamNums = Object.keys(list) + document.getElementById(teammem).innerHTML = "" + for i in teamNums() { + document.getElementById(teammem).innerHTML += "" + i + "" + list.i + "" + } + } else { + document.getElementById(teammem).innerHTML = "You are not part of any teams" + } + }) }); } + function cnt(tn) { - firebase.firestore().collection("UserAssociations").doc(user.id).set({tn : 'captain'} , { merge: true }).then( - teamAssoc=firebase.firestore().collections('UserAssociations').doc(user.uid); - teamAssoc.get().then(function(doc){ - if(doc.exists)}{ - list=doc.data() - teamNums=Object.keys(list) + firebase.firestore().collection("UserAssociations").doc(user.id).set({ + tn: 'captain' + }, { + merge: true + }).then( + teamAssoc = firebase.firestore().collections('UserAssociations').doc(user.uid) teamAssoc.get().then(function(doc) { + if (doc.exists) { + list = doc.data() + teamNums = Object.keys(list) document.getElementById(teammem).innerHTML = "" - for i in teamNums(){ - document.getElementById(teammem).innerHTML +=""+i+""+list.i+"" + for i in teamNums() { + document.getElementById(teammem).innerHTML += "" + i + "" + list.i + "" } - }else { + } else { document.getElementById(teammem).innerHTML = "You are not part of any teams" } }) ) } + function signout() { var user = firebase.auth().currentUser; firebase.auth().signOut().then( - window.location.href = '../'); + window.location.href = '../'); } function deleteAccount() { try { firebase.auth().currentUser.delete().then( - window.location.href = '../'); + window.location.href = '../'); } catch (error) { if (error.code == 'auth/requires-recent-login') { alert("Please sign in again to delete your account.") From 4f3ecf436162dfdf24cbdccc040aac188b4f1fd9 Mon Sep 17 00:00:00 2001 From: Jacob Levine Date: Tue, 12 Feb 2019 20:37:50 -0600 Subject: [PATCH 03/13] fix more typos --- website/public/team/scripts.js | 55 +++++++++++++++++----------------- 1 file changed, 27 insertions(+), 28 deletions(-) diff --git a/website/public/team/scripts.js b/website/public/team/scripts.js index 46617800..6a5cb57f 100644 --- a/website/public/team/scripts.js +++ b/website/public/team/scripts.js @@ -30,37 +30,36 @@ window.onload = function() { }; firebase.initializeApp(config); firebase.auth().onAuthStateChanged(function(user) { - if (user != null) { - if (user.displayName != null) { - document.getElementById('status').innerHTML = "You are signed in as: " + user.displayName; - document.getElementById('newDN').innerHTML = user.displayName; - } else if (user.email != null) { - document.getElementById('status').innerHTML = "You are signed in as: " + user.email; - } else if (user.phoneNumber != null) { - document.getElementById('status').innerHTML = "You are signed in as: " + user.phoneNumber; - } else { - document.getElementById('status').innerHTML = "You are signed in."; - } - if (user.email != null) { - document.getElementById('newEM').innerHTML = user.email; + if (user != null) { + if (user.displayName != null) { + document.getElementById('status').innerHTML = "You are signed in as: " + user.displayName; + document.getElementById('newDN').innerHTML = user.displayName; + } else if (user.email != null) { + document.getElementById('status').innerHTML = "You are signed in as: " + user.email; + } else if (user.phoneNumber != null) { + document.getElementById('status').innerHTML = "You are signed in as: " + user.phoneNumber; + } else { + document.getElementById('status').innerHTML = "You are signed in."; + } + if (user.email != null) { + document.getElementById('newEM').innerHTML = user.email; + } + } else { + window.location.replace('../'); + } + teamAssoc = firebase.firestore().collections('UserAssociations').doc(user.uid); + teamAssoc.get().then(function(doc) { + if (doc.exists) { + list = doc.data() + teamNums = Object.keys(list) + document.getElementById(teammem).innerHTML = "" + for i in teamNums() { + document.getElementById(teammem).innerHTML += "" + i + "" + list.i + "" } } else { - window.location.replace('../'); + document.getElementById(teammem).innerHTML = "You are not part of any teams" } - teamAssoc = firebase.firestore().collections('UserAssociations').doc(user.uid); - teamAssoc.get().then(function(doc) { - if (doc.exists) - } { - list = doc.data() - teamNums = Object.keys(list) - document.getElementById(teammem).innerHTML = "" - for i in teamNums() { - document.getElementById(teammem).innerHTML += "" + i + "" + list.i + "" - } - } else { - document.getElementById(teammem).innerHTML = "You are not part of any teams" - } - }) + }) }); } From 6652918ae815f4d05e99eb615a49d1aecd333413 Mon Sep 17 00:00:00 2001 From: Jacob Levine Date: Tue, 12 Feb 2019 20:41:43 -0600 Subject: [PATCH 04/13] I apparently don't know how to js --- website/public/team/index.html | 2 +- website/public/team/scripts.js | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/website/public/team/index.html b/website/public/team/index.html index f082f9bb..af271ae6 100644 --- a/website/public/team/index.html +++ b/website/public/team/index.html @@ -5,8 +5,8 @@ titanscout - + diff --git a/website/public/team/scripts.js b/website/public/team/scripts.js index 6a5cb57f..562cca21 100644 --- a/website/public/team/scripts.js +++ b/website/public/team/scripts.js @@ -53,8 +53,8 @@ window.onload = function() { list = doc.data() teamNums = Object.keys(list) document.getElementById(teammem).innerHTML = "" - for i in teamNums() { - document.getElementById(teammem).innerHTML += "" + i + "" + list.i + "" + for (var i = 0; i < teammem.length; i++) { + document.getElementById(teammem).innerHTML += "" + teammem[i] + "" + list.teammem[i] + "" } } else { document.getElementById(teammem).innerHTML = "You are not part of any teams" @@ -74,8 +74,8 @@ function cnt(tn) { list = doc.data() teamNums = Object.keys(list) document.getElementById(teammem).innerHTML = "" - for i in teamNums() { - document.getElementById(teammem).innerHTML += "" + i + "" + list.i + "" + for (var i = 0; i < teammem.length; i++) { + document.getElementById(teammem).innerHTML += "" + teammem[i] + "" + list.teammem[i] + "" } } else { document.getElementById(teammem).innerHTML = "You are not part of any teams" From e0c159de00bc8b3e12cdc8679e2835d038f4cecd Mon Sep 17 00:00:00 2001 From: Jacob Levine Date: Tue, 12 Feb 2019 20:42:49 -0600 Subject: [PATCH 05/13] fix typos --- website/public/team/scripts.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/website/public/team/scripts.js b/website/public/team/scripts.js index 562cca21..bfa6d394 100644 --- a/website/public/team/scripts.js +++ b/website/public/team/scripts.js @@ -69,7 +69,8 @@ function cnt(tn) { }, { merge: true }).then( - teamAssoc = firebase.firestore().collections('UserAssociations').doc(user.uid) teamAssoc.get().then(function(doc) { + teamAssoc = firebase.firestore().collections('UserAssociations').doc(user.uid); + teamAssoc.get().then(function(doc) { if (doc.exists) { list = doc.data() teamNums = Object.keys(list) From 718ca83a1dd334caf23dafa5b4cbdd36798f5d52 Mon Sep 17 00:00:00 2001 From: Jacob Levine Date: Tue, 12 Feb 2019 20:44:21 -0600 Subject: [PATCH 06/13] fix more typos --- website/public/team/scripts.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/website/public/team/scripts.js b/website/public/team/scripts.js index bfa6d394..c54b9f40 100644 --- a/website/public/team/scripts.js +++ b/website/public/team/scripts.js @@ -47,7 +47,7 @@ window.onload = function() { } else { window.location.replace('../'); } - teamAssoc = firebase.firestore().collections('UserAssociations').doc(user.uid); + teamAssoc = firebase.firestore().collection('UserAssociations').doc(user.uid); teamAssoc.get().then(function(doc) { if (doc.exists) { list = doc.data() @@ -69,7 +69,7 @@ function cnt(tn) { }, { merge: true }).then( - teamAssoc = firebase.firestore().collections('UserAssociations').doc(user.uid); + teamAssoc = firebase.firestore().collection('UserAssociations').doc(user.uid); teamAssoc.get().then(function(doc) { if (doc.exists) { list = doc.data() From d0d431fb54d58fc7ee5678be9f18dfe8b7639235 Mon Sep 17 00:00:00 2001 From: Jacob Levine Date: Tue, 12 Feb 2019 20:46:23 -0600 Subject: [PATCH 07/13] fix even more typos --- website/public/team/scripts.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/website/public/team/scripts.js b/website/public/team/scripts.js index c54b9f40..3bd89e31 100644 --- a/website/public/team/scripts.js +++ b/website/public/team/scripts.js @@ -68,8 +68,8 @@ function cnt(tn) { tn: 'captain' }, { merge: true - }).then( - teamAssoc = firebase.firestore().collection('UserAssociations').doc(user.uid); + }).then(function() { + teamAssoc = firebase.firestore().collection('UserAssociations').doc(user.uid) teamAssoc.get().then(function(doc) { if (doc.exists) { list = doc.data() @@ -82,7 +82,7 @@ function cnt(tn) { document.getElementById(teammem).innerHTML = "You are not part of any teams" } }) - ) + }) } function signout() { From 9e0c6e36ee28ccd33c8d7ac2b2f83faa0e798f54 Mon Sep 17 00:00:00 2001 From: Jacob Levine Date: Tue, 12 Feb 2019 20:48:35 -0600 Subject: [PATCH 08/13] can i set the world record for most typos --- website/public/team/scripts.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/website/public/team/scripts.js b/website/public/team/scripts.js index 3bd89e31..3629bd94 100644 --- a/website/public/team/scripts.js +++ b/website/public/team/scripts.js @@ -52,12 +52,12 @@ window.onload = function() { if (doc.exists) { list = doc.data() teamNums = Object.keys(list) - document.getElementById(teammem).innerHTML = "" - for (var i = 0; i < teammem.length; i++) { - document.getElementById(teammem).innerHTML += "" + teammem[i] + "" + list.teammem[i] + "" + document.getElementById('teammem').innerHTML = "" + for (var i = 0; i < teamNums.length; i++) { + document.getElementById('teammem').innerHTML += "" + teamNums[i] + "" + list[teamNums[i]] + "" } } else { - document.getElementById(teammem).innerHTML = "You are not part of any teams" + document.getElementById('teammem').innerHTML = "You are not part of any teams" } }) }); @@ -75,11 +75,11 @@ function cnt(tn) { list = doc.data() teamNums = Object.keys(list) document.getElementById(teammem).innerHTML = "" - for (var i = 0; i < teammem.length; i++) { - document.getElementById(teammem).innerHTML += "" + teammem[i] + "" + list.teammem[i] + "" + for (var i = 0; i < teamNums.length; i++) { + document.getElementById('teammem').innerHTML += "" + teamNums[i] + "" + list[teamNums[i]] + "" } } else { - document.getElementById(teammem).innerHTML = "You are not part of any teams" + document.getElementById('teammem').innerHTML = "You are not part of any teams" } }) }) From 67ac98b9ab7e90bf826696fffa424046d6f9ebf0 Mon Sep 17 00:00:00 2001 From: Jacob Levine Date: Tue, 12 Feb 2019 20:49:23 -0600 Subject: [PATCH 09/13] fix more typos --- website/public/team/index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/website/public/team/index.html b/website/public/team/index.html index af271ae6..b4ad2071 100644 --- a/website/public/team/index.html +++ b/website/public/team/index.html @@ -32,11 +32,11 @@

Team Membership

- +
- +
From d3b71287c43c0c2087953c896327b768cc6a91bb Mon Sep 17 00:00:00 2001 From: Jacob Levine Date: Tue, 12 Feb 2019 20:52:03 -0600 Subject: [PATCH 10/13] squash bugh --- website/public/team/scripts.js | 1 + 1 file changed, 1 insertion(+) diff --git a/website/public/team/scripts.js b/website/public/team/scripts.js index 3629bd94..d1d5f01b 100644 --- a/website/public/team/scripts.js +++ b/website/public/team/scripts.js @@ -64,6 +64,7 @@ window.onload = function() { } function cnt(tn) { + user=firebase.auth().currentUser; firebase.firestore().collection("UserAssociations").doc(user.id).set({ tn: 'captain' }, { From 4822be0ece9f4267f77030bb915b3e22c661c561 Mon Sep 17 00:00:00 2001 From: Jacob Levine Date: Tue, 12 Feb 2019 20:55:56 -0600 Subject: [PATCH 11/13] fix typos --- website/public/team/scripts.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/public/team/scripts.js b/website/public/team/scripts.js index d1d5f01b..05fac4dd 100644 --- a/website/public/team/scripts.js +++ b/website/public/team/scripts.js @@ -65,7 +65,7 @@ window.onload = function() { function cnt(tn) { user=firebase.auth().currentUser; - firebase.firestore().collection("UserAssociations").doc(user.id).set({ + firebase.firestore().collection("UserAssociations").doc(user.uid).set({ tn: 'captain' }, { merge: true From ffd64eb3d2d5d48429c672c7e274cf78a1fd3094 Mon Sep 17 00:00:00 2001 From: Jacob Levine Date: Tue, 12 Feb 2019 21:00:00 -0600 Subject: [PATCH 12/13] fix typos --- website/public/team/scripts.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/website/public/team/scripts.js b/website/public/team/scripts.js index 05fac4dd..256fdcdd 100644 --- a/website/public/team/scripts.js +++ b/website/public/team/scripts.js @@ -65,9 +65,9 @@ window.onload = function() { function cnt(tn) { user=firebase.auth().currentUser; - firebase.firestore().collection("UserAssociations").doc(user.uid).set({ - tn: 'captain' - }, { + push={} + push[tn]='captian' + firebase.firestore().collection("UserAssociations").doc(user.uid).set(push, { merge: true }).then(function() { teamAssoc = firebase.firestore().collection('UserAssociations').doc(user.uid) From 060a77f4b79639560447b245c617544c6b35944e Mon Sep 17 00:00:00 2001 From: Jacob Levine Date: Tue, 12 Feb 2019 21:00:43 -0600 Subject: [PATCH 13/13] fix more typos --- website/public/team/scripts.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/public/team/scripts.js b/website/public/team/scripts.js index 256fdcdd..9a7aa41f 100644 --- a/website/public/team/scripts.js +++ b/website/public/team/scripts.js @@ -75,7 +75,7 @@ function cnt(tn) { if (doc.exists) { list = doc.data() teamNums = Object.keys(list) - document.getElementById(teammem).innerHTML = "" + document.getElementById('teammem').innerHTML = "" for (var i = 0; i < teamNums.length; i++) { document.getElementById('teammem').innerHTML += "" + teamNums[i] + "" + list[teamNums[i]] + "" }