diff --git a/website/public/index.html b/website/public/index.html index fabcd250..74913101 100644 --- a/website/public/index.html +++ b/website/public/index.html @@ -13,36 +13,10 @@ -
- × - Profile - Team - Scout Matches - Torunament Stats -
+
- - -

TitanScout- Sign In

You are not signed in.

- - - -
-
- New Username: -
-
- New Profile Pic URL: -
-
- New Email: -
-
- -
-
diff --git a/website/public/profile/index.html b/website/public/profile/index.html index fabcd250..730018a5 100644 --- a/website/public/profile/index.html +++ b/website/public/profile/index.html @@ -7,7 +7,7 @@ - + @@ -25,7 +25,7 @@

TitanScout- Sign In

-

You are not signed in.

+

Loading...

diff --git a/website/public/scout/index.html b/website/public/scout/index.html index 0a10af94..92a27b97 100644 --- a/website/public/scout/index.html +++ b/website/public/scout/index.html @@ -14,7 +14,7 @@
× - Profile + Profile Team Scout Matches Torunament Stats @@ -24,6 +24,7 @@

TitanScout- Scout Matches

+

Loading...

diff --git a/website/public/scout/scripts.js b/website/public/scout/scripts.js index f4499004..3a741a5c 100644 --- a/website/public/scout/scripts.js +++ b/website/public/scout/scripts.js @@ -12,6 +12,31 @@ function closeNav() { document.body.style.backgroundColor = "white"; } -window.onload=function(){ +window.onload = function() { document.getElementById('sideload').style.display = 'block'; + var config = { + apiKey: "(insert the TitanScout Api Key Here)", + authDomain: "titanscoutandroid.firebaseapp.com", + databaseURL: "https://titanscoutandroid.firebaseio.com", + projectId: "titanscoutandroid", + 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; + } 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 { + window.location.replace('../'); + } + }); } diff --git a/website/public/scripts.js b/website/public/scripts.js index f70d655e..9f5357b3 100644 --- a/website/public/scripts.js +++ b/website/public/scripts.js @@ -10,15 +10,7 @@ var config = { firebase.initializeApp(config); // FirebaseUI config. var uiConfig = { - callbacks: { - signInSuccessWithAuthResult: function(authResult, redirectUrl) { - if (authResult.user) { - handleSignedInUser(authResult.user); - } - return false; - } - }, - //signInSuccessUrl: '', + signInSuccessUrl: '', signInOptions: [ // Leave the lines as is for the providers you want to offer your users. firebase.auth.GoogleAuthProvider.PROVIDER_ID, @@ -40,187 +32,3 @@ var uiConfig = { alert("we will steal all of the data"); } }; -var handleSignedInUser = function(user) { - document.getElementById("mainhead").innerHTML = "TitanScout- User Info"; - if (user.displayName != null) { - document.getElementById('status').innerHTML = "You are signed in as: " + 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."; - } - document.getElementById('signout').style.display = 'inline-block'; - document.getElementById('updpi').style.display = 'inline-block'; - document.getElementById('deleteacc').style.display = 'inline-block'; - document.getElementById('profileupd').style.display = 'none'; - document.getElementById('sideload').style.display = 'block'; -} -var handleSignedOutUser = function() { - document.getElementById("mainhead").innerHTML = "TitanScout- Sign In"; - document.getElementById('status').innerHTML = "You are not signed in."; - document.getElementById('signout').style.display = 'none'; - document.getElementById('updpi').style.display = 'none'; - document.getElementById('deleteacc').style.display = 'none'; - document.getElementById('profileupd').style.display = 'none'; - document.getElementById('sideload').style.display = 'none'; - ui.start('#firebaseui-auth-container', uiConfig); -}; - -// Initialize the FirebaseUI Widget using Firebase. -var ui = new firebaseui.auth.AuthUI(firebase.auth()); - -// The start method will wait until the DOM is loaded. -ui.start('#firebaseui-auth-container', uiConfig); -var deleteAccount = function() { - try { - firebase.auth().currentUser.delete() - handleSignedOutUser() - } catch (error) { - if (error.code == 'auth/requires-recent-login') { - // The user's credential is too old. She needs to sign in again. - signout() - // The timeout allows the message to be displayed after the UI has - // changed to the signed out state. - setTimeout(function() { - alert('Please sign in again to delete your account.'); - }, 1); - } - } -}; - -function signout() { - var user = firebase.auth().currentUser; - firebase.auth().signOut() - handleSignedOutUser() -} - -function loadupdpi() { - if (firebase.auth().currentUser != null) { - document.getElementById('profileupd').style.display = 'block'; - } else { - setTimeout(function() { - alert('Please sign in to change your account info.'); - }, 1); - handleSignedOutUser(); - } -} - -function upProfileInfo() { - if (firebase.auth().currentUser != null) { - var user = firebase.auth().currentUser; - var newDN = document.getElementById('newDN').value; - var newEM = document.getElementById('newEM').value; - var newPP = document.getElementById('newPP').value; - var si = true - if (newDN != '' && newDN != user.displayName) { - if (newPP != '' && newPP != user.photoURL) { - try { - user.updateProfile({ - displayName: newDN, - photoURL: newPP - }); - } catch (error) { - if (error.code == 'auth/requires-recent-login') { - si = false; - // The user's credential is too old. She needs to sign in again. - signout() - // The timeout allows the message to be displayed after the UI has - // changed to the signed out state. - setTimeout(function() { - alert('Please sign in again to delete your account.'); - }, 1); - } else { - alert("An error occurred: " + error) - } - } - } else { - try { - user.updateProfile({ - displayName: newDN - }); - } catch (error) { - if (error.code == 'auth/requires-recent-login') { - si = false; - // The user's credential is too old. She needs to sign in again. - signout() - // The timeout allows the message to be displayed after the UI has - // changed to the signed out state. - setTimeout(function() { - alert('Please sign in again to delete your account.'); - }, 1); - } else { - alert("An error occurred: " + error) - } - } - } - } else { - if (newPP != '' && newPP != user.photoURL) { - try { - user.updateProfile({ - photoURL: newPP - }); - } catch (error) { - if (error.code == 'auth/requires-recent-login') { - si = false; - // The user's credential is too old. She needs to sign in again. - signout() - // The timeout allows the message to be displayed after the UI has - // changed to the signed out state. - setTimeout(function() { - alert('Please sign in again to delete your account.'); - }, 1); - } else { - alert("An error occurred: " + error) - } - } - } - } - if (newEM != '' && newEM != user.email) { - try { - user.updateEmail(newEM) - } catch (error) { - si = false; - if (error.code == 'auth/requires-recent-login') { - // The user's credential is too old. She needs to sign in again. - signout() - // The timeout allows the message to be displayed after the UI has - // changed to the signed out state. - setTimeout(function() { - alert('Please sign in again to delete your account.'); - }, 1); - } else { - alert("An error occurred: " + error) - } - } - } - if (si) { - setTimeout(function(){handleSignedInUser(user);},1) - } - - } else { - setTimeout(function() { - alert('Please sign in to change your account info.'); - }, 1); - handleSignedOutUser(); - } -} -/* Set the width of the side navigation to 250px and the left margin of the page content to 250px and add a black background color to body */ -function openNav() { - document.getElementById("mySidenav").style.width = "250px"; - document.getElementById("main").style.marginLeft = "250px"; - document.body.style.backgroundColor = "rgba(0,0,0,0.4)"; -} - -/* 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 */ -function closeNav() { - document.getElementById("mySidenav").style.width = "0"; - document.getElementById("main").style.marginLeft = "0"; - document.body.style.backgroundColor = "white"; -} -window.onload=function(){ - if(firebase.auth().currentUser!=null){ - handleSignedInUser(firebase.auth().currentUser) - } -} diff --git a/website/public/stats/index.html b/website/public/stats/index.html index c15bbf15..b631cbc9 100644 --- a/website/public/stats/index.html +++ b/website/public/stats/index.html @@ -14,7 +14,7 @@
× - Profile + Profile Team Scout Matches Torunament Stats @@ -23,8 +23,8 @@ -

TitanScout- Torunament Statistics

-

You are not signed in.

+

TitanScout- Tournament Statistics

+

Loading...

diff --git a/website/public/team/index.html b/website/public/team/index.html index f14400c0..7b47e18c 100644 --- a/website/public/team/index.html +++ b/website/public/team/index.html @@ -14,7 +14,7 @@
× - Profile + Profile Team Scout Matches Torunament Stats @@ -24,6 +24,7 @@

TitanScout- Your Teams

+

Loading...

diff --git a/website/public/team/scripts.js b/website/public/team/scripts.js index f4499004..3a741a5c 100644 --- a/website/public/team/scripts.js +++ b/website/public/team/scripts.js @@ -12,6 +12,31 @@ function closeNav() { document.body.style.backgroundColor = "white"; } -window.onload=function(){ +window.onload = function() { document.getElementById('sideload').style.display = 'block'; + var config = { + apiKey: "(insert the TitanScout Api Key Here)", + authDomain: "titanscoutandroid.firebaseapp.com", + databaseURL: "https://titanscoutandroid.firebaseio.com", + projectId: "titanscoutandroid", + 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; + } 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 { + window.location.replace('../'); + } + }); }