From 8bdb6ddc3eb8f486c4fda6e50027ce19383c6ad8 Mon Sep 17 00:00:00 2001 From: Jayashree-panda Date: Fri, 12 Apr 2019 05:05:05 +0530 Subject: [PATCH 1/3] general conversation updated --- service/messages/messages.json | 33 ++++++++++++++++++++++---- service/messages/messages_replies.json | 20 ++++++++++------ 2 files changed, 41 insertions(+), 12 deletions(-) diff --git a/service/messages/messages.json b/service/messages/messages.json index 5a567ce..a46d039 100644 --- a/service/messages/messages.json +++ b/service/messages/messages.json @@ -4,7 +4,8 @@ "hello", "hey", "whats up", - "yo" + "yo", + "Hey there" ], "initial-greetings-name": [ "hi jarvis", @@ -32,7 +33,13 @@ "whats your work", "what is your work", "your work", - "work" + "work", + "I need your help", + "I need your help. Please help me!", + "How you work?", + "How you work? Please guide me!", + "How you work? Let me know!" + ], "about": [ "whats your name", @@ -41,15 +48,31 @@ "who are you", "tell me about yourself", "about you", - "about" + "about", + "May I know something about you?", + "Can you say something about you?", + "Would you bother to introduce yourself?", + "Would you please bother to introduce yourself?", + "Introduce yourself", + "Can you please introduce yourself?", + "I wanna know something about you. Can you introduce yourself?", + "I would like to know something about you. Can you introduce yourself?", + "I would like to know something about you. Would you please bother to introduce yourself?" + ], "age": [ "how old are you", "your age", - "how many years are you old", "how long have a been", "jarvis age", - "jarvis years" + "jarvis years", + "Whats your age?", + "Whats your age, Jarvis?", + "Hey jarvis! Whats your age now?", + "Hey jarvis! Whats your age?", + "Hey jarvis! How old are you?", + "Hey! Whats your age?" + ], "birthday": [ "when is your birthday", diff --git a/service/messages/messages_replies.json b/service/messages/messages_replies.json index b0b5095..92b5487 100644 --- a/service/messages/messages_replies.json +++ b/service/messages/messages_replies.json @@ -5,7 +5,10 @@ "hi! whats up?", "hello! whats up?", "hey there!", - "hey there! Anything I can help you with?" + "hey there! Anything I can help you with?", + "Hey! I am Jarvis here. Anything I may help you with?", + "Hello! I am very excited to talk with you. Is there anything I may serve you with?" + ], "initial-greetings-name": [ "hi %s! How can i help you?", @@ -14,19 +17,22 @@ "hey %s! What can i help you with?", "hey %s!", "hi %s!", - "hello %s!" + "hello %s!", + "hey %s! I am ready here. Anything I may help you with?" ], "help": [ - "I can do lots of things! You can ask for web search, specific google/yahoo/bing search, images, videos and also find answers for any of your queries!", - "You can ask for web search, specific google/yahoo/bing search, images, videos and also find answers for any of your queries!", - "I can help you with web search, specific google/yahoo/bing search, images, videos and also find answers for any of your queries!", - "My work is to help you with the web search, specific google/yahoo/bing search, images, videos and also find answers for any of your queries!" + "I can do lots of things! You can ask for web search, specific google/yahoo/bing search, images, videos, search for medicines specifications, set reminder and also find answers for any of your queries!", + "You can ask for web search, specific google/yahoo/bing search, images, videos, search for medicines specifications, set reminder and also find answers for any of your queries!", + "I can help you with web search, specific google/yahoo/bing search, images, videos, search for medicines specifications, set reminder and also find answers for any of your queries!", + "My work is to help you with the web search, specific google/yahoo/bing search, images, videos, search for medicines specifications, set reminder and also find answers for any of your queries!" ], "about": [ "I am Jarvis, your personal assistant. How can I help you?", "Jarvis is my name", "My name is jarvis! Anything I can help you with?", - "I am your assistant, Jarvis. Anything I can help you with?" + "I am your assistant, Jarvis. Anything I can help you with?", + "I am Jarvis, your personal assistant. Feels great to talk with you. May I help you with anything?", + "I am Jarvis, your personal assistant. Nice to talk with you. May I serve you with anything?" ], "age": [ "I am 2 months old", From 2b0b83fad4fe225c10ed36ac85729e1581f5f948 Mon Sep 17 00:00:00 2001 From: Jayashree-panda Date: Fri, 12 Apr 2019 19:31:15 +0530 Subject: [PATCH 2/3] fixed eslint errors --- view/app-jarvis.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/view/app-jarvis.js b/view/app-jarvis.js index 2c63d1a..48c64a2 100644 --- a/view/app-jarvis.js +++ b/view/app-jarvis.js @@ -95,7 +95,7 @@ app.controller('MainController', function($scope,$location,$rootScope,$http) { show: false, length: null }; - console.log(messageObj) + console.log(messageObj); console.log(res); setTimeout(() => { $scope.scrollDown(); @@ -139,7 +139,7 @@ app.controller('MainController', function($scope,$location,$rootScope,$http) { messageObj.message = message; $scope.messageStack.push(messageObj); } else if ((status === 'success' || status) && message === 'Here are your reminders : ') { - console.log("In show reminder"); + console.log('In show reminder'); messageObj.sender = 'jarvis-bot'; messageObj.time = String(new Date().getHours() + ':' + new Date().getMinutes()); messageObj.length = message.length; @@ -245,7 +245,7 @@ app.controller('MainController', function($scope,$location,$rootScope,$http) { }); $scope.formData.remTitle = ''; $scope.formData.remDescription = ''; - } + }; $scope.scrollDown = function() { var elem = document.getElementById('stackArea-parent'); From 1404450d9d16a279165da3c6afb68b2c997c33b8 Mon Sep 17 00:00:00 2001 From: Jayashree-panda Date: Fri, 12 Apr 2019 20:47:10 +0530 Subject: [PATCH 3/3] bugs fixed --- service/messages/messages.json | 42 +++++++++++++------------- service/messages/messages_replies.json | 8 ++--- view/app-jarvis.js | 2 -- 3 files changed, 25 insertions(+), 27 deletions(-) diff --git a/service/messages/messages.json b/service/messages/messages.json index a46d039..72894a6 100644 --- a/service/messages/messages.json +++ b/service/messages/messages.json @@ -5,7 +5,7 @@ "hey", "whats up", "yo", - "Hey there" + "hey there" ], "initial-greetings-name": [ "hi jarvis", @@ -34,11 +34,11 @@ "what is your work", "your work", "work", - "I need your help", - "I need your help. Please help me!", - "How you work?", - "How you work? Please guide me!", - "How you work? Let me know!" + "i need your help", + "i need your help please help me", + "how you work", + "how you work please guide me", + "how you work let me know" ], "about": [ @@ -49,15 +49,15 @@ "tell me about yourself", "about you", "about", - "May I know something about you?", - "Can you say something about you?", - "Would you bother to introduce yourself?", - "Would you please bother to introduce yourself?", - "Introduce yourself", - "Can you please introduce yourself?", - "I wanna know something about you. Can you introduce yourself?", - "I would like to know something about you. Can you introduce yourself?", - "I would like to know something about you. Would you please bother to introduce yourself?" + "may i know something about you", + "can you say something about you", + "would you bother to introduce yourself", + "would you please bother to introduce yourself", + "introduce yourself", + "can you please introduce yourself", + "i wanna know something about you can you introduce yourself", + "i would like to know something about you can you introduce yourself", + "i would like to know something about you would you please bother to introduce yourself" ], "age": [ @@ -66,12 +66,12 @@ "how long have a been", "jarvis age", "jarvis years", - "Whats your age?", - "Whats your age, Jarvis?", - "Hey jarvis! Whats your age now?", - "Hey jarvis! Whats your age?", - "Hey jarvis! How old are you?", - "Hey! Whats your age?" + "whats your age", + "whats your age, jarvis", + "hey jarvis whats your age now", + "hey jarvis whats your age", + "hey jarvis how old are you", + "hey whats your age" ], "birthday": [ diff --git a/service/messages/messages_replies.json b/service/messages/messages_replies.json index 92b5487..c6cc692 100644 --- a/service/messages/messages_replies.json +++ b/service/messages/messages_replies.json @@ -21,10 +21,10 @@ "hey %s! I am ready here. Anything I may help you with?" ], "help": [ - "I can do lots of things! You can ask for web search, specific google/yahoo/bing search, images, videos, search for medicines specifications, set reminder and also find answers for any of your queries!", - "You can ask for web search, specific google/yahoo/bing search, images, videos, search for medicines specifications, set reminder and also find answers for any of your queries!", - "I can help you with web search, specific google/yahoo/bing search, images, videos, search for medicines specifications, set reminder and also find answers for any of your queries!", - "My work is to help you with the web search, specific google/yahoo/bing search, images, videos, search for medicines specifications, set reminder and also find answers for any of your queries!" + "I can do lots of things! You can ask for web search, specific google/yahoo/bing search, images, videos, search for medicines specifications, set reminder, tasklist and also find answers for any of your queries!", + "You can ask for web search, specific google/yahoo/bing search, images, videos, search for medicines specifications, set reminder, tasklist and also find answers for any of your queries!", + "I can help you with web search, specific google/yahoo/bing search, images, videos, search for medicines specifications, set reminder, tasklist and also find answers for any of your queries!", + "My work is to help you with the web search, specific google/yahoo/bing search, images, videos, search for medicines specifications, set reminder, tasklist and also find answers for any of your queries!" ], "about": [ "I am Jarvis, your personal assistant. How can I help you?", diff --git a/view/app-jarvis.js b/view/app-jarvis.js index 48c64a2..1e6dbed 100644 --- a/view/app-jarvis.js +++ b/view/app-jarvis.js @@ -139,14 +139,12 @@ app.controller('MainController', function($scope,$location,$rootScope,$http) { messageObj.message = message; $scope.messageStack.push(messageObj); } else if ((status === 'success' || status) && message === 'Here are your reminders : ') { - console.log('In show reminder'); messageObj.sender = 'jarvis-bot'; messageObj.time = String(new Date().getHours() + ':' + new Date().getMinutes()); messageObj.length = message.length; messageObj.message = message; messageObj.result = result; $scope.messageStack.push(messageObj); - console.log(messageObj); } else if ((status === 'success' || status) && (message === 'Information about the medicine : ' || message === 'Help on the given symptoms : ')) { messageObj.sender = 'jarvis-bot'; messageObj.time = String(hrs2 + ':' + mins2);