This commit is contained in:
Arjun Patel
2018-01-21 10:59:15 -08:00
parent 6c1baab753
commit 38c93a13f4
4 changed files with 98 additions and 27 deletions
+55
View File
@@ -10,12 +10,53 @@ html {
background-color: #d7dae0; background-color: #d7dae0;
} }
.g-signin2 {
display: none;
}
.nav { .nav {
width: 100%; width: 100%;
height: 40px; height: 40px;
position: relative;
background-color: black; background-color: black;
} }
.home {
position: absolute;
float: left;
height: 40px;
width: 50px;
color: white !important;
cursor: pointer;
}
.profile {
float: right;
height: 40px;
}
#email {
position: absolute;
top: 50%;
right: 0;
transform: translate(-50%, -50%);
font-size: 15px;
vertical-align: middle;
color:white;
font-family: 'Open Sans Condensed', sans-serif;
}
#profImg {
height: 30px;
width: 30px;
margin: 0;
position: absolute;
top: 50%;
right: 0;
transform: translate(-50%, -50%);
border-radius: 50px;
}
.cardsCont { .cardsCont {
background-color: #d7dae0; background-color: #d7dae0;
} }
@@ -32,6 +73,20 @@ html {
padding: 0 !important; padding: 0 !important;
} }
.welRow {
margin-top: 5px;
text-align: center;
}
.hr {
border-color: grey;
}
#welcome {
font-family: 'Open Sans Condensed', sans-serif;
font-size: 40px;
color: #37474F;
}
.goalRow { .goalRow {
margin: 0; margin: 0;
padding: 0; padding: 0;
+41 -5
View File
@@ -13,7 +13,13 @@
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous"> <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
<script src="https://use.fontawesome.com/7b29adddad.js"></script> <script src="https://use.fontawesome.com/7b29adddad.js"></script>
<meta name="google-signin-client_id" content="1028038812776-ovsjf90n1m620svlfncolr3h00c0frdn.apps.googleusercontent.com">
<script src="https://apis.google.com/js/api.js"></script>
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
<script src="https://apis.google.com/js/platform.js" async defer></script>
<script type="text/javascript"> <script type="text/javascript">
google.charts.load('current', {'packages':['corechart']}); google.charts.load('current', {'packages':['corechart']});
google.charts.setOnLoadCallback(drawChart); google.charts.setOnLoadCallback(drawChart);
function drawChart() { function drawChart() {
@@ -58,16 +64,23 @@
</head> </head>
<body> <body>
<div class="nav container-fluid"> <div class="g-signin2" data-onsuccess="onSignIn"></div>
<div class="row"> <div class="nav">
<div class="col-sm-12"> <div id="home" onclick="signOut();" class="home"><i class="fa fa-home fa-3x home" aria-hidden="true"></i></div>
<font color="white">Reflex</font> <div class="profile">
</div> <p id="email"></p>
<img id="profImg" src="" />
</div> </div>
</div> </div>
<div class="container-fluid cardsCont"> <div class="container-fluid cardsCont">
<div class="row">
<div class="col-sm-12 welRow">
<p id="welcome">Welcome to your interactive Fitness Program!</p>
</div>
</div>
<hr class="hr">
<div class="row goalRow"> <div class="row goalRow">
<div class="col-md-6 cardCont"> <div class="col-md-6 cardCont">
<div class="card"> <div class="card">
@@ -118,6 +131,29 @@
</div> </div>
</div> </div>
<script type="text/javascript">
function onSignIn(googleUser) {
var profile = googleUser.getBasicProfile();
console.log('hi');
console.log('ID: ' + profile.getId()); // Do not send to your backend! Use an ID token instead.
console.log('Name: ' + profile.getName());
console.log('Image URL: ' + profile.getImageUrl());
console.log('Email: ' + profile.getEmail()); // This is null if the 'email' scope is not present.
document.getElementById("welcome").innerHTML = 'Welcome to your interactive fitness program, ' + profile.getName() + '!';
document.getElementById('email').innerHTML = profile.getEmail();
document.getElementById('profImg').src = profile.getImageUrl();
}
function signOut() {
var auth2 = gapi.auth2.getAuthInstance();
auth2.signOut().then(function () {
console.log('User signed out.');
});
}
$('#home').click(function() {
window.location.href = "http://localhost:8000";
});
</script>
</body> </body>
</html> </html>
+1
View File
@@ -13,6 +13,7 @@
<script type="text/javascript"> <script type="text/javascript">
function onSignIn(googleUser) { function onSignIn(googleUser) {
var profile = googleUser.getBasicProfile(); var profile = googleUser.getBasicProfile();
console.log('hi');
console.log('ID: ' + profile.getId()); // Do not send to your backend! Use an ID token instead. console.log('ID: ' + profile.getId()); // Do not send to your backend! Use an ID token instead.
console.log('Name: ' + profile.getName()); console.log('Name: ' + profile.getName());
console.log('Image URL: ' + profile.getImageUrl()); console.log('Image URL: ' + profile.getImageUrl());
+1 -22
View File
@@ -1,23 +1,2 @@
$(document).ready(function() {
$('body').css('display','none');
$(document).ready(function() {
$('body').fadeIn(1000);
$('a').on('click',function(event){
var thetarget = this.getAttribute('target')
if (thetarget != "_blank"){
var thehref = this.getAttribute('href')
event.preventDefault();
$('body').fadeOut(function(){
//alert(thehref)
window.location = thehref
});
}
});
});
setTimeout(function(){
$('body').fadeIn();
},1000)
});
console.log('hi');