last commit

This commit is contained in:
Arjun Patel
2017-10-08 16:29:58 -07:00
parent 7e0f356838
commit 80e7a6041d
5 changed files with 25 additions and 26 deletions
+2 -2
View File
@@ -8,10 +8,10 @@ function directionsURL(inCommand) {
var link = "https://www.google.com/maps/embed/v1/directions?key=AIzaSyCZCgZY7ZlSMk1DW0NEEoHZ9qwdSL4AR1k&origin="+origin+"&destination="+dest var link = "https://www.google.com/maps/embed/v1/directions?key=AIzaSyCZCgZY7ZlSMk1DW0NEEoHZ9qwdSL4AR1k&origin="+origin+"&destination="+dest
mapsFrame.src = link; mapsFrame.src = link;
$('#map').delay(3000).fadeIn(); $('#map').delay(3000).fadeIn();
$('#search-cont').delay(2700).animate({'margin-top' : '-=200px'}); $('#search-cont').delay(2700).animate({'margin-top' : '-200px'});
$('#input').mousedown(function() { $('#input').mousedown(function() {
$('#map').fadeOut(500); $('#map').fadeOut(500);
$('#search-cont').animate({'margin-top' : '+=200px'}); $('#search-cont').animate({'margin-top' : '5%'});
$('#input').unbind(); $('#input').unbind();
}); });
} }
+10 -12
View File
@@ -17,19 +17,17 @@
<button id="authorize-button" style="display: none;">Sign-In</button> <button id="authorize-button" style="display: none;">Sign-In</button>
<button id="signout-button" style="display: none;">Sign-Out</button> <button id="signout-button" style="display: none;">Sign-Out</button>
<button id="create-event" style="display: none;">Create-Event</button> <button id="create-event" style="display: none;">Create-Event</button>
<div id="SkypeButton_Call_justinkimchi77_1" style="display:none;">
<script type="text/javascript">
//function skypeCall(userName) {
Skype.ui({
"name": "call",
"element": "SkypeButton_Call_justinkimchi77_1",
"participants": ['justinkimchi77']
});
// }
</script>
</div>
<div class="container main-bg" id="content"> <div class="container main-bg" id="content">
<div id="SkypeButton_Call_justinkimchi77_1">
<script type="text/javascript">
Skype.ui({
"name": "call",
"element": "SkypeButton_Call_justinkimchi77_1",
"participants": ['live:emailtoosajal']
});
</script>
</div>
<div class="row"> <div class="row">
<div class="col-xs-12 search-col"> <div class="col-xs-12 search-col">
<div id="search-cont" class="search-cont"> <div id="search-cont" class="search-cont">
@@ -63,7 +61,7 @@
<p class="text">gcal | googlecalendar<br><hr><br>mapsd | directions<br><hr><br>skype</p> <p class="text">gcal | googlecalendar<br><hr><br>mapsd | directions<br><hr><br>skype</p>
</div> </div>
<div class="col-xs-8 cols" style="border-left: 1px solid white;"> <div class="col-xs-8 cols" style="border-left: 1px solid white;">
<p class="text"><br><i>[mm/dd/yy] [00:00] [00:00]</i><br><hr><br><i>[address]</i> to <i>[address]</i> <i>[method of travel]</i><br><hr><br><i>[username]</i></p> <p class="text"><br><i>[mm/dd/yy] [00:00] [00:00]</i><br><hr><br><i>[address]</i> to <i>[address]</i><br><hr><br><i>[username]</i></p>
</div> </div>
</div> </div>
</div> </div>
+12
View File
@@ -47,6 +47,9 @@ div.main-bg {
margin-right: -50%; margin-right: -50%;
transform: translate(-50%, -50%); transform: translate(-50%, -50%);
} }
#search-cont {
position: fixed;
}
.stylish-input-group .input-group-addon{ .stylish-input-group .input-group-addon{
@@ -140,3 +143,12 @@ p.text {
right:0; right:0;
top: 0; top: 0;
} }
#SkypeButton_Call_justinkimchi77_1 {
position: absolute;
top: 45%;
left: 50%;
margin-right: -50%;
transform: translate(-50%, -50%);
z-index: 20;
display: none;
}
+1 -1
View File
@@ -56,7 +56,7 @@ function captureInput() {
else if (command == "skype") { else if (command == "skype") {
console.log('launched skype app'); console.log('launched skype app');
//skypeCall(actualCommand); //skypeCall(actualCommand);
document.getElementById('SkypeButton_Call_justinkimchi77_1').click(); $('#SkypeButton_Call_justinkimchi77_1').fadeIn();
} }
else if (gapi.auth2.getAuthInstance().isSignedIn.get()) { else if (gapi.auth2.getAuthInstance().isSignedIn.get()) {
console.log('already signed in'); console.log('already signed in');
-11
View File
@@ -16,19 +16,8 @@
}); });
} }
skypeCall(friend); skypeCall(friend);
jQuery('body').trigger("click");
</script> </script>
</div> </div>
</form>
<!--<div id="SkypeButton_Call_justinkimchi77_1">
<script type="text/javascript">
Skype.ui({
"name": "call",
"element": "SkypeButton_Call_justinkimchi77_1",
"participants": ["justinkimchi77"]
});
</script>
</div> --->
</body> </body>
</html> </html>