dialog test

2018-01-18 19:08:51 +01:00 · 2018-01-18 07:38:09 +01:00 · 2018-01-18 01:15:14 +01:00
45 changed files with 1425 additions and 7367 deletions
--- a/README.md
+++ b/README.md
@@ -1,11 +1,6 @@
-To obtain client ID and secret :
-https://developer.amazon.com/lwa/sp/overview.html
-Click create new security profile, and add whitelist redirect uri : https://layla.amazon.com/api/skill/link/M2ODJY6EXOY6KO
+To obtain new Auth Code :

-
-To obtain new Auth Code : 
-
-https://www.amazon.com/ap/oa?client_id=amzn1.application-oa2-client.8c183daec15c488c9126b62bda9f7832&scope=alexa::ask:skills:readwrite alexa::ask:models:readwrite alexa::ask:skills:test&response_type=code&redirect_uri=https://layla.amazon.com/api/skill/link/M2ODJY6EXOY6KO
+https://www.amazon.com/ap/oa?client_id=amzn1.application-oa2-client.c748ca56ded04a95b236979898585ff7&scope=alexa::ask:skills:readwrite alexa::ask:models:readwrite alexa::ask:skills:test&response_type=code&redirect_uri=https://layla.amazon.com/api/skill/link/M2ODJY6EXOY6KO

 Response URL (Decoded) :

@@ -72,8 +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.2445552d-954d-4cd6-b77f-295368e02842", "intents" : [ { "intentName" : "GetFirstQuestion", "questionExplanation" : "","questions" : [ "tell me something about projects", "tell me all about projects" ], "answer" : "blablabla bla bla", "answerType":0, "externalAnswerSource":"" }, { "intentName" : "GetThirdQuestion", "questionExplanation" : "","questions" : [ "Give me third question" ], "answer" : "This is answer to the third question", "answerType":1, "externalAnswerSource":"http://sarajevotimes.com" } ], "invocationName" : "saburly", "invocationAnswer" : "We are Saburly team one", "contactEmail":"bilal@saburly.com" })
-
+		* 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" })
 		
        *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"
--- a/backend/components/alexa.js
+++ b/backend/components/alexa.js
@@ -0,0 +1,255 @@
+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,
+            },
+            (request, response) => {
+              return response.say (intent.answer).shouldEndSession (false);
+            }
+          );
+        });
+
+        alexaApp.launch ((request, response) => {
+          return response.say (skill.invocationAnswer).shouldEndSession (false);
+        });
+
+
+        
+
+        alexaApp.intent (
+          'EmailIntent',
+          {
+            dialog: {
+              'type': 'delegate',
+            },
+            slots: [
+              {
+                name:'Name',
+                type:'AMAZON.US_FIRST_NAME',
+                samples:[
+                  'My name is {-|Name}',
+                  'I am {-|Name}',
+                  '{-|Name}'
+                ]
+              },
+              {
+                "name": "Email",
+                "type": "emailSlot",
+                "samples": [
+                  "{blablablabla@blablabla.blabla.blabla|Email}",
+                  "My email is {blablablabla@blablabla.blabla.blabla|Email}"
+                ]
+              },
+              {
+                "name": "Message",
+                "type": "emailMessage",
+                "samples": [
+                  "{Quick brown fox jumps over lazy dog. Quick brown fox jumps over lazy dog. Quick brown fox jumps over lazy dog.|Message}",
+                  "My message is {Quick brown fox jumps over lazy dog. Quick brown fox jumps over lazy dog. Quick brown fox jumps over lazy dog.|Message}"
+                ]
+              }
+            ],
+            utterances: [
+              'I would like to send a message',
+              'I want to send a message',
+              'Send message',
+            ],
+          },
+          (request, response) => {
+            console.log('Name : ' + request.slot('Name'));
+            console.log('Color : ' + request.slot('Color'));
+            
+          }
+        );
+
+        /*
+        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');
+        });
+      });
+  },
+};
--- a/backend/config/config.js
+++ b/backend/config/config.js
@@ -1,33 +1,17 @@
-constants = require('./constants')
 var config = {};

-config.SKILL_STAGE = constants.skillStage.IN_DEVELOPMENT;
-
 config.DB_URL = 'mongodb://localhost:27017/tellall';
 config.PORT = 5000;

-//Bilal TOKENS
-//config.TOKEN = 'Atza|IwEBIBe6gDqrrowEEav6N-_6s4NztYeP3oG8PGWmu8ZiZw6lbOh3wNla3TK6pY-VEpT1d8an-dVf_n3kXJzVFsNo_4xBfZyFHGoCTDTFjs3yBRul4PVdBOhwwiH3-sgRLcUofZbe2oE06GmTcbfYtaStfXpQI5dfpldfnsJg_CvhSA6AHb_snJT3F6lyXzbV076d_3cYUMJxFldJGnYcviNHHxjjmuQTD06hhGzCbAxxe9eBmkuopRsNfyedLT2UlKP_ublah9CUGA3AdIX_3Iuke82jMwGnNl9gv7pbaDNEjAbj7IQSl3B08uuREtJq-oTBOjALNXRvFxTJmQjZwXNf9eHC7fSHJDdEPdZQU0AcffRQObAyAkUuL6Jv39OHzhb3Q64-zzoyODqnJyLP5SQZ2JVF53Kc_cTBqjIc9pXljqe7yEVk6JDs7q1zKbBibx_AQm57TO79IzWyLBzBMlYL5HdTsqEfRzLeDw2tws-hGMgkx2HWfdbYnmf5Qb4SyIhzvmmdfPLg3MVKTxjIBu1rx0xf3n0PLZP1EO6jsJPoMRPg77Gm4oit5Zp6s37ek3A3Vxh-ntoASpkrkxGTG9kVtRNt';
-//config.REFRESH_TOKEN = 'Atzr|IwEBICA3kDhfSJxlwvnQp9AD1o115AC_KBbFd5GBg8oN_QHWn2or5xFQ09BruuK6a07tGHtTt_9q2Y21mnOMH4RDtYXTVG9ADgLE6mHWKZFxYVwt3kHMiUJdY5lJcsOtWLoblrS-bJ0BEXXK5nVDt_bSI5IB7NUf-9QVZxhovRH_ANSxdTjJT0_rMIAZY3WEj68FEap49q_pg72BhnxHVZD2TC3zvX96_DN65HE5SoSgT7OiMAeiJewB_SyemW_HxBwaB-_X-G1ifOtnrzZ4gXTpOrEUlHI2YPuvRMBMtmz1h-nXDZYv3vwU3RA57Qj_ZNVcScj8_RXf2xq8w48v0PzZFXYBSalfnqPq6eUvSSbAJUp6bB8y596JlvR5dFQe_Z--X0Gkfo85IcyrI9D44vK9sJhrGhCVi2FDDa8pHczmNSen99JYZvDif-zpYzgbcymAkOV0gC7JvYMxlZfETT3NTBy7eVA7fJI1SZaeA_qW49xRcBkZBu5gkqTpeGWUU1cGr2aXRVVmXGM22NfV5E7KzvEBsCeHml_tCfxZeKY8Msd8hJb0Cd59u-_hsuc8oNjsOpIdFF976dY3uTmAgHWpG2PH';
-
-//Saburly TOKENS
-config.TOKEN = 'Atza|IwEBIABS0RvlVshGGO64X0tabhUuzpJKjbWNgxpRiy7YTftFD_lWlp-cbeXuVjRAu8kior2W2C5swf_rEHYvELQXdw78gB9WJQh4ITncPgqNCxvEnwVpIXiyeC_O287DRErnTYbI3s34i4NcxrXzobB8fIpTZxOkg6BI6vQGvvaiNLsTim2ElDYgAEmdgTN77llcMai521aovDqEw_XFc6GspeXhiGKxRomCMIL2UaT649owapDQ3y3Ug9eHvEaBzqjYdOUAtRtv19BGkG8YPs3npHmP5AD0Oc3ByCfrofcGk7fdd_nq28pRX6h4LXk4ylM279qlneWh9EErsWh8vtWuGEGusnDxW17OzEzf7HuwNDqdCJ6gCrIEkZaHISrSQ-vTsYGhKbv0z4nNjf_W_aoc9UJr9LnISCXx424R--iGDKZXhYWlZRjaiHsXE33MpS_M-sdN6GXYQwIjanTUahVXh5h-IBam5uJzTejE6CkIh5iUJ6um2IlDelJRMGS-T_aaG3zUvEagvEd9V9Z5mVN_kmO8bH4H2VefZuFGHRsCPa6SoLrlN0rkXK5fMw-zXfV2MHvQFdkgqYqGKxiEwWJ-g4n1ZrcPtWQowHT2z2yWrfnM2A6g8GIdPT23znmRcrdz4EU';
-config.REFRESH_TOKEN = 'Atzr|IwEBIENdBZntrzvJYesv8SGhnty4Nyk2ZySL09elw5N0wH8S1Brz1UgIYLqenw3sKKxnc-VrIUbNtl1Ka4GDKwcTr2fDU_AbKQ6YXzeRBrfRQVvNOeCtjZE8P6Kg1PxAeQoCsqo7WPxK8ZdUaLwPjt_xiZ1FXtr01g-211PJs4KEg5jyF5nY2S14jA_TbwDW6ihpNqWd6ZklTZSRaOeSGa1mXZCSZ5yTsZIQV1Pn0fKhCXtcVg2L833YqRmextmHij4-2NtBQdW3gif5MPdhYjTqDNwgxO3OOagK1uSFqXOnMcmEDnxZuQQApugfDzClfN6DiDALCKN4dVAX8-OU_L2xsUkKiFP9rQjvHWJoRFBT1FpXjBfoVyzM1AaJ6C83WX6SjOBE0hhikQKIaPSe1ikK8_MzOIs2wqLLPnLGnKj3kcKMkDmY6DMgxfWj2H0hwLy0oZ7_qykS7wUHMGjRO5yScuBWFIr0RFFu00GS7zrKjkhFc_E4ZBBKskn0gywS-5pogo0U1rQtLg8lQJsVbxXQwtq2TxkGFMBiVxtQcXtHM1qbCVXpZQbk7ezxvasj4yAIsF4H7KBiZSGmWHkk4yADykWJSntTjFcM2wG0wSiEYoYzJQ';
+config.TOKEN = 'Atza|IwEBIBe6gDqrrowEEav6N-_6s4NztYeP3oG8PGWmu8ZiZw6lbOh3wNla3TK6pY-VEpT1d8an-dVf_n3kXJzVFsNo_4xBfZyFHGoCTDTFjs3yBRul4PVdBOhwwiH3-sgRLcUofZbe2oE06GmTcbfYtaStfXpQI5dfpldfnsJg_CvhSA6AHb_snJT3F6lyXzbV076d_3cYUMJxFldJGnYcviNHHxjjmuQTD06hhGzCbAxxe9eBmkuopRsNfyedLT2UlKP_ublah9CUGA3AdIX_3Iuke82jMwGnNl9gv7pbaDNEjAbj7IQSl3B08uuREtJq-oTBOjALNXRvFxTJmQjZwXNf9eHC7fSHJDdEPdZQU0AcffRQObAyAkUuL6Jv39OHzhb3Q64-zzoyODqnJyLP5SQZ2JVF53Kc_cTBqjIc9pXljqe7yEVk6JDs7q1zKbBibx_AQm57TO79IzWyLBzBMlYL5HdTsqEfRzLeDw2tws-hGMgkx2HWfdbYnmf5Qb4SyIhzvmmdfPLg3MVKTxjIBu1rx0xf3n0PLZP1EO6jsJPoMRPg77Gm4oit5Zp6s37ek3A3Vxh-ntoASpkrkxGTG9kVtRNt';
+config.REFRESH_TOKEN = 'Atzr|IwEBICA3kDhfSJxlwvnQp9AD1o115AC_KBbFd5GBg8oN_QHWn2or5xFQ09BruuK6a07tGHtTt_9q2Y21mnOMH4RDtYXTVG9ADgLE6mHWKZFxYVwt3kHMiUJdY5lJcsOtWLoblrS-bJ0BEXXK5nVDt_bSI5IB7NUf-9QVZxhovRH_ANSxdTjJT0_rMIAZY3WEj68FEap49q_pg72BhnxHVZD2TC3zvX96_DN65HE5SoSgT7OiMAeiJewB_SyemW_HxBwaB-_X-G1ifOtnrzZ4gXTpOrEUlHI2YPuvRMBMtmz1h-nXDZYv3vwU3RA57Qj_ZNVcScj8_RXf2xq8w48v0PzZFXYBSalfnqPq6eUvSSbAJUp6bB8y596JlvR5dFQe_Z--X0Gkfo85IcyrI9D44vK9sJhrGhCVi2FDDa8pHczmNSen99JYZvDif-zpYzgbcymAkOV0gC7JvYMxlZfETT3NTBy7eVA7fJI1SZaeA_qW49xRcBkZBu5gkqTpeGWUU1cGr2aXRVVmXGM22NfV5E7KzvEBsCeHml_tCfxZeKY8Msd8hJb0Cd59u-_hsuc8oNjsOpIdFF976dY3uTmAgHWpG2PH';
 config.TOKEN_EXPIRES_IN = 1515100500;

-
-
-//config.SKILL_ID = 'amzn1.ask.skill.efbf0564-a732-4ba9-958f-57939138adae'; //bilal
-config.SKILL_ID = 'amzn1.ask.skill.2445552d-954d-4cd6-b77f-295368e02842'; //saburly
+config.SKILL_ID = 'amzn1.ask.skill.efbf0564-a732-4ba9-958f-57939138adae';
 //config.SKILL_DB_ID = '5a5016e775becaef2015da10'; //for server
-config.SKILL_DB_ID = '5abd461329f85e4ec728d945'; //for local
+config.SKILL_DB_ID = '5a232fb86ce046c749739455'; //for local

-//Bilal 
-//config.CLIENT_ID = 'amzn1.application-oa2-client.c748ca56ded04a95b236979898585ff7';
-//config.CLIENT_SECRET = '6dea8125cecd049d3c4cff7bb5bdfd3ff17bc6fed246c4c8f6b519d9ed08d0b3';
-
-//Saburly
-config.CLIENT_ID = 'amzn1.application-oa2-client.8c183daec15c488c9126b62bda9f7832';
-config.CLIENT_SECRET = '3acaa0755291132ee11e1cceaa100feef96a0244662df712a52189199cc655de';
+config.CLIENT_ID = 'amzn1.application-oa2-client.c748ca56ded04a95b236979898585ff7';
+config.CLIENT_SECRET = '6dea8125cecd049d3c4cff7bb5bdfd3ff17bc6fed246c4c8f6b519d9ed08d0b3';

 module.exports = config;
--- a/backend/config/constants.js
+++ b/backend/config/constants.js
@@ -1,84 +1,31 @@
 const constants = {};

-constants.skillStage = {
-  IN_DEVELOPMENT: 'development',
-  LIVE: 'live',
-};
-
 constants.amazonResultCodes = {
-  OK: 200,
-  ACCEPTED: 202,
-  BAD_REQUEST: 400,
-  UNAUTHORIZED: 401,
-  NOT_FOUND: 404,
-  CONFLICT: 409,
-  PAYLOAD_TOO_LARGE: 413,
-};
+    OK:200,
+    ACCEPTED:202,
+    BAD_REQUEST:400,
+    UNAUTHORIZED:401,
+    NOT_FOUND:404,
+    CONFLICT:409,
+    PAYLOAD_TOO_LARGE:413
+}

 constants.apiResultCodes = {
-  GENERIC_ERROR: -1,
-  OK: 0,
-  AMAZON_ERROR: 1, //amazon api works, but error is some of the amazonResultCodes
-  AMAZON_FAIL: 2, //amazon api doesn't work
-  DATABASE_ERROR: 3,
-  NO_SKILL: 4,
-  INCONSISTENT_STATE: 5,
-  INVALID_SKILL: 6,
-};
+    GENERIC_ERROR : -1,
+    OK:0,
+    AMAZON_ERROR:1, //amazon api works, but error is some of the amazonResultCodes
+    AMAZON_FAIL:2, //amazon api doesn't work
+    DATABASE_ERROR:3,
+    NO_SKILL:4,
+    INCONSISTEN_STATE:5,
+}

 constants.HTTPResultCodes = {
-  INTERNAL_SERVER_ERROR: 500,
-};
+    INTERNAL_SERVER_ERROR : 500,
+}

 constants.SKILL_ID_LENGTH = 24;

-constants.voiceResponseStrings = {
-  QUESTION_NOT_FOUND: 'Sorry, I didnt understand',
-  GENERIC_CONTINUE: 'Say something to continue',
-  DIDNT_ASK_ANYTHING: 'There was no question to answer to',
-  ERROR_SUMMARIZING_CONTENT: 'Sorry, there was problem with summarizing news',
-  ERROR_FETCHING_CONTENT: 'Failed to get content',
-};

-//Timing is given in [ms]
-constants.voiceResponseTimings = {
-  PAUSE_BETWEEN_QUESTIONS: 650,
-  PAUSE_AFTER_WELCOME_MESSAGE: 650,
-  PAUSE_BETWEEN_TITLES: 500,
-  PAUSE_BETWEEN_TITLE_AND_CONTENT: 500,
-  PAUSE_BETWEEN_NEWS: 800,
-};

-constants.stringConstraints = {
-  INTENT_EXPLANATION_MAX_LENGTH: 70,
-
-  INTENT_NAME_MAX_LENGTH: 30,
-  INTENT_NAME_MIN_LENGTH: 2,
-
-  QUESTION_MAX_LENGTH: 150,
-  QUESTION_MIN_LENGTH: 2,
-
-  ANSWER_MAX_LENGTH: 150,
-  ANSWER_MIN_LENGTH: 2,
-
-  INVOCATION_NAME_MAX_LENGTH: 50,
-  INVOCATION_NAME_MIN_LENGTH: 2,
-  INVOCATION_ANSWER_MAX_LENGTH: 100,
-
-  EMAIL_MAX_LENGTH: 100,
-};
-
-constants.answerType = {
-  PREDEFINED: 0,
-  EXTERNAL_SOURCE_WP_TITLES: 1,
-  EXTERNAL_SOURCE_WP_NEWS: 2,
-};
-
-constants.contentType = {
-  TITLES: 0,
-  NEWS: 1,
-};
-
-constants.FIXED_SUMMARY_LENGTH = 3;
-
-module.exports = constants;
+module.exports = constants;
--- a/backend/config/email.js
+++ b/backend/config/email.js
@@ -1,14 +0,0 @@
-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;
--- a/backend/controllers/index.js
+++ b/backend/controllers/index.js
@@ -1,6 +1,5 @@
 var express = require ('express'), router = express.Router ();

 router.use ('/skill', require ('./skill'));
-router.use ('/saburly', require('./saburlyEntryPoint'));

 module.exports = router;
--- a/backend/controllers/saburlyEntryPoint.js
+++ b/backend/controllers/saburlyEntryPoint.js
@@ -1,12 +0,0 @@
-var express = require ('express'), router = express.Router ();
-var bodyParser = require ('body-parser');
-var alexa = require ('../models/alexa');
-var verifier = require('alexa-verifier-middleware')
-
-router.use(verifier);
-
-router.post ('/', bodyParser.json (), async (req, res) => {
-  alexa.run (req, res);
-});
-
-module.exports = router;
--- a/backend/controllers/skill.js
+++ b/backend/controllers/skill.js
@@ -1,10 +1,9 @@
-let express = require ('express'), router = express.Router ();
+var express = require ('express'), router = express.Router ();
 const constants = require ('../config/constants');
-let databaseHelper = require ('../helpers/database');
-let amazonHelper = require ('../helpers/amazon');
-let skillValidator = require('../helpers/skillValidator');
-let bodyParser = require ('body-parser');
-let alexa = require ('../models/alexa');
+var databaseHelper = require ('../helpers/database');
+var amazonHelper = require ('../helpers/amazon');
+var bodyParser = require ('body-parser');
+var alexa = require ('../components/alexa');

 router.get ('/:id', async (req, res, next) => {
  const id = req.params.id;
@@ -32,20 +31,6 @@ router.put ('/:id', bodyParser.json (), async (req, res, next) => {
  delete skill.updateOnAmazon;
  delete skill._id;

-  //Validate skill
-  if (!skillValidator.validateSkill(skill)){
-    //skill not valid
-    res
-    .status (
-      constants.HTTPResultCodes.INTERNAL_SERVER_ERROR
-    )
-    .json ({
-      result: constants.apiResultCodes.INVALID_SKILL,
-      message: '',
-    });
-    return;
-  }
-
  //First get current skill from DB
  databaseHelper
    .getSkill (id)
@@ -56,7 +41,6 @@ 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 => {
@@ -65,80 +49,47 @@ router.put ('/:id', bodyParser.json (), async (req, res, next) => {
                  amazonResult === constants.amazonResultCodes.ACCEPTED
                ) {
                  res.json ({result: constants.apiResultCodes.OK, message: ''});
-                  alexa.updateModel ();
+                  alexa.updateIntentsJSON ();
                } else {
-                  //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: '',
-                        });
-                    });
+                  res.status(constants.HTTPResultCodes.INTERNAL_SERVER_ERROR).json ({
+                    result: constants.apiResultCodes.AMAZON_ERROR,
+                    message: amazonResult,
+                  });
                }
              })
              .catch (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: '',
-                      });
-                  });
+                res.status(constants.HTTPResultCodes.INTERNAL_SERVER_ERROR).json ({
+                  result: constants.apiResultCodes.AMAZON_FAIL,
+                  message: e,
+                });
              });
-          } else {
-            //No need to update on Amazon, tell to user it's ok
+          }else{
            res.json ({result: constants.apiResultCodes.OK, message: ''});
-            alexa.updateModel ();
+            alexa.updateIntentsJSON ();
          }
        })
        .catch (() => {
-          //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: '',
-          });
+          //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: '',
+              });
+            });
        });
    })
    .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: ''});
    });
 });

--- a/backend/helpers/amazon.js
+++ b/backend/helpers/amazon.js
@@ -37,22 +37,15 @@ 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);
        }
      }
@@ -63,206 +56,237 @@ var refreshTokens = function () {
 var generateInteractionModel = function (skill) {
  let result = {};
  let allIntents = [];
+  let allPrompts = [];
+  let dialogIntents = [];
+  let allTypes = [];
+
+  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});
  });

-  //Built-In like intents (Amazon built-in don't work, probably something related to existance of dialog intent
-  
-  allIntents.push ({
-    name: 'HelpIntent',
-    samples: ['Help', 'Can you help me', 'I need help'],
-    slots: [],
-  },
-  {
-    name: 'CancelIntent',
-    samples: ['Cancel', 'Stop', 'Please stop'],
-    slots: [],
-  },
-  {
-    name: 'YesIntent',
-    samples: [
-      'Yes',
-      'Yes please',
-      'I would like that',
-      'Yes I would like that',
-    ],
-    slots: [],
-  },
-  {
-    name: 'NoIntent',
-    samples: ['No', 'No thank you'],
-    slots: [],
+  allIntents.push({
+    name:'EmailIntent',
+    samples:['I would like to send a message', 'I want to send a message', 'Send a message'],
+    slots:[
+      {
+        name:'Name',
+        type:'AMAZON.US_FIRST_NAME',
+        samples:[
+          'My name is {Name}',
+          'I am {Name}',
+          '{Name}'
+        ]
+      },
+      {
+        "name": "Email",
+        "type": "emailSlot",
+        "samples": [
+          "{Email}",
+          "My email is {Email}"
+        ]
+      },
+      {
+        "name": "Message",
+        "type": "emailMessage",
+        "samples": [
+          "{Message}",
+          "My message is {Message}"
+        ]
+      }
+    ]
  });

-  //Special intent for sending message (Dialog)
+  allPrompts.push(
+    {
+      "id": "Elicit.Intent-EmailIntent.IntentSlot-Name",
+      "variations": [
+        {
+          "type": "PlainText",
+          "value": "What is your name ?"
+        }
+      ]
+    }
+  );
+
+  allPrompts.push(
+    {
+      "id": "Elicit.Intent-EmailIntent.IntentSlot-Color",
+      "variations": [
+        {
+          "type": "PlainText",
+          "value": "What is your email"
+        },
+        {
+          "type": "PlainText",
+          "value": "Tell me your email"
+        }
+      ]
+    }
+  );
+
+  allPrompts.push(
+    {
+      "id": "Elicit.Intent-EmailIntent.IntentSlot-Message",
+      "variations": [
+        {
+          "type": "PlainText",
+          "value": "What is your message ?"
+        },
+        {
+          "type": "PlainText",
+          "value": "What is the message ?"
+        }
+      ]
+    }
+  );
+
+  dialogIntents.push(
+    {
+      "name": "EmailIntent",
+      "confirmationRequired": false,
+      "prompts": {},
+      "slots": [
+        {
+          "name": "Name",
+          "type": "AMAZON.US_FIRST_NAME",
+          "elicitationRequired": true,
+          "confirmationRequired": false,
+          "prompts": {
+            "elicitation": "Elicit.Intent-EmailIntent.IntentSlot-Name"
+          }
+        },
+        {
+          "name": "Email",
+          "type": "emailSlot",
+          "elicitationRequired": true,
+          "confirmationRequired": false,
+          "prompts": {
+            "elicitation": "Elicit.Intent-EmailIntent.IntentSlot-Email"
+          }
+        },
+        {
+          "name": "Message",
+          "type": "emailMessage",
+          "elicitationRequired": true,
+          "confirmationRequired": false,
+          "prompts": {
+            "elicitation": "Elicit.Intent-EmailIntent.IntentSlot-Message"
+          }
+        }
+      ]
+    }
+  );
+
+  allTypes.push(
+    {
+      "name": "emailMessage",
+      "values": [
+        {
+          "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": []
+          }
+        }
+      ]
+    }
+  );
+
+  allTypes.push(
+    {
+      "name": "emailSlot",
+      "values": [
+        {
+          "id": null,
+          "name": {
+            "value": "blablablabla@blablabla.blabla.blabla",
+            "synonyms": []
+          }
+        }
+      ]
+    }
+  );
+
+
+
+
+  //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',
+    ],
+  });

  allIntents.push ({
-    name: 'SendMessageIntent',
-    samples: [
-      'I would like to send a message',
-      'I want to send a message',
-      'Send message',
-    ],
+    name: 'EmailIntent',
    slots: [
      {
        name: 'Name',
        type: 'AMAZON.US_FIRST_NAME',
-        samples: ['My name is {Name}', 'I am {Name}', '{Name}'],
      },
      {
        name: 'Email',
-        type: 'EmailSlot',
-        samples: ['My email is {Email}', '{Email}'],
+        type: 'AMAZON.LITERAL',
      },
      {
        name: 'Message',
-        type: 'MessageSlot',
-        samples: ['{Message}'],
+        type: 'AMAZON.LITERAL',
+      },
+      {
+        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.types = allTypes;
+  result.interactionModel.prompts = allPrompts;
  result.interactionModel.dialog = {};
  result.interactionModel.dialog.intents = dialogIntents;

@@ -270,16 +294,14 @@ var generateInteractionModel = function (skill) {
 };

 var uploadSkill = function (skill) {
-  let generatedInteractionModel = generateInteractionModel (skill);
-  console.log(skill.skillID);
  return fetch (
-    `https://api.amazonalexa.com/v1/skills/${skill.skillID}/stages/development/interactionModel/locales/en-US`,
+    `https://api.amazonalexa.com/v0/skills/${skill.skillID}/interactionModel/locales/en-US`,
    {
-      method: 'PUT',
+      method: 'POST',
      headers: {
        Authorization: config.TOKEN,
      },
-      body: generatedInteractionModel,
+      body: generateInteractionModel (skill),
    }
  );
 };
--- a/backend/helpers/email.js
+++ b/backend/helpers/email.js
@@ -1,75 +0,0 @@
-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);
-  },
-
-  sendEmail: 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);
-        }
-      });
-    });
-  },
-};
--- a/backend/helpers/externalSource.js
+++ b/backend/helpers/externalSource.js
@@ -1,112 +0,0 @@
-let request = require ('request');
-let Parser = require ('rss-parser');
-let summarizer = require ('nodejs-text-summarizer');
-var htmlToText = require ('html-to-text');
-const constants = require ('../config/constants');
-
-let parser = new Parser ();
-
-getDataFromWPJSON = function (sourceUrl, page = 1, maxPosts = 10) {
-  return new Promise ((resolve, reject) => {
-    var options = {
-      method: 'GET',
-      url: `${sourceUrl}/wp-json/wp/v2/posts`,
-      qs: {
-        page: page,
-        per_page: maxPosts,
-      },
-    };
-
-    request (options, (error, response, body) => {
-      if (error) {
-        reject (error);
-      } else {
-        resolve (JSON.parse (body));
-      }
-    });
-  });
-};
-
-summarizeText = function (text, length, clearText = true) {
-  let preparedText = text;
-  if (clearText) {
-    preparedText = htmlToText.fromString (text, {
-      wordwrap: false,
-      ignoreHref: true,
-      ignoreImage: true,
-    });
-  }
-
-  return summarizer (preparedText, {n: length});
-};
-
-getTitlesFromWP = function (sourceUrl) {
-  return new Promise ((resolve, reject) => {
-    getDataFromWPJSON (sourceUrl)
-      .then (rawData => {
-        let result = '';
-        rawData.forEach (post => {
-          result +=
-            post.title.rendered +
-            `<break time="${constants.voiceResponseTimings.PAUSE_BETWEEN_TITLES}ms"/> `;
-        });
-        resolve (result);
-      })
-      .catch (err => {
-        reject (constants.voiceResponseStrings.ERROR_FETCHING_CONTENT);
-      });
-  });
-};
-
-getLatestNewsFromWP = function (
-  sourceUrl,
-  postCount = 10,
-  includeTitle = false
-) {
-  return new Promise ((resolve, reject) => {
-    getDataFromWPJSON (sourceUrl, 1, postCount)
-      .then (rawData => {
-        let result = '';
-        let htmlToTextOptions = {
-          wordwrap: false,
-          ignoreHref: true,
-          ignoreImage: true,
-        };
-
-        try {
-          rawData.forEach (post => {
-            result += includeTitle ? post.title.rendered : '';
-            result += includeTitle
-              ? `<break time="${constants.voiceResponseTimings.PAUSE_BETWEEN_TITLE_AND_CONTENT}ms"/>`
-              : '';
-            result += summarizeText (
-              post.content.rendered,
-              constants.FIXED_SUMMARY_LENGTH
-            );
-            result += `<break time="${constants.voiceResponseTimings.PAUSE_BETWEEN_NEWS}ms"/>`;
-          });
-
-          resolve (result);
-        } catch (err) {
-          reject (constants.voiceResponseStrings.ERROR_SUMMARIZING_CONTENT);
-        }
-      })
-      .catch (err => {
-        reject (constants.voiceResponseStrings.ERROR_FETCHING_CONTENT);
-      });
-  });
-};
-
-module.exports = {
-  getAnswerFromWP: function (sourceUrl, contentType) {
-    //This function will extract needed data from JSON, which we got from getDataFromWPJSON
-    switch (contentType) {
-      case constants.contentType.TITLES:
-        return getTitlesFromWP (sourceUrl);
-        break;
-      case constants.contentType.NEWS:
-        return getLatestNewsFromWP (sourceUrl);
-        break;
-    }
-  },
-};
--- a/backend/helpers/skillValidator.js
+++ b/backend/helpers/skillValidator.js
@@ -1,107 +0,0 @@
-const constants = require ('../config/constants');
-
-validateEmail = function (email) {
-  if (email.length > constants.stringConstraints.EMAIL_MAX_LENGTH) return false;
-  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);
-};
-
-validateIntentName = function (intentName) {
-  if (
-    intentName.length < constants.stringConstraints.INTENT_NAME_MIN_LENGTH ||
-    intentName.length > constants.stringConstraints.INTENT_NAME_MAX_LENGTH
-  )
-    return false;
-  let validIntentNameRegex = /^[a-z]*$/i;
-  return validIntentNameRegex.test (intentName);
-};
-
-validateQuestion = function (question) {
-  if (
-    question.length < constants.stringConstraints.QUESTION_MIN_LENGTH ||
-    question.length > constants.stringConstraints.QUESTION_MAX_LENGTH
-  )
-    return false;
-  let validQuestionNameRegex = /^[a-z,.' ]*$/i;
-  return validQuestionNameRegex.test (question);
-};
-
-validateAnswer = function (answer, answerType) {
-  if (answerType !== constants.answerType.PREDEFINED) return true;
-  
-  if (
-    answer.length < constants.stringConstraints.ANSWER_MIN_LENGTH ||
-    answer.length > constants.stringConstraints.ANSWER_MAX_LENGTH
-  )
-    return false;
-  let validAnswerRegex = /^[a-z,.' ]*$/i;
-  return validAnswerRegex.test (answer);
-};
-
-validateExternalAnswerSource = function (externalAnswerSource, answerType){
-  // TODO: implement validation logic
-  return true;
-}
-
-validateInvocationName = function (invocationName) {
-  if (
-    invocationName.length < constants.stringConstraints.INVOCATION_NAME_MIN_LENGTH ||
-    invocationName.length > constants.stringConstraints.INVOCATION_NAME_MAX_LENGTH
-  )
-    return false;
-  let validInvocationNameRegex = /^[a-z,.' ]*$/;
-  return validInvocationNameRegex.test (invocationName);
-};
-
-validateInvocationAnswer = function (invocationAnswer) {
-  if (invocationAnswer.length > constants.stringConstraints.INVOCATION_ANSWER_MAX_LENGTH)
-    return false;
-  let validInvocationAnswerRegex = /^[a-z,.' ]*$/i;
-  return validInvocationAnswerRegex.test (invocationAnswer);
-};
-
-validateIntentExplanation = function (explanation) {
-  if (explanation.length > constants.stringConstraints.INTENT_EXPLANATION_MAX_LENGTH)
-    return false;
-  let validExplanationRegex = /^[a-z,.' ]*$/i;
-  return validExplanationRegex.test (explanation);
-};
-
-module.exports = {
-  validateSkill: function (skill) {
-    try {
-      if (
-        !validateEmail (skill.contactEmail) ||
-        !validateInvocationName (skill.invocationName) ||
-        !validateInvocationAnswer (skill.invocationAnswer)
-      )
-        return false;
-      for (let i = 0; i < skill.intents.length; i++) {
-        if (!validateIntentName (skill.intents[i].intentName)) return false;
-        if (!validateAnswer (skill.intents[i].answer, skill.intents[i].answerType)) return false;
-        if (!validateExternalAnswerSource(skill.intents[i].externalAnswerSource, skill.intents[i].answerType)) return false;
-
-        for (let j = 0; j < skill.intents.length; j++) {
-          if (i === j) continue;
-          if (skill.intents[i].intentName === skill.intents[j].intentName)
-            return false;
-        }
-
-        for (let j = 0; j < skill.intents[i].questions.length; j++) {
-          if (!validateQuestion (skill.intents[i].questions[j])) return false;
-
-          for (let k = 0; k < skill.intents[i].questions.length; k++) {
-            if (j === k) continue;
-            if (skill.intents[i].questions[j] === skill.intents[i].questions[k])
-              return false;
-          }
-        }
-      }
-
-      return true;
-    } catch (e) {
-      console.log ('Error : ' + e);
-      return false;
-    }
-  },
-};
--- a/backend/models/alexa.js
+++ b/backend/models/alexa.js
@@ -1,291 +0,0 @@
-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');
-let predefinedSourceHelper = require ('../helpers/externalSource');
-
-var handlers = {};
-var destinationEmail;
-let skillName; 
-
-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;
-        skillName = activeSkill.invocationName;
-
-        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"/>';
-          }
-        });
-        listOfPossibleQuestions +=
-          'If you dont know what to do, just say help or stop';
-
-        //Handler for launch requestconsole.log()
-        handlers = {
-          LaunchRequest: function () {
-            this.response
-              .speak (
-                activeSkill.invocationAnswer +
-                  '<break time="' +
-                  constants.voiceResponseTimings.PAUSE_AFTER_WELCOME_MESSAGE +
-                  'ms"/>' +
-                  'Would you like to hear list of questions that you can ask me'
-              )
-              .listen (constants.voiceResponseStrings.GENERIC_CONTINUE);
-            this.attributes['LaunchRequestYesNo'] = true;
-            this.emit (':responseReady');
-          },
-        };
-
-        //Handlers for user defined questions
-        activeSkill.intents.map (intent => {
-          handlers[intent.intentName] = function () {
-            if (this.attributes['LaunchRequestYesNo']) {
-              this.attributes['LaunchRequestYesNo'] = false;
-            }
-
-            let answerPromiseProps = {
-              resolve: null,
-              reject: null,
-            };
-
-            let answerPromise = new Promise ((resolve, reject) => {
-              answerPromiseProps = {
-                resolve: resolve,
-                reject: reject,
-              };
-            });
-
-            switch (intent.answerType) {
-              case constants.answerType.PREDEFINED:
-                answerPromiseProps.resolve (intent.answer);
-                break;
-              case constants.answerType.EXTERNAL_SOURCE_WP_TITLES:
-                predefinedSourceHelper
-                  .getAnswerFromWP (
-                    intent.externalAnswerSource,
-                    constants.contentType.TITLES
-                  )
-                  .then (answer => {
-                    answerPromiseProps.resolve (answer);
-                  })
-                  .catch (error => {
-                    answerPromiseProps.reject (error);
-                  });
-                break;
-              case constants.answerType.EXTERNAL_SOURCE_WP_NEWS:
-                predefinedSourceHelper
-                  .getAnswerFromWP (
-                    intent.externalAnswerSource,
-                    constants.contentType.NEWS
-                  )
-                  .then (answer => {
-                    answerPromiseProps.resolve (answer);
-                  })
-                  .catch (error => {
-                    answerPromiseProps.reject (error);
-                  });
-                break;
-            }
-
-            answerPromise
-              .then (answer => {
-                this.response
-                  .speak (answer);
-                this.emit (':responseReady');
-              })
-              .catch (error => {
-                this.response
-                  .speak (error);
-                this.emit (':responseReady');
-              });
-          };
-        });
-
-        //Handler for sending message
-        handlers.SendMessageIntent = function () {
-          if (this.attributes['LaunchRequestYesNo']) {
-            this.attributes['LaunchRequestYesNo'] = false;
-          }
-
-          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
-              .sendEmail (
-                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');
-              });
-          }
-        };
-
-        //Built-In intents
-
-        handlers.CancelIntent = function () {
-          if (this.attributes['LaunchRequestYesNo']) {
-            this.attributes['LaunchRequestYesNo'] = false;
-          }
-          this.response.speak (`Thank you for using ${skillName}`);
-          this.emit (':responseReady');
-        };
-
-        handlers.HelpIntent = function () {
-          if (this.attributes['LaunchRequestYesNo']) {
-            this.attributes['LaunchRequestYesNo'] = false;
-          }
-          this.response
-            .speak (listOfPossibleQuestions)
-            .listen (constants.voiceResponseStrings.GENERIC_CONTINUE);
-          this.emit (':responseReady');
-        };
-
-        handlers.YesIntent = function () {
-          if (this.attributes['LaunchRequestYesNo']) {
-            this.attributes['LaunchRequestYesNo'] = false;
-            this.emit ('HelpIntent');
-          } else {
-            this.response
-              .speak (constants.voiceResponseStrings.DIDNT_ASK_ANYTHING);
-            this.emit (':responseReady');
-          }
-        };
-
-        handlers.NoIntent = function () {
-          if (this.attributes['LaunchRequestYesNo']) {
-            this.attributes['LaunchRequestYesNo'] = false;
-            this.response
-              .speak ('');
-            this.emit (':responseReady');
-          } else {
-            this.response
-              .speak (constants.voiceResponseStrings.DIDNT_ASK_ANYTHING);
-            this.emit (':responseReady');
-          }
-        };
-
-        //Default handler for unknown question
-
-        handlers.Unhandled = function () {
-          this.response
-            .speak (constants.voiceResponseStrings.QUESTION_NOT_FOUND);
-          this.emit (':responseReady');
-        };
-
-        //Session handlers
-
-        handlers.SessionEndedRequest = function () {
-          this.response.speak (`Thank you for using ${skillName}`);
-          this.emit (':responseReady');
-        };
-      })
-      .catch (e => {
-        //Something is wrong, skill is not ready, use catch-all intent to inform user
-        console.log ('Error. Skill doesnt exist');
-      });
-  },
-};
--- a/backend/package-lock.json
+++ b/backend/package-lock.json
--- a/backend/package.json
+++ b/backend/package.json
@@ -1,20 +1,17 @@
 {
-  "name": "tellall",
+  "name": "example",
  "version": "1.0.0",
  "description": "",
  "main": "test.js",
  "dependencies": {
-    "alexa-sdk": "^1.0.25",
-    "alexa-verifier-middleware": "^1.0.1",
+    "alexa-app": "4.2.0",
    "body-parser": "^1.13.1",
    "ejs": "^2.5.7",
    "express": "^4.13.0",
-    "html-to-text": "^4.0.0",
    "isomorphic-fetch": "^2.2.1",
    "mongodb": "^2.2.33",
-    "nodejs-text-summarizer": "GotPPay/nodejs-text-summarizer",
-    "nodemailer": "^4.4.1",
-    "request": "^2.83.0",
-    "rss-parser": "^3.1.1"
-  }
+    "request": "^2.83.0"
+  },
+  "author": "Matt Kruse <github@mattkruse.com> (http://mattkruse.com/)",
+  "license": "MIT"
 }
--- a/backend/server.js
+++ b/backend/server.js
@@ -1,7 +1,11 @@
+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 ('./models/alexa');
+var alexa = require('./components/alexa');
+

 var MongoClient = require ('mongodb').MongoClient;
 var ObjectID = require ('mongodb').ObjectID;
@@ -9,7 +13,10 @@ var ObjectID = require ('mongodb').ObjectID;
 const router = express.Router ();
 var app = express ();

-app.set ('view engine', 'ejs'); // Should be removed
+// ALWAYS setup the alexa app and attach it to express before anything else.
+alexa.init (app);
+
+app.set ('view engine', 'ejs');
 app.use (require ('./middleware')); //common middleware for all requests
 app.use (require ('./controllers')); //all routes

@@ -19,7 +26,7 @@ MongoClient.connect (config.DB_URL)

    app.listen (config.PORT, () => {
      console.log ('Express server running on port  ' + config.PORT);
-      alexa.updateModel ();
+      alexa.updateIntentsJSON ();
      databaseHelper.loadTokens ();
    });
  })
--- a/backend/views/test.ejs
+++ b/backend/views/test.ejs
@@ -0,0 +1,10 @@
+<div style="white-space:pre;border:1px solid black;margin:5px;padding:5px;font-family:monospace;">
+Schema:
+
+<%=schema%>
+
+Utterances:
+
+<%=utterances%>
+
+</div>
--- a/web/package-lock.json
+++ b/web/package-lock.json
--- a/web/package.json
+++ b/web/package.json
@@ -4,15 +4,12 @@
  "private": true,
  "dependencies": {
    "keymaster": "^1.6.2",
-    "node-sass-chokidar": "0.0.3",
    "react": "^16.2.0",
    "react-dom": "^16.2.0",
    "react-md": "^1.2.8",
    "react-popup": "^0.9.1",
    "react-scripts": "1.0.17",
-    "webfontloader": "^1.6.28",
-    "node-sass": "^4.7.2",
-    "npm-run-all": "^4.1.2"
+    "webfontloader": "^1.6.28"
  },
  "scripts": {
    "build-css": "node-sass-chokidar --include-path ./node_modules src/ -o src/",
@@ -20,19 +17,14 @@
    "watch-css": "nodemon -e scss -x \"npm run watch-css-mine\"",
    "start-js": "react-scripts start",
    "start": "npm-run-all -p watch-css start-js",
-    "react-build": "react-scripts build",
+    "react-build" : "react-scripts build",
    "build": "npm-run-all -p build-css react-build",
    "test": "react-scripts test --env=jsdom",
    "eject": "react-scripts eject"
  },
  "devDependencies": {
-    "babel-jest": "^22.4.3",
-    "enzyme": "^3.3.0",
-    "enzyme-adapter-react-16": "^1.1.1",
-    "enzyme-to-json": "^3.3.3",
-    "jest": "^20.0.3",
-    "jest-enzyme": "^6.0.0",
+    "node-sass": "^4.7.2",
    "nodemon": "^1.12.1",
-    "react-test-renderer": "^16.3.0"
+    "npm-run-all": "^4.1.2"
  }
 }
--- a/web/src/App.js
+++ b/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,125 +6,90 @@ 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 {isEmailValid} from './lib/helpers';
+import {getSkill, updateSkill} from './lib/api'
 import {
-  NEW_INTENT_SELECTED_INDEX,
-  LAUNCH_REQUEST_SELECTED_INDEX,
-  CONTACT_SELECTED_INDEX,
-  RESULT_CODES,
-  INVOCATION_NAME_MIN_LENGTH,
-  INTENT_NAME_MIN_LENGTH,
-  QUESTION_MIN_LENGTH,
-  ANSWER_MIN_LENGTH,
-  ANSWER_TYPE,
-} 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);

-    this.state = {
-      _id: '5abd461329f85e4ec728d945',
-      skillID: '',
-      skillName: '',
-      invocationName: 'Saburly',
-      invocationAnswer: 'We are saburly',
-      allIntents: [],
-      selectedIntent: {
-        intentName: '',
-        intentExplanation: '',
-        questions: [''],
-        answer: '',
-        answerType: ANSWER_TYPE.PREDEFINED,
-        externalAnswerSource: '',
-      },
-      selectedIndex: NEW_INTENT_SELECTED_INDEX,
-      contactEmail: '',
-      waiting: false,
-    };
+  constructor(props){
+    super(props);

-    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.state={_id:'5a232fb86ce046c749739455',
+                skillID:'',
+                skillName:'',
+                invocationName:'Saburly',
+                invocationAnswer:'We are saburly', 
+                allIntents:[], 
+                selectedIntent: {intentName:'',questions:[''],answer:''}, 
+                selectedIndex:NEW_INTENT_SELECTED_INDEX, 
+                contactEmail:'',
+                waiting: false
+              };

-    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);
+    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);
  }

-  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,
@@ -132,239 +97,97 @@ class App extends Component {
      invocationName: name,
      invocationAnswer: answer,
      contactEmail: email,
-      updateOnAmazon: updateOnAmazon,
+      updateOnAmazon: updateOnAmazon
    };
  }

-  handleIntentClick (selectedIntent, index) {
-    this.setState ({
-      selectedIntent: selectedIntent,
-      selectedIndex: index,
-    });
+  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) {
-    if (name.length < INVOCATION_NAME_MIN_LENGTH) {
-      Popup.alert ('Invocation name should be at least 2 characters long');
-      return;
-    }
-
-    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) {
-    if (isEmailValid (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
-      );
-    } else {
-      Popup.alert ('Please enter valid email');
-    }
+  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) {
-    if (selectedIntent.intentName.length < INTENT_NAME_MIN_LENGTH) {
-      Popup.alert ('Question name should have at least 2 characters');
-      return;
-    }
+  
+  handleSaveIntentClick(selectedIntent){
+    let newAllIntentsJSON = JSON.stringify(this.state.allIntents);
+    let newAllIntents = JSON.parse(newAllIntentsJSON);

-    if (
-      selectedIntent.answerType === ANSWER_TYPE.PREDEFINED &&
-      selectedIntent.answer.length < ANSWER_MIN_LENGTH
-    ) {
-      Popup.alert ('Answer should have at least 2 characters');
-      return;
-    }
-
-    for (let i = 0; i < selectedIntent.questions.length; i++) {
-      if (selectedIntent.questions[i].length < QUESTION_MIN_LENGTH) {
-        Popup.alert ('Question variant should have at least 2 characters');
-        return;
-      }
-    }
-
-    //Check for same question variants and same question name in other intents
-    //all intents with the same intentName, or some of the questions are the same
-    //will be kept in filteredIntents. After filterring, there should be only one 
-    //intent left, the selected one
-    
-    let selectedIntentQuestionsForSearch = selectedIntent.questions.map(question=>
-      question.toLowerCase().trim());
-
-    let filteredIntents = this.state.allIntents.filter(intent=>{
-      let result = (selectedIntent.intentName.toLowerCase().trim() === intent.intentName.toLowerCase().trim());
-      let filteredQuestions = intent.questions.filter(question=>{
-        return (selectedIntentQuestionsForSearch.indexOf(question.toLowerCase().trim())!==-1);
-      });
-      return (result || filteredQuestions.length > 0);
-    });
-
-    if (filteredIntents.length > 1){
-      Popup.alert('Question name or question variant already exists');
-      return;
-    }
-
-    let newAllIntentsJSON = JSON.stringify (this.state.allIntents);
-    let newAllIntents = JSON.parse (newAllIntentsJSON);
-
-    let resolveState = null;
-    let rejectState = {waiting: false};
-
-    if (this.state.selectedIndex === NEW_INTENT_SELECTED_INDEX) {
+    let newState = null;
+    if (this.state.selectedIndex === NEW_INTENT_SELECTED_INDEX){
      //new intent
-      newAllIntents.push (selectedIntent);
-      resolveState = {
-        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;
-      resolveState = {
-        allIntents: newAllIntents,
-        selectedIntent: selectedIntent,
-        waiting: false,
-      };
+      newState = {allIntents: newAllIntents, selectedIntent: selectedIntent, waiting: false};
    }
-    this.setState ({waiting: true});
-    this.sendSkill (
-      newAllIntents,
-      true,
-      resolveState,
-      rejectState,
-      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: '',
-        intentExplanation: '',
-        answerType: ANSWER_TYPE.PREDEFINED,
-        externalAnswerSource: '',
-      },
-    });
+  handleAddIntentClick(){
+    this.setState({allIntents: this.state.allIntents, selectedIndex: NEW_INTENT_SELECTED_INDEX,launchRequest:false,selectedIntent: {intentName:'',questions:[''], answer:''}});
  }

-  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);
-        });
+  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);
+      });
    });
  }
 }
--- a/web/src/App.test.js
+++ b/web/src/App.test.js
@@ -0,0 +1,8 @@
+import React from 'react';
+import ReactDOM from 'react-dom';
+import App from './App';
+
+it('renders without crashing', () => {
+  const div = document.createElement('div');
+  ReactDOM.render(<App />, div);
+});
--- a/web/src/components/AnswerSource.js
+++ b/web/src/components/AnswerSource.js
@@ -1,60 +0,0 @@
-import React, {Component} from 'react';
-import {Button} from 'react-md';
-import AnswerSourceForm from './helper/AnswerSourceForm';
-import '../css/components/IntentDetails.css';
-
-class AnswerSource extends Component {
-  constructor (props) {
-    super (props);
-
-    this.state = {
-      isModalOpen: false,
-      answerType: this.props.answerType
-    };
-  }
-
-  onOpen () {
-    this.setState ({
-      isModalOpen: true,
-      answerType: this.props.answerType
-    });
-  }
-
-  onClose () {
-    this.setState ({
-      isModalOpen: false,
-    });
-  }
-
-  onSave(){
-    this.onClose();
-    this.props.onSaveAnswerType(this.state.answerType);
-  }
-
-  onSourceChange(value, event){
-    this.setState({answerType:parseInt(value,10)});
-  }
-
-  render () {
-    let modal;
-    if (this.state.isModalOpen) {
-      modal = <AnswerSourceForm 
-                isModalOpen={this.state.isModalOpen}
-                answerType={this.state.answerType}
-                onSave={this.onSave.bind(this)}
-                onClose={this.onClose.bind(this)}
-                onSourceChange={this.onSourceChange.bind(this)}
-              />
-    }
-    return (
-      <div>
-        <Button flat primary onClick={this.onOpen.bind (this)}>
-          Answer type
-        </Button>
-        {modal}
-      </div>
-    );
-  }
-}
-
-export default AnswerSource;
--- a/web/src/components/Contact.js
+++ b/web/src/components/Contact.js
@@ -40,10 +40,8 @@ class Contact extends Component {
  }

  handleEmailEdit(e){
-    const isEmailValid = e.length < EMAIL_MAX_LENGTH;
-    if (isEmailValid){
-      this.setState({contactEmail: e});
-    }
+    if (e.length === EMAIL_MAX_LENGTH) return;
+    this.setState({contactEmail: e});
  }
 }

--- a/web/src/components/IntentDetails.js
+++ b/web/src/components/IntentDetails.js
@@ -1,208 +1,115 @@
-import React, {Component} from 'react';
+import React, { Component } from 'react';
 import {Button, SVGIcon, TextField} from 'react-md';
-import AnswerSource from './AnswerSource.js';
 import '../css/components/IntentDetails.css';
-import '../css/Common.css';
-import {
-  QUESTION_MAX_LENGTH,
-  ANSWER_MAX_LENGTH,
-  INTENT_NAME_MAX_LENGTH,
-  INTENT_EXPLANATION_MAX_LENGTH,
-  ANSWER_TYPE,
-} from '../config/constants';
-import AnswerTextBox from './helper/AnswerTextBox.js';
+import {QUESTION_MAX_LENGTH, ANSWER_MAX_LENGTH, INTENT_NAME_MAX_LENGTH} from '../config/constants';

 class IntentDetails extends Component {
-  constructor (props) {
-    super (props);
+  constructor(props){
+    super(props);

-    this.state = {intent: props.selectedIntent};
+    this.state= {intent: props.selectedIntent};

-    this.addQuestion = this.addQuestion.bind (this);
-    this.deleteQuestion = this.deleteQuestion.bind (this);
-    this.handleQuestionEdit = this.handleQuestionEdit.bind (this);
-    this.handleIntentNameEdit = this.handleIntentNameEdit.bind (this);
-    this.handleIntentExplanationEdit = this.handleIntentExplanationEdit.bind (
-      this
-    );
+    this.addQuestion = this.addQuestion.bind(this);
+    this.deleteQuestion = this.deleteQuestion.bind(this);
+    this.handleQuestionEdit = this.handleQuestionEdit.bind(this);
+    this.handleAnswerEdit = this.handleAnswerEdit.bind(this);
+    this.handleIntentNameEdit = this.handleIntentNameEdit.bind(this);
  }

-  componentWillReceiveProps (props) {
-    this.setState ({intent: props.selectedIntent});
+  componentWillReceiveProps(props){
+    this.setState({intent: props.selectedIntent});
  }

-  render () {
+  render() {
    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}
            maxLength={INTENT_NAME_MAX_LENGTH}
-            value={this.state.intent.intentName}
-          />
+            value={this.state.intent.intentName} />
        </div>
        <h5 className="QuestionTitle">Question variants</h5>
-        {this.state.intent.questions.map ((question, index) => {
-          return (
-            <div key={index} className="QuestionBox">
-              <TextField
-                id="intent question"
-                lineDirection="center"
-                placeholder="Question"
-                className="md-cell md-cell--bottom IntentDetailsInputBoxes"
-                maxLength={QUESTION_MAX_LENGTH}
-                rightIcon={
-                  <SVGIcon
-                    onClick={() => {
-                      this.deleteQuestion (index);
-                    }}
-                  >
-                    {' '}
-                    <path
-                      fill="#000000"
-                      d="M19,4H15.5L14.5,3H9.5L8.5,4H5V6H19M6,19A2,2 0 0,0 8,21H16A2,2 0 0,0 18,19V7H6V19Z"
-                    />
-                    {' '}
-                  </SVGIcon>
-                }
-                onChange={e => {
-                  this.handleQuestionEdit (e, index);
-                }}
-                value={question}
-              />
-            </div>
-          );
-        })}
-        <Button
-          className="AddQuestionVariantButton"
-          icon
-          primary
-          onClick={this.addQuestion}
-          disabled={this.props.waiting}
-        >
-          add
-        </Button>
-        <AnswerSource
-          className="AnswerTypeButton"
-          onSaveAnswerType={this.handleExternalSourceSave.bind(this)}
-          answerType={this.state.intent.answerType}
-        />
-        <AnswerTextBox
-          answerType={this.state.intent.answerType}
-          externalAnswerSource={this.state.intent.externalAnswerSource}
-          handleAnswerSourceEdit={this.handleAnswerSourceEdit.bind(this)}
-          handleAnswerEdit={this.handleAnswerEdit.bind(this)}
-          answer={this.state.intent.answer}
-        />
-        <Button
-          className="IntentDetailsButton-firstInRow"
-          flat
-          primary
-          swapTheming
-          onClick={() => {
-            this.props.onSaveIntentClick (this.state.intent);
-          }}
-          disabled={this.props.waiting}
-        >
-          Save
-        </Button>
-        <Button
-          className="IntentDetailsButton"
-          flat
-          primary
-          onClick={() => {
-            this.props.onDeleteIntentClick (this.state.intent);
-          }}
-          disabled={this.props.waiting}
-        >
-          Delete
-        </Button>
-
+        {
+          this.state.intent.questions.map((question, index)=>{
+            return (
+              <div key={index} className="QuestionBox">
+                <TextField
+                  id="intent question"
+                  lineDirection="center"
+                  placeholder="Question"
+                  className="md-cell md-cell--bottom IntentDetailsInputBoxes"
+                  maxLength={QUESTION_MAX_LENGTH}
+                  rightIcon={<SVGIcon onClick={()=>{this.deleteQuestion(question)}}> <path fill="#000000" d="M19,4H15.5L14.5,3H9.5L8.5,4H5V6H19M6,19A2,2 0 0,0 8,21H16A2,2 0 0,0 18,19V7H6V19Z"/> </SVGIcon>}
+                  onChange={(e)=>{this.handleQuestionEdit(e,index)}}
+                  value={question}/>
+              </div>
+            );
+          })
+        }
+        <br></br>
+        {
+          <div className="QuestionBox">
+            <TextField
+              id="intent answer"
+              lineDirection="center"
+              label="Answer"
+              placeholder="Answer"
+              maxLength={ANSWER_MAX_LENGTH}
+              className="md-cell md-cell--bottom IntentDetailsInputBoxes"
+              onChange={this.handleAnswerEdit}
+              value={this.state.intent.answer}/>
+          </div>
+        }
+        <br></br>
+        <br></br>
+        <Button className="IntentDetailsButton" flat primary onClick={()=>{this.props.onDeleteIntentClick(this.state.intent)}} disabled={this.props.waiting}>Delete question</Button>
+        <Button className="IntentDetailsButton" flat primary swapTheming onClick={this.addQuestion} disabled={this.props.waiting}>Add variant</Button>        
+        <Button className="IntentDetailsButton" flat primary swapTheming onClick={()=>{this.props.onSaveIntentClick(this.state.intent)}} disabled={this.props.waiting}>Save</Button>
+        
      </div>
    );
  }

-  addQuestion () {
+  addQuestion(){
    let newIntent = this.state.intent;
-    newIntent.questions.push ('');
-    this.setState ({intent: newIntent});
+    newIntent.questions.push('');
+    this.setState({intent: newIntent});
  }

-  deleteQuestion (index) {
-    if (this.state.intent.questions.length > 1) {
-      let newIntent = this.state.intent;
-      if (index >= 0 && index < newIntent.questions.length) newIntent.questions.splice (index, 1);
-      this.setState ({intent: newIntent});
-    }
-  }
-
-  handleQuestionEdit (e, index) {
-    const isQuestionValid = e.length < QUESTION_MAX_LENGTH && /^[a-z,.' ]*$/i.test (e);
-    if (isQuestionValid){
-      let newIntent = this.state.intent;
-      newIntent.questions[index] = e;
-      this.setState ({intent: newIntent});
-    }
-  }
-
-  handleIntentExplanationEdit (e, index) {
-    const isExplanationValid = e.length < INTENT_EXPLANATION_MAX_LENGTH && /^[a-z,.' ]*$/i.test (e);
-    if (isExplanationValid){
-      let newIntent = this.state.intent;
-      newIntent.intentExplanation = e;
-      this.setState ({intent: newIntent});
-    }
-  }
-
-  handleAnswerEdit (e) {
-    const isAnswerValid = e.length < ANSWER_MAX_LENGTH && /^[a-z,.' ]*$/i.test (e);
-    if (isAnswerValid){
-      let newIntent = this.state.intent;
-      newIntent.answer = e;
-      this.setState ({intent: newIntent});
-    }
-  }
-
-  handleAnswerSourceEdit (e) {
-    const isAnswerSourceValid = e.length < ANSWER_MAX_LENGTH; 
-    if (isAnswerSourceValid){
-      let newIntent = this.state.intent;
-      newIntent.externalAnswerSource = e;
-      this.setState ({intent: newIntent});
-    }
-  }
-
-  handleIntentNameEdit (e) {
-    const isIntentNameValid = e.length < INTENT_NAME_MAX_LENGTH && /^[a-z]*$/i.test (e);
-    if (isIntentNameValid){
-      let newIntent = this.state.intent;
-      newIntent.intentName = e;
-      this.setState ({intent: newIntent});
-    }
-  }
-
-  handleExternalSourceSave (answerType) {
+  deleteQuestion(question){
    let newIntent = this.state.intent;
-    newIntent.answerType = answerType;
-    this.setState ({intent: newIntent});
+    let removeId = newIntent.questions.indexOf(question);
+    if (removeId !== -1)
+      newIntent.questions.splice(removeId,1);
+    
+    this.setState({intent: newIntent});
+  }
+
+  handleQuestionEdit(e,index){
+    if (e.length === QUESTION_MAX_LENGTH) return;
+    let newIntent = this.state.intent;
+    newIntent.questions[index] = e;
+    this.setState({intent: newIntent});
+  }
+
+  handleAnswerEdit(e){
+    if (e.length === ANSWER_MAX_LENGTH) return;
+    let newIntent = this.state.intent;
+    newIntent.answer = e;
+    this.setState({intent: newIntent});
+  }
+
+  handleIntentNameEdit(e){
+    if (e.length === INTENT_NAME_MAX_LENGTH) return;
+    let newIntent = this.state.intent;
+    newIntent.intentName = e;
+    this.setState({intent: newIntent});
  }
 }

--- a/web/src/components/LaunchRequest.js
+++ b/web/src/components/LaunchRequest.js
@@ -25,7 +25,7 @@ class LaunchRequest extends Component {
        <TextField
          id="invocation name"
          lineDirection="center"
-          placeholder="saburly"
+          placeholder="Saburly"
          label="Invocation name"
          className="md-cell md-cell--bottom InvocationInputBoxes"
          maxLength={INVOCATION_NAME_MAX_LENGTH}
@@ -52,17 +52,13 @@ class LaunchRequest extends Component {
  }

  handleNameEdit(e){
-    const isInvocationNameValid = e.length < INVOCATION_NAME_MAX_LENGTH && (/^[a-z,.' ]*$/.test(e));
-    if (isInvocationNameValid) { 
-      this.setState({invocationName: e});
-    }
+    if (e.length === INVOCATION_NAME_MAX_LENGTH) return;
+    this.setState({invocationName: e});
  }

  handleAnswerEdit(e){
-    const isInvocationAnswerValid = e.length < INVOCATION_ANSWER_MAX_LENGTH && (/^[a-z,.' ]*$/i.test(e));
-    if (isInvocationAnswerValid){
-      this.setState({invocationAnswer: e});
-    }
+    if (e.length === INVOCATION_ANSWER_MAX_LENGTH) return;
+    this.setState({invocationAnswer: e});
  }
 }

--- a/web/src/components/tests/AnswerSource.test.js
+++ b/web/src/components/tests/AnswerSource.test.js
@@ -1,61 +0,0 @@
-import React from 'react';
-import {Button} from 'react-md';
-import {shallow, mount} from 'enzyme';
-import AnswerSource from '../AnswerSource';
-import {ANSWER_TYPE} from '../../config/constants';
-
-it ('renders without crashing', () => {
-  shallow (<AnswerSource />);
-});
-
-describe ('functional tests', () => {
-  let wrapper;
-  beforeEach (() => {
-    const onSaveAnswerTypeFunction = jest.fn ();
-    wrapper = mount (
-      <AnswerSource onSaveAnswerType={onSaveAnswerTypeFunction} />
-    );
-    wrapper.setState ({
-      isModalOpen: false,
-      answerType: 0,
-    });
-  });
-
-  it ('snapshot', ()=>{
-    expect(wrapper).toMatchSnapshot();
-  });
-
-  it ('renders only a button', () => {
-    expect (wrapper.first ().text ()).toEqual ('Answer type');
-    expect (wrapper.find ('AnswerSourceForm').exists ()).toEqual (false);
-  });
-
-  it ('answer type button click opens modal form', () => {
-    expect (wrapper.find ('AnswerSourceFormA').exists ()).toEqual (false);
-    expect (wrapper.state ().isModalOpen).toEqual (false);
-    const AnswerTypeButton = wrapper.find ('button').first ();
-    AnswerTypeButton.simulate ('click');
-    expect (wrapper.state ().isModalOpen).toEqual (true);
-    expect (wrapper.find ('AnswerSourceForm').exists ()).toEqual (true);
-    expect (wrapper.find ('button').length).toBe (3);
-    expect (wrapper.find ('button').first ().text ()).toEqual ('Answer type');
-  });
-
-  it ('save button changes answerType value in state and closes the form ', () => {
-    const AnswerTypeButton = wrapper.find ('button').first ();
-    AnswerTypeButton.simulate ('click');
-    const saveButton = wrapper.find ('button').at (2);
-    const optionControl = wrapper.find ('SelectionControlGroup');
-    expect (saveButton.text ()).toEqual ('Save');
-    expect (optionControl.exists ()).toEqual (true);
-    optionControl.simulate ('change', {
-      target: {value: String (ANSWER_TYPE.EXTERNAL_SOURCE_WP_NEWS)},
-    });
-    saveButton.simulate ('click');
-    expect (wrapper.state ().answerType).toBe (
-      ANSWER_TYPE.EXTERNAL_SOURCE_WP_NEWS
-    );
-    expect (wrapper.state ().isModalOpen).toEqual (false);
-    expect (wrapper.find ('button').length).toBe (1);
-  });
-});
--- a/web/src/components/tests/IntentDetails.test.js
+++ b/web/src/components/tests/IntentDetails.test.js
@@ -1,318 +0,0 @@
-import React from 'react';
-import {shallow, mount} from 'enzyme';
-import IntentDetails from '../IntentDetails';
-import {
-  QUESTION_MAX_LENGTH,
-  ANSWER_MAX_LENGTH,
-  INTENT_NAME_MAX_LENGTH,
-  INTENT_EXPLANATION_MAX_LENGTH,
-  ANSWER_TYPE,
-} from '../../config/constants';
-
-it ('renders without crashing', () => {
-  const dummyIntent = {
-    questions: ['q1', 'q2'],
-  };
-  shallow (<IntentDetails selectedIntent={dummyIntent} />);
-});
-
-describe('complete testing', () => {
-
-  let wrapper;
-  let newIntent;
-  beforeEach(()=>{
-    newIntent = {
-      intentName: '',
-      intentExplanation: '',
-      questions: [''],
-      answer: '',
-      answerType: ANSWER_TYPE.PREDEFINED,
-      externalAnswerSource: '',
-    };
-  
-    wrapper = mount(<IntentDetails selectedIntent={newIntent} />);
-    expect(wrapper.state('intent')).toEqual(newIntent);
-  });
-
-  it ('snapshot', () =>{
-    expect(wrapper).toMatchSnapshot();
-  });
-
-  it ('renders correctly for new intent input when empty intent is sent', () => {
-    expect(wrapper.find('TextField').length).toBe(4);
-    expect(wrapper.find('Button').length).toBe(4);
-  
-    expect(wrapper.find('TextField').at(0).props().id).toEqual('intent explanation');
-    expect(wrapper.find('TextField').at(1).props().id).toEqual('intent name');
-    expect(wrapper.find('TextField').at(2).props().id).toEqual('intent question');
-    expect(wrapper.find('TextField').at(3).props().id).toEqual('intent answer');
-  
-    expect(wrapper.find('Button').at(0).props().children).toEqual('add');
-    expect(wrapper.find('Button').at(1).props().children).toEqual('Answer type');
-    expect(wrapper.find('Button').at(2).props().children).toEqual('Save');
-    expect(wrapper.find('Button').at(3).props().children).toEqual('Delete');
-  });
-
-  it ('receives correct props for non empty intent with predefined answer', () => {
-    newIntent = {
-      intentName: 'Dummy intent',
-      intentExplanation: 'Dummy explanation',
-      questions: ['Dummy question'],
-      answer: 'dummy answer',
-      answerType: ANSWER_TYPE.PREDEFINED,
-      externalAnswerSource: '',
-    };
-  
-    wrapper = mount(<IntentDetails selectedIntent={newIntent} />);
-    expect(wrapper.state('intent')).toEqual(newIntent);
-  });
-
-  it ('receives correct props for non empty intent with external source for answer', () => {
-    newIntent = {
-      intentName: 'Dummy intent',
-      intentExplanation: 'Dummy explanation',
-      questions: ['Dummy question'],
-      answer: '',
-      answerType: ANSWER_TYPE.EXTERNAL_SOURCE_WP_NEWS,
-      externalAnswerSource: 'http://sarajevotimes.com',
-    };
-  
-    wrapper = mount(<IntentDetails selectedIntent={newIntent} />);
-    expect(wrapper.state('intent')).toEqual(newIntent);
-  });
-
-  it ('adds text field when add button is clicked', () => {
-    const addButton = wrapper.find('button').at(0);
-    addButton.simulate('click');
-    expect(wrapper.find('TextField').length).toBe(5);
-    addButton.simulate('click');
-    expect(wrapper.find('TextField').length).toBe(6);
-    
-    expect(wrapper.find('TextField').at(0).props().id).toEqual('intent explanation');
-    expect(wrapper.find('TextField').at(1).props().id).toEqual('intent name');
-    expect(wrapper.find('TextField').at(2).props().id).toEqual('intent question');
-    expect(wrapper.find('TextField').at(3).props().id).toEqual('intent question');
-    expect(wrapper.find('TextField').at(4).props().id).toEqual('intent question');
-    expect(wrapper.find('TextField').at(5).props().id).toEqual('intent answer');
-
-    expect(wrapper.state('intent').questions.length).toBe(3);
-    
-  });
-
-  it ('removes correct text field when delete button on text field is clicked', () => {
-    const addButton = wrapper.find('button').at(0);
-    addButton.simulate('click');
-    addButton.simulate('click');
-    
-    let firstQuestionTextField = wrapper.find('TextField').at(2);
-    let secondQuestionTextField = wrapper.find('TextField').at(3);
-    let thirdQuestionTextField = wrapper.find('TextField').at(4);
-
-    firstQuestionTextField.instance().props.onChange('first question');
-    secondQuestionTextField.instance().props.onChange('second question');
-    thirdQuestionTextField.instance().props.onChange('third question');
-    
-    expect(firstQuestionTextField.instance().value).toEqual('first question');
-    expect(secondQuestionTextField.instance().value).toEqual('second question');
-    expect(thirdQuestionTextField.instance().value).toEqual('third question');
-    expect(wrapper.state('intent').questions.length).toBe(3);
-
-    const rightIcon = secondQuestionTextField.props().rightIcon;
-    rightIcon.props.onClick(secondQuestionTextField.props().key);
-    
-    expect(wrapper.state('intent').questions.length).toBe(2);
-    expect(secondQuestionTextField.instance().value).toEqual('third question');
-    expect(thirdQuestionTextField.instance()._field._field).toBeNull();
-  });
-
-  it ('does not remove text field when it is only one left', () => {
-    let firstQuestionTextField = wrapper.find('TextField').at(2);
-
-    firstQuestionTextField.instance().props.onChange('first question');
-    
-    expect(firstQuestionTextField.props().id).toEqual('intent question');
-    expect(wrapper.state('intent').questions.length).toBe(1);
-    
-    const rightIcon = firstQuestionTextField.props().rightIcon;
-    rightIcon.props.onClick(firstQuestionTextField.props().key);
-
-    expect(wrapper.state('intent').questions.length).toBe(1);
-    expect(firstQuestionTextField.instance().value).toEqual('first question');
-  });
-
-  it ('accepts text without special characters for intent explanation', () => {
-    let explanationTextField = wrapper.find('TextField').at(0);
-    let validExplanationText = 'to get latest news, say ';
-    explanationTextField.instance().props.onChange(validExplanationText);
-    expect(wrapper.state('intent').intentExplanation).toEqual(validExplanationText);
-    expect(explanationTextField.instance().value).toEqual(validExplanationText);
-  });
-
-  it ('does not accept text with special characters for intent explanation', () => {
-    let explanationTextField = wrapper.find('TextField').at(0);
-    let invalidExplanationText = '554to get latest news, say #$ ';
-    explanationTextField.instance().props.onChange(invalidExplanationText);
-    expect(wrapper.state('intent').intentExplanation).toEqual('');
-    expect(explanationTextField.instance().value).toEqual('');
-  });
-
-  it ('does not accept too long text for intent explanation', () => {
-    let explanationTextField = wrapper.find('TextField').at(0);
-    let invalidExplanationText = new Array(INTENT_EXPLANATION_MAX_LENGTH + 10).join('A');
-    explanationTextField.instance().props.onChange(invalidExplanationText);
-    expect(wrapper.state('intent').intentExplanation).toEqual('');
-    expect(explanationTextField.instance().value).toEqual('');
-  });
-
-  it ('accepts text without special characters for intent name', () => {
-    let intentNameTextField = wrapper.find('TextField').at(1);
-    let validIntentNameText = 'intentName';
-    intentNameTextField.instance().props.onChange(validIntentNameText);
-    expect(wrapper.state('intent').intentName).toEqual(validIntentNameText);
-    expect(intentNameTextField.instance().value).toEqual(validIntentNameText);
-  });
-
-  it ('does not accept text with speces characters for intent name', () => {
-    let intentNameTextField = wrapper.find('TextField').at(1);
-    let invalidIntentNameText = 'intentName with space';
-    intentNameTextField.instance().props.onChange(invalidIntentNameText);
-    expect(wrapper.state('intent').intentName).toEqual('');
-    expect(intentNameTextField.instance().value).toEqual('');
-  });
-
-  it ('does not accept text with special characters for intent name', () => {
-    let intentNameTextField = wrapper.find('TextField').at(1);
-    let invalidIntentNameText = 'intentName23!';
-    intentNameTextField.instance().props.onChange(invalidIntentNameText);
-    expect(wrapper.state('intent').intentName).toEqual('');
-    expect(intentNameTextField.instance().value).toEqual('');
-  });
-
-  it ('does not accept too long text for intent name', () => {
-    let intentNameTextField = wrapper.find('TextField').at(1);
-    let invalidIntentNameText = new Array(INTENT_NAME_MAX_LENGTH + 10).join('A');
-    intentNameTextField.instance().props.onChange(invalidIntentNameText);
-    expect(wrapper.state('intent').intentName).toEqual('');
-    expect(intentNameTextField.instance().value).toEqual('');
-  });
-
-  it ('accepts text without special characters for question text', () => {
-    let questionTextField = wrapper.find('TextField').at(2);
-    let validQuestionText = 'read me latest news'
-    questionTextField.instance().props.onChange(validQuestionText);
-    expect(wrapper.state('intent').questions).toEqual([validQuestionText]);
-    expect(questionTextField.instance().value).toEqual(validQuestionText);
-  });
-
-  it ('does not accept text with special characters for question text', () => {
-    let questionTextField = wrapper.find('TextField').at(2);
-    let invalidQuestionText = 'read m3 1at35t news #'
-    questionTextField.instance().props.onChange(invalidQuestionText);
-    expect(wrapper.state('intent').questions).toEqual(['']);
-    expect(questionTextField.instance().value).toEqual('');
-  });
-
-  it ('does not accept too long text for question text', () => {
-    let questionTextField = wrapper.find('TextField').at(2);
-    let invalidQuestionText = new Array(QUESTION_MAX_LENGTH + 10).join('A');
-    questionTextField.instance().props.onChange(invalidQuestionText);
-    expect(wrapper.state('intent').questions).toEqual(['']);
-    expect(questionTextField.instance().value).toEqual('');
-  });
-
-  it ('accepts text without special characters for answer text', () => {
-    let answerTextField = wrapper.find('TextField').at(3);
-    let validAnswerText = 'this is valid answer.'
-    answerTextField.instance().props.onChange(validAnswerText);
-    expect(wrapper.state('intent').answer).toEqual(validAnswerText);
-    expect(answerTextField.instance().value).toEqual(validAnswerText);
-  });
-
-  it ('does not accept text with special characters for answer text', () => {
-    let answerTextField = wrapper.find('TextField').at(3);
-    let invalidAnswerText = 'this is invalid answer.0123'
-    answerTextField.instance().props.onChange(invalidAnswerText);
-    expect(wrapper.state('intent').answer).toEqual('');
-    expect(answerTextField.instance().value).toEqual('');
-  });
-
-  it ('does not accept too long text for answer text', () => {
-    let answerTextField = wrapper.find('TextField').at(3);
-    let invalidAnswerText = new Array(ANSWER_MAX_LENGTH + 10).join('A');
-    answerTextField.instance().props.onChange(invalidAnswerText);
-    expect(wrapper.state('intent').answer).toEqual('');
-    expect(answerTextField.instance().value).toEqual('');
-  });
-
-  it ('accepts text for external source as answer', () => {
-    newIntent = {
-      intentName: '',
-      intentExplanation: '',
-      questions: [''],
-      answer: '',
-      answerType: ANSWER_TYPE.EXTERNAL_SOURCE_WP_NEWS,
-      externalAnswerSource: '',
-    };
-  
-    wrapper = mount(<IntentDetails selectedIntent={newIntent} />);
-
-    let answerTextField = wrapper.find('TextField').at(3);
-    let validAnswerText = 'http://sarajevotimes.com'
-    answerTextField.instance().props.onChange(validAnswerText);
-    expect(wrapper.state('intent').externalAnswerSource).toEqual(validAnswerText);
-    expect(answerTextField.instance().value).toEqual(validAnswerText);
-  });
-
-  it ('does not accept too long text for external source as answer', () => {
-    newIntent = {
-      intentName: '',
-      intentExplanation: '',
-      questions: [''],
-      answer: '',
-      answerType: ANSWER_TYPE.EXTERNAL_SOURCE_WP_NEWS,
-      externalAnswerSource: '',
-    };
-  
-    wrapper = mount(<IntentDetails selectedIntent={newIntent} />);
-    
-    let answerTextField = wrapper.find('TextField').at(3);
-    let invalidAnswerText = new Array(ANSWER_MAX_LENGTH + 10).join('A');
-    answerTextField.instance().props.onChange(invalidAnswerText);
-    expect(wrapper.state('intent').answer).toEqual('');
-    expect(answerTextField.instance().value).toEqual('');
-  });
-
-  it ('calls function with correct data on save button click', () => {
-    newIntent = {
-      intentName: 'Dummy intent',
-      intentExplanation: 'Dummy explanation',
-      questions: ['Dummy question'],
-      answer: 'Dummy answer',
-      answerType: ANSWER_TYPE.PREDEFINED,
-      externalAnswerSource: '',
-    };
-    const onSaveFunction = jest.fn();
-  
-    wrapper = mount(<IntentDetails selectedIntent={newIntent} onSaveIntentClick={onSaveFunction} />);
-    wrapper.find('Button').at(2).simulate('click');
-    expect(onSaveFunction).toBeCalledWith(newIntent);
-  });
-
-  it ('calls function with correct data on delete button click', () => {
-    newIntent = {
-      intentName: 'Dummy intent',
-      intentExplanation: 'Dummy explanation',
-      questions: ['Dummy question'],
-      answer: 'Dummy answer',
-      answerType: ANSWER_TYPE.PREDEFINED,
-      externalAnswerSource: '',
-    };
-    const onSaveFunction = jest.fn();
-  
-    wrapper = mount(<IntentDetails selectedIntent={newIntent} onDeleteIntentClick={onSaveFunction} />);
-    wrapper.find('Button').at(3).simulate('click');
-    expect(onSaveFunction).toBeCalledWith(newIntent);
-  });
-
-  
-});
--- a/web/src/components/tests/snapshots/AnswerSource.test.js.snap
+++ b/web/src/components/tests/snapshots/AnswerSource.test.js.snap
@@ -1,93 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`functional tests snapshot 1`] = `
-<AnswerSource
-  onSaveAnswerType={[Function]}
->
-  <div>
-    <withInk(withTooltip(Button))
-      flat={true}
-      inkTransitionEnterTimeout={450}
-      inkTransitionLeaveTimeout={300}
-      inkTransitionOverlap={150}
-      onClick={[Function]}
-      primary={true}
-    >
-      <withTooltip(Button)
-        flat={true}
-        ink={
-          <InkContainer
-            className={undefined}
-            disabledInteractions={undefined}
-            inkClassName={undefined}
-            inkStyle={undefined}
-            pulse={undefined}
-            style={undefined}
-            transitionEnterTimeout={450}
-            transitionLeaveTimeout={300}
-            transitionOverlap={150}
-            waitForInkTransition={undefined}
-          />
-        }
-        onClick={[Function]}
-        primary={true}
-      >
-        <Button
-          fixedPosition="br"
-          flat={true}
-          iconBefore={true}
-          ink={
-            <InkContainer
-              className={undefined}
-              disabledInteractions={undefined}
-              inkClassName={undefined}
-              inkStyle={undefined}
-              pulse={undefined}
-              style={undefined}
-              transitionEnterTimeout={450}
-              transitionLeaveTimeout={300}
-              transitionOverlap={150}
-              waitForInkTransition={undefined}
-            />
-          }
-          onClick={[Function]}
-          primary={true}
-          type="button"
-        >
-          <button
-            className="md-btn md-btn--flat md-btn--text md-pointer--hover md-text--theme-primary md-ink--primary md-inline-block"
-            onClick={[Function]}
-            onKeyDown={[Function]}
-            onKeyUp={[Function]}
-            onMouseDown={[Function]}
-            onMouseEnter={[Function]}
-            onMouseLeave={[Function]}
-            onMouseUp={[Function]}
-            onTouchEnd={[Function]}
-            onTouchStart={[Function]}
-            type="button"
-          >
-            <InkContainer
-              key="ink-container"
-              transitionEnterTimeout={450}
-              transitionLeaveTimeout={300}
-              transitionOverlap={150}
-            >
-              <TransitionGroup
-                childFactory={[Function]}
-                className="md-ink-container"
-                component="div"
-              >
-                <div
-                  className="md-ink-container"
-                />
-              </TransitionGroup>
-            </InkContainer>
-            Answer type
-          </button>
-        </Button>
-      </withTooltip(Button)>
-    </withInk(withTooltip(Button))>
-  </div>
-</AnswerSource>
-`;
--- a/web/src/components/tests/snapshots/IntentDetails.test.js.snap
+++ b/web/src/components/tests/snapshots/IntentDetails.test.js.snap
@@ -1,898 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`complete testing snapshot 1`] = `
-<IntentDetails
-  selectedIntent={
-    Object {
-      "answer": "",
-      "answerType": 0,
-      "externalAnswerSource": "",
-      "intentExplanation": "",
-      "intentName": "",
-      "questions": Array [
-        "",
-      ],
-    }
-  }
->
-  <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
-        className="md-cell md-cell--bottom IntentDetailsInputBoxes"
-        fullWidth={true}
-        id="intent explanation"
-        leftIconStateful={true}
-        lineDirection="center"
-        maxLength={70}
-        onChange={[Function]}
-        passwordIcon={
-          <FontIcon
-            iconClassName="material-icons"
-          >
-            remove_red_eye
-          </FontIcon>
-        }
-        placeholder="To ask us about our services, say "
-        rightIconStateful={true}
-        type="text"
-        value=""
-      >
-        <div
-          className="md-text-field-container md-full-width md-text-field-container--input md-cell md-cell--bottom IntentDetailsInputBoxes"
-          onClick={[Function]}
-        >
-          <FloatingLabel
-            active={false}
-            error={false}
-            floating={false}
-            htmlFor="intent explanation"
-            iconOffset={false}
-            key="label"
-          />
-          <InputField
-            className=""
-            fullWidth={true}
-            id="intent explanation"
-            inlineIndicator={false}
-            key="field"
-            onBlur={[Function]}
-            onChange={[Function]}
-            onFocus={[Function]}
-            placeholder="To ask us about our services, say "
-            type="text"
-            value=""
-          >
-            <input
-              className="md-text-field md-text-field--margin md-full-width md-text"
-              id="intent explanation"
-              onBlur={[Function]}
-              onChange={[Function]}
-              onFocus={[Function]}
-              placeholder="To ask us about our services, say "
-              type="text"
-              value=""
-            />
-          </InputField>
-          <TextFieldDivider
-            active={false}
-            error={false}
-            key="text-divider"
-            lineDirection="center"
-          >
-            <Divider
-              className="md-divider--text-field md-divider--expand-from-center"
-            >
-              <hr
-                className="md-divider md-divider--text-field md-divider--expand-from-center"
-              />
-            </Divider>
-          </TextFieldDivider>
-          <TextFieldMessage
-            active={false}
-            currentLength={0}
-            error={false}
-            key="message"
-            leftIcon={false}
-            maxLength={70}
-            rightIcon={false}
-          >
-            <div
-              className="md-text-field-message-container md-text-field-message-container--count-only md-full-width md-text--disabled"
-            >
-              <Message
-                active={false}
-                key="message"
-              />
-              <Message
-                active={false}
-                className="md-text-field-message--counter"
-                key="counter"
-              >
-                <div
-                  aria-hidden={true}
-                  className="md-text-field-message md-text-field-message--inactive md-text-field-message--counter"
-                >
-                  0 / 70
-                </div>
-              </Message>
-            </div>
-          </TextFieldMessage>
-        </div>
-      </TextField>
-      <br />
-      <TextField
-        className="md-cell md-cell--bottom IntentDetailsInputBoxes"
-        fullWidth={true}
-        id="intent name"
-        label="Question name"
-        leftIconStateful={true}
-        lineDirection="center"
-        maxLength={30}
-        onChange={[Function]}
-        passwordIcon={
-          <FontIcon
-            iconClassName="material-icons"
-          >
-            remove_red_eye
-          </FontIcon>
-        }
-        rightIconStateful={true}
-        type="text"
-        value=""
-      >
-        <div
-          className="md-text-field-container md-full-width md-text-field-container--input md-cell md-cell--bottom IntentDetailsInputBoxes"
-          onClick={[Function]}
-        >
-          <FloatingLabel
-            active={false}
-            error={false}
-            floating={false}
-            htmlFor="intent name"
-            iconOffset={false}
-            key="label"
-            label="Question name"
-          >
-            <label
-              className="md-floating-label md-floating-label--inactive md-floating-label--inactive-sized md-text--secondary"
-              htmlFor="intent name"
-            >
-              Question name
-            </label>
-          </FloatingLabel>
-          <InputField
-            className=""
-            fullWidth={true}
-            id="intent name"
-            inlineIndicator={false}
-            key="field"
-            label="Question name"
-            onBlur={[Function]}
-            onChange={[Function]}
-            onFocus={[Function]}
-            placeholder={null}
-            type="text"
-            value=""
-          >
-            <input
-              className="md-text-field md-text-field--floating-margin md-full-width md-text"
-              id="intent name"
-              onBlur={[Function]}
-              onChange={[Function]}
-              onFocus={[Function]}
-              placeholder={null}
-              type="text"
-              value=""
-            />
-          </InputField>
-          <TextFieldDivider
-            active={false}
-            error={false}
-            key="text-divider"
-            lineDirection="center"
-          >
-            <Divider
-              className="md-divider--text-field md-divider--expand-from-center"
-            >
-              <hr
-                className="md-divider md-divider--text-field md-divider--expand-from-center"
-              />
-            </Divider>
-          </TextFieldDivider>
-          <TextFieldMessage
-            active={false}
-            currentLength={0}
-            error={false}
-            key="message"
-            leftIcon={false}
-            maxLength={30}
-            rightIcon={false}
-          >
-            <div
-              className="md-text-field-message-container md-text-field-message-container--count-only md-full-width md-text--disabled"
-            >
-              <Message
-                active={false}
-                key="message"
-              />
-              <Message
-                active={false}
-                className="md-text-field-message--counter"
-                key="counter"
-              >
-                <div
-                  aria-hidden={true}
-                  className="md-text-field-message md-text-field-message--inactive md-text-field-message--counter"
-                >
-                  0 / 30
-                </div>
-              </Message>
-            </div>
-          </TextFieldMessage>
-        </div>
-      </TextField>
-    </div>
-    <h5
-      className="QuestionTitle"
-    >
-      Question variants
-    </h5>
-    <div
-      className="QuestionBox"
-      key="0"
-    >
-      <TextField
-        className="md-cell md-cell--bottom IntentDetailsInputBoxes"
-        fullWidth={true}
-        id="intent question"
-        leftIconStateful={true}
-        lineDirection="center"
-        maxLength={150}
-        onChange={[Function]}
-        passwordIcon={
-          <FontIcon
-            iconClassName="material-icons"
-          >
-            remove_red_eye
-          </FontIcon>
-        }
-        placeholder="Question"
-        rightIcon={
-          <SVGIcon
-            focusable="false"
-            onClick={[Function]}
-            role="img"
-            viewBox="0 0 24 24"
-            xmlns="http://www.w3.org/2000/svg"
-          >
-             
-            <path
-              d="M19,4H15.5L14.5,3H9.5L8.5,4H5V6H19M6,19A2,2 0 0,0 8,21H16A2,2 0 0,0 18,19V7H6V19Z"
-              fill="#000000"
-            />
-             
-          </SVGIcon>
-        }
-        rightIconStateful={true}
-        type="text"
-        value=""
-      >
-        <div
-          className="md-text-field-container md-full-width md-text-field-container--input md-cell md-cell--bottom IntentDetailsInputBoxes"
-          onClick={[Function]}
-        >
-          <FloatingLabel
-            active={false}
-            error={false}
-            floating={false}
-            htmlFor="intent question"
-            iconOffset={false}
-            key="label"
-          />
-          <div
-            className="md-text-field-icon-container"
-            key="icon-divider"
-          >
-            <div
-              className="md-text-field-divider-container md-text-field-divider-container--grow"
-              key="divider-container"
-            >
-              <InputField
-                className=""
-                fullWidth={true}
-                id="intent question"
-                inlineIndicator={false}
-                key="field"
-                onBlur={[Function]}
-                onChange={[Function]}
-                onFocus={[Function]}
-                placeholder="Question"
-                type="text"
-                value=""
-              >
-                <input
-                  className="md-text-field md-text-field--margin md-full-width md-text"
-                  id="intent question"
-                  onBlur={[Function]}
-                  onChange={[Function]}
-                  onFocus={[Function]}
-                  placeholder="Question"
-                  type="text"
-                  value=""
-                />
-              </InputField>
-              <TextFieldDivider
-                active={false}
-                error={false}
-                key="text-divider"
-                lineDirection="center"
-              >
-                <Divider
-                  className="md-divider--text-field md-divider--expand-from-center"
-                >
-                  <hr
-                    className="md-divider md-divider--text-field md-divider--expand-from-center"
-                  />
-                </Divider>
-              </TextFieldDivider>
-            </div>
-            <SVGIcon
-              className="md-text-field-icon md-text-field-icon--positioned"
-              error={false}
-              focusable="false"
-              key="icon-right"
-              onClick={[Function]}
-              primary={false}
-              role="img"
-              viewBox="0 0 24 24"
-              xmlns="http://www.w3.org/2000/svg"
-            >
-              <svg
-                aria-labelledby={null}
-                className="md-icon md-text-field-icon md-text-field-icon--positioned"
-                focusable="false"
-                onClick={[Function]}
-                role="img"
-                viewBox="0 0 24 24"
-                xmlns="http://www.w3.org/2000/svg"
-              >
-                 
-                <path
-                  d="M19,4H15.5L14.5,3H9.5L8.5,4H5V6H19M6,19A2,2 0 0,0 8,21H16A2,2 0 0,0 18,19V7H6V19Z"
-                  fill="#000000"
-                />
-                 
-              </svg>
-            </SVGIcon>
-          </div>
-          <TextFieldMessage
-            active={false}
-            currentLength={0}
-            error={false}
-            key="message"
-            leftIcon={false}
-            maxLength={150}
-            rightIcon={true}
-          >
-            <div
-              className="md-text-field-message-container md-text-field-message-container--count-only md-text-field-message-container--right-icon-offset md-full-width md-text--disabled"
-            >
-              <Message
-                active={false}
-                key="message"
-              />
-              <Message
-                active={false}
-                className="md-text-field-message--counter"
-                key="counter"
-              >
-                <div
-                  aria-hidden={true}
-                  className="md-text-field-message md-text-field-message--inactive md-text-field-message--counter"
-                >
-                  0 / 150
-                </div>
-              </Message>
-            </div>
-          </TextFieldMessage>
-        </div>
-      </TextField>
-    </div>
-    <withInk(withTooltip(Button))
-      className="AddQuestionVariantButton"
-      icon={true}
-      inkTransitionEnterTimeout={450}
-      inkTransitionLeaveTimeout={300}
-      inkTransitionOverlap={150}
-      onClick={[Function]}
-      primary={true}
-    >
-      <withTooltip(Button)
-        className="AddQuestionVariantButton"
-        icon={true}
-        ink={
-          <InkContainer
-            className={undefined}
-            disabledInteractions={undefined}
-            inkClassName={undefined}
-            inkStyle={undefined}
-            pulse={undefined}
-            style={undefined}
-            transitionEnterTimeout={450}
-            transitionLeaveTimeout={300}
-            transitionOverlap={150}
-            waitForInkTransition={undefined}
-          />
-        }
-        onClick={[Function]}
-        primary={true}
-      >
-        <Button
-          className="AddQuestionVariantButton"
-          fixedPosition="br"
-          icon={true}
-          iconBefore={true}
-          ink={
-            <InkContainer
-              className={undefined}
-              disabledInteractions={undefined}
-              inkClassName={undefined}
-              inkStyle={undefined}
-              pulse={undefined}
-              style={undefined}
-              transitionEnterTimeout={450}
-              transitionLeaveTimeout={300}
-              transitionOverlap={150}
-              waitForInkTransition={undefined}
-            />
-          }
-          onClick={[Function]}
-          primary={true}
-          type="button"
-        >
-          <button
-            className="md-btn md-btn--icon md-pointer--hover md-text--theme-primary md-ink--primary md-inline-block AddQuestionVariantButton"
-            onClick={[Function]}
-            onKeyDown={[Function]}
-            onKeyUp={[Function]}
-            onMouseDown={[Function]}
-            onMouseEnter={[Function]}
-            onMouseLeave={[Function]}
-            onMouseUp={[Function]}
-            onTouchEnd={[Function]}
-            onTouchStart={[Function]}
-            type="button"
-          >
-            <InkContainer
-              key="ink-container"
-              transitionEnterTimeout={450}
-              transitionLeaveTimeout={300}
-              transitionOverlap={150}
-            >
-              <TransitionGroup
-                childFactory={[Function]}
-                className="md-ink-container"
-                component="div"
-              >
-                <div
-                  className="md-ink-container"
-                />
-              </TransitionGroup>
-            </InkContainer>
-            <FontIcon
-              iconClassName="material-icons"
-              inherit={true}
-            >
-              <i
-                className="md-icon material-icons md-text--inherit"
-              >
-                add
-              </i>
-            </FontIcon>
-          </button>
-        </Button>
-      </withTooltip(Button)>
-    </withInk(withTooltip(Button))>
-    <AnswerSource
-      answerType={0}
-      className="AnswerTypeButton"
-      onSaveAnswerType={[Function]}
-    >
-      <div>
-        <withInk(withTooltip(Button))
-          flat={true}
-          inkTransitionEnterTimeout={450}
-          inkTransitionLeaveTimeout={300}
-          inkTransitionOverlap={150}
-          onClick={[Function]}
-          primary={true}
-        >
-          <withTooltip(Button)
-            flat={true}
-            ink={
-              <InkContainer
-                className={undefined}
-                disabledInteractions={undefined}
-                inkClassName={undefined}
-                inkStyle={undefined}
-                pulse={undefined}
-                style={undefined}
-                transitionEnterTimeout={450}
-                transitionLeaveTimeout={300}
-                transitionOverlap={150}
-                waitForInkTransition={undefined}
-              />
-            }
-            onClick={[Function]}
-            primary={true}
-          >
-            <Button
-              fixedPosition="br"
-              flat={true}
-              iconBefore={true}
-              ink={
-                <InkContainer
-                  className={undefined}
-                  disabledInteractions={undefined}
-                  inkClassName={undefined}
-                  inkStyle={undefined}
-                  pulse={undefined}
-                  style={undefined}
-                  transitionEnterTimeout={450}
-                  transitionLeaveTimeout={300}
-                  transitionOverlap={150}
-                  waitForInkTransition={undefined}
-                />
-              }
-              onClick={[Function]}
-              primary={true}
-              type="button"
-            >
-              <button
-                className="md-btn md-btn--flat md-btn--text md-pointer--hover md-text--theme-primary md-ink--primary md-inline-block"
-                onClick={[Function]}
-                onKeyDown={[Function]}
-                onKeyUp={[Function]}
-                onMouseDown={[Function]}
-                onMouseEnter={[Function]}
-                onMouseLeave={[Function]}
-                onMouseUp={[Function]}
-                onTouchEnd={[Function]}
-                onTouchStart={[Function]}
-                type="button"
-              >
-                <InkContainer
-                  key="ink-container"
-                  transitionEnterTimeout={450}
-                  transitionLeaveTimeout={300}
-                  transitionOverlap={150}
-                >
-                  <TransitionGroup
-                    childFactory={[Function]}
-                    className="md-ink-container"
-                    component="div"
-                  >
-                    <div
-                      className="md-ink-container"
-                    />
-                  </TransitionGroup>
-                </InkContainer>
-                Answer type
-              </button>
-            </Button>
-          </withTooltip(Button)>
-        </withInk(withTooltip(Button))>
-      </div>
-    </AnswerSource>
-    <AnswerTextBox
-      answer=""
-      answerType={0}
-      externalAnswerSource=""
-      handleAnswerEdit={[Function]}
-      handleAnswerSourceEdit={[Function]}
-    >
-      <div
-        className="QuestionBox"
-      >
-        <TextField
-          className="md-cell md-cell--bottom IntentDetailsInputBoxes"
-          fullWidth={true}
-          id="intent answer"
-          label="Answer"
-          leftIconStateful={true}
-          lineDirection="center"
-          maxLength={150}
-          onChange={[Function]}
-          passwordIcon={
-            <FontIcon
-              iconClassName="material-icons"
-            >
-              remove_red_eye
-            </FontIcon>
-          }
-          placeholder="Answer"
-          rightIconStateful={true}
-          type="text"
-          value=""
-        >
-          <div
-            className="md-text-field-container md-full-width md-text-field-container--input md-cell md-cell--bottom IntentDetailsInputBoxes"
-            onClick={[Function]}
-          >
-            <FloatingLabel
-              active={false}
-              error={false}
-              floating={false}
-              htmlFor="intent answer"
-              iconOffset={false}
-              key="label"
-              label="Answer"
-            >
-              <label
-                className="md-floating-label md-floating-label--inactive md-floating-label--inactive-sized md-text--secondary"
-                htmlFor="intent answer"
-              >
-                Answer
-              </label>
-            </FloatingLabel>
-            <InputField
-              className=""
-              fullWidth={true}
-              id="intent answer"
-              inlineIndicator={false}
-              key="field"
-              label="Answer"
-              onBlur={[Function]}
-              onChange={[Function]}
-              onFocus={[Function]}
-              placeholder={null}
-              type="text"
-              value=""
-            >
-              <input
-                className="md-text-field md-text-field--floating-margin md-full-width md-text"
-                id="intent answer"
-                onBlur={[Function]}
-                onChange={[Function]}
-                onFocus={[Function]}
-                placeholder={null}
-                type="text"
-                value=""
-              />
-            </InputField>
-            <TextFieldDivider
-              active={false}
-              error={false}
-              key="text-divider"
-              lineDirection="center"
-            >
-              <Divider
-                className="md-divider--text-field md-divider--expand-from-center"
-              >
-                <hr
-                  className="md-divider md-divider--text-field md-divider--expand-from-center"
-                />
-              </Divider>
-            </TextFieldDivider>
-            <TextFieldMessage
-              active={false}
-              currentLength={0}
-              error={false}
-              key="message"
-              leftIcon={false}
-              maxLength={150}
-              rightIcon={false}
-            >
-              <div
-                className="md-text-field-message-container md-text-field-message-container--count-only md-full-width md-text--disabled"
-              >
-                <Message
-                  active={false}
-                  key="message"
-                />
-                <Message
-                  active={false}
-                  className="md-text-field-message--counter"
-                  key="counter"
-                >
-                  <div
-                    aria-hidden={true}
-                    className="md-text-field-message md-text-field-message--inactive md-text-field-message--counter"
-                  >
-                    0 / 150
-                  </div>
-                </Message>
-              </div>
-            </TextFieldMessage>
-          </div>
-        </TextField>
-      </div>
-    </AnswerTextBox>
-    <withInk(withTooltip(Button))
-      className="IntentDetailsButton-firstInRow"
-      flat={true}
-      inkTransitionEnterTimeout={450}
-      inkTransitionLeaveTimeout={300}
-      inkTransitionOverlap={150}
-      onClick={[Function]}
-      primary={true}
-      swapTheming={true}
-    >
-      <withTooltip(Button)
-        className="IntentDetailsButton-firstInRow"
-        flat={true}
-        ink={
-          <InkContainer
-            className={undefined}
-            disabledInteractions={undefined}
-            inkClassName={undefined}
-            inkStyle={undefined}
-            pulse={undefined}
-            style={undefined}
-            transitionEnterTimeout={450}
-            transitionLeaveTimeout={300}
-            transitionOverlap={150}
-            waitForInkTransition={undefined}
-          />
-        }
-        onClick={[Function]}
-        primary={true}
-        swapTheming={true}
-      >
-        <Button
-          className="IntentDetailsButton-firstInRow"
-          fixedPosition="br"
-          flat={true}
-          iconBefore={true}
-          ink={
-            <InkContainer
-              className={undefined}
-              disabledInteractions={undefined}
-              inkClassName={undefined}
-              inkStyle={undefined}
-              pulse={undefined}
-              style={undefined}
-              transitionEnterTimeout={450}
-              transitionLeaveTimeout={300}
-              transitionOverlap={150}
-              waitForInkTransition={undefined}
-            />
-          }
-          onClick={[Function]}
-          primary={true}
-          swapTheming={true}
-          type="button"
-        >
-          <button
-            className="md-btn md-btn--flat md-btn--text md-pointer--hover md-background--primary md-background--primary-hover md-inline-block IntentDetailsButton-firstInRow"
-            onClick={[Function]}
-            onKeyDown={[Function]}
-            onKeyUp={[Function]}
-            onMouseDown={[Function]}
-            onMouseEnter={[Function]}
-            onMouseLeave={[Function]}
-            onMouseUp={[Function]}
-            onTouchEnd={[Function]}
-            onTouchStart={[Function]}
-            type="button"
-          >
-            <InkContainer
-              key="ink-container"
-              transitionEnterTimeout={450}
-              transitionLeaveTimeout={300}
-              transitionOverlap={150}
-            >
-              <TransitionGroup
-                childFactory={[Function]}
-                className="md-ink-container"
-                component="div"
-              >
-                <div
-                  className="md-ink-container"
-                />
-              </TransitionGroup>
-            </InkContainer>
-            Save
-          </button>
-        </Button>
-      </withTooltip(Button)>
-    </withInk(withTooltip(Button))>
-    <withInk(withTooltip(Button))
-      className="IntentDetailsButton"
-      flat={true}
-      inkTransitionEnterTimeout={450}
-      inkTransitionLeaveTimeout={300}
-      inkTransitionOverlap={150}
-      onClick={[Function]}
-      primary={true}
-    >
-      <withTooltip(Button)
-        className="IntentDetailsButton"
-        flat={true}
-        ink={
-          <InkContainer
-            className={undefined}
-            disabledInteractions={undefined}
-            inkClassName={undefined}
-            inkStyle={undefined}
-            pulse={undefined}
-            style={undefined}
-            transitionEnterTimeout={450}
-            transitionLeaveTimeout={300}
-            transitionOverlap={150}
-            waitForInkTransition={undefined}
-          />
-        }
-        onClick={[Function]}
-        primary={true}
-      >
-        <Button
-          className="IntentDetailsButton"
-          fixedPosition="br"
-          flat={true}
-          iconBefore={true}
-          ink={
-            <InkContainer
-              className={undefined}
-              disabledInteractions={undefined}
-              inkClassName={undefined}
-              inkStyle={undefined}
-              pulse={undefined}
-              style={undefined}
-              transitionEnterTimeout={450}
-              transitionLeaveTimeout={300}
-              transitionOverlap={150}
-              waitForInkTransition={undefined}
-            />
-          }
-          onClick={[Function]}
-          primary={true}
-          type="button"
-        >
-          <button
-            className="md-btn md-btn--flat md-btn--text md-pointer--hover md-text--theme-primary md-ink--primary md-inline-block IntentDetailsButton"
-            onClick={[Function]}
-            onKeyDown={[Function]}
-            onKeyUp={[Function]}
-            onMouseDown={[Function]}
-            onMouseEnter={[Function]}
-            onMouseLeave={[Function]}
-            onMouseUp={[Function]}
-            onTouchEnd={[Function]}
-            onTouchStart={[Function]}
-            type="button"
-          >
-            <InkContainer
-              key="ink-container"
-              transitionEnterTimeout={450}
-              transitionLeaveTimeout={300}
-              transitionOverlap={150}
-            >
-              <TransitionGroup
-                childFactory={[Function]}
-                className="md-ink-container"
-                component="div"
-              >
-                <div
-                  className="md-ink-container"
-                />
-              </TransitionGroup>
-            </InkContainer>
-            Delete
-          </button>
-        </Button>
-      </withTooltip(Button)>
-    </withInk(withTooltip(Button))>
-  </div>
-</IntentDetails>
-`;
--- a/web/src/components/helper/AnswerSourceForm.js
+++ b/web/src/components/helper/AnswerSourceForm.js
@@ -1,57 +0,0 @@
-import React, {Component} from 'react';
-import {Button, SelectionControlGroup} from 'react-md';
-import Modal from './Modal';
-
-class AnswerSourceForm extends Component{
-
-    render(){
-        return(
-        <Modal
-            title="Answer type"
-            actions={[
-            <Button
-                flat
-                swapTheming
-                onClick={this.props.onClose.bind (this)}
-                key="cancel"
-            >
-                Cancel
-            </Button>,
-            <Button 
-                flat 
-                primary 
-                swapTheming 
-                key="save"
-                onClick={this.props.onSave.bind(this)}
-            >
-                Save
-            </Button>,
-            ]}
-        >
-            <SelectionControlGroup
-            id="answer-source"
-            name="answer-source"
-            type="radio"
-            label="Import answer from:"
-            onChange={this.props.onSourceChange.bind(this)}
-            controls={[
-                {
-                label: 'Predefined answer',
-                value: '0'
-                },
-                {
-                label: 'WordPress titles',
-                value: '1',
-                },
-                {
-                label: 'WordPress latest news',
-                value: '2',
-                },
-            ]}
-            defaultValue={String(this.props.answerType)}
-            />
-        </Modal>);
-    }
-}
-
-export default AnswerSourceForm;
--- a/web/src/components/helper/AnswerTextBox.js
+++ b/web/src/components/helper/AnswerTextBox.js
@@ -1,44 +0,0 @@
-import React, {Component} from 'react';
-import {TextField} from 'react-md';
-import '../../css/components/IntentDetails.css';
-import '../../css/Common.css';
-import {
-  ANSWER_MAX_LENGTH,
-  ANSWER_TYPE,
-} from '../../config/constants';
-
-class AnswerTextBox extends Component {
-
-  render () {
-      //theese are defaults for ANSWER_TYPE.PREDEFINED
-      let labelText="Answer";
-      let valueText=this.props.answer;
-      let onChangeValue=this.props.handleAnswerEdit;
-      switch(this.props.answerType){
-          case ANSWER_TYPE.EXTERNAL_SOURCE_WP_TITLES:
-          case ANSWER_TYPE.EXTERNAL_SOURCE_WP_NEWS:
-            labelText="Answer source";
-            valueText=this.props.externalAnswerSource;
-            onChangeValue=this.props.handleAnswerSourceEdit
-            break;
-      }
-      
-
-    return(
-    <div className="QuestionBox">
-        <TextField
-          id="intent answer"
-          lineDirection="center"
-          label={labelText}
-          placeholder={labelText}
-          maxLength={ANSWER_MAX_LENGTH}
-          className="md-cell md-cell--bottom IntentDetailsInputBoxes"
-          onChange={onChangeValue}
-          value={valueText}
-        />
-      </div>
-    );
-  }
-}
-
-export default AnswerTextBox;
--- a/web/src/components/helper/Modal.js
+++ b/web/src/components/helper/Modal.js
@@ -1,23 +0,0 @@
-import React, { Component } from 'react';
-import '../../css/components/Modal.css';
-
-class Modal extends Component {
-    render() {
-        const { title, children, actions } = this.props;
-        return (
-            <div className="modal">
-                <div className="modal-content">
-                    <h2 className="header">
-                        {title}
-                    </h2>
-                    {children}
-                    <div className="actions">
-                        {actions}
-                    </div>
-                </div>
-            </div>
-        );
-    }
-}
-
-export default Modal;
--- a/web/src/components/helper/tests/AnswerSourceForm.test.js
+++ b/web/src/components/helper/tests/AnswerSourceForm.test.js
@@ -1,76 +0,0 @@
-import React from 'react';
-import { shallow, mount } from 'enzyme';
-import AnswerSourceForm from '../AnswerSourceForm';
-import {ANSWER_TYPE} from '../../../config/constants'
-
-it('renders without crashing', () => {
-  shallow(<AnswerSourceForm onClose={()=>{}} onSave={()=>{}} onSourceChange={()=>{}} />);
-});
-
-it ('snapshot',()=>{
-  const wrapper = mount(<AnswerSourceForm onClose={()=>{}} onSave={()=>{}} onSourceChange={()=>{}} />);
-  expect(wrapper).toMatchSnapshot();
-})
-
-it('calls onClose when cancel is pressed', () => {
-  const onClose = jest.fn();
-  const wrapper = mount(<AnswerSourceForm onClose={onClose} onSave={()=>{}} onSourceChange={()=>{}} />);
-  const cancelButton = wrapper.find('button').at(0);
-  expect(cancelButton.text()).toEqual('Cancel');
-  cancelButton.simulate('click');
-  expect(onClose).toBeCalled();
-});
-
-it('calls onSave when save is pressed', () => {
-  const onSave = jest.fn();
-  const wrapper = mount(<AnswerSourceForm onClose={()=>{}} onSave={onSave} onSourceChange={()=>{}} />);
-  const saveButton = wrapper.find('button').at(1);
-  expect(saveButton.text()).toEqual('Save');
-  saveButton.simulate('click');
-  expect(onSave).toBeCalled();
-});
-
-it('sets PREDEFINED value when Predefined answer is selected', () => {
-  let selectedValue = null;
-
-  const wrapper = mount(<AnswerSourceForm 
-    onClose={()=>{}} 
-    onSave={()=>{}} 
-    onSourceChange={(value)=>{selectedValue=value}} />);
-
-  const optionControl = wrapper.find('SelectionControlGroup');
-  expect(optionControl.exists()).toEqual(true);
-  optionControl.simulate('change',{target:{value:String(ANSWER_TYPE.PREDEFINED)}});
-  expect(selectedValue).toBe(String(ANSWER_TYPE.PREDEFINED));
-  
-});
-
-it('sets EXTERNAL_SOURCE_WP_TITLES value when WordPress titles is selected', () => {
-  let selectedValue = null;
-
-  const wrapper = mount(<AnswerSourceForm 
-    onClose={()=>{}} 
-    onSave={()=>{}} 
-    onSourceChange={(value)=>{selectedValue=value}} />);
-
-  const optionControl = wrapper.find('SelectionControlGroup');
-  expect(optionControl.exists()).toEqual(true);
-  optionControl.simulate('change',{target:{value:String(ANSWER_TYPE.EXTERNAL_SOURCE_WP_TITLES)}});
-  expect(selectedValue).toBe(String(ANSWER_TYPE.EXTERNAL_SOURCE_WP_TITLES));
-  
-});
-
-it('sets EXTERNAL_SOURCE_WP_NEWS value when WordPress latest news is selected', () => {
-  let selectedValue = null;
-
-  const wrapper = mount(<AnswerSourceForm 
-    onClose={()=>{}} 
-    onSave={()=>{}} 
-    onSourceChange={(value)=>{selectedValue=value}} />);
-
-  const optionControl = wrapper.find('SelectionControlGroup');
-  expect(optionControl.exists()).toEqual(true);
-  optionControl.simulate('change',{target:{value:String(ANSWER_TYPE.EXTERNAL_SOURCE_WP_NEWS)}});
-  expect(selectedValue).toBe(String(ANSWER_TYPE.EXTERNAL_SOURCE_WP_NEWS));
-  
-});
--- a/web/src/components/helper/tests/AnswerTextBox.test.js
+++ b/web/src/components/helper/tests/AnswerTextBox.test.js
@@ -1,93 +0,0 @@
-import React from 'react';
-import {shallow, mount} from 'enzyme';
-import AnswerTextBox from '../AnswerTextBox';
-import {ANSWER_TYPE} from '../../../config/constants';
-
-it ('renders without crashing', () => {
-  shallow (<AnswerTextBox />);
-});
-
-describe ('predefined answer selected', () => {
-  let wrapper;
-  let textField;
-
-  beforeEach (() => {
-    const onChange = jest.fn();
-    wrapper = mount (
-      <AnswerTextBox
-        answerType={ANSWER_TYPE.PREDEFINED}
-        answer={'Dummy answer'}
-        handleAnswerEdit={onChange}
-      />
-    );
-    textField = wrapper.find ('TextField').first ();
-  });
-
-  it ('snapshot', () =>{
-    expect(wrapper).toMatchSnapshot();
-  });
-
-  it ('renders text box for normal answer', () => {
-    expect (textField.props ().label).toEqual ('Answer');
-  });
-
-  it ('receives valid answer text', () => {
-    expect (textField.props ().value).toEqual ('Dummy answer');
-  });
-});
-
-describe ('WordPress titles selected', () => {
-  let wrapper;
-  let textField;
-  beforeEach (() => {
-    const onChange = jest.fn();
-    wrapper = mount (
-      <AnswerTextBox
-        answerType={ANSWER_TYPE.EXTERNAL_SOURCE_WP_TITLES}
-        externalAnswerSource={'Dummy answer'}
-        handleAnswerSourceEdit={onChange}
-      />
-    );
-    textField = wrapper.find ('TextField').first ();
-  });
-
-  it ('snapshot', () =>{
-    expect(wrapper).toMatchSnapshot();
-  });
-
-  it ('renders text box for external source input', () => {
-    expect (textField.props ().label).toEqual ('Answer source');
-  });
-
-  it ('receives valid answer text', () => {
-    expect (textField.props ().value).toEqual ('Dummy answer');
-  });
-});
-
-describe ('WordPress latest news selected', () => {
-  let wrapper;
-  let textField;
-  beforeEach (() => {
-    const onChange = jest.fn();
-    wrapper = mount (
-      <AnswerTextBox
-        answerType={ANSWER_TYPE.EXTERNAL_SOURCE_WP_NEWS}
-        externalAnswerSource={'Dummy answer'}
-        handleAnswerSourceEdit={onChange}
-      />
-    );
-    textField = wrapper.find ('TextField').first ();
-  });
-
-  it ('snapshot', () =>{
-    expect(wrapper).toMatchSnapshot();
-  });
-
-  it ('renders text box for external source input', () => {
-    expect (textField.props ().label).toEqual ('Answer source');
-  });
-
-  it ('receives valid answer text', () => {
-    expect (textField.props ().value).toEqual ('Dummy answer');
-  });
-});
--- a/web/src/components/helper/tests/Modal.test.js
+++ b/web/src/components/helper/tests/Modal.test.js
@@ -1,27 +0,0 @@
-import React from 'react';
-import { shallow, mount } from 'enzyme';
-import Modal from '../Modal';
-
-it('renders without crashing', () => {
-  shallow(<Modal />);
-});
-
-let actionButton;
-let childButton;
-let wrapper;
-
-beforeEach(()=>{
-  actionButton = <button key={0}>Dummy action button</button>;
-  childButton = <button key={1}>Child button</button>;
-  wrapper = mount(<Modal title={'Dummy title'} actions={[actionButton]}>{childButton}</Modal>);
-});
-
-it ('snapshot', () => {
-  expect(wrapper).toMatchSnapshot();
-});
-
-it('receives props as expected', () =>{
-  expect(wrapper.props().title).toEqual('Dummy title');
-  expect(wrapper.props().actions).toEqual([actionButton]);
-  expect(wrapper.props().children).toEqual(childButton);
-});
--- a/web/src/components/helper/tests/snapshots/AnswerSourceForm.test.js.snap
+++ b/web/src/components/helper/tests/snapshots/AnswerSourceForm.test.js.snap
@@ -1,675 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`snapshot 1`] = `
-<AnswerSourceForm
-  onClose={[Function]}
-  onSave={[Function]}
-  onSourceChange={[Function]}
->
-  <Modal
-    actions={
-      Array [
-        <withInk(withTooltip(Button))
-          flat={true}
-          inkTransitionEnterTimeout={450}
-          inkTransitionLeaveTimeout={300}
-          inkTransitionOverlap={150}
-          onClick={[Function]}
-          swapTheming={true}
-      >
-          Cancel
-      </withInk(withTooltip(Button))>,
-        <withInk(withTooltip(Button))
-          flat={true}
-          inkTransitionEnterTimeout={450}
-          inkTransitionLeaveTimeout={300}
-          inkTransitionOverlap={150}
-          onClick={[Function]}
-          primary={true}
-          swapTheming={true}
-      >
-          Save
-      </withInk(withTooltip(Button))>,
-      ]
-    }
-    title="Answer type"
-  >
-    <div
-      className="modal"
-    >
-      <div
-        className="modal-content"
-      >
-        <h2
-          className="header"
-        >
-          Answer type
-        </h2>
-        <SelectionControlGroup
-          component="fieldset"
-          controls={
-            Array [
-              Object {
-                "label": "Predefined answer",
-                "value": "0",
-              },
-              Object {
-                "label": "WordPress titles",
-                "value": "1",
-              },
-              Object {
-                "label": "WordPress latest news",
-                "value": "2",
-              },
-            ]
-          }
-          defaultValue="undefined"
-          id="answer-source"
-          label="Import answer from:"
-          labelClassName="md-subheading-1"
-          labelComponent="legend"
-          name="answer-source"
-          onChange={[Function]}
-          type="radio"
-        >
-          <fieldset
-            className="md-selection-control-group"
-            onChange={[Function]}
-            onKeyDown={[Function]}
-          >
-            <legend
-              className="md-subheading-1"
-            >
-              Import answer from:
-            </legend>
-            <SelectionControl
-              checked={false}
-              checkedCheckboxIcon={
-                <FontIcon
-                  iconClassName="material-icons"
-                >
-                  check_box
-                </FontIcon>
-              }
-              checkedRadioIcon={
-                <FontIcon
-                  iconClassName="material-icons"
-                >
-                  radio_button_checked
-                </FontIcon>
-              }
-              className=""
-              id="answer-source0"
-              key="control0"
-              label="Predefined answer"
-              name="answer-source"
-              type="radio"
-              uncheckedCheckboxIcon={
-                <FontIcon
-                  iconClassName="material-icons"
-                >
-                  check_box_outline_blank
-                </FontIcon>
-              }
-              uncheckedRadioIcon={
-                <FontIcon
-                  iconClassName="material-icons"
-                >
-                  radio_button_unchecked
-                </FontIcon>
-              }
-              value="0"
-            >
-              <div
-                className="md-selection-control-container"
-                onKeyDown={[Function]}
-              >
-                <input
-                  aria-hidden={true}
-                  checked={false}
-                  className="md-selection-control-input"
-                  id="answer-source0"
-                  name="answer-source"
-                  onChange={[Function]}
-                  type="radio"
-                  value="0"
-                />
-                <label
-                  className="md-selection-control-label md-pointer--hover md-text"
-                  htmlFor="answer-source0"
-                >
-                  <withInk(AccessibleFakeButton)
-                    aria-checked={false}
-                    className="md-selection-control-toggle md-btn md-btn--icon md-text--secondary"
-                    inkTransitionEnterTimeout={450}
-                    inkTransitionLeaveTimeout={300}
-                    inkTransitionOverlap={150}
-                    role="radio"
-                  >
-                    <AccessibleFakeButton
-                      aria-checked={false}
-                      className="md-selection-control-toggle md-btn md-btn--icon md-text--secondary"
-                      component="div"
-                      ink={
-                        <InkContainer
-                          className={undefined}
-                          disabledInteractions={undefined}
-                          inkClassName={undefined}
-                          inkStyle={undefined}
-                          pulse={undefined}
-                          style={undefined}
-                          transitionEnterTimeout={450}
-                          transitionLeaveTimeout={300}
-                          transitionOverlap={150}
-                          waitForInkTransition={undefined}
-                        />
-                      }
-                      listenToEnter={true}
-                      listenToSpace={true}
-                      noFocusOutline={true}
-                      role="radio"
-                      tabIndex={0}
-                    >
-                      <div
-                        aria-checked={false}
-                        aria-pressed={false}
-                        className="md-fake-btn md-pointer--hover md-fake-btn--no-outline md-selection-control-toggle md-btn md-btn--icon md-text--secondary"
-                        onBlur={[Function]}
-                        onClick={[Function]}
-                        onKeyDown={[Function]}
-                        onKeyUp={[Function]}
-                        role="radio"
-                        tabIndex={0}
-                      >
-                        <InkContainer
-                          key="ink-container"
-                          transitionEnterTimeout={450}
-                          transitionLeaveTimeout={300}
-                          transitionOverlap={150}
-                        >
-                          <TransitionGroup
-                            childFactory={[Function]}
-                            className="md-ink-container"
-                            component="div"
-                          >
-                            <div
-                              className="md-ink-container"
-                            />
-                          </TransitionGroup>
-                        </InkContainer>
-                        <FontIcon
-                          iconClassName="material-icons"
-                          inherit={true}
-                          key=".1"
-                        >
-                          <i
-                            className="md-icon material-icons md-text--inherit"
-                          >
-                            radio_button_unchecked
-                          </i>
-                        </FontIcon>
-                      </div>
-                    </AccessibleFakeButton>
-                  </withInk(AccessibleFakeButton)>
-                  <span>
-                    Predefined answer
-                  </span>
-                </label>
-              </div>
-            </SelectionControl>
-            <SelectionControl
-              checked={false}
-              checkedCheckboxIcon={
-                <FontIcon
-                  iconClassName="material-icons"
-                >
-                  check_box
-                </FontIcon>
-              }
-              checkedRadioIcon={
-                <FontIcon
-                  iconClassName="material-icons"
-                >
-                  radio_button_checked
-                </FontIcon>
-              }
-              className=""
-              id="answer-source1"
-              key="control1"
-              label="WordPress titles"
-              name="answer-source"
-              tabIndex={-1}
-              type="radio"
-              uncheckedCheckboxIcon={
-                <FontIcon
-                  iconClassName="material-icons"
-                >
-                  check_box_outline_blank
-                </FontIcon>
-              }
-              uncheckedRadioIcon={
-                <FontIcon
-                  iconClassName="material-icons"
-                >
-                  radio_button_unchecked
-                </FontIcon>
-              }
-              value="1"
-            >
-              <div
-                className="md-selection-control-container"
-                onKeyDown={[Function]}
-              >
-                <input
-                  aria-hidden={true}
-                  checked={false}
-                  className="md-selection-control-input"
-                  id="answer-source1"
-                  name="answer-source"
-                  onChange={[Function]}
-                  type="radio"
-                  value="1"
-                />
-                <label
-                  className="md-selection-control-label md-pointer--hover md-text"
-                  htmlFor="answer-source1"
-                >
-                  <withInk(AccessibleFakeButton)
-                    aria-checked={false}
-                    className="md-selection-control-toggle md-btn md-btn--icon md-text--secondary"
-                    inkTransitionEnterTimeout={450}
-                    inkTransitionLeaveTimeout={300}
-                    inkTransitionOverlap={150}
-                    role="radio"
-                    tabIndex={-1}
-                  >
-                    <AccessibleFakeButton
-                      aria-checked={false}
-                      className="md-selection-control-toggle md-btn md-btn--icon md-text--secondary"
-                      component="div"
-                      ink={
-                        <InkContainer
-                          className={undefined}
-                          disabledInteractions={undefined}
-                          inkClassName={undefined}
-                          inkStyle={undefined}
-                          pulse={undefined}
-                          style={undefined}
-                          transitionEnterTimeout={450}
-                          transitionLeaveTimeout={300}
-                          transitionOverlap={150}
-                          waitForInkTransition={undefined}
-                        />
-                      }
-                      listenToEnter={true}
-                      listenToSpace={true}
-                      noFocusOutline={true}
-                      role="radio"
-                      tabIndex={-1}
-                    >
-                      <div
-                        aria-checked={false}
-                        aria-pressed={false}
-                        className="md-fake-btn md-pointer--hover md-fake-btn--no-outline md-selection-control-toggle md-btn md-btn--icon md-text--secondary"
-                        onBlur={[Function]}
-                        onClick={[Function]}
-                        onKeyDown={[Function]}
-                        onKeyUp={[Function]}
-                        role="radio"
-                        tabIndex={-1}
-                      >
-                        <InkContainer
-                          key="ink-container"
-                          transitionEnterTimeout={450}
-                          transitionLeaveTimeout={300}
-                          transitionOverlap={150}
-                        >
-                          <TransitionGroup
-                            childFactory={[Function]}
-                            className="md-ink-container"
-                            component="div"
-                          >
-                            <div
-                              className="md-ink-container"
-                            />
-                          </TransitionGroup>
-                        </InkContainer>
-                        <FontIcon
-                          iconClassName="material-icons"
-                          inherit={true}
-                          key=".1"
-                        >
-                          <i
-                            className="md-icon material-icons md-text--inherit"
-                          >
-                            radio_button_unchecked
-                          </i>
-                        </FontIcon>
-                      </div>
-                    </AccessibleFakeButton>
-                  </withInk(AccessibleFakeButton)>
-                  <span>
-                    WordPress titles
-                  </span>
-                </label>
-              </div>
-            </SelectionControl>
-            <SelectionControl
-              checked={false}
-              checkedCheckboxIcon={
-                <FontIcon
-                  iconClassName="material-icons"
-                >
-                  check_box
-                </FontIcon>
-              }
-              checkedRadioIcon={
-                <FontIcon
-                  iconClassName="material-icons"
-                >
-                  radio_button_checked
-                </FontIcon>
-              }
-              className=""
-              id="answer-source2"
-              key="control2"
-              label="WordPress latest news"
-              name="answer-source"
-              tabIndex={-1}
-              type="radio"
-              uncheckedCheckboxIcon={
-                <FontIcon
-                  iconClassName="material-icons"
-                >
-                  check_box_outline_blank
-                </FontIcon>
-              }
-              uncheckedRadioIcon={
-                <FontIcon
-                  iconClassName="material-icons"
-                >
-                  radio_button_unchecked
-                </FontIcon>
-              }
-              value="2"
-            >
-              <div
-                className="md-selection-control-container"
-                onKeyDown={[Function]}
-              >
-                <input
-                  aria-hidden={true}
-                  checked={false}
-                  className="md-selection-control-input"
-                  id="answer-source2"
-                  name="answer-source"
-                  onChange={[Function]}
-                  type="radio"
-                  value="2"
-                />
-                <label
-                  className="md-selection-control-label md-pointer--hover md-text"
-                  htmlFor="answer-source2"
-                >
-                  <withInk(AccessibleFakeButton)
-                    aria-checked={false}
-                    className="md-selection-control-toggle md-btn md-btn--icon md-text--secondary"
-                    inkTransitionEnterTimeout={450}
-                    inkTransitionLeaveTimeout={300}
-                    inkTransitionOverlap={150}
-                    role="radio"
-                    tabIndex={-1}
-                  >
-                    <AccessibleFakeButton
-                      aria-checked={false}
-                      className="md-selection-control-toggle md-btn md-btn--icon md-text--secondary"
-                      component="div"
-                      ink={
-                        <InkContainer
-                          className={undefined}
-                          disabledInteractions={undefined}
-                          inkClassName={undefined}
-                          inkStyle={undefined}
-                          pulse={undefined}
-                          style={undefined}
-                          transitionEnterTimeout={450}
-                          transitionLeaveTimeout={300}
-                          transitionOverlap={150}
-                          waitForInkTransition={undefined}
-                        />
-                      }
-                      listenToEnter={true}
-                      listenToSpace={true}
-                      noFocusOutline={true}
-                      role="radio"
-                      tabIndex={-1}
-                    >
-                      <div
-                        aria-checked={false}
-                        aria-pressed={false}
-                        className="md-fake-btn md-pointer--hover md-fake-btn--no-outline md-selection-control-toggle md-btn md-btn--icon md-text--secondary"
-                        onBlur={[Function]}
-                        onClick={[Function]}
-                        onKeyDown={[Function]}
-                        onKeyUp={[Function]}
-                        role="radio"
-                        tabIndex={-1}
-                      >
-                        <InkContainer
-                          key="ink-container"
-                          transitionEnterTimeout={450}
-                          transitionLeaveTimeout={300}
-                          transitionOverlap={150}
-                        >
-                          <TransitionGroup
-                            childFactory={[Function]}
-                            className="md-ink-container"
-                            component="div"
-                          >
-                            <div
-                              className="md-ink-container"
-                            />
-                          </TransitionGroup>
-                        </InkContainer>
-                        <FontIcon
-                          iconClassName="material-icons"
-                          inherit={true}
-                          key=".1"
-                        >
-                          <i
-                            className="md-icon material-icons md-text--inherit"
-                          >
-                            radio_button_unchecked
-                          </i>
-                        </FontIcon>
-                      </div>
-                    </AccessibleFakeButton>
-                  </withInk(AccessibleFakeButton)>
-                  <span>
-                    WordPress latest news
-                  </span>
-                </label>
-              </div>
-            </SelectionControl>
-          </fieldset>
-        </SelectionControlGroup>
-        <div
-          className="actions"
-        >
-          <withInk(withTooltip(Button))
-            flat={true}
-            inkTransitionEnterTimeout={450}
-            inkTransitionLeaveTimeout={300}
-            inkTransitionOverlap={150}
-            key="cancel"
-            onClick={[Function]}
-            swapTheming={true}
-          >
-            <withTooltip(Button)
-              flat={true}
-              ink={
-                <InkContainer
-                  className={undefined}
-                  disabledInteractions={undefined}
-                  inkClassName={undefined}
-                  inkStyle={undefined}
-                  pulse={undefined}
-                  style={undefined}
-                  transitionEnterTimeout={450}
-                  transitionLeaveTimeout={300}
-                  transitionOverlap={150}
-                  waitForInkTransition={undefined}
-                />
-              }
-              onClick={[Function]}
-              swapTheming={true}
-            >
-              <Button
-                fixedPosition="br"
-                flat={true}
-                iconBefore={true}
-                ink={
-                  <InkContainer
-                    className={undefined}
-                    disabledInteractions={undefined}
-                    inkClassName={undefined}
-                    inkStyle={undefined}
-                    pulse={undefined}
-                    style={undefined}
-                    transitionEnterTimeout={450}
-                    transitionLeaveTimeout={300}
-                    transitionOverlap={150}
-                    waitForInkTransition={undefined}
-                  />
-                }
-                onClick={[Function]}
-                swapTheming={true}
-                type="button"
-              >
-                <button
-                  className="md-btn md-btn--flat md-btn--text md-pointer--hover md-text md-inline-block"
-                  onClick={[Function]}
-                  onKeyDown={[Function]}
-                  onKeyUp={[Function]}
-                  onMouseDown={[Function]}
-                  onMouseEnter={[Function]}
-                  onMouseLeave={[Function]}
-                  onMouseUp={[Function]}
-                  onTouchEnd={[Function]}
-                  onTouchStart={[Function]}
-                  type="button"
-                >
-                  <InkContainer
-                    key="ink-container"
-                    transitionEnterTimeout={450}
-                    transitionLeaveTimeout={300}
-                    transitionOverlap={150}
-                  >
-                    <TransitionGroup
-                      childFactory={[Function]}
-                      className="md-ink-container"
-                      component="div"
-                    >
-                      <div
-                        className="md-ink-container"
-                      />
-                    </TransitionGroup>
-                  </InkContainer>
-                  Cancel
-                </button>
-              </Button>
-            </withTooltip(Button)>
-          </withInk(withTooltip(Button))>
-          <withInk(withTooltip(Button))
-            flat={true}
-            inkTransitionEnterTimeout={450}
-            inkTransitionLeaveTimeout={300}
-            inkTransitionOverlap={150}
-            key="save"
-            onClick={[Function]}
-            primary={true}
-            swapTheming={true}
-          >
-            <withTooltip(Button)
-              flat={true}
-              ink={
-                <InkContainer
-                  className={undefined}
-                  disabledInteractions={undefined}
-                  inkClassName={undefined}
-                  inkStyle={undefined}
-                  pulse={undefined}
-                  style={undefined}
-                  transitionEnterTimeout={450}
-                  transitionLeaveTimeout={300}
-                  transitionOverlap={150}
-                  waitForInkTransition={undefined}
-                />
-              }
-              onClick={[Function]}
-              primary={true}
-              swapTheming={true}
-            >
-              <Button
-                fixedPosition="br"
-                flat={true}
-                iconBefore={true}
-                ink={
-                  <InkContainer
-                    className={undefined}
-                    disabledInteractions={undefined}
-                    inkClassName={undefined}
-                    inkStyle={undefined}
-                    pulse={undefined}
-                    style={undefined}
-                    transitionEnterTimeout={450}
-                    transitionLeaveTimeout={300}
-                    transitionOverlap={150}
-                    waitForInkTransition={undefined}
-                  />
-                }
-                onClick={[Function]}
-                primary={true}
-                swapTheming={true}
-                type="button"
-              >
-                <button
-                  className="md-btn md-btn--flat md-btn--text md-pointer--hover md-background--primary md-background--primary-hover md-inline-block"
-                  onClick={[Function]}
-                  onKeyDown={[Function]}
-                  onKeyUp={[Function]}
-                  onMouseDown={[Function]}
-                  onMouseEnter={[Function]}
-                  onMouseLeave={[Function]}
-                  onMouseUp={[Function]}
-                  onTouchEnd={[Function]}
-                  onTouchStart={[Function]}
-                  type="button"
-                >
-                  <InkContainer
-                    key="ink-container"
-                    transitionEnterTimeout={450}
-                    transitionLeaveTimeout={300}
-                    transitionOverlap={150}
-                  >
-                    <TransitionGroup
-                      childFactory={[Function]}
-                      className="md-ink-container"
-                      component="div"
-                    >
-                      <div
-                        className="md-ink-container"
-                      />
-                    </TransitionGroup>
-                  </InkContainer>
-                  Save
-                </button>
-              </Button>
-            </withTooltip(Button)>
-          </withInk(withTooltip(Button))>
-        </div>
-      </div>
-    </div>
-  </Modal>
-</AnswerSourceForm>
-`;
--- a/web/src/components/helper/tests/snapshots/AnswerTextBox.test.js.snap
+++ b/web/src/components/helper/tests/snapshots/AnswerTextBox.test.js.snap
@@ -1,376 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`WordPress latest news selected snapshot 1`] = `
-<AnswerTextBox
-  answerType={2}
-  externalAnswerSource="Dummy answer"
-  handleAnswerSourceEdit={[Function]}
->
-  <div
-    className="QuestionBox"
-  >
-    <TextField
-      className="md-cell md-cell--bottom IntentDetailsInputBoxes"
-      fullWidth={true}
-      id="intent answer"
-      label="Answer source"
-      leftIconStateful={true}
-      lineDirection="center"
-      maxLength={150}
-      onChange={[Function]}
-      passwordIcon={
-        <FontIcon
-          iconClassName="material-icons"
-        >
-          remove_red_eye
-        </FontIcon>
-      }
-      placeholder="Answer source"
-      rightIconStateful={true}
-      type="text"
-      value="Dummy answer"
-    >
-      <div
-        className="md-text-field-container md-full-width md-text-field-container--input md-cell md-cell--bottom IntentDetailsInputBoxes"
-        onClick={[Function]}
-      >
-        <FloatingLabel
-          active={false}
-          error={false}
-          floating={true}
-          htmlFor="intent answer"
-          iconOffset={false}
-          key="label"
-          label="Answer source"
-        >
-          <label
-            className="md-floating-label md-floating-label--floating md-text--secondary"
-            htmlFor="intent answer"
-          >
-            Answer source
-          </label>
-        </FloatingLabel>
-        <InputField
-          className=""
-          fullWidth={true}
-          id="intent answer"
-          inlineIndicator={false}
-          key="field"
-          label="Answer source"
-          onBlur={[Function]}
-          onChange={[Function]}
-          onFocus={[Function]}
-          placeholder="Answer source"
-          type="text"
-          value="Dummy answer"
-        >
-          <input
-            className="md-text-field md-text-field--floating-margin md-full-width md-text"
-            id="intent answer"
-            onBlur={[Function]}
-            onChange={[Function]}
-            onFocus={[Function]}
-            placeholder="Answer source"
-            type="text"
-            value="Dummy answer"
-          />
-        </InputField>
-        <TextFieldDivider
-          active={false}
-          error={false}
-          key="text-divider"
-          lineDirection="center"
-        >
-          <Divider
-            className="md-divider--text-field md-divider--expand-from-center"
-          >
-            <hr
-              className="md-divider md-divider--text-field md-divider--expand-from-center"
-            />
-          </Divider>
-        </TextFieldDivider>
-        <TextFieldMessage
-          active={false}
-          currentLength={12}
-          error={false}
-          key="message"
-          leftIcon={false}
-          maxLength={150}
-          rightIcon={false}
-        >
-          <div
-            className="md-text-field-message-container md-text-field-message-container--count-only md-full-width md-text--disabled"
-          >
-            <Message
-              active={false}
-              key="message"
-            />
-            <Message
-              active={false}
-              className="md-text-field-message--counter"
-              key="counter"
-            >
-              <div
-                aria-hidden={true}
-                className="md-text-field-message md-text-field-message--inactive md-text-field-message--counter"
-              >
-                12 / 150
-              </div>
-            </Message>
-          </div>
-        </TextFieldMessage>
-      </div>
-    </TextField>
-  </div>
-</AnswerTextBox>
-`;
-
-exports[`WordPress titles selected snapshot 1`] = `
-<AnswerTextBox
-  answerType={1}
-  externalAnswerSource="Dummy answer"
-  handleAnswerSourceEdit={[Function]}
->
-  <div
-    className="QuestionBox"
-  >
-    <TextField
-      className="md-cell md-cell--bottom IntentDetailsInputBoxes"
-      fullWidth={true}
-      id="intent answer"
-      label="Answer source"
-      leftIconStateful={true}
-      lineDirection="center"
-      maxLength={150}
-      onChange={[Function]}
-      passwordIcon={
-        <FontIcon
-          iconClassName="material-icons"
-        >
-          remove_red_eye
-        </FontIcon>
-      }
-      placeholder="Answer source"
-      rightIconStateful={true}
-      type="text"
-      value="Dummy answer"
-    >
-      <div
-        className="md-text-field-container md-full-width md-text-field-container--input md-cell md-cell--bottom IntentDetailsInputBoxes"
-        onClick={[Function]}
-      >
-        <FloatingLabel
-          active={false}
-          error={false}
-          floating={true}
-          htmlFor="intent answer"
-          iconOffset={false}
-          key="label"
-          label="Answer source"
-        >
-          <label
-            className="md-floating-label md-floating-label--floating md-text--secondary"
-            htmlFor="intent answer"
-          >
-            Answer source
-          </label>
-        </FloatingLabel>
-        <InputField
-          className=""
-          fullWidth={true}
-          id="intent answer"
-          inlineIndicator={false}
-          key="field"
-          label="Answer source"
-          onBlur={[Function]}
-          onChange={[Function]}
-          onFocus={[Function]}
-          placeholder="Answer source"
-          type="text"
-          value="Dummy answer"
-        >
-          <input
-            className="md-text-field md-text-field--floating-margin md-full-width md-text"
-            id="intent answer"
-            onBlur={[Function]}
-            onChange={[Function]}
-            onFocus={[Function]}
-            placeholder="Answer source"
-            type="text"
-            value="Dummy answer"
-          />
-        </InputField>
-        <TextFieldDivider
-          active={false}
-          error={false}
-          key="text-divider"
-          lineDirection="center"
-        >
-          <Divider
-            className="md-divider--text-field md-divider--expand-from-center"
-          >
-            <hr
-              className="md-divider md-divider--text-field md-divider--expand-from-center"
-            />
-          </Divider>
-        </TextFieldDivider>
-        <TextFieldMessage
-          active={false}
-          currentLength={12}
-          error={false}
-          key="message"
-          leftIcon={false}
-          maxLength={150}
-          rightIcon={false}
-        >
-          <div
-            className="md-text-field-message-container md-text-field-message-container--count-only md-full-width md-text--disabled"
-          >
-            <Message
-              active={false}
-              key="message"
-            />
-            <Message
-              active={false}
-              className="md-text-field-message--counter"
-              key="counter"
-            >
-              <div
-                aria-hidden={true}
-                className="md-text-field-message md-text-field-message--inactive md-text-field-message--counter"
-              >
-                12 / 150
-              </div>
-            </Message>
-          </div>
-        </TextFieldMessage>
-      </div>
-    </TextField>
-  </div>
-</AnswerTextBox>
-`;
-
-exports[`predefined answer selected snapshot 1`] = `
-<AnswerTextBox
-  answer="Dummy answer"
-  answerType={0}
-  handleAnswerEdit={[Function]}
->
-  <div
-    className="QuestionBox"
-  >
-    <TextField
-      className="md-cell md-cell--bottom IntentDetailsInputBoxes"
-      fullWidth={true}
-      id="intent answer"
-      label="Answer"
-      leftIconStateful={true}
-      lineDirection="center"
-      maxLength={150}
-      onChange={[Function]}
-      passwordIcon={
-        <FontIcon
-          iconClassName="material-icons"
-        >
-          remove_red_eye
-        </FontIcon>
-      }
-      placeholder="Answer"
-      rightIconStateful={true}
-      type="text"
-      value="Dummy answer"
-    >
-      <div
-        className="md-text-field-container md-full-width md-text-field-container--input md-cell md-cell--bottom IntentDetailsInputBoxes"
-        onClick={[Function]}
-      >
-        <FloatingLabel
-          active={false}
-          error={false}
-          floating={true}
-          htmlFor="intent answer"
-          iconOffset={false}
-          key="label"
-          label="Answer"
-        >
-          <label
-            className="md-floating-label md-floating-label--floating md-text--secondary"
-            htmlFor="intent answer"
-          >
-            Answer
-          </label>
-        </FloatingLabel>
-        <InputField
-          className=""
-          fullWidth={true}
-          id="intent answer"
-          inlineIndicator={false}
-          key="field"
-          label="Answer"
-          onBlur={[Function]}
-          onChange={[Function]}
-          onFocus={[Function]}
-          placeholder="Answer"
-          type="text"
-          value="Dummy answer"
-        >
-          <input
-            className="md-text-field md-text-field--floating-margin md-full-width md-text"
-            id="intent answer"
-            onBlur={[Function]}
-            onChange={[Function]}
-            onFocus={[Function]}
-            placeholder="Answer"
-            type="text"
-            value="Dummy answer"
-          />
-        </InputField>
-        <TextFieldDivider
-          active={false}
-          error={false}
-          key="text-divider"
-          lineDirection="center"
-        >
-          <Divider
-            className="md-divider--text-field md-divider--expand-from-center"
-          >
-            <hr
-              className="md-divider md-divider--text-field md-divider--expand-from-center"
-            />
-          </Divider>
-        </TextFieldDivider>
-        <TextFieldMessage
-          active={false}
-          currentLength={12}
-          error={false}
-          key="message"
-          leftIcon={false}
-          maxLength={150}
-          rightIcon={false}
-        >
-          <div
-            className="md-text-field-message-container md-text-field-message-container--count-only md-full-width md-text--disabled"
-          >
-            <Message
-              active={false}
-              key="message"
-            />
-            <Message
-              active={false}
-              className="md-text-field-message--counter"
-              key="counter"
-            >
-              <div
-                aria-hidden={true}
-                className="md-text-field-message md-text-field-message--inactive md-text-field-message--counter"
-              >
-                12 / 150
-              </div>
-            </Message>
-          </div>
-        </TextFieldMessage>
-      </div>
-    </TextField>
-  </div>
-</AnswerTextBox>
-`;
--- a/web/src/components/helper/tests/snapshots/Modal.test.js.snap
+++ b/web/src/components/helper/tests/snapshots/Modal.test.js.snap
@@ -1,42 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`snapshot 1`] = `
-<Modal
-  actions={
-    Array [
-      <button>
-        Dummy action button
-    </button>,
-    ]
-  }
-  title="Dummy title"
->
-  <div
-    className="modal"
-  >
-    <div
-      className="modal-content"
-    >
-      <h2
-        className="header"
-      >
-        Dummy title
-      </h2>
-      <button
-        key="1"
-      >
-        Child button
-      </button>
-      <div
-        className="actions"
-      >
-        <button
-          key="0"
-        >
-          Dummy action button
-        </button>
-      </div>
-    </div>
-  </div>
-</Modal>
-`;
--- a/web/src/config/constants.js
+++ b/web/src/config/constants.js
@@ -1,19 +1,11 @@
-export const INTENT_EXPLANATION_MAX_LENGTH = 70;
-
 export const INTENT_NAME_MAX_LENGTH = 30;
-export const INTENT_NAME_MIN_LENGTH = 2;
-
 export const QUESTION_MAX_LENGTH = 150;
-export const QUESTION_MIN_LENGTH = 2;
-
 export const ANSWER_MAX_LENGTH = 150;
-export const ANSWER_MIN_LENGTH = 2;

 export const INTENT_TITLE_MAX_LENGTH = 20;
 export const INTENT_TITLE_TOOLTIP_DELAY = 700;

-export const INVOCATION_NAME_MAX_LENGTH = 50;
-export const INVOCATION_NAME_MIN_LENGTH = 2;
+export const INVOCATION_NAME_MAX_LENGTH = 15;
 export const INVOCATION_ANSWER_MAX_LENGTH = 100;

 export const EMAIL_MAX_LENGTH = 100;
@@ -22,12 +14,6 @@ export const NEW_INTENT_SELECTED_INDEX = -1;
 export const LAUNCH_REQUEST_SELECTED_INDEX = -2;
 export const CONTACT_SELECTED_INDEX = -3;

-export const ANSWER_TYPE = {
-  PREDEFINED: 0,
-  EXTERNAL_SOURCE_WP_TITLES : 1,
-  EXTERNAL_SOURCE_WP_NEWS : 2
-}
-
 export const RESULT_CODES = {
  OK: 0,
  ERROR: -1,
--- a/web/src/css/components/IntentDetails.scss
+++ b/web/src/css/components/IntentDetails.scss
@@ -9,25 +9,10 @@
 }

 .IntentDetailsInputBoxes{
-    width: 90%;
+    width: 60%;
 }

 .IntentDetailsButton{
-    float: right;
-    margin-right: 25px;
-}
-
-.IntentDetailsButton-firstInRow{
-    float: right;
-    margin-right: 10%;
-}
-
-.AddQuestionVariantButton{
-    float: right;
-    margin-right: 10%;
-}
-
-.AnswerTypeButton{
-    float: right;
-    margin-right: 30px;
+    float: left;
+    margin-left: 25px;
 }
--- a/web/src/css/components/Modal.scss
+++ b/web/src/css/components/Modal.scss
@@ -1,32 +0,0 @@
-.modal {
-	position: fixed;
-	left: 0;
-	top: 0;
-	width: 100%;
-	height: 100%;
-	background-color: rgba(37, 37, 37, .7);
-	z-index: 1;
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	.modal-content {
-		color: black;
-		padding: 20px;
-		padding-bottom: 0px;
-		display: flex;
-		flex-direction: column;
-		align-items: flex-start;
-		height: auto;
-		background-color: #FFF;
-		min-width: 500px;
-		.actions {
-			border-top: 1px solid #bebebe;
-			width: 100%;
-			display: flex;
-			justify-content: flex-end;
-			min-width: 500px;
-			margin: 0 -20px;
-			padding: 10px;
-		}
-	}
-}
--- a/web/src/css/index.css
+++ b/web/src/css/index.css
@@ -115,10 +115,10 @@ h5, .md-subheading-1 {
  line-height: 24px; }

 p, .md-body-1 {
-  line-height: 20px; }
+  line-height: 1.42857; }

 h6, .md-body-2 {
-  line-height: 24px; }
+  line-height: 1.42857; }

 caption, .md-caption {
  font-size: 12px; }
@@ -1378,7 +1378,7 @@ tbody .md-table-row {
    line-height: inherit; }

 .md-table-checkbox .md-selection-control-label {
-  display: flex; }
+  display: block; }

 .md-table-checkbox .md-selection-control-container {
  margin-left: 12px;
--- a/web/src/lib/api.js
+++ b/web/src/lib/api.js
@@ -17,4 +17,4 @@ export const updateSkill = (skill)=>{
    },
    body: JSON.stringify(skill),
  });
-}
+}
--- a/web/src/lib/helpers.js
+++ b/web/src/lib/helpers.js
@@ -1,5 +0,0 @@
-export const isEmailValid = 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);
-};
--- a/web/src/setupTests.js
+++ b/web/src/setupTests.js
@@ -1,5 +0,0 @@
-import { configure } from 'enzyme';
-import Adapter from 'enzyme-adapter-react-16';
-import 'jest-enzyme';
-
-configure({ adapter: new Adapter() });
Author	SHA1	Message	Date
GotPPay	2ccc0c6ca2	dialog test	2018-01-18 19:08:51 +01:00
GotPPay	554a16794d	dialog test	2018-01-18 07:38:09 +01:00
GotPPay	c731f7597c	dialog test	2018-01-18 01:15:14 +01:00