Merge pull request #5 from GotPPay/step-4

Step 4
2018-01-15 14:56:03 +01:00
parent 44ef80b7dd 1b04e72b98
commit 49d30f00f8
36 changed files with 11884 additions and 931 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,204 @@
+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
+      .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);
+        });
+
+        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
@@ -8,8 +8,10 @@ config.REFRESH_TOKEN = 'Atzr|IwEBICA3kDhfSJxlwvnQp9AD1o115AC_KBbFd5GBg8oN_QHWn2o
 config.TOKEN_EXPIRES_IN = 1515100500;

 config.SKILL_ID = 'amzn1.ask.skill.efbf0564-a732-4ba9-958f-57939138adae';
+//config.SKILL_DB_ID = '5a5016e775becaef2015da10'; //for server
+config.SKILL_DB_ID = '5a232fb86ce046c749739455'; //for local

 config.CLIENT_ID = 'amzn1.application-oa2-client.c748ca56ded04a95b236979898585ff7';
 config.CLIENT_SECRET = '6dea8125cecd049d3c4cff7bb5bdfd3ff17bc6fed246c4c8f6b519d9ed08d0b3';

-module.exports=config;
+module.exports = config;
--- a/backend/config/constants.js
+++ b/backend/config/constants.js
@@ -0,0 +1,25 @@
+const constants = {};
+
+constants.amazonResultCodes = {
+    ok:200,
+    accepted:202,
+    badRequest:400,
+    unauthorized:401,
+    notFound:404,
+    conflict:409,
+    payloadTooLarge:413
+}
+
+constants.apiResultCodes = {
+    genericError : -1,
+    ok:0,
+    amazonError:1,
+    databaseError:2,
+
+}
+
+constants.skillIDLength = 24;
+
+
+
+module.exports = constants;
--- a/backend/controllers/index.js
+++ b/backend/controllers/index.js
@@ -0,0 +1,6 @@
+var express = require ('express'), router = express.Router ();
+
+router.use ('/getSkill', require ('./skill'));
+router.use ('/updateSkill', require ('./skill')); // this will be fixed in next code refactoring
+
+module.exports = router;
--- a/backend/controllers/skill.js
+++ b/backend/controllers/skill.js
@@ -0,0 +1,91 @@
+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.skillIDLength) {
+    res.json ([]);
+  } else {
+    databaseHelper
+      .getSkill (id)
+      .then (result => {
+        res.json (result);
+      })
+      .catch (err => {
+        res.json ([]);
+      });
+  }
+});
+
+router.post ('/: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;
+
+  console.log ('id = ' + id);
+
+  if (id !== '-1') {
+    if (updateOnAmazon) {
+      amazonHelper
+        .updateSkill (skill)
+        .then (amazonResult => {
+          console.log ('Amazon : ' + amazonResult);
+          if (
+            amazonResult === constants.amazonResultCodes.ok ||
+            amazonResult === constants.amazonResultCodes.accepted
+          ) {
+            //Skill uploaded, it's ok to update databaseI
+            databaseHelper
+              .updateSkill (id, skill)
+              .then (result => {
+                res.json ({result: constants.apiResultCodes.ok, message: ''});
+                alexa.updateIntentsJSON ();
+              })
+              .catch (e => {
+                res.json ({
+                  result: constants.apiResultCodes.databaseError,
+                  message: '',
+                });
+              });
+          } else {
+            res.json ({
+              result: constants.apiResultCodes.amazonError,
+              message: amazonResult,
+            });
+          }
+        })
+        .catch (e => {
+          res.json ({
+            result: constants.apiResultCodes.amazonError,
+            message: 'unknown',
+          });
+        });
+    } else {
+      databaseHelper
+        .updateSkill (id, skill)
+        .then (result => {
+          res.json ({result: constants.apiResultCodes.ok, message: ''});
+          alexa.updateIntentsJSON ();
+        })
+        .catch (e => {
+          res.json ({
+            result: constants.apiResultCodes.databaseError,
+            message: '',
+          });
+        });
+    }
+  } else {
+    //no new skills for now
+  }
+});
+
+module.exports = router;
--- a/backend/express.js
+++ b/backend/express.js
@@ -1,177 +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 skillID = 'amzn1.ask.skill.7115bfc9-313e-4728-830b-ebd19ce96cb3';
-var skillDbID = '5a232fb86ce046c749739455'; //_id in database 
-
-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 normal
-app.set("view engine", "ejs");
-alexaApp.launch(function(request, response) {
-  console.log("Alexa launch");
-  console.log(request);
-  const skill = db.collection('skill_list').findOne({_id: ObjectID(skillDbID)}, (err,result)=>{
-    if (err){
-      response.say("I could not find desired skill")
-    }else{
-      response.say(skill.invocationAnswer);
-    }
-  });
-});
-
-var findElementByAttr = function (data, attr, val){
-  for(var i = 0; i < data.length; i ++) {
-    if(data[i][attr] === val) {
-        return i;
-    }
-  }
-  return -1;
-}
-
-alexaApp.request = (jsonRequest) => {
-  const alexaRequest = new alexa.request(jsonRequest);
-  if (alexaRequest.type() === "IntentRequest") {
-    const skill = db.collection('skill_list').findOne({
-      _id: skillDbID
-    });
-    if (skill) {
-      let intentId = findElementByAttr(skill.intents, 'intentName', alexaRequest.data.request.intent.name);
-      const response = new alexa.response(alexaRequest.getSession());
-      if (intentId !== -1){
-        return response.say(skill.intents[intentId].answer);
-      }else{
-        return response.say('Sorry, I could not find desired intent');
-      }
-    }
-  }
-};
-
-router.get ('/getSkill/:id', async (req, res, next) => {
-  try {
-    const id = req.params.id;
-
-    if (id.length !== 24){
-      res.json([]);
-      throw("error");
-    }
-
-    db.collection ('skill_list').find({_id: ObjectID(id)}).toArray((err,result)=>{
-      if (err){
-        throw err;
-        res.json([]);
-      }else{
-        res.json(result);
-      }
-    });
-    
-  } catch (e) {
-    console.log ('error:', e);
-    next (e);
-  }
-});
-
-router.get ('/deleteSkill/:skillID', async (req, res, next) => {
-  try {
-    let id = req.params.id;
-    let result = db.collection('skill_list').remove({_id: ObjectID(id)},(err,result)=>{
-      if (err) throw err;
-      res.json(result);
-    });
-  } catch (e) {
-    console.log ('error:', e);
-    next (e);
-  }
-});
-
-router.post ('/updateSkill/:id', async (req, res, next) => {
-  
-    let id = req.params.id;
-    let skill = req.body;
-    delete skill._id;
-    if (id !== '-1'){
-      amazonHelper.updateSkill(skill,db).then(amazonResult=>{
-        if (amazonResult===200 || amazonResult===202){
-          //Skill uploaded, it's ok to update database
-          let result = db.collection('skill_list').update({_id: ObjectID(id)}, skill,{upsert:true}, (err, result)=>{
-            if (JSON.parse(result).nModified===1){
-              //database update ok
-              res.json({result:0, message:'ok'});
-            }else{
-              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 => {
-  db = database;
-  db.collection ('intent_list');
-  
-  databaseHelper.initModule(db);
-  
-  app.listen (config.PORT, () =>{
-    console.log ('Express server running on port ' + config.PORT);
-    databaseHelper.loadTokens();
-  });
-}).catch(e=>{
-  console.log("error : " + e);
-});
--- a/backend/helpers/amazon.js
+++ b/backend/helpers/amazon.js
@@ -1,118 +1,171 @@
-require('isomorphic-fetch');
-const config = require('../config');
-var request = require("request");
-var token = require('./token');
+require ('isomorphic-fetch');
+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: TOKEN
-            },
-        }).then(l=>l.text()).then(result=>{
-            return result;
-        });
-    }catch(e){
-        console.log("err : " + e);
+var getBuildStatus = function (skillID) {
+  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 refreshToken = function(db){
-    return new Promise((resolve, reject)=>{
-        var options = { method: 'POST',
-        url: 'https://api.amazon.com/auth/o2/token',
-        headers: 
-         { 'cache-control': 'no-cache',
-           'content-type': 'application/x-www-form-urlencoded' },
-        form: 
-         { grant_type: 'refresh_token',
-           refresh_token: config.REFRESH_TOKEN,
-           client_id: config.CLIENT_ID,
-           client_secret: config.CLIENT_SECRET } };
-      
-        request(options, function (error, response, body) {
-            if (error) reject(error);
-            parsedResponse = JSON.parse(body);
-            if (parsedResponse.refresh_token){
-                try{
-                    token.updateTokens(parsedResponse.refresh_token, parsedResponse.access_token, parsedResponse.expires_in,db);
-                    resolve();
-                }catch(e){
-                    reject(e);
-                }
-            }
-        });
+var refreshTokens = function () {
+  return new Promise ((resolve, reject) => {
+    var options = {
+      method: 'POST',
+      url: 'https://api.amazon.com/auth/o2/token',
+      headers: {
+        'cache-control': 'no-cache',
+        'content-type': 'application/x-www-form-urlencoded',
+      },
+      form: {
+        grant_type: 'refresh_token',
+        refresh_token: config.REFRESH_TOKEN,
+        client_id: config.CLIENT_ID,
+        client_secret: config.CLIENT_SECRET,
+      },
+    };
+
+    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
+        );
+      console.log ('Token refresh failed');
+      console.log (body);
+      reject (body);
    });
-}
+  });
+};

-var generateInteractionModel = function(skill){
-    let result = {};
-    let allIntents = [];
-    let defaultIntents = [{
-            name: "AMAZON.CancelIntent",
-            samples: []
-            },
-            {
-            name: "AMAZON.HelpIntent",
-            samples: []
-            },
-            {
-            name: "AMAZON.StopIntent",
-            samples: []
-            }];
+var generateInteractionModel = function (skill) {
+  let result = {};
+  let allIntents = [];
+  let defaultIntents = [
+    {
+      name: 'AMAZON.CancelIntent',
+      samples: [],
+    },
+    {
+      name: 'AMAZON.HelpIntent',
+      samples: [],
+    },
+    {
+      name: 'AMAZON.StopIntent',
+      samples: [],
+    },
+  ];

-    /*
+  /*
    defaultIntents.map(intent=>{
        allIntents.push(intent);
    });
    */

-    skill.intents.map(intent=>{
-        allIntents.push({name: intent.intentName, samples: intent.questions});
-    });
+  skill.intents.map (intent => {
+    allIntents.push ({name: intent.intentName, samples: intent.questions});
+  });

-    result.interactionModel = {};
+  //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',
+    ],
+  });

-    result.interactionModel.languageModel = {
-        invocationName: skill.invocationName,
-        intents: allIntents
-    };
+  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',
+      },
+    ],

-    return JSON.stringify(result);
-}
+    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}',
+    ],
+  });

-var uploadSkill = function(skill){
-    return fetch(`https://api.amazonalexa.com/v0/skills/${skill.skillID}/interactionModel/locales/en-US`, {
-            method: 'POST',
-            headers: {
-                Authorization: config.TOKEN
-            },
-                body: generateInteractionModel(skill)
-            });
-}
+  result.interactionModel = {};
+
+  result.interactionModel.languageModel = {
+    invocationName: skill.invocationName,
+    intents: allIntents,
+  };
+
+  return JSON.stringify (result);
+};
+
+var uploadSkill = function (skill) {
+  return fetch (
+    `https://api.amazonalexa.com/v0/skills/${skill.skillID}/interactionModel/locales/en-US`,
+    {
+      method: 'POST',
+      headers: {
+        Authorization: config.TOKEN,
+      },
+      body: generateInteractionModel (skill),
+    }
+  );
+};

 module.exports = {
-    updateSkill: function(skill, db){
-        return new Promise((resolve,reject)=>{
-            if (new Date() / 1000 > config.TOKEN_EXPIRES_IN){
-                refreshToken(db).then(()=>{
-                    uploadSkill(skill).then(response=>{
-                        resolve(response.status);
-                    });
-                }).catch(e=>{
-                    reject(e);
-                });
-            }else{
-                uploadSkill(skill).then(response=>{
-                    resolve(response.status);
-                }).catch(e=>{
-                    reject(e);
-                })
-            }
-        });
-
-        
-    }
-};
+  updateSkill: function (skill) {
+    return new Promise ((resolve, reject) => {
+      if (new Date () / 1000 > config.TOKEN_EXPIRES_IN) {
+        refreshTokens ()
+          .then (() => {
+            uploadSkill (skill).then (response => {
+              resolve (response.status);
+            });
+          })
+          .catch (e => {
+            reject (e);
+          });
+      } else {
+        uploadSkill (skill)
+          .then (response => {
+            resolve (response.status);
+          })
+          .catch (e => {
+            reject (e);
+          });
+      }
+    });
+  },
+};
--- a/backend/helpers/database.js
+++ b/backend/helpers/database.js
@@ -1,27 +1,111 @@
-const config = require('../config');
+const config = require ('../config/config');
+var ObjectID = require ('mongodb').ObjectID;

 var db = null;

-
 module.exports = {
-    initModule : function(databaseObject){
-        db=databaseObject;
-    },
+  initModule: function (databaseObject) {
+    db = databaseObject;
+    db.collection ('intent_list');
+  },

-    loadTokens : function(){
-        db.collection('token_list').findOne().then(tokens=>{
-            if (tokens !== null){
-                config.TOKEN = tokens.access_token;
-                config.REFRESH_TOKEN = tokens.refresh_token;
-                config.TOKEN_EXPIRES_IN = tokens.expires_in;
-            }else{
-                //Cannot continue without tokens
-                console.log("Cannot continue without tokens in database");
-                process.exit(-1);
-            }
-        }).catch(e=>{
-            console.log("Error loading tokens ! Cannot continue without tokens in database");
-            process.exit(-1);
-        })
-    }
-}
+  loadTokens: function () {
+    db
+      .collection ('token_list')
+      .findOne ()
+      .then (tokens => {
+        if (tokens !== null) {
+          config.TOKEN = tokens.access_token;
+          config.REFRESH_TOKEN = tokens.refresh_token;
+          config.TOKEN_EXPIRES_IN = tokens.expires_in;
+        } else {
+          //Cannot continue without tokens
+          console.log ('Cannot continue without tokens in database');
+          process.exit (-1);
+        }
+      })
+      .catch (e => {
+        console.log (
+          'Error loading tokens ! Cannot continue without tokens in database'
+        );
+        process.exit (-1);
+      });
+  },
+
+  updateTokens: function (refresh_token, access_token, expires_in) {
+    return new Promise ((resolve, reject) => {
+      let newTokenDocument = {
+        id: 1,
+        refresh_token: refresh_token,
+        access_token: access_token,
+        expires_in: new Date () / 1000 + expires_in,
+      };
+      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 ();
+        });
+    });
+  },
+
+  loadSkill: function (skillDbID) {
+    return new Promise ((resolve, reject) => {
+      db
+        .collection ('skill_list')
+        .findOne ({_id: ObjectID (skillDbID)}, (err, skill) => {
+          if (skill) {
+            resolve (skill);
+          } else {
+            reject (err);
+          }
+        });
+    });
+  },
+
+  updateSkill: function (id, skill) {
+    return new Promise ((resolve, reject) => {
+      db
+        .collection ('skill_list')
+        .update ({_id: ObjectID (id)}, skill, {upsert: true}, (err, result) => {
+          if (err){
+            reject();
+          }else{
+            resolve();
+          }
+        });
+    });
+  },
+
+  deleteSkill: function (id) {
+    return new Promise ((resolve, reject) => {
+      db
+        .collection ('skill_list')
+        .remove ({_id: ObjectID (id)}, (err, 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);
+          }else{
+            resolve (result);
+          }
+        });
+    });
+  },
+};
--- a/backend/helpers/token.js
+++ b/backend/helpers/token.js
@@ -1,19 +0,0 @@
-const config = require('../config');
-var ObjectID = require ('mongodb').ObjectID;
-
-module.exports = {
-    updateTokens : function (refresh_token, access_token, expires_in, db){
-        let newTokenDocument = {
-            id:1,
-            refresh_token:refresh_token,
-            access_token: access_token,
-            expires_in: (new Date() / 1000) + expires_in
-        }
-        let result = db.collection('token_list').update({id:1}, newTokenDocument,{upsert:true}, (err, result)=>{
-            if (err) throw new Error(err);
-            config.REFRESH_TOKEN = refresh_token;
-            config.TOKEN = access_token;
-            config.TOKEN_EXPIRES_IN = newTokenDocument.expires_in;
-        });
-    }
-};
--- 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, OPTIONS');
+  res.header ('Access-Control-Allow-Credentials', 'true');
+  next ();
+};
--- a/backend/package-lock.json
+++ b/backend/package-lock.json
@@ -211,6 +211,16 @@
        "concat-map": "0.0.1"
      }
    },
+    "bson": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/bson/-/bson-1.0.4.tgz",
+      "integrity": "sha1-k8ENOeqltYQVy8QFLz5T5WKwtyw="
+    },
+    "buffer-shims": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz",
+      "integrity": "sha1-mXjOMXOIxkmth5MCjDR37wRKi1E="
+    },
    "builtin-modules": {
      "version": "1.1.1",
      "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz",
@@ -428,6 +438,19 @@
      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.1.tgz",
      "integrity": "sha1-eePVhlU0aQn+bw9Fpd5oEDspTSA="
    },
+    "encoding": {
+      "version": "0.1.12",
+      "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.12.tgz",
+      "integrity": "sha1-U4tm8+5izRq1HsMjgp0flIDHS+s=",
+      "requires": {
+        "iconv-lite": "0.4.19"
+      }
+    },
+    "es6-promise": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-3.2.1.tgz",
+      "integrity": "sha1-7FYjOGgDKQkgcXDDlEjiREndH8Q="
+    },
    "escape-html": {
      "version": "1.0.3",
      "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
@@ -711,11 +734,30 @@
      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.5.2.tgz",
      "integrity": "sha1-1LUFvemUaYfM8PxY2QEP+WB+P6A="
    },
+    "is-stream": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
+      "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ="
+    },
    "is-typedarray": {
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
    },
+    "isarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
+    },
+    "isomorphic-fetch": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz",
+      "integrity": "sha1-YRrhrPFPXoH3KVB0coGf6XM1WKk=",
+      "requires": {
+        "node-fetch": "1.7.3",
+        "whatwg-fetch": "2.0.3"
+      }
+    },
    "isstream": {
      "version": "0.1.2",
      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
@@ -819,6 +861,25 @@
        "brace-expansion": "1.1.8"
      }
    },
+    "mongodb": {
+      "version": "2.2.33",
+      "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-2.2.33.tgz",
+      "integrity": "sha1-tTfEcdNKZlG0jzb9vyl1A0Dgi1A=",
+      "requires": {
+        "es6-promise": "3.2.1",
+        "mongodb-core": "2.1.17",
+        "readable-stream": "2.2.7"
+      }
+    },
+    "mongodb-core": {
+      "version": "2.1.17",
+      "resolved": "https://registry.npmjs.org/mongodb-core/-/mongodb-core-2.1.17.tgz",
+      "integrity": "sha1-pBizN6FKFJkPtRC5I97mqBMXPfg=",
+      "requires": {
+        "bson": "1.0.4",
+        "require_optional": "1.0.1"
+      }
+    },
    "ms": {
      "version": "2.0.0",
      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
@@ -840,6 +901,15 @@
      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz",
      "integrity": "sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk="
    },
+    "node-fetch": {
+      "version": "1.7.3",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-1.7.3.tgz",
+      "integrity": "sha512-NhZ4CsKx7cYm2vSrBAr2PvFOe6sWDf0UYLRqA6svUYg7+/TSfVAu49jYC4BvQ4Sms9SZgdqGBgroqfDhJdTyKQ==",
+      "requires": {
+        "encoding": "0.1.12",
+        "is-stream": "1.1.0"
+      }
+    },
    "node-forge": {
      "version": "0.7.1",
      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.7.1.tgz",
@@ -910,6 +980,11 @@
      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
      "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns="
    },
+    "process-nextick-args": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
+      "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M="
+    },
    "proxy-addr": {
      "version": "2.0.2",
      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.2.tgz",
@@ -945,6 +1020,20 @@
        "unpipe": "1.0.0"
      }
    },
+    "readable-stream": {
+      "version": "2.2.7",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.7.tgz",
+      "integrity": "sha1-BwV6y+JGeyIELTb5jFrVBwVOlbE=",
+      "requires": {
+        "buffer-shims": "1.0.0",
+        "core-util-is": "1.0.2",
+        "inherits": "2.0.3",
+        "isarray": "1.0.0",
+        "process-nextick-args": "1.0.7",
+        "string_decoder": "1.0.3",
+        "util-deprecate": "1.0.2"
+      }
+    },
    "request": {
      "version": "2.83.0",
      "resolved": "https://registry.npmjs.org/request/-/request-2.83.0.tgz",
@@ -974,6 +1063,15 @@
        "uuid": "3.1.0"
      }
    },
+    "require_optional": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/require_optional/-/require_optional-1.0.1.tgz",
+      "integrity": "sha512-qhM/y57enGWHAe3v/NcwML6a3/vfESLe/sGM2dII+gEO0BpKRUkWZow/tyloNqJyN6kXSl3RyyM8Ll5D/sJP8g==",
+      "requires": {
+        "resolve-from": "2.0.0",
+        "semver": "5.4.1"
+      }
+    },
    "resolve": {
      "version": "1.5.0",
      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.5.0.tgz",
@@ -983,6 +1081,11 @@
        "path-parse": "1.0.5"
      }
    },
+    "resolve-from": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-2.0.0.tgz",
+      "integrity": "sha1-lICrIOlP+h2egKgEx+oUdhGWa1c="
+    },
    "safe-buffer": {
      "version": "5.1.1",
      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
@@ -991,8 +1094,7 @@
    "semver": {
      "version": "5.4.1",
      "resolved": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz",
-      "integrity": "sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg==",
-      "optional": true
+      "integrity": "sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg=="
    },
    "send": {
      "version": "0.16.1",
@@ -1065,6 +1167,14 @@
      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.4.0.tgz",
      "integrity": "sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew=="
    },
+    "string_decoder": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
+      "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
+      "requires": {
+        "safe-buffer": "5.1.1"
+      }
+    },
    "stringstream": {
      "version": "0.0.5",
      "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
@@ -1182,6 +1292,11 @@
      "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
      "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw="
    },
+    "util-deprecate": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
+    },
    "utils-merge": {
      "version": "1.0.1",
      "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
@@ -1212,6 +1327,11 @@
        "extsprintf": "1.3.0"
      }
    },
+    "whatwg-fetch": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-2.0.3.tgz",
+      "integrity": "sha1-nITsLc9oGH/wC8ZOEnS0QhduHIQ="
+    },
    "wrappy": {
      "version": "1.0.2",
      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
--- 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.dbURL)
+  .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,62 +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
-}
--- a/web/package-lock.json
+++ b/web/package-lock.json
--- 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,15 +25,17 @@ 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];
+    getSkill(this.state._id).then(l=>l.json()).then(result=>{
+      let jResult = result[0];
      if (jResult===undefined) return;
      this.setState({ skillID:jResult.skillID,skillName:jResult.skillName, invocationName: jResult.invocationName,
                      invocationAnswer: jResult.invocationAnswer, 
-                      allIntents: jResult.intents})
+                      allIntents: jResult.intents, contactEmail: jResult.contactEmail})
    })

    this.handleIntentClick = this.handleIntentClick.bind(this);
@@ -38,56 +45,60 @@ class App extends Component {
    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() {
-    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}>
-          </IntentList>
-          <LaunchRequest  invocationName={this.state.invocationName}
-                          invocationAnswer={this.state.invocationAnswer}
-                          onSaveClick={this.handleSaveLaunchRequestClick}> </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}>
-          </IntentList>
-          <IntentDetails  selectedIntent={this.state.selectedIntent}
-                          onDeleteIntentClick={this.handleDeleteIntentClick}
-                          onSaveIntentClick={this.handleSaveIntentClick}>
-          </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
    };
  }

@@ -96,47 +107,41 @@ 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({invocationName: name, invocationAnswer: answer});
-    console.log("handleSaveLaunchRequest");
-      updateSkill(this.createSkill(this.state.allIntents,name,answer)).then(l=>l.text()).then(result=>{
-        let jResult = JSON.parse(result);
-        if (jResult.result !== 0){
-          Popup.alert('Model was not saved. Please try again');
-        }else{
-          Popup.alert('Saved');
-        }
-        console.log(jResult.message);
-      }).catch(e=>{
-        console.log("Error :" + e);
-        Popup.alert('Model was not saved. Please try again');
-      });
+    this.setState({waiting:true, invocationName:name, invocationAnswer: answer});
+    this.sendSkill(this.state.allIntents,true,{waiting:false},{waiting:false},name,answer,this.state.contactEmail,true);
+  }
+
+  handleSaveEmailClick(email){
+    this.setState({waiting:true});
+    this.sendSkill(this.state.allIntents,true,{contactEmail: email, waiting:false},{waiting:false},this.state.invocationName,this.state.invocationAnswer,email,false);
  }

  handleDeleteIntentClick(selectedIntent){
-    let id = this.state.allIntents.indexOf(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;
+    });
+
    if (id!==-1){
      try{
-        //I don't like this, state in database is different than component state, for some time
-        //TODO : move database operation in componentWillUpdate or componentDidUpdate
-        let newAllIntents = this.state.allIntents;
+        let newAllIntentsJSON = JSON.stringify(this.state.allIntents);
+        let newAllIntents = JSON.parse(newAllIntentsJSON);
        newAllIntents.splice(id,1);
-        this.setState({allIntents: newAllIntents, selectedIntent: {intentName:'', questions:[''],answer:''}});
-        updateSkill(this.createSkill(newAllIntents)).then(l=>l.text()).then(result=>{
-          let jResult = JSON.parse(result);
-          if (jResult.result !== 0){
-            Popup.alert('Model was not saved. Please try again');
-          }else{
-            Popup.alert('Saved');
-          }
-          console.log(jResult.message);
-        }).catch(e=>{
-          console.log("error : " + e);
-          Popup.alert('Model was not saved. Please try again');
-        });
+        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);
      }
@@ -145,33 +150,46 @@ class App extends Component {

  
  handleSaveIntentClick(selectedIntent){
-    let newAllIntents = this.state.allIntents;
-    if (this.state.selectedIndex === -1){
+    let newAllIntentsJSON = JSON.stringify(this.state.allIntents);
+    let newAllIntents = JSON.parse(newAllIntentsJSON);
+
+    let newState = null;
+    if (this.state.selectedIndex === NEW_INTENT_SELECTED_INDEX){
      //new intent
      newAllIntents.push(selectedIntent);
-      this.setState({allIntents: newAllIntents, selectedIntent: selectedIntent, selectedIndex: newAllIntents.length-1});
+      newState = {allIntents: newAllIntents, selectedIntent: selectedIntent, selectedIndex: newAllIntents.length-1, waiting:false};
    }else{
      newAllIntents[this.state.selectedIndex] = selectedIntent;
-      this.setState({allIntents: newAllIntents, selectedIntent: selectedIntent});
+      newState = {allIntents: newAllIntents, selectedIntent: selectedIntent, waiting: false};
    }
-    
-    updateSkill(this.createSkill(newAllIntents)).then(l=>l.text()).then(result=>{
-      let jResult = JSON.parse(result);
-      if (jResult.result !== 0){
-        Popup.alert('Model was not saved. Please try again');
-      }else{
-        Popup.alert('Saved');
-      }
-      console.log(jResult.message);
-    }).catch(e=>{
-      Popup.alert('Model was not saved. Please try again');
-      console.log("error : " + e);
-    });
-  
+    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: -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, 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/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%'}}
+            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">Questions</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,18 @@ 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)}}>Delete intent</Button>
-        <Button style={{float:'left', marginLeft: '22%'}} flat primary swapTheming onClick={this.addQuestion}>Add question</Button>        
-        <Button style={{float:'left', marginLeft: '20px'}} flat primary swapTheming onClick={()=>{this.props.onSaveIntentClick(this.state.intent)}}>Save</Button>
+        <Button className="IntentDetailsButton" flat primary onClick={()=>{this.props.onDeleteIntentClick(this.state.intent)}} disabled={this.props.waiting}>Delete intent</Button>
+        <Button className="IntentDetailsButton" flat primary swapTheming onClick={this.addQuestion} disabled={this.props.waiting}>Add question</Button>        
+        <Button className="IntentDetailsButton" flat primary swapTheming onClick={()=>{this.props.onSaveIntentClick(this.state.intent)}} disabled={this.props.waiting}>Save</Button>
+        
      </div>
    );
  }
@@ -109,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 {
  
@@ -21,9 +21,10 @@ class IntentItem extends Component {
                <Button className={this.props.selectedIndex===this.state.index ? 'IntentItem-selected' : 'IntentItem'}
                        onClick={()=>{this.state.onClick(this.state.intent,this.state.index)}}
                        flat
+                        disabled={this.props.waiting}
                        tooltipDelay={INTENT_TITLE_TOOLTIP_DELAY}
                        tooltipLabel={this.state.intent.intentName.length>INTENT_TITLE_MAX_LENGTH ? this.state.intent.questions[0] : ''}>
-                            {this.state.index+1}. {buttonTitle}
+                            {buttonTitle}
                </Button>  
                <br></br>
            </div>
--- 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,22 +20,32 @@ class IntentList extends Component {
    render() {
        return (
            <div className="IntentList">
-                <Button className={this.props.selectedIndex===-2 ? "LaunchRequest-selected" : "LaunchRequest"} flat primary 
-                        onClick={this.props.onLaunchRequestClick}>Launch request</Button>
+                <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>
                </div>
                {
                    this.state.intents.map((intent,index)=>{
                    return <IntentItem 
-                                key={index} intent={intent} index={index} 
+                                key={intent.intentName} intent={intent} index={index} 
                                selectedIndex={this.props.selectedIndex} 
-                                onClick={this.state.onIntentClick}>
+                                onClick={this.state.onIntentClick}
+                                waiting={this.props.waiting}>
                            </IntentItem>
                    })
                }
                <br></br>
-                <Button className={"AddIntent"} flat primary swapTheming onClick={this.props.onAddIntentClick}>Add intent</Button>
+                <Button className="AddIntent" flat primary swapTheming 
+                        onClick={this.props.onAddIntentClick}
+                        disabled={this.props.waiting}>Add intent</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,33 @@ 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 onClick={()=>{this.props.onSaveClick(this.state.invocationName, this.state.invocationAnswer)}}>Save</Button>
+        <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 = 'tellall.saburly.com';
-
 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,71 +0,0 @@
-/*IntentList and IntentItem CSS*/
-.IntentList {
-  width: 30%;
-  min-height: 9999px;
-  height: 9999px;
-  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: 9999px;
-  height: 9999px;
-  background-color: #f5f5f5; }
-
-.QuestionBox {
-  margin: 25px; }
-
-/*LaunchRequest CSS*/
-.LaunchRequestBox {
-  float: left;
-  width: 70%;
-  min-height: 9999px;
-  height: 9999px;
-  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,86 +0,0 @@
-/*IntentList and IntentItem CSS*/
-
-.IntentList{
-    width: 30%;
-    min-height:9999px;
-    height:9999px;
-    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:9999px;
-    height:9999px;
-    background-color: #f5f5f5;
-}
-
-.QuestionBox{
-    margin:25px;
-}
-
-/*LaunchRequest CSS*/
-
-.LaunchRequestBox{
-    float: left;
-    width:70%;
-    min-height: 9999px;
-    height: 9999px;
-    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/css/index.scss
+++ b/web/src/css/index.scss
@@ -2,7 +2,6 @@

@include react-md-everything;

-
 body {
  margin: 0;
  padding: 0;
--- a/web/src/css/popup.scss
+++ b/web/src/css/popup.scss
@@ -1,205 +1,174 @@
 .mm-popup {
-    display: none;
-}
+  display: none; }

 .mm-popup--visible {
-    display: block;
-}
+  display: block; }

-    .mm-popup__overlay {
-        position: fixed;
-        top: 0;
-        left: 0;
-        width: 100%;
-        height: 100%;
-        z-index: 1000;
-        overflow: auto;
-        background: rgba(0, 0, 0, .1);
-    }
+.mm-popup__overlay {
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  z-index: 1000;
+  overflow: auto;
+  background: rgba(0, 0, 0, 0.1); }

-    .mm-popup__close {
-        position: absolute;
-        top: 15px;
-        right: 20px;
-        padding: 0;
-        width: 20px;
-        height: 20px;
-        cursor: pointer;
-        outline: none;
-        text-align: center;
-        border-radius: 10px;
-        border: none;
-        text-indent: -9999px;
-        background: transparent url('data:image/png;base64,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') no-repeat center center;
-        background-size: 100%;
-        margin: 0;
-    }
+.mm-popup__close {
+  position: absolute;
+  top: 15px;
+  right: 20px;
+  padding: 0;
+  width: 20px;
+  height: 20px;
+  cursor: pointer;
+  outline: none;
+  text-align: center;
+  border-radius: 10px;
+  border: none;
+  text-indent: -9999px;
+  background: transparent url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAABGdBTUEAALGPC/xhBQAAB8BJREFUWAnFWAtsU1UY/s+5XTcYYxgfvERQeQXxNeYLjVFxLVvb2xasKIgSVNQoREVI1GhmfC6ioijiNDo1vBxb19uVtRWUzAQ1+EowOkSQzTBAUJio27r2Hr9TLJTaa7vK4yTtvec///+f7/znf5xzGf2PZnVMKRHUczEJNpgYDSEdPzTB6GdG1EbE2sxk+qqxsW5rrtNAT+/aZLtrkiDdLYhUIcSwQ9KsA7DaAbKdEWOCQBckxwrkOGP0Lf7rTAqrW+vzbT4kk91/1gAB7BqdYlVC0KUAsQuANOKKjwYUNYfff//PdNNZ3O4zqEe/FguZykhUYFGFQKspnBYGNW1LOplUWkaANtvUc3pY5FUAKwewb4jzR0KaN8ikoXrRZs2aVbBr3/6bddKfhHUHAugys+j3eCCwYv9/qflPgFab83ps52ookxZ6OOT3regtsNTJHY45fSO05yGh6wsFsZ1cIVtI035M5Uv0DQFabY77BWOLsNrmQrPi8Xq9vyaEjsXT4pg6VuiRABZfzAVzhwK+T9Lp5emIFru6QCd6CXv4+sRLSizHGpycM+yvayng/S6Do7QIJtZZVXVyOiz/sqDV4XAKweoxsDjUqM1PJ3QsaeVz5+bHtrc2IjWVmky8tKmhYVuy/qMsWOZyXSR0Wo4IDVxRWrIgmfF4vTctWdINF7oJljwQ7dG9lpkzC5PnOgywsrKSU1R/Gz6xo7hPwXT0scsnpkkXEnncjTw6kvZ3vJI8q5Lo5BUV3YaAuFthyjStof6HBP1EPbe3tOweNWpMF0AuGHveuNqtLS375NxxC8rQB7inkOd8wcaGDScKVOo8/fvmLwWOPZFIrDIxFgcYEbtnA9wgk1lZmBgwetrtnqGTbapqNG5Et06ZMhhuYzIal/Ta2tpOlMVnEAOeCqfzfEmLA0SV8KB+bljr9Wbc2ijrujpGwmdxOB+SCrJpckGiu+enT7/85uZM/P375FcjDn6LxsRMycsrPJ5B2PerOLE1mYTleNDvX8k4W4xK8HyZ3XlvJpkym+qJEa1B1VjHRwz7IBM/rBjBNodhxXLJy6N/dbvlSz4nr3xm08J+7QHkyTdI6EssDsftRjJWh2smtmwlyrZ29tBBbplSjHiT6ZyxIHZ1vHQnVBlRArTfaZq2J5kp0zuS+D2w5Hs4/FWj8sxI5bfa1TuF0GtAX4W0Na26uronlceon89FSI5FRPf1HJY4C2e1HUbMRnR5aCguyIf1RC143oW1piZ44Z/zdCFgYXpnYmnJrdg27HL2LW4sxg7A9YYhqthwEmJ99uJHOOXEiMxbNm76qkAX+kps9xSUyXHwzyps02tBv29urqcfGG4fzgKnIYrFMHTajkzbuzcAjBb3zb8ROtajTHqx2Cq8L4IL3JcruEMIxF4cck/niK4IjlV5vYN1NLeMPATDd6DKPBclhfmP5sipdxBSRdKCe/E7PScVEMJxnllszlfgcw/CYk8g4X8OSwbKHY7Lc9Up5aB2MNxvN2eC7UUnJ4DYXm51ON/AqXsuVvpAuFGrVAYUVUD991HBmuStL1eQ2N7hkG1DfqY92J4ze6vI4/EoCI53YcE7EBD3hAL+xVJH0/Llv5tFkRUTtOoiGrbY3ONz0F2MAOnPGG8FQLYRCi7DhP2yVTRnzpy8A391r8TipqNYzkZALEuWlRchpU9BGfbpF8Fi6yar6pjk8UzvBzt7SuM8grbwPBMPwArm37u6JmUSlOPyBLyjfVcdttGNPDfjQ7+/Jp1cU23tXp6fNwkRfTCmi/XydpiOLx0tRvoNWPzOoN+7iQe83u/h2Dvgh7Z0zKk0/afWF+C8VsYVTzigrUodT+6H6ut3IaKvw0KiEYp8pKpqUfJ4unfp16C7meD1Mk3JDprwovbdaLNNP+VQ3/hfKGwFJ+WasL+hwZjryEjY5/vZTObrYJFmznHJzNA+2/S1dI2BsLysUBBDw8qGdOr0Ixz75XCj/2FJOxlNpiyrQ/0CuZmF/b4Jhy2I2ie/qywFqHkAO/BkgJNzWu3OW7GTJZzT/EQV+meL5Veewudg0FhnjJacDIAul2sATlZPw3gavjR8nMBwGCDOofuA+m74o0de3BMMJ+KJwDD9GY2twdGtH+7GDybPeZTTbvthy+aRo8cUYxWPjhw1duO2rVu2JzMfr3dzYZF0LzdTmCvk832RPM9hCyaIEy+ZsBBpoRnlqyGXy1FCTzbPeKm0q1WoGnch1c0La9qHqXLxKE4lyqrS0YlKQVTBhJifKGOpfP+nXz5jRv9Yx8HliFwbXOtR1PFn0+lLC1Ayylrb0dn1IqJqHmr1alL4ApnT0inpLa1MVa9kungLQYk7B90SDGiakQ5DgAkBi02djeiqgrJC3A8WiQHFVUZfVBMyRs9yp3McrpPPIhHjXs02m0zspiafT54jDVtGgFJSpoDOqP4YfOU+KO+Cco1xsYaPGBHMdFOTRaBbl9+zyYlcWwZ17Vjw41dOmPAefDDj95+sACaWV+5ynQsLzMZ104NAGoVo/0Oe/eDgrVDUhtl2gl7IOA2Of/FnYgSAXRBPuoI+JS5WDzn11DdramqwyOxarwAmq7Ta3RfqIqZCwWhYZjicHbdDGhoHLeTXfmrHUWwngDaTWWkMe72/JMtn+/43YTIL+pAwwhkAAAAASUVORK5CYII=") no-repeat center center;
+  background-size: 100%;
+  margin: 0; }

-    .mm-popup__input {
-        display: block;
-        width: 100%;
-        height: 30px;
-        border-radius: 3px;
-        background: #f5f5f5;
-        border: 1px solid #e9ebec;
-        outline: none;
-        -moz-box-sizing: border-box !important;
-        -webkit-box-sizing: border-box !important;
-        box-sizing: border-box !important;
-        font-size: 14px;
-        padding: 0 12px;
-        color: #808080;
-    }
+.mm-popup__input {
+  display: block;
+  width: 100%;
+  height: 30px;
+  border-radius: 3px;
+  background: #f5f5f5;
+  border: 1px solid #e9ebec;
+  outline: none;
+  -moz-box-sizing: border-box !important;
+  -webkit-box-sizing: border-box !important;
+  box-sizing: border-box !important;
+  font-size: 14px;
+  padding: 0 12px;
+  color: #808080; }

-    .mm-popup__btn {
-        border-radius: 3px;
-        -moz-box-sizing: border-box;
-        -webkit-box-sizing: border-box;
-        box-sizing: border-box;
-        padding: 0 10px;
-        margin: 0;
-        line-height: 32px;
-        height: 32px;
-        border: 1px solid #666;
-        text-align: center;
-        display: inline-block;
-        font-size: 12px;
-        font-weight: 400;
-        color: #333;
-        background: transparent;
-        outline: none;
-        text-decoration: none;
-        cursor: pointer;
-        font-family: "Open Sans", sans-serif;
-    }
+.mm-popup__btn {
+  border-radius: 3px;
+  -moz-box-sizing: border-box;
+  -webkit-box-sizing: border-box;
+  box-sizing: border-box;
+  padding: 0 10px;
+  margin: 0;
+  line-height: 32px;
+  height: 32px;
+  border: 1px solid #666;
+  text-align: center;
+  display: inline-block;
+  font-size: 12px;
+  font-weight: 400;
+  color: #333;
+  background: transparent;
+  outline: none;
+  text-decoration: none;
+  cursor: pointer;
+  font-family: "Open Sans", sans-serif; }

-    .mm-popup__btn--success {
-        background-color: #27ae60;
-        border-color: #27ae60;
-        color: #fff;
-    }
+.mm-popup__btn--success {
+  background-color: #27ae60;
+  border-color: #27ae60;
+  color: #fff; }

-    .mm-popup__btn--danger {
-        background-color: #c5545c;
-        border-color: #c5545c;
-        color: #fff;
-    }
+.mm-popup__btn--danger {
+  background-color: #c5545c;
+  border-color: #c5545c;
+  color: #fff; }

-    .mm-popup__box {
-        width: 350px;
-        position: fixed;
-        top: 10%;
-        left: 50%;
-        margin-left: -175px;
-        background: #fff;
-        box-shadow: 0px 5px 20px 0px rgba(126,137,140,0.20);
-        border-radius: 5px;
-        border: 1px solid #B8C8CC;
-        overflow: hidden;
-        z-index: 1001;
-    }
+.mm-popup__box {
+  width: 350px;
+  position: fixed;
+  top: 10%;
+  left: 50%;
+  margin-left: -175px;
+  background: #fff;
+  box-shadow: 0px 5px 20px 0px rgba(126, 137, 140, 0.2);
+  border-radius: 5px;
+  border: 1px solid #B8C8CC;
+  overflow: hidden;
+  z-index: 1001; }

-        .mm-popup__box__header {
-            padding: 15px 20px;
-            background: #EDF5F7;
-            color: #454B4D;
-        }
+.mm-popup__box__header {
+  padding: 15px 20px;
+  background: #EDF5F7;
+  color: #454B4D; }

-            .mm-popup__box__header__title {
-                margin: 0;
-                font-size: 16px;
-                text-align: left;
-                font-weight: 600;
-            }
+.mm-popup__box__header__title {
+  margin: 0;
+  font-size: 16px;
+  text-align: left;
+  font-weight: 600; }

-        .mm-popup__box__body {
-            padding: 20px;
-            line-height: 1.4;
-            font-size: 14px;
-            color: #454B4D;
-            background: #fff;
-            position: relative;
-            z-index: 2;
-        }
+.mm-popup__box__body {
+  padding: 20px;
+  line-height: 1.4;
+  font-size: 14px;
+  color: #454B4D;
+  background: #fff;
+  position: relative;
+  z-index: 2; }

-            .mm-popup__box__body p {
-                margin: 0 0 5px;
-            }
+.mm-popup__box__body p {
+  margin: 0 0 5px; }

-        .mm-popup__box__footer {
-            overflow: hidden;
-            padding: 40px 20px 20px;
-        }
+.mm-popup__box__footer {
+  overflow: hidden;
+  padding: 40px 20px 20px; }

-            .mm-popup__box__footer__right-space {
-                float: right;
-            }
+.mm-popup__box__footer__right-space {
+  float: right; }

-                .mm-popup__box__footer__right-space .mm-popup__btn {
-                    margin-left: 5px;
-                }
+.mm-popup__box__footer__right-space .mm-popup__btn {
+  margin-left: 5px; }

-            .mm-popup__box__footer__left-space {
-                float: left;
-            }
+.mm-popup__box__footer__left-space {
+  float: left; }

-                .mm-popup__box__footer__left-space .mm-popup__btn {
-                    margin-right: 5px;
-                }
+.mm-popup__box__footer__left-space .mm-popup__btn {
+  margin-right: 5px; }

-    .mm-popup__box--popover {
-        width: 300px;
-        margin-left: -150px;
-    }
+.mm-popup__box--popover {
+  width: 300px;
+  margin-left: -150px; }

-        .mm-popup__box--popover .mm-popup__close {
-            position: absolute;
-            top: 5px;
-            right: 5px;
-            padding: 0;
-            width: 20px;
-            height: 20px;
-            cursor: pointer;
-            outline: none;
-            text-align: center;
-            border-radius: 10px;
-            border: none;
-            text-indent: -9999px;
-            background: transparent url('data:image/png;base64,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') no-repeat center center;
-            background-size: 100%;
-            margin: 0;
-            z-index: 3;
-        }
+.mm-popup__box--popover .mm-popup__close {
+  position: absolute;
+  top: 5px;
+  right: 5px;
+  padding: 0;
+  width: 20px;
+  height: 20px;
+  cursor: pointer;
+  outline: none;
+  text-align: center;
+  border-radius: 10px;
+  border: none;
+  text-indent: -9999px;
+  background: transparent url("data:image/png;base64,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") no-repeat center center;
+  background-size: 100%;
+  margin: 0;
+  z-index: 3; }

-        .mm-popup__box--popover .mm-popup__box__body {
-            padding: 20px;
-        }
+.mm-popup__box--popover .mm-popup__box__body {
+  padding: 20px; }

@media (max-width: 420px) {
-    .mm-popup__box {
-        width: auto;
-        left: 10px;
-        right: 10px;
-        top: 10px;
-        margin-left: 0;
-    }
-
-    .mm-popup__box__footer__left-space {
-        float: none;
-    }
-
-    .mm-popup__box__footer__right-space {
-        float: none;
-    }
-
-    .mm-popup__box__footer {
-        padding-top: 30px;
-    }
-
-    .mm-popup__box__footer .mm-popup__btn {
-        display: block;
-        width: 100%;
-        text-align: center;
-        margin-top: 10px;
-    }
-}
+  .mm-popup__box {
+    width: auto;
+    left: 10px;
+    right: 10px;
+    top: 10px;
+    margin-left: 0; }
+  .mm-popup__box__footer__left-space {
+    float: none; }
+  .mm-popup__box__footer__right-space {
+    float: none; }
+  .mm-popup__box__footer {
+    padding-top: 30px; }
+  .mm-popup__box__footer .mm-popup__btn {
+    display: block;
+    width: 100%;
+    text-align: center;
+    margin-top: 10px; } }
--- a/web/src/lib/api.js
+++ b/web/src/lib/api.js
@@ -1,5 +1,5 @@
 import fetch from 'isomorphic-fetch';
-import {BASE_URL} from '../config';
+import {BASE_URL} from '../config/config';

 export const getAllIntents = (id)=>{
    let url = `http://${BASE_URL}/intents/${id}`
--- 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>