Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

general conversation updated #96

Merged
merged 4 commits into from
Apr 12, 2019
Merged

general conversation updated #96

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8bdb6dd
general conversation updated
Jayashree-panda Apr 11, 2019
e316834
Merge branch 'master' of https://github.com/Harkishen-Singh/Jarvis-pe…
Jayashree-panda Apr 12, 2019
2b0b83f
fixed eslint errors
Jayashree-panda Apr 12, 2019
1404450
bugs fixed
Jayashree-panda Apr 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 28 additions & 5 deletions service/messages/messages.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
"hello",
"hey",
"whats up",
"yo"
"yo",
"Hey there"
],
"initial-greetings-name": [
"hi jarvis",
Expand Down Expand Up @@ -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!",
Harkishen-Singh marked this conversation as resolved.
Show resolved Hide resolved
"How you work?",
"How you work? Please guide me!",
"How you work? Let me know!"
Harkishen-Singh marked this conversation as resolved.
Show resolved Hide resolved

],
"about": [
"whats your name",
Expand All @@ -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?",
Harkishen-Singh marked this conversation as resolved.
Show resolved Hide resolved
"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",
Expand Down
20 changes: 13 additions & 7 deletions service/messages/messages_replies.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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?",
Expand All @@ -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!"
Harkishen-Singh marked this conversation as resolved.
Show resolved Hide resolved
],
"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",
Expand Down
6 changes: 3 additions & 3 deletions view/app-jarvis.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down Expand Up @@ -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');
Harkishen-Singh marked this conversation as resolved.
Show resolved Hide resolved
messageObj.sender = 'jarvis-bot';
messageObj.time = String(new Date().getHours() + ':' + new Date().getMinutes());
messageObj.length = message.length;
Expand Down Expand Up @@ -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');
Expand Down