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 · 2018-01-16 17:05:21 +01:00 · 2018-01-16 16:56:56 +01:00 · 2018-01-16 14:48:51 +01:00
32 changed files with 1078 additions and 628 deletions
--- a/README.md
+++ b/README.md
@@ -1,12 +1,98 @@
-first terminal 
-cd web
-npm install
-npm start
+To obtain new Auth Code :

-second terminal
-cd backend
-npm install
-node express.js
+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) :
+
+https://layla.amazon.com/api/skill/link/M2ODJY6EXOY6KO?code=ANCgZUfEFdlRRkpSNFuA&scope=alexa::ask:skills:readwrite alexa::ask:models:readwrite alexa::ask:skills:test
+
+Code : ANCgZUfEFdlRRkpSNFuA
+=======================================
+
+Now to get Access Token :
+
+Send a POST request to https://api.amazon.com/auth/o2/token with the following parameters
+
+ - HTTP Header Parameters
+
+		Content-Type: application/x-www-form-urlencoded
+
+ - HTTP Body Parameters
+
+		grant_type: authorization_code
+		code: The authorization code that was returned in the response.
+		client_id: The product’s client ID. To access this information, navigate to Amazon’s Developer Console. After you’ve logged in, click Get Started > under Alexa Voice Service, then click Edit next to a registered product (or create a new one). From the left navigation select Security Profile. This page contains both Client ID and Client Secret for your product.
+		client_secret: The product’s client secret. To access this information, navigate to Amazon’s Developer Console. After you’ve logged in, click Get Started > under Alexa Voice Service, then click Edit next to a registered product (or create a new one). From the left navigation select Security Profile. This page contains both Client ID and Client Secret for your product.
+		redirect_uri: One of the return URIs that you added to your app’s security profile when signing up.
+
+Response : 
+
+{
+    "access_token": "Atza|IwEBIBe6gDqrrowEEav6N-_6s4NztYeP3oG8PGWmu8ZiZw6lbOh3wNla3TK6pY-VEpT1d8an-dVf_n3kXJzVFsNo_4xBfZyFHGoCTDTFjs3yBRul4PVdBOhwwiH3-sgRLcUofZbe2oE06GmTcbfYtaStfXpQI5dfpldfnsJg_CvhSA6AHb_snJT3F6lyXzbV076d_3cYUMJxFldJGnYcviNHHxjjmuQTD06hhGzCbAxxe9eBmkuopRsNfyedLT2UlKP_ublah9CUGA3AdIX_3Iuke82jMwGnNl9gv7pbaDNEjAbj7IQSl3B08uuREtJq-oTBOjALNXRvFxTJmQjZwXNf9eHC7fSHJDdEPdZQU0AcffRQObAyAkUuL6Jv39OHzhb3Q64-zzoyODqnJyLP5SQZ2JVF53Kc_cTBqjIc9pXljqe7yEVk6JDs7q1zKbBibx_AQm57TO79IzWyLBzBMlYL5HdTsqEfRzLeDw2tws-hGMgkx2HWfdbYnmf5Qb4SyIhzvmmdfPLg3MVKTxjIBu1rx0xf3n0PLZP1EO6jsJPoMRPg77Gm4oit5Zp6s37ek3A3Vxh-ntoASpkrkxGTG9kVtRNt",
+    "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",
+    "token_type": "bearer",
+    "expires_in": 3600
+}
+
+================================
+
+Now to get new Access token using refresh token : 
+
+Send a POST request to https://api.amazon.com/auth/o2/token with the following parameters:
+
+	- HTTP Header Parameters
+
+		Content-Type: application/x-www-form-urlencoded
+
+	- HTTP Body Parameters
+
+		grant_type: refresh_token
+		refresh_token: The URL-encoded refresh token returned with the last request for a new access token.
+		client_id: To access this information, navigate to Amazon’s Developer Console. After you’ve logged in, click Get Started > under Alexa Voice Service, then click Edit next to a registered product (or create a new one). From the left navigation select Security Profile. This page contains both Client ID and Client Secret for your product.
+		client_secret: The website’s client secret. To access this information, navigate to Amazon’s Developer Console. After you’ve logged in, click Get Started > under Alexa Voice Service, then click Edit next to a registered product (or create a new one). From the left navigation select Security Profile. This page contains both Client ID and Client Secret for your product.
+
+Response : 
+
+{
+    "access_token": "Atza|IwEBILtBe3hrHovrMx7Oivng-RB2EKzvCm_epXJE2HXPMQzXTFqK10Zrqt-Z8paeRoLQBqbLCmqWvcr5RTNgw9qjtfzOTsOrXC1VKqKmxpqHTrJyn2TLGsCzFjBDfADNjCyufWTf2ZlsSzjxW2GiqCHlwoPSd9pFrLavtRThrm1J-5KvnFrj-yD-tYTSwrgX5W5p2SrjQxoE3aP5b96z6p8GvCL9lM1pddafAxkHb22A3IzR-pYGmEijb4ksRuaIf4WCNwssWV6GBIB2oJA5CU-Dtd2mOZZ5-dYpSSeCHyGumTYecTxxMVSdiVjCqB8WT6AtvvutWFQQoldHjJmIwBsTZP-iQcl-UyajOZJ03GqRUym5Hp-49uByzVG-MfR_Z5qVmYjjsLQEOLCY9kPVnmRGnOTj6YPjrHXibd6P8TQOMh4VTcgFpg-afKKABP6EeDwok1t2ivuYh5OJju-B1A6gzhMi4vQJYKq107e0QMYBBhrf_OqCgMbfnQZ8j40qocVGID5YWv8uk5wKyI61LrbzrTltmzxzNemzqbSBzwAlfNS6GW-jVjg8svsi1lb_EVRbhyOoWJWX3mEd-5GDYyUcyInleiAR0aIHVP94pZxqdiCamA",
+    "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",
+    "token_type": "bearer",
+    "expires_in": 3600
+}
+
+=======================
+=======================
+
+Prerequests for step 3 (run on server):
 requires running mongodb service

+	Database (tellall) with collection (skill_list)
+		* Insert dummy skill with : db.skill_list.insert({"skillID" : "amzn1.ask.skill.efbf0564-a732-4ba9-958f-57939138adae", "intents" : [ 	{ 	"intentName" : "GetFirstQuestion", 	"questions" : [ 	"tell me something about projects", 	"tell me all about projects" ], 	"answer" : "blablabla bla bla" }, 	{ 	"intentName" : "GetThirdQuestion", 	"questions" : [ 	"Give me third question" ], 	"answer" : "This is answer to the third question" } ], "invocationName" : "Saburly", "invocationAnswer" : "We are Saburly team one" })
+		
+        *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"
+
+	Database (tellall) with collection (token_list)
+		* Insert tokens with : db.token_list.insert({"id" : 1, "refresh_token" : "...", "access_token" : "...", "expires_in" : 1515173601.754 })
+			(Change refresh_token and access_token dots with real ones)
+
+	Set skill_id, client_id and client_secret to appropriate values in backend/config.js
+	Set base_url to "tellall.saburly.com" in web/src/config.
+
+	Start backend service from backend/ running "node express.js"
+
+
+======
+for local testing :
+
+first terminal :
+    *cd web
+    *npm start
+
+second terminal :
+    * cd backend
+    *npm install
+    *node express.js
+
+
+
--- a/backend/SaburlySkillInteractionModel.json
+++ b/backend/SaburlySkillInteractionModel.json
@@ -1,60 +0,0 @@
-{
-  "languageModel": {
-    "intents": [
-      {
-        "name": "AMAZON.CancelIntent",
-        "samples": []
-      },
-      {
-        "name": "AMAZON.HelpIntent",
-        "samples": []
-      },
-      {
-        "name": "AMAZON.StopIntent",
-        "samples": []
-      },
-      {
-        "name": "GetProcessIntent",
-        "samples": [
-          "tell me  your process",
-          "what is your process",
-          "how do you work",
-          "about your proces"
-        ],
-        "slots": []
-      },
-      {
-        "name": "GetProjectsIntent",
-        "samples": [
-          "list me your projects",
-          "show me what you have done",
-          "what did you do so far",
-          "what are your projects",
-          "your project"
-        ],
-        "slots": []
-      },
-      {
-        "name": "GetServicesIntent",
-        "samples": [
-          "what are your services",
-          "what services do you ofer",
-          "what you do",
-          "your service",
-          "tell me service"
-        ],
-        "slots": []
-      },
-      {
-        "name": "GetTechnologiesIntent",
-        "samples": [
-          "list me your technologies",
-          "give me your technologies",
-          "what you know"
-        ],
-        "slots": []
-      }
-    ],
-    "invocationName": "saburly"
-  }
-}
--- 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,6 +1,6 @@
 var config = {};

-config.dbURL = 'mongodb://localhost:27017/tellall';
+config.DB_URL = 'mongodb://localhost:27017/tellall';
 config.PORT = 5000;

 config.TOKEN = 'Atza|IwEBIBe6gDqrrowEEav6N-_6s4NztYeP3oG8PGWmu8ZiZw6lbOh3wNla3TK6pY-VEpT1d8an-dVf_n3kXJzVFsNo_4xBfZyFHGoCTDTFjs3yBRul4PVdBOhwwiH3-sgRLcUofZbe2oE06GmTcbfYtaStfXpQI5dfpldfnsJg_CvhSA6AHb_snJT3F6lyXzbV076d_3cYUMJxFldJGnYcviNHHxjjmuQTD06hhGzCbAxxe9eBmkuopRsNfyedLT2UlKP_ublah9CUGA3AdIX_3Iuke82jMwGnNl9gv7pbaDNEjAbj7IQSl3B08uuREtJq-oTBOjALNXRvFxTJmQjZwXNf9eHC7fSHJDdEPdZQU0AcffRQObAyAkUuL6Jv39OHzhb3Q64-zzoyODqnJyLP5SQZ2JVF53Kc_cTBqjIc9pXljqe7yEVk6JDs7q1zKbBibx_AQm57TO79IzWyLBzBMlYL5HdTsqEfRzLeDw2tws-hGMgkx2HWfdbYnmf5Qb4SyIhzvmmdfPLg3MVKTxjIBu1rx0xf3n0PLZP1EO6jsJPoMRPg77Gm4oit5Zp6s37ek3A3Vxh-ntoASpkrkxGTG9kVtRNt';
--- a/backend/config/constants.js
+++ b/backend/config/constants.js
@@ -0,0 +1,31 @@
+const constants = {};
+
+constants.amazonResultCodes = {
+    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,
+    INCONSISTEN_STATE:5,
+}
+
+constants.HTTPResultCodes = {
+    INTERNAL_SERVER_ERROR : 500,
+}
+
+constants.SKILL_ID_LENGTH = 24;
+
+
+
+module.exports = constants;
--- a/backend/controllers/index.js
+++ b/backend/controllers/index.js
@@ -0,0 +1,5 @@
+var express = require ('express'), router = express.Router ();
+
+router.use ('/skill', require ('./skill'));
+
+module.exports = router;
--- a/backend/controllers/skill.js
+++ b/backend/controllers/skill.js
@@ -0,0 +1,96 @@
+var express = require ('express'), router = express.Router ();
+const constants = require ('../config/constants');
+var databaseHelper = require ('../helpers/database');
+var amazonHelper = require ('../helpers/amazon');
+var bodyParser = require ('body-parser');
+var alexa = require ('../components/alexa');
+
+router.get ('/:id', async (req, res, next) => {
+  const id = req.params.id;
+
+  if (id.length !== constants.SKILL_ID_LENGTH) {
+    res.json ([]);
+  } else {
+    databaseHelper
+      .getSkill (id)
+      .then (result => {
+        res.json (result);
+      })
+      .catch (err => {
+        res.json ([]);
+      });
+  }
+});
+
+router.put ('/:id', bodyParser.json (), async (req, res, next) => {
+  let id = req.params.id;
+  let dataFromWeb = JSON.stringify (req.body);
+  let skill = JSON.parse (dataFromWeb);
+  let updateOnAmazon = skill.updateOnAmazon;
+
+  delete skill.updateOnAmazon;
+  delete skill._id;
+
+  //First get current skill from DB
+  databaseHelper
+    .getSkill (id)
+    .then (currentSkillState => {
+      //Now let's update skill in DB
+      databaseHelper
+        .updateSkill (id, skill)
+        .then (() => {
+          //Ok, done, now update skill on Amazon (if needed)
+          if (updateOnAmazon) {
+            amazonHelper
+              .updateSkill (skill)
+              .then (amazonResult => {
+                if (
+                  amazonResult === constants.amazonResultCodes.OK ||
+                  amazonResult === constants.amazonResultCodes.ACCEPTED
+                ) {
+                  res.json ({result: constants.apiResultCodes.OK, message: ''});
+                  alexa.updateIntentsJSON ();
+                } else {
+                  res.status(constants.HTTPResultCodes.INTERNAL_SERVER_ERROR).json ({
+                    result: constants.apiResultCodes.AMAZON_ERROR,
+                    message: amazonResult,
+                  });
+                }
+              })
+              .catch (e => {
+                res.status(constants.HTTPResultCodes.INTERNAL_SERVER_ERROR).json ({
+                  result: constants.apiResultCodes.AMAZON_FAIL,
+                  message: e,
+                });
+              });
+          }else{
+            res.json ({result: constants.apiResultCodes.OK, message: ''});
+            alexa.updateIntentsJSON ();
+          }
+        })
+        .catch (() => {
+          //Update in database didn't go well, revert changes
+          databaseHelper
+            .updateSkill (id, currentSkillState)
+            .then (() => {
+              res.status(constants.HTTPResultCodes.INTERNAL_SERVER_ERROR).json ({
+                result: constants.apiResultCodes.DATABASE_ERROR,
+                message: '',
+              });
+            })
+            .catch (() => {
+              //This should never happen, something is seriously wrong, like no database connection
+              res.status(constants.HTTPResultCodes.INTERNAL_SERVER_ERROR).json ({
+                result: constants.apiResultCodes.INCONSISTEN_STATE,
+                message: '',
+              });
+            });
+        });
+    })
+    .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: ''});
+    });
+});
+
+module.exports = router;
--- a/backend/express.js
+++ b/backend/express.js
@@ -1,150 +0,0 @@
-var amazonHelper = require ('./helpers/amazon');
-var databaseHelper = require ('./helpers/database');
-const config = require ('./config');
-require ('isomorphic-fetch');
-var express = require ('express');
-var alexa = require ('alexa-app');
-var bodyParser = require ('body-parser');
-var MongoClient = require ('mongodb').MongoClient;
-var ObjectID = require ('mongodb').ObjectID;
-
-const router = express.Router ();
-
-var app = express ();
-
-// ALWAYS setup the alexa app and attach it to express before anything else.
-var alexaApp = new alexa.app ('step3'); // this means we still work with one skill
-
-alexaApp.express ({
-  expressApp: app,
-
-  // 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,
-});
-
-// now POST calls to /test in express will be handled by the app.request() function
-
-// from here on you can setup any other express routes or middlewares as nor
-
-app.set ('view engine', 'ejs');
-
-var updateIntentsJSON = function () {
-  databaseHelper
-    .loadSkill (config.SKILL_DB_ID)
-    .then (skill => {
-      skill.intents.map (intent => {
-        alexaApp.intent (
-          intent.intentName,
-          {
-            slots: [],
-            utterances: intent.questions,
-          },
-          function (request, response) {
-            return response.say (intent.answer).shouldEndSession(false);
-          }
-        );
-      });
-      alexaApp.launch ((request, response) => {
-        return response.say (skill.invocationAnswer).shouldEndSession(false);
-      });
-    })
-    .catch (err => {
-      console.log (err);
-      alexaApp.launch ((request, response) => {
-        return response.say ('Sorry, there was no skill with that name');
-      });
-    });
-};
-
-router.get ('/getSkill/:id', async (req, res, next) => {
-  const id = req.params.id;
-
-  if (id.length !== 24) {
-    res.json ([]);
-  } else {
-    databaseHelper
-      .getSkill (id)
-      .then (result => {
-        res.json (result);
-      })
-      .catch (err => {
-        res.json ([]);
-      });
-  }
-});
-
-router.get ('/deleteSkill/:skillID', async (req, res, next) => {
-  databaseHelper
-    .deleteSkill (req.params.id)
-    .then (result => {
-      res.json (result);
-    })
-    .catch (err => {
-      res.json (err);
-    });
-});
-
-router.post ('/updateSkill/:id', async (req, res, next) => {
-  let id = req.params.id;
-  let skill = req.body;
-  delete skill._id;
-  console.log('id = ' + id);
-  if (id !== '-1') {
-    amazonHelper
-      .updateSkill (skill)
-      .then (amazonResult => {
-	console.log('amazon result : ' + amazonResult);
-        if (amazonResult === 200 || amazonResult === 202) {
-          //Skill uploaded, it's ok to update databaseI
-          databaseHelper
-            .updateSkill (id, skill)
-            .then (result => {
-              res.json ({result: 0, message: 'ok'});
-              updateIntentsJSON ();
-            })
-            .catch (e => {
-              res.json ({result: -1, message: 'ok'});
-            });
-        } else {
-          res.json ({result: -1, message: 'Amazon result ' + amazonResult});
-        }
-      })
-      .catch (e => {
-        //skill upload went wrong, don't update database, send error
-        res.json ({result: -1, message: e});
-      });
-  } else {
-    //no new skills for now
-  }
-});
-
-app.use (function (req, res, next) {
-  res.header ('Access-Control-Allow-Origin', '*');
-  res.header ('Access-Control-Allow-Headers', 'Origin, Content-Type');
-  res.header ('Access-Control-Allow-Methods', 'GET, POST, OPTIONS');
-  res.header ('Access-Control-Allow-Credentials', 'true');
-  next ();
-});
-
-app.use (bodyParser.json ());
-app.use ('/', router);
-
-MongoClient.connect (config.dbURL)
-  .then (database => {
-    databaseHelper.initModule (database);
-
-    app.listen (config.PORT, () => {
-      console.log ('Express server running on port ' + config.PORT);
-      updateIntentsJSON ();
-      databaseHelper.loadTokens ();
-    });
-  })
-  .catch (e => {
-    console.log ('error : ' + e);
-  });
--- a/backend/helpers/amazon.js
+++ b/backend/helpers/amazon.js
@@ -1,26 +1,20 @@
 require ('isomorphic-fetch');
-const config = require ('../config');
+const config = require ('../config/config');
 var request = require ('request');
 var databaseHelper = require ('./database');

 var getBuildStatus = function (skillID) {
-  try {
-    fetch (
-      `https://api.amazonalexa.com/v0/skills/${skillID}/interactionModel/locales/en-US/status`,
-      {
-        method: 'GET',
-        headers: {
-          Authorization: config.TOKEN,
-        },
-      }
-    )
-      .then (l => l.text ())
-      .then (result => {
-        return result;
-      });
-  } catch (e) {
-    console.log ('err : ' + e);
-  }
+  fetch (
+    `https://api.amazonalexa.com/v0/skills/${skillID}/interactionModel/locales/en-US/status`,
+    {
+      method: 'GET',
+      headers: {
+        Authorization: config.TOKEN,
+      },
+    }
+  ).then (result => {
+    return result.text ();
+  });
 };

 var refreshTokens = function () {
@@ -41,14 +35,20 @@ var refreshTokens = function () {
    };

    request (options, function (error, response, body) {
-      if (error) reject (error);
-      parsedResponse = JSON.parse (body);
-      if (parsedResponse.refresh_token)
-        return databaseHelper.updateTokens (
-          parsedResponse.refresh_token,
-          parsedResponse.access_token,
-          parsedResponse.expires_in
-        );
+      if (error) {
+        reject (error);
+      }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{
+          reject (body);
+        }
+      }
    });
  });
 };
@@ -56,6 +56,10 @@ var refreshTokens = function () {
 var generateInteractionModel = function (skill) {
  let result = {};
  let allIntents = [];
+  let allPrompts = [];
+  let dialogIntents = [];
+  let allTypes = [];
+
  let defaultIntents = [
    {
      name: 'AMAZON.CancelIntent',
@@ -81,6 +85,199 @@ var generateInteractionModel = function (skill) {
    allIntents.push ({name: intent.intentName, samples: intent.questions});
  });

+  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}"
+        ]
+      }
+    ]
+  });
+
+  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: 'EmailIntent',
+    slots: [
+      {
+        name: 'Name',
+        type: 'AMAZON.US_FIRST_NAME',
+      },
+      {
+        name: 'Email',
+        type: 'AMAZON.LITERAL',
+      },
+      {
+        name: '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}',
+    ],
+  });
+  */
+
+
+
  result.interactionModel = {};

  result.interactionModel.languageModel = {
@@ -88,6 +285,11 @@ var generateInteractionModel = function (skill) {
    intents: allIntents,
  };

+  result.interactionModel.types = allTypes;
+  result.interactionModel.prompts = allPrompts;
+  result.interactionModel.dialog = {};
+  result.interactionModel.dialog.intents = dialogIntents;
+
  return JSON.stringify (result);
 };

--- a/backend/helpers/database.js
+++ b/backend/helpers/database.js
@@ -1,4 +1,4 @@
-const config = require ('../config');
+const config = require ('../config/config');
 var ObjectID = require ('mongodb').ObjectID;

 var db = null;
@@ -43,16 +43,19 @@ module.exports = {
      db
        .collection ('token_list')
        .update ({id: 1}, newTokenDocument, {upsert: true}, (err, result) => {
-          if (err) reject (err);
-          config.REFRESH_TOKEN = refresh_token;
-          config.TOKEN = access_token;
-          config.TOKEN_EXPIRES_IN = newTokenDocument.expires_in;
-          resolve ();
+          if (err) { 
+            reject (err)
+          }else{
+            config.REFRESH_TOKEN = refresh_token;
+            config.TOKEN = access_token;
+            config.TOKEN_EXPIRES_IN = newTokenDocument.expires_in;
+            resolve ();
+          }
        });
    });
  },

-  loadSkill: function (skillDbID) {
+  getSkill: function (skillDbID) {
    return new Promise ((resolve, reject) => {
      db
        .collection ('skill_list')
@@ -71,11 +74,10 @@ module.exports = {
      db
        .collection ('skill_list')
        .update ({_id: ObjectID (id)}, skill, {upsert: true}, (err, result) => {
-          if (JSON.parse (result).nModified === 1) {
-            //database update ok
-            resolve ();
-          } else {
-            reject ();
+          if (err){
+            reject();
+          }else{
+            resolve();
          }
        });
    });
@@ -86,21 +88,12 @@ module.exports = {
      db
        .collection ('skill_list')
        .remove ({_id: ObjectID (id)}, (err, result) => {
-          if (err) reject (err);
-          resolve (result);
+          if (err){
+            reject (err);
+          }else{
+            resolve (result);
+          }
        });
    });
-  },
-
-  getSkill: function (id) {
-    return new Promise ((resolve, reject) => {
-      db
-        .collection ('skill_list')
-        .find ({_id: ObjectID (id)})
-        .toArray ((err, result) => {
-          if (err) reject (err);
-          resolve (result);
-        });
-    });
-  },
+  }
 };
--- a/backend/middleware/index.js
+++ b/backend/middleware/index.js
@@ -0,0 +1,7 @@
+module.exports = function (req, res, next) {
+  res.header ('Access-Control-Allow-Origin', '*');
+  res.header ('Access-Control-Allow-Headers', 'Origin, Content-Type');
+  res.header ('Access-Control-Allow-Methods', 'GET, POST, PUT');
+  res.header ('Access-Control-Allow-Credentials', 'true');
+  next ();
+};
--- a/backend/server.js
+++ b/backend/server.js
@@ -0,0 +1,35 @@
+var amazonHelper = require ('./helpers/amazon');
+var databaseHelper = require ('./helpers/database');
+const config = require ('./config/config');
+const constants = require ('./config/constants');
+require ('isomorphic-fetch');
+var express = require ('express');
+var alexa = require('./components/alexa');
+
+
+var MongoClient = require ('mongodb').MongoClient;
+var ObjectID = require ('mongodb').ObjectID;
+
+const router = express.Router ();
+var app = express ();
+
+// ALWAYS setup the alexa app and attach it to express before anything else.
+alexa.init (app);
+
+app.set ('view engine', 'ejs');
+app.use (require ('./middleware')); //common middleware for all requests
+app.use (require ('./controllers')); //all routes
+
+MongoClient.connect (config.DB_URL)
+  .then (database => {
+    databaseHelper.initModule (database);
+
+    app.listen (config.PORT, () => {
+      console.log ('Express server running on port  ' + config.PORT);
+      alexa.updateIntentsJSON ();
+      databaseHelper.loadTokens ();
+    });
+  })
+  .catch (e => {
+    console.log ('error : ' + e);
+  });
--- a/web/README.md
+++ b/web/README.md
@@ -1,82 +0,0 @@
-To obtain new Auth Code :
-
-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) :
-
-https://layla.amazon.com/api/skill/link/M2ODJY6EXOY6KO?code=ANCgZUfEFdlRRkpSNFuA&scope=alexa::ask:skills:readwrite alexa::ask:models:readwrite alexa::ask:skills:test
-
-Code : ANCgZUfEFdlRRkpSNFuA
-
-=======================================
-
-Now to get Access Token :
-
-Send a POST request to https://api.amazon.com/auth/o2/token with the following parameters
-
- - HTTP Header Parameters
-
-		Content-Type: application/x-www-form-urlencoded
-
- - HTTP Body Parameters
-
-		grant_type: authorization_code
-		code: The authorization code that was returned in the response.
-		client_id: The product’s client ID. To access this information, navigate to Amazon’s Developer Console. After you’ve logged in, click Get Started > under Alexa Voice Service, then click Edit next to a registered product (or create a new one). From the left navigation select Security Profile. This page contains both Client ID and Client Secret for your product.
-		client_secret: The product’s client secret. To access this information, navigate to Amazon’s Developer Console. After you’ve logged in, click Get Started > under Alexa Voice Service, then click Edit next to a registered product (or create a new one). From the left navigation select Security Profile. This page contains both Client ID and Client Secret for your product.
-		redirect_uri: One of the return URIs that you added to your app’s security profile when signing up.
-
-Response : 
-
-{
-    "access_token": "Atza|IwEBIBe6gDqrrowEEav6N-_6s4NztYeP3oG8PGWmu8ZiZw6lbOh3wNla3TK6pY-VEpT1d8an-dVf_n3kXJzVFsNo_4xBfZyFHGoCTDTFjs3yBRul4PVdBOhwwiH3-sgRLcUofZbe2oE06GmTcbfYtaStfXpQI5dfpldfnsJg_CvhSA6AHb_snJT3F6lyXzbV076d_3cYUMJxFldJGnYcviNHHxjjmuQTD06hhGzCbAxxe9eBmkuopRsNfyedLT2UlKP_ublah9CUGA3AdIX_3Iuke82jMwGnNl9gv7pbaDNEjAbj7IQSl3B08uuREtJq-oTBOjALNXRvFxTJmQjZwXNf9eHC7fSHJDdEPdZQU0AcffRQObAyAkUuL6Jv39OHzhb3Q64-zzoyODqnJyLP5SQZ2JVF53Kc_cTBqjIc9pXljqe7yEVk6JDs7q1zKbBibx_AQm57TO79IzWyLBzBMlYL5HdTsqEfRzLeDw2tws-hGMgkx2HWfdbYnmf5Qb4SyIhzvmmdfPLg3MVKTxjIBu1rx0xf3n0PLZP1EO6jsJPoMRPg77Gm4oit5Zp6s37ek3A3Vxh-ntoASpkrkxGTG9kVtRNt",
-    "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",
-    "token_type": "bearer",
-    "expires_in": 3600
-}
-
-================================
-
-Now to get new Access token using refresh token : 
-
-Send a POST request to https://api.amazon.com/auth/o2/token with the following parameters:
-
-	- HTTP Header Parameters
-
-		Content-Type: application/x-www-form-urlencoded
-
-	- HTTP Body Parameters
-
-		grant_type: refresh_token
-		refresh_token: The URL-encoded refresh token returned with the last request for a new access token.
-		client_id: To access this information, navigate to Amazon’s Developer Console. After you’ve logged in, click Get Started > under Alexa Voice Service, then click Edit next to a registered product (or create a new one). From the left navigation select Security Profile. This page contains both Client ID and Client Secret for your product.
-		client_secret: The website’s client secret. To access this information, navigate to Amazon’s Developer Console. After you’ve logged in, click Get Started > under Alexa Voice Service, then click Edit next to a registered product (or create a new one). From the left navigation select Security Profile. This page contains both Client ID and Client Secret for your product.
-
-Response : 
-
-{
-    "access_token": "Atza|IwEBILtBe3hrHovrMx7Oivng-RB2EKzvCm_epXJE2HXPMQzXTFqK10Zrqt-Z8paeRoLQBqbLCmqWvcr5RTNgw9qjtfzOTsOrXC1VKqKmxpqHTrJyn2TLGsCzFjBDfADNjCyufWTf2ZlsSzjxW2GiqCHlwoPSd9pFrLavtRThrm1J-5KvnFrj-yD-tYTSwrgX5W5p2SrjQxoE3aP5b96z6p8GvCL9lM1pddafAxkHb22A3IzR-pYGmEijb4ksRuaIf4WCNwssWV6GBIB2oJA5CU-Dtd2mOZZ5-dYpSSeCHyGumTYecTxxMVSdiVjCqB8WT6AtvvutWFQQoldHjJmIwBsTZP-iQcl-UyajOZJ03GqRUym5Hp-49uByzVG-MfR_Z5qVmYjjsLQEOLCY9kPVnmRGnOTj6YPjrHXibd6P8TQOMh4VTcgFpg-afKKABP6EeDwok1t2ivuYh5OJju-B1A6gzhMi4vQJYKq107e0QMYBBhrf_OqCgMbfnQZ8j40qocVGID5YWv8uk5wKyI61LrbzrTltmzxzNemzqbSBzwAlfNS6GW-jVjg8svsi1lb_EVRbhyOoWJWX3mEd-5GDYyUcyInleiAR0aIHVP94pZxqdiCamA",
-    "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",
-    "token_type": "bearer",
-    "expires_in": 3600
-}
-
-=======================
-=======================
-
-Prerequests for step 3 :
-
-	Database (tellall) with collection (skill_list)
-		Insert dummy skill with : db.skill_list.insert({"skillID" : "amzn1.ask.skill.efbf0564-a732-4ba9-958f-57939138adae", "intents" : [ 	{ 	"intentName" : "GetFirstQuestion", 	"questions" : [ 	"tell me something about projects", 	"tell me all about projects" ], 	"answer" : "blablabla bla bla" }, 	{ 	"intentName" : "GetThirdQuestion", 	"questions" : [ 	"Give me third question" ], 	"answer" : "This is answer to the third question" } ], "invocationName" : "Saburly", "invocationAnswer" : "We are Saburly team one" })
-		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"
-
-	Database (tellall) with collection (token_list)
-		Insert tokens with : db.token_list.insert({"id" : 1, "refresh_token" : "...", "access_token" : "...", "expires_in" : 1515173601.754 })
-			(Change refresh_token and access_token dots with real ones)
-
-	Set skill_id, client_id and client_secret to appropriate values in backend/config.js
-	Set base_url to "tellall.saburly.com" in web/src/config.
-
-	Start backend service from backend/ running "node express.js"
-
--- a/web/package.json
+++ b/web/package.json
@@ -17,7 +17,8 @@
    "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",
-    "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"
  },
--- a/web/src/App.js
+++ b/web/src/App.js
@@ -4,9 +4,14 @@ import './css/popup.css';
 import IntentList from './components/IntentList';
 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 {
+          NEW_INTENT_SELECTED_INDEX,
+          LAUNCH_REQUEST_SELECTED_INDEX,
+          CONTACT_SELECTED_INDEX,
+          RESULT_CODES} from './config/constants'

 class App extends Component {

@@ -20,17 +25,16 @@ class App extends Component {
                invocationAnswer:'We are saburly', 
                allIntents:[], 
                selectedIntent: {intentName:'',questions:[''],answer:''}, 
-                selectedIndex:-1, 
-                launchRequest:false,
+                selectedIndex:NEW_INTENT_SELECTED_INDEX, 
+                contactEmail:'',
                waiting: false
              };

-    getSkill(this.state._id).then(l=> l.text()).then(result=>{
-      let jResult = JSON.parse(result)[0];
-      if (jResult===undefined) return;
-      this.setState({ skillID:jResult.skillID,skillName:jResult.skillName, invocationName: jResult.invocationName,
-                      invocationAnswer: jResult.invocationAnswer, 
-                      allIntents: jResult.intents})
+    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);
@@ -41,62 +45,59 @@ class App extends Component {
    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() {
-
-    if(this.state.launchRequest){
-      return (
-        <div className="App">
-        <Popup/>
-          <div className="App-header">
-            <h1> Tell All </h1>
-          </div>
-          <IntentList allIntents={this.state.allIntents} 
-                      onLaunchRequestClick={this.handleLaunchRequestClick}
-                      onIntentClick={this.handleIntentClick}
-                      onAddIntentClick={this.handleAddIntentClick}
-                      selectedIndex={this.state.selectedIndex}
-                      waiting={this.state.waiting}>
-          </IntentList>
-          <LaunchRequest  invocationName={this.state.invocationName}
-                          invocationAnswer={this.state.invocationAnswer}
-                          onSaveClick={this.handleSaveLaunchRequestClick}
-                          waiting={this.state.waiting}> 
-          </LaunchRequest>
-        </div>
-      );
-    }else{
-      return (
-        <div className="App">
-        <Popup/>
-          <div className="App-header">
-            <h1> Tell All </h1>
-          </div>
-          <IntentList allIntents={this.state.allIntents} 
-                      onLaunchRequestClick={this.handleLaunchRequestClick}
-                      onIntentClick={this.handleIntentClick}
-                      onAddIntentClick={this.handleAddIntentClick}
-                      selectedIndex={this.state.selectedIndex}
-                      waiting={this.state.waiting}>
-          </IntentList>
-          <IntentDetails  selectedIntent={this.state.selectedIntent}
-                          onDeleteIntentClick={this.handleDeleteIntentClick}
-                          onSaveIntentClick={this.handleSaveIntentClick}
-                          waiting={this.state.waiting}>
-          </IntentDetails>
-        </div>
-      );
+    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}/> ;
+        break;
+      case CONTACT_SELECTED_INDEX:
+        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}/>;
    }
+
+    return(
+      <div className="App">
+      <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}/>
+      
+        {rightPanel}
+      </div>
+    );
  }

-  createSkill(intents, name, answer){
+  createSkill(intents, name, answer, email, updateOnAmazon){
    return {
      _id: this.state._id,
      skillID: this.state.skillID,
      intents: intents,
-      invocationName: (name===undefined) ? this.state.invocationName : name,
-      invocationAnswer: (answer===undefined)? this.state.invocationAnswer: answer
+      invocationName: name,
+      invocationAnswer: answer,
+      contactEmail: email,
+      updateOnAmazon: updateOnAmazon
    };
  }

@@ -105,16 +106,26 @@ class App extends Component {
  }

  handleLaunchRequestClick(){
-    this.setState({selectedIndex: -2, launchRequest:true});
+    this.setState({selectedIndex: LAUNCH_REQUEST_SELECTED_INDEX});
+  }
+
+  handleContactClick(){
+    this.setState({selectedIndex: CONTACT_SELECTED_INDEX})
  }

  handleSaveLaunchRequestClick(name, answer){
    this.setState({waiting:true, invocationName:name, invocationAnswer: answer});
-    this.sendSkill(this.state.allIntents,true,{waiting:false},{waiting:false},name,answer);
+    this.sendSkill(this.state.allIntents,true,{waiting:false},{waiting:false},name,answer,this.state.contactEmail,true);
+  }
+
+  handleSaveEmailClick(email){
+    this.setState({waiting:true});
+    this.sendSkill(this.state.allIntents,true,{contactEmail: email, waiting:false},{waiting:false},this.state.invocationName,this.state.invocationAnswer,email,false);
  }

  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;
@@ -128,7 +139,7 @@ class App extends Component {
        this.setState({waiting:true});

        let newState = {allIntents: newAllIntents, selectedIntent: {intentName:'', questions:[''],answer:''}, waiting:false};
-        this.sendSkill(newAllIntents,true,newState,{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);
@@ -142,7 +153,7 @@ class App extends Component {
    let newAllIntents = JSON.parse(newAllIntentsJSON);

    let newState = null;
-    if (this.state.selectedIndex === -1){
+    if (this.state.selectedIndex === NEW_INTENT_SELECTED_INDEX){
      //new intent
      newAllIntents.push(selectedIntent);
      newState = {allIntents: newAllIntents, selectedIntent: selectedIntent, selectedIndex: newAllIntents.length-1, waiting:false};
@@ -151,18 +162,18 @@ class App extends Component {
      newState = {allIntents: newAllIntents, selectedIntent: selectedIntent, waiting: false};
    }
    this.setState({waiting:true});
-    this.sendSkill(newAllIntents, true, newState, {waiting:false});
+    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: -1,launchRequest:false,selectedIntent: {intentName:'',questions:[''], answer:''}});
+    this.setState({allIntents: this.state.allIntents, selectedIndex: NEW_INTENT_SELECTED_INDEX,launchRequest:false,selectedIntent: {intentName:'',questions:[''], answer:''}});
  }

-  sendSkill(newAllIntents, showPopUp, resolveState, rejectState, newName, newAnswer){
+  sendSkill(newAllIntents, showPopUp, resolveState, rejectState, newName, newAnswer, email, updateOnAmazon){
    return new Promise((resolve,reject)=>{
-      updateSkill(this.createSkill(newAllIntents,newName,newAnswer)).then(l=>l.text()).then(result=>{
-        let jResult = JSON.parse(result);
-        if (jResult.result !== 0){
+      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);
@@ -172,6 +183,7 @@ class App extends Component {
          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/components/Contact.js
+++ b/web/src/components/Contact.js
@@ -0,0 +1,48 @@
+import React, { Component } from 'react';
+import {Button, TextField} from 'react-md';
+import '../css/Common.css';
+import '../css/components/Contact.css';
+import {EMAIL_MAX_LENGTH} from '../config/constants';
+
+class Contact extends Component {
+  constructor(props){
+    super(props);
+
+    this.state = {contactEmail: props.contactEmail};
+
+    this.handleEmailEdit = this.handleEmailEdit.bind(this);
+  }
+
+  componentWillReceiveProps(props){
+    this.setState({contactEmail: props.contactEmail});
+  }
+
+  render() {
+    return (
+      <div className="RightPanelBox">
+        <h5 className="PanelSubTitle"> Contact address will be used for direct messaging through Alexa </h5>
+        <TextField
+          id="contact email"
+          lineDirection="center"
+          label="Contact email"
+          className="md-cell md-cell--bottom ContactEmailInput"
+          maxLength={EMAIL_MAX_LENGTH}
+          onChange={this.handleEmailEdit}
+          value={this.state.contactEmail}/>
+        <br></br>
+        <br></br>
+        <br></br>
+        <Button className="SaveButton" flat primary swapTheming 
+                onClick={()=>{this.props.onSaveEmailClick(this.state.contactEmail)}}
+                disabled={this.props.waiting}>Save</Button>
+      </div>
+    );
+  }
+
+  handleEmailEdit(e){
+    if (e.length === EMAIL_MAX_LENGTH) return;
+    this.setState({contactEmail: e});
+  }
+}
+
+export default Contact;
--- a/web/src/components/IntentDetails.js
+++ b/web/src/components/IntentDetails.js
@@ -1,7 +1,7 @@
 import React, { Component } from 'react';
 import {Button, SVGIcon, TextField} from 'react-md';
-import '../css/Intent.css'
-import {QUESTION_MAX_LENGTH, ANSWER_MAX_LENGTH, INTENT_NAME_MAX_LENGTH} from '../config';
+import '../css/components/IntentDetails.css';
+import {QUESTION_MAX_LENGTH, ANSWER_MAX_LENGTH, INTENT_NAME_MAX_LENGTH} from '../config/constants';

 class IntentDetails extends Component {
  constructor(props){
@@ -22,20 +22,19 @@ class IntentDetails extends Component {

  render() {
    return (
-      <div className="IntentDetails">
+      <div className="RightPanelBox">
        <div className="QuestionBox">
          <TextField
            id="intent name"
            lineDirection="center"
            placeholder="Intent name"
-            label="Intent name"
-            className="md-cell md-cell--bottom"
-            style={{width:'60%'}}
+            label="Question name"
+            className="md-cell md-cell--bottom IntentDetailsInputBoxes"
            onChange={this.handleIntentNameEdit}
            maxLength={INTENT_NAME_MAX_LENGTH}
            value={this.state.intent.intentName} />
        </div>
-        <h5 style={{marginTop:'20px', marginLeft: '30px', float: 'left'}}>Questions</h5>
+        <h5 className="QuestionTitle">Question variants</h5>
        {
          this.state.intent.questions.map((question, index)=>{
            return (
@@ -44,8 +43,7 @@ class IntentDetails extends Component {
                  id="intent question"
                  lineDirection="center"
                  placeholder="Question"
-                  className="md-cell md-cell--bottom"
-                  style={{width:'60%'}}
+                  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)}}
@@ -62,18 +60,17 @@ class IntentDetails extends Component {
              lineDirection="center"
              label="Answer"
              placeholder="Answer"
-              style={{width:'60%'}}
              maxLength={ANSWER_MAX_LENGTH}
-              className="md-cell md-cell--bottom"
+              className="md-cell md-cell--bottom IntentDetailsInputBoxes"
              onChange={this.handleAnswerEdit}
              value={this.state.intent.answer}/>
          </div>
        }
        <br></br>
        <br></br>
-        <Button style={{float:'left', marginLeft: '25px'}} flat primary onClick={()=>{this.props.onDeleteIntentClick(this.state.intent)}} disabled={this.props.waiting}>Delete intent</Button>
-        <Button style={{float:'left', marginLeft: '22%'}} flat primary swapTheming onClick={this.addQuestion} disabled={this.props.waiting}>Add question</Button>        
-        <Button style={{float:'left', marginLeft: '20px'}} 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 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>
    );
@@ -110,7 +107,6 @@ class IntentDetails extends Component {

  handleIntentNameEdit(e){
    if (e.length === INTENT_NAME_MAX_LENGTH) return;
-    //e.replace(/\s/g,'');
    let newIntent = this.state.intent;
    newIntent.intentName = e;
    this.setState({intent: newIntent});
--- a/web/src/components/IntentItem.js
+++ b/web/src/components/IntentItem.js
@@ -1,7 +1,7 @@
 import React, { Component } from 'react';
 import {Button} from 'react-md';
-import '../css/Intent.css'
-import {INTENT_TITLE_MAX_LENGTH, INTENT_TITLE_TOOLTIP_DELAY} from '../config'
+import '../css/components/IntentItem.css'
+import {INTENT_TITLE_MAX_LENGTH, INTENT_TITLE_TOOLTIP_DELAY} from '../config/constants'

 class IntentItem extends Component {
  
--- a/web/src/components/IntentList.js
+++ b/web/src/components/IntentList.js
@@ -1,7 +1,10 @@
 import React, { Component } from 'react';
 import {Button} from 'react-md';
 import IntentItem from './IntentItem';
-import '../css/Intent.css'
+import '../css/components/IntentList.css';
+import {
+    LAUNCH_REQUEST_SELECTED_INDEX,
+    CONTACT_SELECTED_INDEX} from '../config/constants'

 class IntentList extends Component {
    constructor (props){
@@ -17,11 +20,17 @@ class IntentList extends Component {
    render() {
        return (
            <div className="IntentList">
-                <Button className={this.props.selectedIndex===-2 ? "LaunchRequest-selected" : "LaunchRequest"} flat primary 
+                <Button className={this.props.selectedIndex===LAUNCH_REQUEST_SELECTED_INDEX ? "LaunchRequestButton-selected" : "LaunchRequestButton"} flat primary 
                        onClick={this.props.onLaunchRequestClick}
                        disabled={this.props.waiting} >Launch request</Button>
+
+                <Button className={this.props.selectedIndex===CONTACT_SELECTED_INDEX ? "ContactButton-selected" : "ContactButton"} flat primary 
+                        onClick={this.props.onContactClick}
+                        disabled={this.props.waiting} >Contact</Button>
+                
+                
                <div className="IntentList-title">
-                    <h3>Intents</h3>
+                    <h3>Questions</h3>
                </div>
                {
                    this.state.intents.map((intent,index)=>{
@@ -34,9 +43,9 @@ class IntentList extends Component {
                    })
                }
                <br></br>
-                <Button className={"AddIntent"} flat primary swapTheming 
+                <Button className="AddIntent" flat primary swapTheming 
                        onClick={this.props.onAddIntentClick}
-                        disabled={this.props.waiting}>Add intent</Button>
+                        disabled={this.props.waiting}>Add question</Button>
            </div>  
        );
    }
--- a/web/src/components/LaunchRequest.js
+++ b/web/src/components/LaunchRequest.js
@@ -1,7 +1,8 @@
 import React, { Component } from 'react';
 import {Button, TextField} from 'react-md';
-import '../css/Intent.css'
-import { INVOCATION_NAME_MAX_LENGTH, INVOCATION_ANSWER_MAX_LENGTH } from '../config';
+import '../css/Common.css';
+import '../css/components/LaunchRequest.css';
+import { INVOCATION_NAME_MAX_LENGTH, INVOCATION_ANSWER_MAX_LENGTH } from '../config/constants';

 class LaunchRequest extends Component {
  constructor(props){
@@ -19,33 +20,31 @@ class LaunchRequest extends Component {

  render() {
    return (
-      <div className="LaunchRequestBox">
-        <h5 style={{textAlign:'left', marginTop: '30px', marginLeft: '20px'}}> Invocation name customers use to activate the skill. For example "Open Saburly" or "Talk to Saburly" </h5>
+      <div className="RightPanelBox">
+        <h5 className="PanelSubTitle"> Invocation name customers use to activate the skill. For example "Open Saburly" or "Talk to Saburly" </h5>
        <TextField
          id="invocation name"
          lineDirection="center"
          placeholder="Saburly"
          label="Invocation name"
-          className="md-cell md-cell--bottom"
-          style={{width:'60%', marginLeft: '20px'}}
+          className="md-cell md-cell--bottom InvocationInputBoxes"
          maxLength={INVOCATION_NAME_MAX_LENGTH}
          onChange={this.handleNameEdit}
          value={this.state.invocationName}/>
        <br></br>
-        <h5 style={{textAlign:'left', marginLeft: '20px', marginTop: '30px'}}>Answer customers get from Alexa when they activate the skill.</h5>
+        <h5 className="PanelSubTitle" >Answer customers get from Alexa when they activate the skill.</h5>
        <TextField
          id="invocation answer"
          lineDirection="center"
          placeholder="We are Saburly, ask us something about us"
          label="Answer"
-          className="md-cell md-cell--bottom"
-          style={{width:'60%', marginLeft: '20px'}}
+          className="md-cell md-cell--bottom InvocationInputBoxes"
          maxLength={INVOCATION_ANSWER_MAX_LENGTH}
          onChange={this.handleAnswerEdit}
          value={this.state.invocationAnswer}/>
        <br></br>
        <br></br>
-        <Button style={{float:'right', marginRight: '20px'}} flat primary swapTheming 
+        <Button className="SaveButton" flat primary swapTheming 
                onClick={()=>{this.props.onSaveClick(this.state.invocationName, this.state.invocationAnswer)}}
                disabled={this.props.waiting}>Save</Button>
      </div>
--- a/web/src/config/config.js
+++ b/web/src/config/config.js
@@ -0,0 +1,4 @@
+//export const BASE_URL = 'tellall.saburly.com'; //for server
+export const BASE_URL = 'localhost:5000'; //for local
+
+
--- a/web/src/config/constants.js
+++ b/web/src/config/constants.js
@@ -1,5 +1,3 @@
-export const BASE_URL = 'localhost:5000';
-
 export const INTENT_NAME_MAX_LENGTH = 30;
 export const QUESTION_MAX_LENGTH = 150;
 export const ANSWER_MAX_LENGTH = 150;
@@ -9,3 +7,14 @@ export const INTENT_TITLE_TOOLTIP_DELAY = 700;

 export const INVOCATION_NAME_MAX_LENGTH = 15;
 export const INVOCATION_ANSWER_MAX_LENGTH = 100;
+
+export const EMAIL_MAX_LENGTH = 100;
+
+export const NEW_INTENT_SELECTED_INDEX = -1;
+export const LAUNCH_REQUEST_SELECTED_INDEX = -2;
+export const CONTACT_SELECTED_INDEX = -3;
+
+export const RESULT_CODES = {
+  OK: 0,
+  ERROR: -1,
+};
--- a/web/src/css/Common.scss
+++ b/web/src/css/Common.scss
@@ -0,0 +1,21 @@
+$minHeight : calc(100vh - 80px); //80px is height of the title div container
+
+/* Common for right panel components */
+
+.RightPanelBox{
+    float: left;
+    width: 70%;
+    min-height:$minHeight;
+    background-color: #f5f5f5;
+}
+
+.PanelSubTitle{
+    text-align: left; 
+    margin-top: 30px; 
+    margin-left: 20px;
+}
+
+.SaveButton{
+    float: right; 
+    margin-right: 20px;
+}
--- a/web/src/css/Intent.css
+++ b/web/src/css/Intent.css
@@ -1,68 +0,0 @@
-/*IntentList and IntentItem CSS*/
-.IntentList {
-  width: 30%;
-  min-height: calc(100vh - 80px);
-  float: left;
-  background-color: #eff0f0; }
-
-.IntentList-title {
-  font-size: 1.5em;
-  height: 70px;
-  padding: 20px;
-  text-align: left;
-  background-color: #eff0f0; }
-
-.LaunchRequest {
-  text-align: left;
-  width: 100%;
-  height: 50px;
-  background-color: #d8d8d8; }
-
-.LaunchRequest-selected {
-  text-align: left;
-  width: 100%;
-  height: 50px;
-  background-color: #f5f5f5; }
-
-.AddIntent {
-  float: right;
-  margin: 12px; }
-
-.IntentItem {
-  margin-top: 2px;
-  margin-bottom: 2px;
-  height: 50px;
-  width: 100%;
-  text-align: left;
-  background-color: #d8d8d8; }
-
-.IntentItem-selected {
-  margin-top: 2px;
-  margin-bottom: 2px;
-  height: 50px;
-  width: 100%;
-  text-align: left;
-  background-color: #f5f5f5; }
-
-/*IntentDetails CSS*/
-.IntentDetails {
-  float: left;
-  width: 70%;
-  min-height: calc(100vh - 80px);
-  background-color: #f5f5f5; }
-
-.QuestionBox {
-  margin: 25px; }
-
-/*LaunchRequest CSS*/
-.LaunchRequestBox {
-  float: left;
-  width: 70%;
-  min-height: calc(100vh - 80px);
-  background-color: #f5f5f5; }
-
-.ExplanationText {
-  float: left;
-  margin-top: 30px;
-  margin-left: 20px;
-  text-align: left; }
--- a/web/src/css/Intent.scss
+++ b/web/src/css/Intent.scss
@@ -1,85 +0,0 @@
-$minHeight : calc(100vh - 80px);
-
-/*IntentList and IntentItem CSS*/
-
-.IntentList{
-    width: 30%;
-    min-height:$minHeight;
-    float:left;
-    background-color: #eff0f0;
-}
-
-.IntentList-title{
-    font-size: 1.5em;
-    height: 70px;
-    padding: 20px;
-    text-align:left;
-    background-color: #eff0f0;
-}
-
-.LaunchRequest{
-    text-align: left;
-    width: 100%;
-    height: 50px;
-    background-color: #d8d8d8
-}
-
-.LaunchRequest-selected{
-    text-align: left;
-    width: 100%;
-    height: 50px;
-    background-color: #f5f5f5;
-}
-
-.AddIntent{
-    float: right;
-    margin: 12px;
-}
-
-.IntentItem{
-    margin-top: 2px;
-    margin-bottom: 2px;
-    height: 50px;
-    width:100%;
-    text-align:left;
-    background-color: #d8d8d8;
-}
-
-.IntentItem-selected{
-    margin-top: 2px;
-    margin-bottom: 2px;
-    height: 50px;
-    width:100%;
-    text-align:left;
-    background-color: #f5f5f5;
-    
-}
-
-/*IntentDetails CSS*/
-
-.IntentDetails{
-    float: left;
-    width: 70%;
-    min-height:$minHeight;
-    background-color: #f5f5f5;
-}
-
-.QuestionBox{
-    margin:25px;
-}
-
-/*LaunchRequest CSS*/
-
-.LaunchRequestBox{
-    float: left;
-    width:70%;
-    min-height:$minHeight;
-    background-color: #f5f5f5;
-}
-
-.ExplanationText{
-    float: left;
-    margin-top: 30px;
-    margin-left: 20px;
-    text-align: left;
-}
--- a/web/src/css/components/Contact.scss
+++ b/web/src/css/components/Contact.scss
@@ -0,0 +1,4 @@
+.ContactEmailInput{
+    width: 60%;
+    margin-left: 20px;
+}
--- a/web/src/css/components/IntentDetails.scss
+++ b/web/src/css/components/IntentDetails.scss
@@ -0,0 +1,18 @@
+.QuestionBox{
+    margin:25px;
+}
+
+.QuestionTitle{
+    margin-top:20px; 
+    margin-left: 30px;
+    float: left;
+}
+
+.IntentDetailsInputBoxes{
+    width: 60%;
+}
+
+.IntentDetailsButton{
+    float: left;
+    margin-left: 25px;
+}
--- a/web/src/css/components/IntentItem.scss
+++ b/web/src/css/components/IntentItem.scss
@@ -0,0 +1,18 @@
+.IntentItem{
+    margin-top: 2px;
+    margin-bottom: 2px;
+    height: 50px;
+    width:100%;
+    text-align:left;
+    background-color: #d8d8d8;
+}
+
+.IntentItem-selected{
+    margin-top: 2px;
+    margin-bottom: 2px;
+    height: 50px;
+    width:100%;
+    text-align:left;
+    background-color: #f5f5f5;
+    
+}
--- a/web/src/css/components/IntentList.scss
+++ b/web/src/css/components/IntentList.scss
@@ -0,0 +1,52 @@
+$minHeight : calc(100vh - 80px); //80px is height of the title div container
+
+
+.IntentList{
+    width: 30%;
+    min-height:$minHeight;
+    float:left;
+    background-color: #eff0f0;
+}
+
+.IntentList-title{
+    font-size: 1.5em;
+    height: 70px;
+    padding: 20px;
+    text-align:left;
+    background-color: #eff0f0;
+}
+
+.AddIntent{
+    float: right;
+    margin: 12px;
+}
+
+.LaunchRequestButton{
+    text-align: left;
+    width: 100%;
+    height: 50px;
+    background-color: #d8d8d8
+}
+
+.LaunchRequestButton-selected{
+    text-align: left;
+    width: 100%;
+    height: 50px;
+    background-color: #f5f5f5;
+}
+
+.ContactButton{
+    text-align: left;
+    color: #009b8a;
+    width: 100%;
+    height: 50px;
+    background-color: #d8d8d8
+}
+
+.ContactButton-selected{
+    text-align: left;
+    color: #009b8a;
+    width: 100%;
+    height: 50px;
+    background-color: #f5f5f5;
+}
--- a/web/src/css/components/LaunchRequest.scss
+++ b/web/src/css/components/LaunchRequest.scss
@@ -0,0 +1,11 @@
+.ExplanationText{
+    float: left;
+    margin-top: 30px;
+    margin-left: 20px;
+    text-align: left;
+}
+
+.InvocationInputBoxes{
+    width: 60%; 
+    margin-left: 20px;
+}
--- a/web/src/lib/api.js
+++ b/web/src/lib/api.js
@@ -1,26 +1,16 @@
 import fetch from 'isomorphic-fetch';
-import {BASE_URL} from '../config';
-
-export const getAllIntents = (id)=>{
-    let url = `http://${BASE_URL}/intents/${id}`
-    return fetch(url, {method: 'GET'});
-}
+import {BASE_URL} from '../config/config';

 export const getSkill = (id)=>{
-  let url = `http://${BASE_URL}/getSkill/${id}`
-  return fetch(url, {method: 'GET'});
-}
-
-export const deleteSkill = (id)=>{
-  let url = `http://${BASE_URL}/deleteSkill/${id}`
+  let url = `http://${BASE_URL}/skill/${id}`
  return fetch(url, {method: 'GET'});
 }

 export const updateSkill = (skill)=>{
  let id = (skill._id) ? skill._id : -1;
-  let url = `http://${BASE_URL}/updateSkill/${id}`
+  let url = `http://${BASE_URL}/skill/${id}`
  return fetch(url, {
-    method: 'POST',
+    method: 'PUT',
    headers: {
      'Accept': 'application/json',
      'Content-Type': 'application/json'
--- a/web/src/logo.svg
+++ b/web/src/logo.svg
@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 841.9 595.3">
-    <g fill="#61DAFB">
-        <path d="M666.3 296.5c0-32.5-40.7-63.3-103.1-82.4 14.4-63.6 8-114.2-20.2-130.4-6.5-3.8-14.1-5.6-22.4-5.6v22.3c4.6 0 8.3.9 11.4 2.6 13.6 7.8 19.5 37.5 14.9 75.7-1.1 9.4-2.9 19.3-5.1 29.4-19.6-4.8-41-8.5-63.5-10.9-13.5-18.5-27.5-35.3-41.6-50 32.6-30.3 63.2-46.9 84-46.9V78c-27.5 0-63.5 19.6-99.9 53.6-36.4-33.8-72.4-53.2-99.9-53.2v22.3c20.7 0 51.4 16.5 84 46.6-14 14.7-28 31.4-41.3 49.9-22.6 2.4-44 6.1-63.6 11-2.3-10-4-19.7-5.2-29-4.7-38.2 1.1-67.9 14.6-75.8 3-1.8 6.9-2.6 11.5-2.6V78.5c-8.4 0-16 1.8-22.6 5.6-28.1 16.2-34.4 66.7-19.9 130.1-62.2 19.2-102.7 49.9-102.7 82.3 0 32.5 40.7 63.3 103.1 82.4-14.4 63.6-8 114.2 20.2 130.4 6.5 3.8 14.1 5.6 22.5 5.6 27.5 0 63.5-19.6 99.9-53.6 36.4 33.8 72.4 53.2 99.9 53.2 8.4 0 16-1.8 22.6-5.6 28.1-16.2 34.4-66.7 19.9-130.1 62-19.1 102.5-49.9 102.5-82.3zm-130.2-66.7c-3.7 12.9-8.3 26.2-13.5 39.5-4.1-8-8.4-16-13.1-24-4.6-8-9.5-15.8-14.4-23.4 14.2 2.1 27.9 4.7 41 7.9zm-45.8 106.5c-7.8 13.5-15.8 26.3-24.1 38.2-14.9 1.3-30 2-45.2 2-15.1 0-30.2-.7-45-1.9-8.3-11.9-16.4-24.6-24.2-38-7.6-13.1-14.5-26.4-20.8-39.8 6.2-13.4 13.2-26.8 20.7-39.9 7.8-13.5 15.8-26.3 24.1-38.2 14.9-1.3 30-2 45.2-2 15.1 0 30.2.7 45 1.9 8.3 11.9 16.4 24.6 24.2 38 7.6 13.1 14.5 26.4 20.8 39.8-6.3 13.4-13.2 26.8-20.7 39.9zm32.3-13c5.4 13.4 10 26.8 13.8 39.8-13.1 3.2-26.9 5.9-41.2 8 4.9-7.7 9.8-15.6 14.4-23.7 4.6-8 8.9-16.1 13-24.1zM421.2 430c-9.3-9.6-18.6-20.3-27.8-32 9 .4 18.2.7 27.5.7 9.4 0 18.7-.2 27.8-.7-9 11.7-18.3 22.4-27.5 32zm-74.4-58.9c-14.2-2.1-27.9-4.7-41-7.9 3.7-12.9 8.3-26.2 13.5-39.5 4.1 8 8.4 16 13.1 24 4.7 8 9.5 15.8 14.4 23.4zM420.7 163c9.3 9.6 18.6 20.3 27.8 32-9-.4-18.2-.7-27.5-.7-9.4 0-18.7.2-27.8.7 9-11.7 18.3-22.4 27.5-32zm-74 58.9c-4.9 7.7-9.8 15.6-14.4 23.7-4.6 8-8.9 16-13 24-5.4-13.4-10-26.8-13.8-39.8 13.1-3.1 26.9-5.8 41.2-7.9zm-90.5 125.2c-35.4-15.1-58.3-34.9-58.3-50.6 0-15.7 22.9-35.6 58.3-50.6 8.6-3.7 18-7 27.7-10.1 5.7 19.6 13.2 40 22.5 60.9-9.2 20.8-16.6 41.1-22.2 60.6-9.9-3.1-19.3-6.5-28-10.2zM310 490c-13.6-7.8-19.5-37.5-14.9-75.7 1.1-9.4 2.9-19.3 5.1-29.4 19.6 4.8 41 8.5 63.5 10.9 13.5 18.5 27.5 35.3 41.6 50-32.6 30.3-63.2 46.9-84 46.9-4.5-.1-8.3-1-11.3-2.7zm237.2-76.2c4.7 38.2-1.1 67.9-14.6 75.8-3 1.8-6.9 2.6-11.5 2.6-20.7 0-51.4-16.5-84-46.6 14-14.7 28-31.4 41.3-49.9 22.6-2.4 44-6.1 63.6-11 2.3 10.1 4.1 19.8 5.2 29.1zm38.5-66.7c-8.6 3.7-18 7-27.7 10.1-5.7-19.6-13.2-40-22.5-60.9 9.2-20.8 16.6-41.1 22.2-60.6 9.9 3.1 19.3 6.5 28.1 10.2 35.4 15.1 58.3 34.9 58.3 50.6-.1 15.7-23 35.6-58.4 50.6zM320.8 78.4z"/>
-        <circle cx="420.9" cy="296.5" r="45.7"/>
-        <path d="M520.5 78.1z"/>
-    </g>
-</svg>
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
MirnaM	3e37c93395	Merge pull request #7 from GotPPay/inconsistent-state-fix Inconsistent state fix	2018-01-16 17:05:21 +01:00
GotPPay	cd041c0131	code improvements	2018-01-16 16:56:56 +01:00
MirnaM	0607f1e98d	Merge pull request #9 from GotPPay/UI-text-fix Ui text fix	2018-01-16 14:48:51 +01:00
GotPPay	5db270d957	fix missing css on build	2018-01-16 13:48:39 +01:00
GotPPay	389a71b05a	UI fix	2018-01-16 13:38:05 +01:00
GotPPay	e5783740cf	fix token expired state	2018-01-16 01:44:33 +01:00
GotPPay	1a5f4586a8	inconsistent state fix	2018-01-16 00:40:03 +01:00
GotPPay	a78189f1a1	removed doubled function ; return object instead of array with one element	2018-01-16 00:08:38 +01:00
GotPPay	cd938c3981	additional edit for api refactoring	2018-01-15 23:44:50 +01:00
MirnaM	2bce02ab4e	Merge pull request #6 from GotPPay/api-refactoring Api refactoring	2018-01-15 16:34:33 +01:00
GotPPay	6859f567a9	frontend api refactoring	2018-01-15 16:27:12 +01:00
GotPPay	6e7bccea86	frontend api refactoring	2018-01-15 16:09:41 +01:00
GotPPay	7e4b959ffa	backend api refactoring	2018-01-15 16:09:09 +01:00
GotPPay	e1f315cb81	backend api refactoring	2018-01-15 16:06:37 +01:00
MirnaM	49d30f00f8	Merge pull request #5 from GotPPay/step-4 Step 4	2018-01-15 14:56:03 +01:00
GotPPay	1b04e72b98	Revert changes	2018-01-15 14:52:34 +01:00
GotPPay	07857fd2f4	frontend code refactoring	2018-01-14 01:00:35 +01:00
GotPPay	7f56a28509	backend code refactoring	2018-01-13 14:57:41 +01:00
GotPPay	ff7e564d2e	conflict fix	2018-01-12 08:23:34 +01:00
GotPPay	bbec4e9940	.	2018-01-12 02:12:05 +01:00
GotPPay	b80843cb97	...	2018-01-12 01:56:17 +01:00
Bilal	4c8c1c5e0e	change utterances to correct form;change intents to mimic dialog;	2018-01-11 14:05:44 +00:00
GotPPay	7d79c03d15	initial step 4 for online test	2018-01-11 04:24:16 +01:00
GotPPay	44ef80b7dd	.	2018-01-07 17:53:46 +01:00