-
+
+
+
+ Added Event!
+
diff --git a/main.css b/main.css
index fa18287..82298e4 100644
--- a/main.css
+++ b/main.css
@@ -9,8 +9,18 @@ body {
width: 100%;
margin: 0;
padding: 0;
+ font-family: 'Playfair Display', serif;
+}
+.row {
+ margin: 0;
+ padding: 0;
+ width: 100%;
+ position: absolute;
+ top: 50%;
+ left: 50%;
+ margin-right: -50%;
+ transform: translate(-50%, -50%);
}
-
div.main-bg {
background-image: url("images/main-bg.jpg");
background-repeat: no-repeat;
@@ -19,18 +29,25 @@ div.main-bg {
padding: 0;
height: 100%;
width: 100%;
- /*border: 2px solid red;*/
+}
+.guide-icon {
+ margin: 0;
+ padding: 0;
+ position: fixed;
+ top: 15px;
+ left: 15px;
+ height: 20px;
+ width: 20px;
+}
+.search-col {
+ width:500px;
+ position: absolute;
+ top: 50%;
+ left: 50%;
+ margin-right: -50%;
+ transform: translate(-50%, -50%);
}
-.search-col {
- margin: 0;
- position: absolute;
- top: 50%;
- left: 50%;
- margin-right: -50%;
- transform: translate(-50%, -50%);
- font-size: 30px;
-}
.stylish-input-group .input-group-addon{
background: white !important;
@@ -55,3 +72,71 @@ div.main-bg {
height: 15px;
width: 15px;
}
+
+.guide-popup {
+ position: fixed;
+ height: 280px;
+ width: 500px;
+ background-color:#dce2ed;
+ border-radius: 4px;
+ top: 50%;
+ left: 50%;
+ margin-right: -50%;
+ transform: translate(-50%, -50%);
+ color: black;
+ font-family: 'Playfair Display', serif;
+ border: .5px solid black;
+ display: none;
+}
+div.cols {
+ text-align: center;
+ margin-top: 10px;
+ margin-bottom: 10px;
+ height: 260px;
+ top: 0;
+}
+p.text {
+ margin-top: 20px;
+ font-size: 15px;
+}
+#cancelParent {
+ margin: 0;
+ padding: 0;
+ position: fixed;
+ right: 5px;
+ top: 5px;
+ height: 20px;
+ width: 20px;
+ z-index: 10;
+}
+.cancelPop {
+ margin: 0;
+ padding: 0;
+ position: fixed;
+ right: 5px;
+ top: 5px;
+ height: 20px;
+ width: 20px;
+}
+.updateCont {
+ position: fixed;
+ font-weight: bold;
+ left: 50%;
+ margin-right: -50%;
+ transform: translate(-50%, -50%);
+ text-align: center;
+ bottom: 0;
+ margin: 0;
+ padding: 0;
+ width: 120px;
+ color: green;
+ display: none;
+}
+
+.check {
+ margin-right: 5px;
+ height:15px;
+ width: 15px;
+ right:0;
+ top: 0;
+}
diff --git a/main.js b/main.js
index 56cc3db..85c8cc5 100644
--- a/main.js
+++ b/main.js
@@ -2,14 +2,25 @@ var enterBtn = document.getElementById("enter");
var authorizeButton = document.getElementById('authorize-button');
var signoutButton = document.getElementById('signout-button');
+var guideIcon = document.getElementById('guide-icon');
+ guideIcon.addEventListener("click", function() {
+ $('.guide-popup').slideDown(500);
+ $('.cancelPop').fadeIn();
+ $('#cancelParent').click(function() {
+ console.log('hi');
+ $(this).fadeOut();
+ $('.cancelPop').fadeOut();
+ $('.guide-popup').fadeOut();
+ });
+ });
var runCommandBtn = document.getElementById('create-event');
-enterBtn.addEventListener("click", captureInput);
-window.addEventListener("keypress", function(e) {
- var key = e.which || e.keycode;
- if (key == 13) {
- captureInput();
- }
-});
+ enterBtn.addEventListener("click", captureInput);
+ window.addEventListener("keypress", function(e) {
+ var key = e.which || e.keycode;
+ if (key == 13) {
+ captureInput();
+ }
+ });
var actualCommand = '';
var command = '';
@@ -18,7 +29,7 @@ var dict = {
"googlecalendar": makeEvent,
"mapsd": directionsURL,
"directions": directionsURL,
- "skype": skypeCall
+ "skype": 'buffer'
};
function error() {
@@ -42,7 +53,11 @@ function captureInput() {
console.log('actualCommand is empty!!');
error();
}
-
+ else if (command == "skype") {
+ console.log('launched skype app');
+ //skypeCall(actualCommand);
+ document.getElementById('SkypeButton_Call_justinkimchi77_1').click();
+ }
else if (gapi.auth2.getAuthInstance().isSignedIn.get()) {
console.log('already signed in');
runCommandBtn.addEventListener("click", runCommand);
@@ -51,6 +66,9 @@ function captureInput() {
dict[command](actualCommand);
}
runCommandBtn.click();
+ if (command == 'gcal') {
+ $('.updateCont').slideDown().fadeIn().delay(5000).fadeOut();
+ }
runCommandBtn.removeEventListener("click", runCommand);
}
diff --git a/test.html b/test.html
index f1cf0e6..6f7ab16 100644
--- a/test.html
+++ b/test.html
@@ -1,18 +1,34 @@
-
+
+
+
-
-
-
-
-
+
+
+
+
+
+