Compare commits
36 Commits
dialog-imp
...
question-e
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
dc2c8f384e | ||
|
|
cc579133c0 | ||
|
|
0a8eb2e280 | ||
|
|
6b26db3d18 | ||
|
|
3202bf5f0b | ||
|
|
370edd6ef0 | ||
|
|
0d858ad1c7 | ||
|
|
c6cd49a66f | ||
|
|
97b6755f2f | ||
|
|
b2386ea0d6 | ||
|
|
2ae983d211 | ||
|
|
b1a853c363 | ||
|
|
d58d4b89e3 | ||
|
|
2c6953fe97 | ||
|
|
af19108e9c | ||
|
|
a00859c594 | ||
|
|
085a0324b3 | ||
|
|
d8799fa40d | ||
|
|
de0a4f3176 | ||
|
|
48578d3ffe | ||
|
|
e2d648980b | ||
|
|
b73086291c | ||
|
|
434d45248c | ||
|
|
00272ec67d | ||
|
|
0727328e58 | ||
|
|
e2d76ff03e | ||
|
|
9cff3cd9ae | ||
|
|
2f82709f11 | ||
|
|
4b594898b1 | ||
|
|
b07a9e21b3 | ||
|
|
a570640fe1 | ||
|
|
9e4b06bd4c | ||
|
|
6bfd4adcaf | ||
|
|
48badce0f0 | ||
|
|
68287d49ff | ||
|
|
2f59e12aa7 |
@@ -67,7 +67,7 @@ Prerequests for step 3 (run on server):
|
||||
requires running mongodb service
|
||||
|
||||
Database (tellall) with collection (skill_list)
|
||||
* Insert dummy skill with : db.skill_list.insert({"skillID" : "amzn1.ask.skill.efbf0564-a732-4ba9-958f-57939138adae", "intents" : [ { "intentName" : "GetFirstQuestion", "questions" : [ "tell me something about projects", "tell me all about projects" ], "answer" : "blablabla bla bla" }, { "intentName" : "GetThirdQuestion", "questions" : [ "Give me third question" ], "answer" : "This is answer to the third question" } ], "invocationName" : "Saburly", "invocationAnswer" : "We are Saburly team one" })
|
||||
* Insert dummy skill with : db.skill_list.insert({"skillID" : "amzn1.ask.skill.efbf0564-a732-4ba9-958f-57939138adae", "intents" : [ { "intentName" : "GetFirstQuestion", "questionExplanation" : "", "questions" : [ "tell me something about projects", "tell me all about projects" ], "answer" : "blablabla bla bla" }, { "intentName" : "GetThirdQuestion", "questionExplanation" : "", "questions" : [ "Give me third question" ], "answer" : "This is answer to the third question" } ], "invocationName" : "Saburly", "invocationAnswer" : "We are Saburly team one" })
|
||||
|
||||
*obtain _id and change in web/src/App.js, and also skill_db_id in backend/config.js
|
||||
*enter web/ dir and run "npm run build"
|
||||
|
||||
@@ -1,204 +0,0 @@
|
||||
var alexa = require ('alexa-app');
|
||||
const config = require ('../config/config');
|
||||
var databaseHelper = require ('../helpers/database');
|
||||
|
||||
//User data for sending message, this is skill-related and will be in some skill container
|
||||
var Name = null;
|
||||
var Email = null;
|
||||
var Message = null;
|
||||
var State = 0; // states should be defined in seperate file. (Not sending message, Waiting for name, Waiting for email, Waiting for message)
|
||||
//For now (this is not long term solution)
|
||||
// 0 : Not sending Message
|
||||
// 1 : Waiting for name
|
||||
// 2 : Waiting for email
|
||||
// 3 : Waiting for message
|
||||
|
||||
var alexaApp = new alexa.app ('saburly'); // this means we still work with one skill
|
||||
|
||||
module.exports = {
|
||||
init: function (express) {
|
||||
alexaApp.express ({
|
||||
expressApp: express,
|
||||
|
||||
// verifies requests come from amazon alexa. Must be enabled for production.
|
||||
// You can disable this if you're running a dev environment and want to POST
|
||||
// things to test behavior. enabled by default.
|
||||
checkCert: false,
|
||||
|
||||
// sets up a GET route when set to true. This is handy for testing in
|
||||
// development, but not recommended for production. disabled by default
|
||||
debug: true,
|
||||
});
|
||||
},
|
||||
|
||||
updateIntentsJSON: function () {
|
||||
databaseHelper
|
||||
.getSkill (config.SKILL_DB_ID)
|
||||
.then (skill => {
|
||||
skill.intents.map (intent => {
|
||||
alexaApp.intent (
|
||||
intent.intentName,
|
||||
{
|
||||
slots: [],
|
||||
utterances: intent.questions,
|
||||
},
|
||||
function (request, response) {
|
||||
return response.say (intent.answer).shouldEndSession (false);
|
||||
}
|
||||
);
|
||||
});
|
||||
|
||||
alexaApp.launch ((request, response) => {
|
||||
return response.say (skill.invocationAnswer).shouldEndSession (false);
|
||||
});
|
||||
|
||||
alexaApp.intent (
|
||||
'EmailIntentLaunch',
|
||||
{
|
||||
slots: [],
|
||||
utterances: [
|
||||
'I want to send a message',
|
||||
'I would like to send a message',
|
||||
'I would like to leave a message',
|
||||
'Leave a message',
|
||||
],
|
||||
},
|
||||
function (request, response) {
|
||||
Name = null;
|
||||
Email = null;
|
||||
Message = null;
|
||||
State = 1;
|
||||
|
||||
return response
|
||||
.say ('Ok. What is your name')
|
||||
.shouldEndSession (false);
|
||||
}
|
||||
);
|
||||
|
||||
//TODO : Watch out for this intent. It will make trouble with other regular intents
|
||||
//if other intents have utterance with just one slot like {Data}
|
||||
//It should be taken care somwhere before this, to check if Email Intent is invoked
|
||||
//This is problem only if we introduce slot options for regular intents for users
|
||||
alexaApp.intent (
|
||||
'EmailIntent',
|
||||
{
|
||||
slots: {
|
||||
Name: 'AMAZON.US_FIRST_NAME',
|
||||
Email: 'AMAZON.LITERAL',
|
||||
Message: 'AMAZON.LITERAL',
|
||||
Data: 'AMAZON.LITERAL',
|
||||
},
|
||||
utterances: [
|
||||
'My name is {-|Name}',
|
||||
'I am {-|Name}',
|
||||
'{dawdw at dwd wdw|Data}',
|
||||
'My email is {wadwwdw at wadwwd wdw|Email}',
|
||||
'Send replay to {fkofkeofe at dppfam wd|Email}',
|
||||
'My message is {Quick brown fox jumps over lazy dog|Message}',
|
||||
],
|
||||
},
|
||||
function (request, response) {
|
||||
let Data = undefined;
|
||||
try {
|
||||
if (!Name) Name = request.slot ('Name');
|
||||
} catch (e) {
|
||||
console.log ('Error. No name slot ');
|
||||
Name = undefined;
|
||||
}
|
||||
try {
|
||||
if (!Email) Email = request.slot ('Email');
|
||||
} catch (e) {
|
||||
console.log ('Error. No Email slot');
|
||||
Email = undefined;
|
||||
}
|
||||
try {
|
||||
if (!Message) Message = request.slot ('Message');
|
||||
} catch (e) {
|
||||
console.log ('Error. No Message slot');
|
||||
Message = undefined;
|
||||
}
|
||||
try {
|
||||
Data = request.slot ('Data');
|
||||
} catch (e) {
|
||||
console.log ('Error. No Data slot');
|
||||
Data = undefined;
|
||||
}
|
||||
console.log ('State : ' + State);
|
||||
|
||||
//TODO : Responses could be configurable for each skill ?
|
||||
|
||||
if (State === 1) {
|
||||
//Was waiting for name, so if Name is null, name is probably in Data
|
||||
if ((!Name && Data) || Name) {
|
||||
//got the name, let's continue for the email
|
||||
if (!Name) Name = Data;
|
||||
State = 2;
|
||||
return response
|
||||
.say ('Ok ' + Name + '. What is your email ?')
|
||||
.shouldEndSession (false);
|
||||
} else {
|
||||
//Something is wrong, ask for name again
|
||||
return response
|
||||
.say (
|
||||
'Sorry, I didnt understand your name. Can you say it again ?'
|
||||
)
|
||||
.shouldEndSession (false);
|
||||
}
|
||||
} else if (State === 2) {
|
||||
//was waiting for email, so if Email is null, email is probably in Data
|
||||
if ((!Email && Data) || Email) {
|
||||
//Got the email, first verify email and than continue to message
|
||||
if (!Email) Email = Data;
|
||||
//TODO : verify email
|
||||
State = 3;
|
||||
return response
|
||||
.say ('Great. Whats the message ?')
|
||||
.shouldEndSession (false);
|
||||
} else {
|
||||
//Something is wrong, ask for the email again
|
||||
return response
|
||||
.say (
|
||||
'Sorry, I didnt understan you email. Can you say it again ?'
|
||||
)
|
||||
.shouldEndSession (false);
|
||||
}
|
||||
} else if (State === 3) {
|
||||
//Was waiting for message, so if Message is null, message is probably in Data
|
||||
if ((!Message && Data) || Message) {
|
||||
//Ok, we got all informations. Exit email intent
|
||||
if (!Message) Message = Data;
|
||||
State = 0;
|
||||
//TODO : Send email
|
||||
console.log (
|
||||
'Name : ' +
|
||||
Name +
|
||||
' | Email : ' +
|
||||
Email +
|
||||
' | Message : ' +
|
||||
Message
|
||||
);
|
||||
return response.say (
|
||||
'Message sent. Someone will contact you ASAP'
|
||||
);
|
||||
} else {
|
||||
//Something is wrong, ask for the message again
|
||||
return response
|
||||
.say (
|
||||
'Sorry, I didnt understand your message. Can you say it again ?'
|
||||
)
|
||||
.shouldEndSession (false);
|
||||
}
|
||||
} else {
|
||||
console.log ('State strange ! ' + State);
|
||||
}
|
||||
}
|
||||
);
|
||||
})
|
||||
.catch (err => {
|
||||
console.log (err);
|
||||
alexaApp.launch ((request, response) => {
|
||||
return response.say ('Sorry, there was no skill with that name');
|
||||
});
|
||||
});
|
||||
},
|
||||
};
|
||||
@@ -17,7 +17,7 @@ constants.apiResultCodes = {
|
||||
AMAZON_FAIL:2, //amazon api doesn't work
|
||||
DATABASE_ERROR:3,
|
||||
NO_SKILL:4,
|
||||
INCONSISTEN_STATE:5,
|
||||
INCONSISTENT_STATE:5,
|
||||
}
|
||||
|
||||
constants.HTTPResultCodes = {
|
||||
@@ -26,6 +26,17 @@ constants.HTTPResultCodes = {
|
||||
|
||||
constants.SKILL_ID_LENGTH = 24;
|
||||
|
||||
constants.voiceResponseStrings = {
|
||||
QUESTION_NOT_FOUND : 'Sorry, I didnt understand',
|
||||
GENERIC_CONTINUE : 'Would you like to continue'
|
||||
}
|
||||
|
||||
//Timing is given in [ms]
|
||||
constants.voiceResponseTimings = {
|
||||
PAUSE_BETWEEN_QUESTIONS : 650,
|
||||
PAUSE_AFTER_WELCOME_MESSAGE : 650,
|
||||
}
|
||||
|
||||
|
||||
|
||||
module.exports = constants;
|
||||
14
backend/config/email.js
Normal file
14
backend/config/email.js
Normal file
@@ -0,0 +1,14 @@
|
||||
var config = {};
|
||||
|
||||
config.PORT = 587;
|
||||
config.SMTP_HOST = 'smtp.mail.com';
|
||||
config.SECURE = false;
|
||||
config.AUTH = {
|
||||
user: 'saburly@mail.com',
|
||||
pass: 'KeepSaburly',
|
||||
};
|
||||
|
||||
config.FROM_EMAIL = 'saburly@mail.com';
|
||||
config.SUBJECT = 'Message from Saburly service';
|
||||
|
||||
module.exports = config;
|
||||
@@ -1,5 +1,6 @@
|
||||
var express = require ('express'), router = express.Router ();
|
||||
|
||||
router.use ('/skill', require ('./skill'));
|
||||
router.use ('/saburly', require('./saburlyEntryPoint'));
|
||||
|
||||
module.exports = router;
|
||||
|
||||
9
backend/controllers/saburlyEntryPoint.js
Normal file
9
backend/controllers/saburlyEntryPoint.js
Normal file
@@ -0,0 +1,9 @@
|
||||
var express = require ('express'), router = express.Router ();
|
||||
var bodyParser = require ('body-parser');
|
||||
var alexa = require ('../models/alexa');
|
||||
|
||||
router.post ('/', bodyParser.json (), async (req, res) => {
|
||||
alexa.run (req, res);
|
||||
});
|
||||
|
||||
module.exports = router;
|
||||
@@ -3,7 +3,7 @@ const constants = require ('../config/constants');
|
||||
var databaseHelper = require ('../helpers/database');
|
||||
var amazonHelper = require ('../helpers/amazon');
|
||||
var bodyParser = require ('body-parser');
|
||||
var alexa = require ('../components/alexa');
|
||||
var alexa = require ('../models/alexa');
|
||||
|
||||
router.get ('/:id', async (req, res, next) => {
|
||||
const id = req.params.id;
|
||||
@@ -41,6 +41,7 @@ router.put ('/:id', bodyParser.json (), async (req, res, next) => {
|
||||
.then (() => {
|
||||
//Ok, done, now update skill on Amazon (if needed)
|
||||
if (updateOnAmazon) {
|
||||
//We need to update skill on Amazon
|
||||
amazonHelper
|
||||
.updateSkill (skill)
|
||||
.then (amazonResult => {
|
||||
@@ -49,47 +50,80 @@ router.put ('/:id', bodyParser.json (), async (req, res, next) => {
|
||||
amazonResult === constants.amazonResultCodes.ACCEPTED
|
||||
) {
|
||||
res.json ({result: constants.apiResultCodes.OK, message: ''});
|
||||
alexa.updateIntentsJSON ();
|
||||
alexa.updateModel ();
|
||||
} else {
|
||||
res.status(constants.HTTPResultCodes.INTERNAL_SERVER_ERROR).json ({
|
||||
result: constants.apiResultCodes.AMAZON_ERROR,
|
||||
message: amazonResult,
|
||||
});
|
||||
//Update on amazon failed, revert changes in database and send error to user
|
||||
databaseHelper
|
||||
.updateSkill (id, currentSkillState)
|
||||
.then (() => {
|
||||
res
|
||||
.status (
|
||||
constants.HTTPResultCodes.INTERNAL_SERVER_ERROR
|
||||
)
|
||||
.json ({
|
||||
result: constants.apiResultCodes.AMAZON_ERROR,
|
||||
message: amazonResult,
|
||||
});
|
||||
})
|
||||
.catch (() => {
|
||||
//This should never happen, something is seriously wrong, like no database connection
|
||||
res
|
||||
.status (
|
||||
constants.HTTPResultCodes.INTERNAL_SERVER_ERROR
|
||||
)
|
||||
.json ({
|
||||
result: constants.apiResultCodes.INCONSISTENT_STATE,
|
||||
message: '',
|
||||
});
|
||||
});
|
||||
}
|
||||
})
|
||||
.catch (e => {
|
||||
res.status(constants.HTTPResultCodes.INTERNAL_SERVER_ERROR).json ({
|
||||
result: constants.apiResultCodes.AMAZON_FAIL,
|
||||
message: e,
|
||||
});
|
||||
//Update on amazon failed, revert changes in database and send error to user
|
||||
databaseHelper
|
||||
.updateSkill (id, currentSkillState)
|
||||
.then (() => {
|
||||
res
|
||||
.status (constants.HTTPResultCodes.INTERNAL_SERVER_ERROR)
|
||||
.json ({
|
||||
result: constants.apiResultCodes.AMAZON_FAIL,
|
||||
message: e,
|
||||
});
|
||||
})
|
||||
.catch (() => {
|
||||
//This should never happen, something is seriously wrong, like no database connection
|
||||
res
|
||||
.status (constants.HTTPResultCodes.INTERNAL_SERVER_ERROR)
|
||||
.json ({
|
||||
result: constants.apiResultCodes.INCONSISTENT_STATE,
|
||||
message: '',
|
||||
});
|
||||
});
|
||||
});
|
||||
}else{
|
||||
} else {
|
||||
//No need to update on Amazon, tell to user it's ok
|
||||
res.json ({result: constants.apiResultCodes.OK, message: ''});
|
||||
alexa.updateIntentsJSON ();
|
||||
alexa.updateModel ();
|
||||
}
|
||||
})
|
||||
.catch (() => {
|
||||
//Update in database didn't go well, revert changes
|
||||
databaseHelper
|
||||
.updateSkill (id, currentSkillState)
|
||||
.then (() => {
|
||||
res.status(constants.HTTPResultCodes.INTERNAL_SERVER_ERROR).json ({
|
||||
result: constants.apiResultCodes.DATABASE_ERROR,
|
||||
message: '',
|
||||
});
|
||||
})
|
||||
.catch (() => {
|
||||
//This should never happen, something is seriously wrong, like no database connection
|
||||
res.status(constants.HTTPResultCodes.INTERNAL_SERVER_ERROR).json ({
|
||||
result: constants.apiResultCodes.INCONSISTEN_STATE,
|
||||
message: '',
|
||||
});
|
||||
});
|
||||
//Update in database didn't go well, no need to revert since it failed to write in the first place
|
||||
//just send error to user
|
||||
res
|
||||
.status (
|
||||
constants.HTTPResultCodes.INTERNAL_SERVER_ERROR
|
||||
)
|
||||
.json ({
|
||||
result: constants.apiResultCodes.DATABASE_ERROR,
|
||||
message: '',
|
||||
});
|
||||
});
|
||||
})
|
||||
.catch (e => {
|
||||
//I don't know why, but something went wrong, possibly ID of skill is wrong, doesn't exist in DB
|
||||
res.status(constants.HTTPResultCodes.INTERNAL_SERVER_ERROR).json ({result: constants.apiResultCodes.NO_SKILL, message: ''});
|
||||
res
|
||||
.status (constants.HTTPResultCodes.INTERNAL_SERVER_ERROR)
|
||||
.json ({result: constants.apiResultCodes.NO_SKILL, message: ''});
|
||||
});
|
||||
});
|
||||
|
||||
|
||||
@@ -37,15 +37,22 @@ var refreshTokens = function () {
|
||||
request (options, function (error, response, body) {
|
||||
if (error) {
|
||||
reject (error);
|
||||
}else{
|
||||
} else {
|
||||
parsedResponse = JSON.parse (body);
|
||||
if (parsedResponse.refresh_token){
|
||||
databaseHelper.updateTokens(parsedResponse.refresh_token, parsedResponse.access_token, parsedResponse.expires_in).then(()=>{
|
||||
resolve();
|
||||
}).catch(e=>{
|
||||
reject(e);
|
||||
});
|
||||
}else{
|
||||
if (parsedResponse.refresh_token) {
|
||||
databaseHelper
|
||||
.updateTokens (
|
||||
parsedResponse.refresh_token,
|
||||
parsedResponse.access_token,
|
||||
parsedResponse.expires_in
|
||||
)
|
||||
.then (() => {
|
||||
resolve ();
|
||||
})
|
||||
.catch (e => {
|
||||
reject (e);
|
||||
});
|
||||
} else {
|
||||
reject (body);
|
||||
}
|
||||
}
|
||||
@@ -56,85 +63,186 @@ var refreshTokens = function () {
|
||||
var generateInteractionModel = function (skill) {
|
||||
let result = {};
|
||||
let allIntents = [];
|
||||
let defaultIntents = [
|
||||
{
|
||||
name: 'AMAZON.CancelIntent',
|
||||
samples: [],
|
||||
},
|
||||
{
|
||||
name: 'AMAZON.HelpIntent',
|
||||
samples: [],
|
||||
},
|
||||
{
|
||||
name: 'AMAZON.StopIntent',
|
||||
samples: [],
|
||||
},
|
||||
];
|
||||
|
||||
/*
|
||||
defaultIntents.map(intent=>{
|
||||
allIntents.push(intent);
|
||||
});
|
||||
*/
|
||||
|
||||
skill.intents.map (intent => {
|
||||
allIntents.push ({name: intent.intentName, samples: intent.questions});
|
||||
});
|
||||
|
||||
//Special Email Intents :
|
||||
allIntents.push ({
|
||||
name: 'EmailIntentLaunch',
|
||||
slots: [],
|
||||
samples: [
|
||||
'I want to send a message',
|
||||
'I would like to send a message',
|
||||
'I would like to leave a message',
|
||||
'Leave a message',
|
||||
],
|
||||
});
|
||||
//Special intent for sending message (Dialog)
|
||||
|
||||
allIntents.push ({
|
||||
name: 'EmailIntent',
|
||||
name: 'SendMessageIntent',
|
||||
samples: [
|
||||
'I would like to send a message',
|
||||
'I want to send a message',
|
||||
'Send message',
|
||||
],
|
||||
slots: [
|
||||
{
|
||||
name: 'Name',
|
||||
type: 'AMAZON.US_FIRST_NAME',
|
||||
samples: ['My name is {Name}', 'I am {Name}', '{Name}'],
|
||||
},
|
||||
{
|
||||
name: 'Email',
|
||||
type: 'AMAZON.LITERAL',
|
||||
type: 'EmailSlot',
|
||||
samples: ['My email is {Email}', '{Email}'],
|
||||
},
|
||||
{
|
||||
name: 'Message',
|
||||
type: 'AMAZON.LITERAL',
|
||||
type: 'MessageSlot',
|
||||
samples: ['{Message}'],
|
||||
},
|
||||
{
|
||||
name: 'Data',
|
||||
type: 'AMAZON.LITERAL',
|
||||
},
|
||||
],
|
||||
|
||||
samples: [
|
||||
'My name is {Name}',
|
||||
'I am {Name}',
|
||||
'{exampleww at wwdwdw|Data}',
|
||||
'My email is {example at efefegedd|Email}',
|
||||
'Send replay to {example at abcdefg|Email}',
|
||||
'My message is {The quick brown fox jumps over the lazy dog.The quick brown fox jumps over the lazy dog.The quick brown fox jumps over the lazy dog.|Message}',
|
||||
],
|
||||
});
|
||||
|
||||
let customSlotTypes = [
|
||||
{
|
||||
name: 'EmailSlot',
|
||||
values: [
|
||||
{
|
||||
id: null,
|
||||
name: {
|
||||
value: 'bla@bla.bla',
|
||||
synonyms: [],
|
||||
},
|
||||
},
|
||||
{
|
||||
id: null,
|
||||
name: {
|
||||
value: 'bla.bla@bla.bla.bla',
|
||||
synonyms: [],
|
||||
},
|
||||
},
|
||||
{
|
||||
id: null,
|
||||
name: {
|
||||
value: 'bla_bla@bla.bla',
|
||||
synonyms: [],
|
||||
},
|
||||
},
|
||||
],
|
||||
},
|
||||
{
|
||||
name: 'MessageSlot',
|
||||
values: [
|
||||
{
|
||||
id: null,
|
||||
name: {
|
||||
value: 'Quick brown fox jumps over lazy dog',
|
||||
synonyms: [],
|
||||
},
|
||||
},
|
||||
{
|
||||
id: null,
|
||||
name: {
|
||||
value: 'Quick brown fox jumps over lazy dog. Quick brown fox jumps over lazy dog.',
|
||||
synonyms: [],
|
||||
},
|
||||
},
|
||||
{
|
||||
id: null,
|
||||
name: {
|
||||
value: 'Quick brown fox jumps over lazy dog. Quick brown fox jumps over lazy dog. Quick brown fox jumps over lazy dog.',
|
||||
synonyms: [],
|
||||
},
|
||||
},
|
||||
],
|
||||
},
|
||||
];
|
||||
|
||||
let dialogPrompts = [
|
||||
{
|
||||
id: 'Elicit.Intent-SendMessageIntent.IntentSlot-Name',
|
||||
variations: [
|
||||
{
|
||||
type: 'PlainText',
|
||||
value: 'What is your name ?',
|
||||
},
|
||||
{
|
||||
type: 'PlainText',
|
||||
value: 'Tell me your name',
|
||||
},
|
||||
],
|
||||
},
|
||||
{
|
||||
id: 'Elicit.Intent-SendMessageIntent.IntentSlot-Email',
|
||||
variations: [
|
||||
{
|
||||
type: 'PlainText',
|
||||
value: 'What is your email ?',
|
||||
},
|
||||
{
|
||||
type: 'PlainText',
|
||||
value: 'Tell me your email',
|
||||
},
|
||||
],
|
||||
},
|
||||
{
|
||||
id: 'Elicit.Intent-SendMessageIntent.IntentSlot-Message',
|
||||
variations: [
|
||||
{
|
||||
type: 'PlainText',
|
||||
value: 'What is your message',
|
||||
},
|
||||
],
|
||||
},
|
||||
];
|
||||
|
||||
let dialogIntents = [
|
||||
{
|
||||
name: 'SendMessageIntent',
|
||||
confirmationRequired: false,
|
||||
prompts: {},
|
||||
slots: [
|
||||
{
|
||||
name: 'Name',
|
||||
type: 'AMAZON.US_FIRST_NAME',
|
||||
elicitationRequired: true,
|
||||
confirmationRequired: false,
|
||||
prompts: {
|
||||
elicitation: 'Elicit.Intent-SendMessageIntent.IntentSlot-Name',
|
||||
},
|
||||
},
|
||||
{
|
||||
name: 'Email',
|
||||
type: 'EmailSlot',
|
||||
elicitationRequired: true,
|
||||
confirmationRequired: false,
|
||||
prompts: {
|
||||
elicitation: 'Elicit.Intent-SendMessageIntent.IntentSlot-Email',
|
||||
},
|
||||
},
|
||||
{
|
||||
name: 'Message',
|
||||
type: 'MessageSlot',
|
||||
elicitationRequired: true,
|
||||
confirmationRequired: false,
|
||||
prompts: {
|
||||
elicitation: 'Elicit.Intent-SendMessageIntent.IntentSlot-Message',
|
||||
},
|
||||
},
|
||||
],
|
||||
},
|
||||
];
|
||||
|
||||
result.interactionModel = {};
|
||||
|
||||
result.interactionModel.languageModel = {
|
||||
invocationName: skill.invocationName,
|
||||
types: customSlotTypes,
|
||||
intents: allIntents,
|
||||
};
|
||||
|
||||
result.interactionModel.prompts = dialogPrompts;
|
||||
result.interactionModel.dialog = {};
|
||||
result.interactionModel.dialog.intents = dialogIntents;
|
||||
|
||||
return JSON.stringify (result);
|
||||
};
|
||||
|
||||
var uploadSkill = function (skill) {
|
||||
let generatedInteractionModel = generateInteractionModel (skill);
|
||||
return fetch (
|
||||
`https://api.amazonalexa.com/v0/skills/${skill.skillID}/interactionModel/locales/en-US`,
|
||||
{
|
||||
@@ -142,7 +250,7 @@ var uploadSkill = function (skill) {
|
||||
headers: {
|
||||
Authorization: config.TOKEN,
|
||||
},
|
||||
body: generateInteractionModel (skill),
|
||||
body: generatedInteractionModel,
|
||||
}
|
||||
);
|
||||
};
|
||||
|
||||
75
backend/helpers/email.js
Normal file
75
backend/helpers/email.js
Normal file
@@ -0,0 +1,75 @@
|
||||
const nodemailer = require ('nodemailer');
|
||||
const emailConfig = require('../config/email');
|
||||
|
||||
module.exports = {
|
||||
transformEmailFromAlexaResponse: function (email) {
|
||||
//email from alexa response will contain words instead of symbols, like :
|
||||
//at = @
|
||||
//underscore = _
|
||||
//dash = -
|
||||
//dot = .
|
||||
//TODO: This list should be longer
|
||||
let transformedEmail = email
|
||||
.replace (/\s/g, '') //remove all spaces
|
||||
.replace (/at/gi, '@')
|
||||
.replace (/underscore/gi, '_')
|
||||
.replace (/dash/gi, '-')
|
||||
.replace (/dot/gi, '.');
|
||||
|
||||
return transformedEmail;
|
||||
},
|
||||
|
||||
isEmailValid: function (email) {
|
||||
console.log ('Email to validate : ' + email);
|
||||
let validEmailRegex = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
|
||||
|
||||
return validEmailRegex.test (email);
|
||||
},
|
||||
|
||||
sendEmal: function (name, fromEmail, message, toEmail) {
|
||||
return new Promise ((resolve, reject) => {
|
||||
fromEmail = this.transformEmailFromAlexaResponse(fromEmail);
|
||||
let messageBody =
|
||||
'Hello. User left you a message on Saburly service using Alexa skill. \r\nMessage : ' +
|
||||
message +
|
||||
'\r\nName : ' +
|
||||
name +
|
||||
'\r\nEmail : ' +
|
||||
fromEmail +
|
||||
'\r\nYour Saburly team';
|
||||
|
||||
let messageBodyHTML =
|
||||
'<p>Hello. User left you a message on Saburly service using Alexa skill.</p><br/><b>Message : </b><br/><p>' +
|
||||
message +
|
||||
'</p><br/><b>Name : </b>' +
|
||||
name +
|
||||
'<br/><b>Email : </b>' +
|
||||
fromEmail +
|
||||
'<br/><br/><b>Your Saburly team</b>';
|
||||
|
||||
let transporter = nodemailer.createTransport ({
|
||||
host: emailConfig.SMTP_HOST,
|
||||
port: emailConfig.PORT,
|
||||
secure: emailConfig.SECURE,
|
||||
auth: emailConfig.AUTH,
|
||||
});
|
||||
|
||||
var mailOptions = {
|
||||
from: emailConfig.FROM_EMAIL,
|
||||
replyTo: fromEmail,
|
||||
to: toEmail,
|
||||
subject: emailConfig.SUBJECT,
|
||||
text: messageBody,
|
||||
html: messageBodyHTML,
|
||||
};
|
||||
|
||||
transporter.sendMail (mailOptions, (error, info) => {
|
||||
if (error) {
|
||||
reject (error);
|
||||
} else {
|
||||
resolve (info);
|
||||
}
|
||||
});
|
||||
});
|
||||
},
|
||||
};
|
||||
181
backend/models/alexa.js
Normal file
181
backend/models/alexa.js
Normal file
@@ -0,0 +1,181 @@
|
||||
var Alexa = require ('alexa-sdk');
|
||||
const config = require ('../config/config');
|
||||
var databaseHelper = require ('../helpers/database');
|
||||
var emailHelper = require ('../helpers/email');
|
||||
const constants = require ('../config/constants');
|
||||
|
||||
var handlers = {};
|
||||
var destinationEmail;
|
||||
|
||||
module.exports = {
|
||||
run: function (req, res) {
|
||||
// Build the context manually, because Amazon Lambda is missing
|
||||
var context = {
|
||||
succeed: function (result) {
|
||||
res.json (result);
|
||||
},
|
||||
fail: function (error) {
|
||||
console.log (error);
|
||||
//We could send error json from here
|
||||
},
|
||||
};
|
||||
|
||||
var alexa = Alexa.handler (req.body, context);
|
||||
alexa.appId = config.SKILL_ID;
|
||||
alexa.registerHandlers (handlers);
|
||||
alexa.execute ();
|
||||
},
|
||||
updateModel: function () {
|
||||
//Get info from database, and store it for faster response on intent
|
||||
databaseHelper
|
||||
.getSkill (config.SKILL_DB_ID)
|
||||
.then (activeSkill => {
|
||||
handlers = {};
|
||||
destinationEmail = activeSkill.contactEmail;
|
||||
|
||||
let listOfPossibleQuestions = '';
|
||||
activeSkill.intents.forEach(intent => {
|
||||
if (intent.questions.length > 0 && intent.intentExplanation) {
|
||||
listOfPossibleQuestions +=
|
||||
intent.intentExplanation +
|
||||
intent.questions[0] +
|
||||
'<break time="' +
|
||||
constants.voiceResponseTimings.PAUSE_BETWEEN_QUESTIONS +
|
||||
'ms"/>';
|
||||
}
|
||||
});
|
||||
|
||||
console.log(listOfPossibleQuestions);
|
||||
|
||||
//Handler for launch requestconsole.log()
|
||||
handlers = {
|
||||
LaunchRequest: function () {
|
||||
this.response
|
||||
.speak (
|
||||
activeSkill.invocationAnswer +
|
||||
'<break time="' +
|
||||
constants.voiceResponseTimings.PAUSE_AFTER_WELCOME_MESSAGE +
|
||||
'ms"/>' +
|
||||
listOfPossibleQuestions
|
||||
)
|
||||
.listen (constants.voiceResponseStrings.GENERIC_CONTINUE); //Phrase from listen doesn't work !!!
|
||||
this.emit (':responseReady');
|
||||
},
|
||||
};
|
||||
|
||||
//Handlers for user defined questions
|
||||
activeSkill.intents.map (intent => {
|
||||
handlers[intent.intentName] = function () {
|
||||
this.response
|
||||
.speak (intent.answer)
|
||||
.listen (constants.voiceResponseStrings.GENERIC_CONTINUE); //Phrase from listen doesn't work !!!
|
||||
this.emit (':responseReady');
|
||||
};
|
||||
});
|
||||
|
||||
//Handler for sending message
|
||||
handlers.SendMessageIntent = function () {
|
||||
let intent = this.event.request.intent;
|
||||
|
||||
console.log ('Dialog state : ' + this.event.request.dialogState);
|
||||
console.log (intent);
|
||||
//STARTED, IN_PROGRESS
|
||||
|
||||
if (!intent.slots.Name.value) {
|
||||
//Name not defined yet, ask user for name
|
||||
const slotToElicit = 'Name';
|
||||
const speechOutput = 'What is your name';
|
||||
const repromptSpeech = speechOutput;
|
||||
this.emit (
|
||||
':elicitSlot',
|
||||
slotToElicit,
|
||||
speechOutput,
|
||||
repromptSpeech
|
||||
);
|
||||
} else if (!intent.slots.Email.value) {
|
||||
//Name not defined yet, ask user for email
|
||||
const slotToElicit = 'Email';
|
||||
const speechOutput =
|
||||
'Ok ' + intent.slots.Name.value + '. What is your email';
|
||||
const repromptSpeech = speechOutput;
|
||||
this.emit (
|
||||
':elicitSlot',
|
||||
slotToElicit,
|
||||
speechOutput,
|
||||
repromptSpeech
|
||||
);
|
||||
} else if (!intent.slots.Message.value) {
|
||||
intent.slots.Email.value = emailHelper.transformEmailFromAlexaResponse (
|
||||
intent.slots.Email.value
|
||||
);
|
||||
if (!emailHelper.isEmailValid (intent.slots.Email.value)) {
|
||||
//Email is not valid, ask again
|
||||
const slotToElicit = 'Email';
|
||||
const speechOutput =
|
||||
'Sorry, that was not valid email. What is your email';
|
||||
const repromptSpeech = speechOutput;
|
||||
this.emit (
|
||||
':elicitSlot',
|
||||
slotToElicit,
|
||||
speechOutput,
|
||||
repromptSpeech
|
||||
);
|
||||
} else {
|
||||
//Email is valid
|
||||
const slotToElicit = 'Message';
|
||||
const speechOutput = 'Great. What is your message';
|
||||
const repromptSpeech = speechOutput;
|
||||
this.emit (
|
||||
':elicitSlot',
|
||||
slotToElicit,
|
||||
speechOutput,
|
||||
repromptSpeech
|
||||
);
|
||||
}
|
||||
} else {
|
||||
//all slots are filled
|
||||
console.log ('Name : ' + intent.slots.Name.value);
|
||||
console.log ('Email : ' + intent.slots.Email.value);
|
||||
console.log ('Message : ' + intent.slots.Message.value);
|
||||
emailHelper
|
||||
.sendEmal (
|
||||
intent.slots.Name.value,
|
||||
intent.slots.Email.value,
|
||||
intent.slots.Message.value,
|
||||
destinationEmail
|
||||
)
|
||||
.then (info => {
|
||||
console.log (info);
|
||||
this.response.speak (
|
||||
'Ok. Message sent. Someone will contact you ASAP'
|
||||
);
|
||||
this.emit (':responseReady');
|
||||
})
|
||||
.catch (error => {
|
||||
console.log (error);
|
||||
this.response.speak (
|
||||
'Sorry, there was a problem with sending message.'
|
||||
);
|
||||
this.emit (':responseReady');
|
||||
});
|
||||
}
|
||||
};
|
||||
|
||||
//Default handlers for unknown questions and session close
|
||||
|
||||
handlers.Unhandled = function () {
|
||||
this.response
|
||||
.speak (constants.voiceResponseStrings.QUESTION_NOT_FOUND)
|
||||
.listen (constants.voiceResponseStrings.GENERIC_CONTINUE);
|
||||
};
|
||||
|
||||
handlers.SessionEndedRequest = function () {
|
||||
//We don't care for now
|
||||
};
|
||||
})
|
||||
.catch (e => {
|
||||
//Something is wrong, skill is not ready, use catch-all intent to inform user
|
||||
console.log ('Error. Skill doesnt exist');
|
||||
});
|
||||
},
|
||||
};
|
||||
@@ -4,12 +4,13 @@
|
||||
"description": "",
|
||||
"main": "test.js",
|
||||
"dependencies": {
|
||||
"alexa-app": "4.2.0",
|
||||
"alexa-sdk": "^1.0.25",
|
||||
"body-parser": "^1.13.1",
|
||||
"ejs": "^2.5.7",
|
||||
"express": "^4.13.0",
|
||||
"isomorphic-fetch": "^2.2.1",
|
||||
"mongodb": "^2.2.33",
|
||||
"nodemailer": "^4.4.1",
|
||||
"request": "^2.83.0"
|
||||
},
|
||||
"author": "Matt Kruse <github@mattkruse.com> (http://mattkruse.com/)",
|
||||
|
||||
@@ -1,11 +1,7 @@
|
||||
var amazonHelper = require ('./helpers/amazon');
|
||||
var databaseHelper = require ('./helpers/database');
|
||||
const config = require ('./config/config');
|
||||
const constants = require ('./config/constants');
|
||||
require ('isomorphic-fetch');
|
||||
var express = require ('express');
|
||||
var alexa = require('./components/alexa');
|
||||
|
||||
var alexa = require ('./models/alexa');
|
||||
|
||||
var MongoClient = require ('mongodb').MongoClient;
|
||||
var ObjectID = require ('mongodb').ObjectID;
|
||||
@@ -13,10 +9,7 @@ var ObjectID = require ('mongodb').ObjectID;
|
||||
const router = express.Router ();
|
||||
var app = express ();
|
||||
|
||||
// ALWAYS setup the alexa app and attach it to express before anything else.
|
||||
alexa.init (app);
|
||||
|
||||
app.set ('view engine', 'ejs');
|
||||
app.set ('view engine', 'ejs'); // Should be removed
|
||||
app.use (require ('./middleware')); //common middleware for all requests
|
||||
app.use (require ('./controllers')); //all routes
|
||||
|
||||
@@ -26,7 +19,7 @@ MongoClient.connect (config.DB_URL)
|
||||
|
||||
app.listen (config.PORT, () => {
|
||||
console.log ('Express server running on port ' + config.PORT);
|
||||
alexa.updateIntentsJSON ();
|
||||
alexa.updateModel ();
|
||||
databaseHelper.loadTokens ();
|
||||
});
|
||||
})
|
||||
|
||||
349
web/src/App.js
349
web/src/App.js
@@ -1,4 +1,4 @@
|
||||
import React, { Component } from 'react';
|
||||
import React, {Component} from 'react';
|
||||
import './css/App.css';
|
||||
import './css/popup.css';
|
||||
import IntentList from './components/IntentList';
|
||||
@@ -6,90 +6,117 @@ import IntentDetails from './components/IntentDetails';
|
||||
import LaunchRequest from './components/LaunchRequest';
|
||||
import Contact from './components/Contact';
|
||||
import Popup from 'react-popup';
|
||||
import {getSkill, updateSkill} from './lib/api'
|
||||
import {getSkill, updateSkill} from './lib/api';
|
||||
import {
|
||||
NEW_INTENT_SELECTED_INDEX,
|
||||
LAUNCH_REQUEST_SELECTED_INDEX,
|
||||
CONTACT_SELECTED_INDEX,
|
||||
RESULT_CODES} from './config/constants'
|
||||
NEW_INTENT_SELECTED_INDEX,
|
||||
LAUNCH_REQUEST_SELECTED_INDEX,
|
||||
CONTACT_SELECTED_INDEX,
|
||||
RESULT_CODES,
|
||||
} from './config/constants';
|
||||
|
||||
class App extends Component {
|
||||
constructor (props) {
|
||||
super (props);
|
||||
|
||||
constructor(props){
|
||||
super(props);
|
||||
this.state = {
|
||||
_id: '5a232fb86ce046c749739455',
|
||||
skillID: '',
|
||||
skillName: '',
|
||||
invocationName: 'Saburly',
|
||||
invocationAnswer: 'We are saburly',
|
||||
allIntents: [],
|
||||
selectedIntent: {
|
||||
intentName: '',
|
||||
intentExplanation: '',
|
||||
questions: [''],
|
||||
answer: '',
|
||||
},
|
||||
selectedIndex: NEW_INTENT_SELECTED_INDEX,
|
||||
contactEmail: '',
|
||||
waiting: false,
|
||||
};
|
||||
|
||||
this.state={_id:'5a232fb86ce046c749739455',
|
||||
skillID:'',
|
||||
skillName:'',
|
||||
invocationName:'Saburly',
|
||||
invocationAnswer:'We are saburly',
|
||||
allIntents:[],
|
||||
selectedIntent: {intentName:'',questions:[''],answer:''},
|
||||
selectedIndex:NEW_INTENT_SELECTED_INDEX,
|
||||
contactEmail:'',
|
||||
waiting: false
|
||||
};
|
||||
getSkill (this.state._id).then (l => l.json ()).then (result => {
|
||||
if (result === undefined) return;
|
||||
this.setState ({
|
||||
skillID: result.skillID,
|
||||
skillName: result.skillName,
|
||||
invocationName: result.invocationName,
|
||||
invocationAnswer: result.invocationAnswer,
|
||||
allIntents: result.intents,
|
||||
contactEmail: result.contactEmail,
|
||||
});
|
||||
});
|
||||
|
||||
getSkill(this.state._id).then(l=>l.json()).then(result=>{
|
||||
if (result===undefined) return;
|
||||
this.setState({ skillID:result.skillID,skillName:result.skillName, invocationName: result.invocationName,
|
||||
invocationAnswer: result.invocationAnswer,
|
||||
allIntents: result.intents, contactEmail: result.contactEmail})
|
||||
})
|
||||
|
||||
this.handleIntentClick = this.handleIntentClick.bind(this);
|
||||
this.handleLaunchRequestClick = this.handleLaunchRequestClick.bind(this);
|
||||
this.handleDeleteIntentClick = this.handleDeleteIntentClick.bind(this);
|
||||
this.handleSaveIntentClick = this.handleSaveIntentClick.bind(this);
|
||||
this.handleAddIntentClick = this.handleAddIntentClick.bind(this);
|
||||
this.handleSaveLaunchRequestClick = this.handleSaveLaunchRequestClick.bind(this);
|
||||
this.createSkill = this.createSkill.bind(this);
|
||||
this.sendSkill = this.sendSkill.bind(this);
|
||||
this.handleContactClick = this.handleContactClick.bind(this);
|
||||
this.handleSaveEmailClick = this.handleSaveEmailClick.bind(this);
|
||||
this.handleIntentClick = this.handleIntentClick.bind (this);
|
||||
this.handleLaunchRequestClick = this.handleLaunchRequestClick.bind (this);
|
||||
this.handleDeleteIntentClick = this.handleDeleteIntentClick.bind (this);
|
||||
this.handleSaveIntentClick = this.handleSaveIntentClick.bind (this);
|
||||
this.handleAddIntentClick = this.handleAddIntentClick.bind (this);
|
||||
this.handleSaveLaunchRequestClick = this.handleSaveLaunchRequestClick.bind (
|
||||
this
|
||||
);
|
||||
this.createSkill = this.createSkill.bind (this);
|
||||
this.sendSkill = this.sendSkill.bind (this);
|
||||
this.handleContactClick = this.handleContactClick.bind (this);
|
||||
this.handleSaveEmailClick = this.handleSaveEmailClick.bind (this);
|
||||
}
|
||||
|
||||
render() {
|
||||
render () {
|
||||
let rightPanel;
|
||||
switch (this.state.selectedIndex) {
|
||||
case LAUNCH_REQUEST_SELECTED_INDEX:
|
||||
rightPanel = <LaunchRequest invocationName={this.state.invocationName}
|
||||
invocationAnswer={this.state.invocationAnswer}
|
||||
onSaveClick={this.handleSaveLaunchRequestClick}
|
||||
waiting={this.state.waiting}/> ;
|
||||
rightPanel = (
|
||||
<LaunchRequest
|
||||
invocationName={this.state.invocationName}
|
||||
invocationAnswer={this.state.invocationAnswer}
|
||||
onSaveClick={this.handleSaveLaunchRequestClick}
|
||||
waiting={this.state.waiting}
|
||||
/>
|
||||
);
|
||||
break;
|
||||
case CONTACT_SELECTED_INDEX:
|
||||
rightPanel = <Contact contactEmail={this.state.contactEmail}
|
||||
onSaveEmailClick={this.handleSaveEmailClick}
|
||||
waiting={this.state.waiting}/> ;
|
||||
rightPanel = (
|
||||
<Contact
|
||||
contactEmail={this.state.contactEmail}
|
||||
onSaveEmailClick={this.handleSaveEmailClick}
|
||||
waiting={this.state.waiting}
|
||||
/>
|
||||
);
|
||||
break;
|
||||
default:
|
||||
rightPanel = <IntentDetails selectedIntent={this.state.selectedIntent}
|
||||
onDeleteIntentClick={this.handleDeleteIntentClick}
|
||||
onSaveIntentClick={this.handleSaveIntentClick}
|
||||
waiting={this.state.waiting}/>;
|
||||
rightPanel = (
|
||||
<IntentDetails
|
||||
selectedIntent={this.state.selectedIntent}
|
||||
onDeleteIntentClick={this.handleDeleteIntentClick}
|
||||
onSaveIntentClick={this.handleSaveIntentClick}
|
||||
waiting={this.state.waiting}
|
||||
/>
|
||||
);
|
||||
}
|
||||
|
||||
return(
|
||||
return (
|
||||
<div className="App">
|
||||
<Popup/>
|
||||
<Popup />
|
||||
<div className="App-header">
|
||||
<h1> Tell All </h1>
|
||||
</div>
|
||||
<IntentList allIntents={this.state.allIntents}
|
||||
onLaunchRequestClick={this.handleLaunchRequestClick}
|
||||
onContactClick={this.handleContactClick}
|
||||
onIntentClick={this.handleIntentClick}
|
||||
onAddIntentClick={this.handleAddIntentClick}
|
||||
selectedIndex={this.state.selectedIndex}
|
||||
waiting={this.state.waiting}/>
|
||||
|
||||
<IntentList
|
||||
allIntents={this.state.allIntents}
|
||||
onLaunchRequestClick={this.handleLaunchRequestClick}
|
||||
onContactClick={this.handleContactClick}
|
||||
onIntentClick={this.handleIntentClick}
|
||||
onAddIntentClick={this.handleAddIntentClick}
|
||||
selectedIndex={this.state.selectedIndex}
|
||||
waiting={this.state.waiting}
|
||||
/>
|
||||
|
||||
{rightPanel}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
createSkill(intents, name, answer, email, updateOnAmazon){
|
||||
createSkill (intents, name, answer, email, updateOnAmazon) {
|
||||
return {
|
||||
_id: this.state._id,
|
||||
skillID: this.state.skillID,
|
||||
@@ -97,97 +124,181 @@ class App extends Component {
|
||||
invocationName: name,
|
||||
invocationAnswer: answer,
|
||||
contactEmail: email,
|
||||
updateOnAmazon: updateOnAmazon
|
||||
updateOnAmazon: updateOnAmazon,
|
||||
};
|
||||
}
|
||||
|
||||
handleIntentClick(selectedIntent, index){
|
||||
this.setState({selectedIntent:selectedIntent, selectedIndex: index, launchRequest:false});
|
||||
handleIntentClick (selectedIntent, index) {
|
||||
this.setState ({
|
||||
selectedIntent: selectedIntent,
|
||||
selectedIndex: index,
|
||||
launchRequest: false,
|
||||
});
|
||||
}
|
||||
|
||||
handleLaunchRequestClick(){
|
||||
this.setState({selectedIndex: LAUNCH_REQUEST_SELECTED_INDEX});
|
||||
handleLaunchRequestClick () {
|
||||
this.setState ({selectedIndex: LAUNCH_REQUEST_SELECTED_INDEX});
|
||||
}
|
||||
|
||||
handleContactClick(){
|
||||
this.setState({selectedIndex: CONTACT_SELECTED_INDEX})
|
||||
handleContactClick () {
|
||||
this.setState ({selectedIndex: CONTACT_SELECTED_INDEX});
|
||||
}
|
||||
|
||||
handleSaveLaunchRequestClick(name, answer){
|
||||
this.setState({waiting:true, invocationName:name, invocationAnswer: answer});
|
||||
this.sendSkill(this.state.allIntents,true,{waiting:false},{waiting:false},name,answer,this.state.contactEmail,true);
|
||||
handleSaveLaunchRequestClick (name, answer) {
|
||||
this.setState ({
|
||||
waiting: true,
|
||||
invocationName: name,
|
||||
invocationAnswer: answer,
|
||||
});
|
||||
this.sendSkill (
|
||||
this.state.allIntents,
|
||||
true,
|
||||
{waiting: false},
|
||||
{waiting: false},
|
||||
name,
|
||||
answer,
|
||||
this.state.contactEmail,
|
||||
true
|
||||
);
|
||||
}
|
||||
|
||||
handleSaveEmailClick(email){
|
||||
this.setState({waiting:true});
|
||||
this.sendSkill(this.state.allIntents,true,{contactEmail: email, waiting:false},{waiting:false},this.state.invocationName,this.state.invocationAnswer,email,false);
|
||||
handleSaveEmailClick (email) {
|
||||
this.setState ({waiting: true});
|
||||
this.sendSkill (
|
||||
this.state.allIntents,
|
||||
true,
|
||||
{contactEmail: email, waiting: false},
|
||||
{waiting: false},
|
||||
this.state.invocationName,
|
||||
this.state.invocationAnswer,
|
||||
email,
|
||||
false
|
||||
);
|
||||
}
|
||||
|
||||
handleDeleteIntentClick(selectedIntent){
|
||||
handleDeleteIntentClick (selectedIntent) {
|
||||
let id = -1;
|
||||
//TODO : Change comparsion method ! Same object with different proeprty sorting will not be same string
|
||||
this.state.allIntents.map((intent,index)=>{
|
||||
if ((id===-1) && (JSON.stringify(selectedIntent)===JSON.stringify(intent)))
|
||||
id = index;
|
||||
this.state.allIntents.map ((intent, index) => {
|
||||
if (
|
||||
id === -1 &&
|
||||
JSON.stringify (selectedIntent) === JSON.stringify (intent)
|
||||
)
|
||||
id = index;
|
||||
});
|
||||
|
||||
if (id!==-1){
|
||||
try{
|
||||
let newAllIntentsJSON = JSON.stringify(this.state.allIntents);
|
||||
let newAllIntents = JSON.parse(newAllIntentsJSON);
|
||||
newAllIntents.splice(id,1);
|
||||
this.setState({waiting:true});
|
||||
if (id !== -1) {
|
||||
try {
|
||||
let newAllIntentsJSON = JSON.stringify (this.state.allIntents);
|
||||
let newAllIntents = JSON.parse (newAllIntentsJSON);
|
||||
newAllIntents.splice (id, 1);
|
||||
this.setState ({waiting: true});
|
||||
|
||||
let newState = {allIntents: newAllIntents, selectedIntent: {intentName:'', questions:[''],answer:''}, waiting:false};
|
||||
this.sendSkill(newAllIntents,true,newState,{waiting:false},this.state.invocationName,this.state.invocationAnswer,this.state.contactEmail,true);
|
||||
|
||||
}catch(e){
|
||||
console.log("error : " + e);
|
||||
let newState = {
|
||||
allIntents: newAllIntents,
|
||||
selectedIntent: {intentName: '', questions: [''], answer: ''},
|
||||
waiting: false,
|
||||
};
|
||||
this.sendSkill (
|
||||
newAllIntents,
|
||||
true,
|
||||
newState,
|
||||
{waiting: false},
|
||||
this.state.invocationName,
|
||||
this.state.invocationAnswer,
|
||||
this.state.contactEmail,
|
||||
true
|
||||
);
|
||||
} catch (e) {
|
||||
console.log ('error : ' + e);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
handleSaveIntentClick(selectedIntent){
|
||||
let newAllIntentsJSON = JSON.stringify(this.state.allIntents);
|
||||
let newAllIntents = JSON.parse(newAllIntentsJSON);
|
||||
handleSaveIntentClick (selectedIntent) {
|
||||
let newAllIntentsJSON = JSON.stringify (this.state.allIntents);
|
||||
let newAllIntents = JSON.parse (newAllIntentsJSON);
|
||||
|
||||
let newState = null;
|
||||
if (this.state.selectedIndex === NEW_INTENT_SELECTED_INDEX){
|
||||
if (this.state.selectedIndex === NEW_INTENT_SELECTED_INDEX) {
|
||||
//new intent
|
||||
newAllIntents.push(selectedIntent);
|
||||
newState = {allIntents: newAllIntents, selectedIntent: selectedIntent, selectedIndex: newAllIntents.length-1, waiting:false};
|
||||
}else{
|
||||
newAllIntents.push (selectedIntent);
|
||||
newState = {
|
||||
allIntents: newAllIntents,
|
||||
selectedIntent: selectedIntent,
|
||||
selectedIndex: newAllIntents.length - 1,
|
||||
waiting: false,
|
||||
};
|
||||
} else {
|
||||
newAllIntents[this.state.selectedIndex] = selectedIntent;
|
||||
newState = {allIntents: newAllIntents, selectedIntent: selectedIntent, waiting: false};
|
||||
newState = {
|
||||
allIntents: newAllIntents,
|
||||
selectedIntent: selectedIntent,
|
||||
waiting: false,
|
||||
};
|
||||
}
|
||||
this.setState({waiting:true});
|
||||
this.sendSkill(newAllIntents, true, newState, {waiting:false}, this.state.invocationName,this.state.invocationAnswer,this.state.contactEmail, true);
|
||||
this.setState ({waiting: true});
|
||||
this.sendSkill (
|
||||
newAllIntents,
|
||||
true,
|
||||
newState,
|
||||
{waiting: false},
|
||||
this.state.invocationName,
|
||||
this.state.invocationAnswer,
|
||||
this.state.contactEmail,
|
||||
true
|
||||
);
|
||||
}
|
||||
|
||||
handleAddIntentClick(){
|
||||
this.setState({allIntents: this.state.allIntents, selectedIndex: NEW_INTENT_SELECTED_INDEX,launchRequest:false,selectedIntent: {intentName:'',questions:[''], answer:''}});
|
||||
handleAddIntentClick () {
|
||||
this.setState ({
|
||||
allIntents: this.state.allIntents,
|
||||
selectedIndex: NEW_INTENT_SELECTED_INDEX,
|
||||
launchRequest: false,
|
||||
selectedIntent: {intentName: '', questions: [''], answer: '', intentExplanation:''},
|
||||
});
|
||||
}
|
||||
|
||||
sendSkill(newAllIntents, showPopUp, resolveState, rejectState, newName, newAnswer, email, updateOnAmazon){
|
||||
return new Promise((resolve,reject)=>{
|
||||
updateSkill(this.createSkill(newAllIntents,newName,newAnswer,email,updateOnAmazon)).then(l=>l.json()).then(result=>{
|
||||
if (result.result !== RESULT_CODES.OK){
|
||||
console.log(result.result);
|
||||
if (showPopUp) Popup.alert('Model was not saved. Please try again');
|
||||
this.setState(rejectState);
|
||||
//reject('Error code : ' + jResult.result);
|
||||
}else{
|
||||
if (showPopUp) Popup.alert('Saved');
|
||||
this.setState(resolveState);
|
||||
resolve();
|
||||
}
|
||||
}).catch(e=>{
|
||||
console.log('error : ' + e);
|
||||
if (showPopUp) Popup.alert('Model was not saved. Please try again');
|
||||
this.setState(rejectState);
|
||||
//reject(e);
|
||||
});
|
||||
sendSkill (
|
||||
newAllIntents,
|
||||
showPopUp,
|
||||
resolveState,
|
||||
rejectState,
|
||||
newName,
|
||||
newAnswer,
|
||||
email,
|
||||
updateOnAmazon
|
||||
) {
|
||||
return new Promise ((resolve, reject) => {
|
||||
updateSkill (
|
||||
this.createSkill (
|
||||
newAllIntents,
|
||||
newName,
|
||||
newAnswer,
|
||||
email,
|
||||
updateOnAmazon
|
||||
)
|
||||
)
|
||||
.then (l => l.json ())
|
||||
.then (result => {
|
||||
if (result.result !== RESULT_CODES.OK) {
|
||||
console.log (result);
|
||||
if (showPopUp)
|
||||
Popup.alert ('Model was not saved. Please try again');
|
||||
this.setState (rejectState);
|
||||
//reject('Error code : ' + jResult.result);
|
||||
} else {
|
||||
if (showPopUp) Popup.alert ('Saved');
|
||||
this.setState (resolveState);
|
||||
resolve ();
|
||||
}
|
||||
})
|
||||
.catch (e => {
|
||||
console.log ('error : ' + e);
|
||||
if (showPopUp) Popup.alert ('Model was not saved. Please try again');
|
||||
this.setState (rejectState);
|
||||
//reject(e);
|
||||
});
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,7 +1,8 @@
|
||||
import React, { Component } from 'react';
|
||||
import {Button, SVGIcon, TextField} from 'react-md';
|
||||
import '../css/components/IntentDetails.css';
|
||||
import {QUESTION_MAX_LENGTH, ANSWER_MAX_LENGTH, INTENT_NAME_MAX_LENGTH} from '../config/constants';
|
||||
import '../css/Common.css';
|
||||
import {QUESTION_MAX_LENGTH, ANSWER_MAX_LENGTH, INTENT_NAME_MAX_LENGTH, INTENT_EXPLANATION_MAX_LENGTH} from '../config/constants';
|
||||
|
||||
class IntentDetails extends Component {
|
||||
constructor(props){
|
||||
@@ -14,6 +15,7 @@ class IntentDetails extends Component {
|
||||
this.handleQuestionEdit = this.handleQuestionEdit.bind(this);
|
||||
this.handleAnswerEdit = this.handleAnswerEdit.bind(this);
|
||||
this.handleIntentNameEdit = this.handleIntentNameEdit.bind(this);
|
||||
this.handleIntentExplanationEdit = this.handleIntentExplanationEdit.bind(this);
|
||||
}
|
||||
|
||||
componentWillReceiveProps(props){
|
||||
@@ -24,10 +26,19 @@ class IntentDetails extends Component {
|
||||
return (
|
||||
<div className="RightPanelBox">
|
||||
<div className="QuestionBox">
|
||||
<h5 className="PanelSubTitle"> In introduction, Alexa will help users to ask her the right questions about your business. For Example, she will say : "To ask us about our services, say : What do you do ? ". What do you do ? is defined in question field. Alexa will use first variation of question in intro.</h5>
|
||||
<TextField
|
||||
id="intent explanation"
|
||||
lineDirection="center"
|
||||
placeholder="To ask us about our services, say "
|
||||
className="md-cell md-cell--bottom IntentDetailsInputBoxes"
|
||||
onChange={this.handleIntentExplanationEdit}
|
||||
maxLength={INTENT_EXPLANATION_MAX_LENGTH}
|
||||
value={this.state.intent.intentExplanation} />
|
||||
<br/>
|
||||
<TextField
|
||||
id="intent name"
|
||||
lineDirection="center"
|
||||
placeholder="Intent name"
|
||||
label="Question name"
|
||||
className="md-cell md-cell--bottom IntentDetailsInputBoxes"
|
||||
onChange={this.handleIntentNameEdit}
|
||||
@@ -98,6 +109,13 @@ class IntentDetails extends Component {
|
||||
this.setState({intent: newIntent});
|
||||
}
|
||||
|
||||
handleIntentExplanationEdit(e,index){
|
||||
if (e.length === INTENT_EXPLANATION_MAX_LENGTH) return;
|
||||
let newIntent = this.state.intent;
|
||||
newIntent.intentExplanation = e;
|
||||
this.setState({intent: newIntent});
|
||||
}
|
||||
|
||||
handleAnswerEdit(e){
|
||||
if (e.length === ANSWER_MAX_LENGTH) return;
|
||||
let newIntent = this.state.intent;
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
export const INTENT_NAME_MAX_LENGTH = 30;
|
||||
export const INTENT_EXPLANATION_MAX_LENGTH = 70;
|
||||
export const QUESTION_MAX_LENGTH = 150;
|
||||
export const ANSWER_MAX_LENGTH = 150;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user