Merge branch 'master' into set-engine-requirements

.env.template

@@ -0,0 +1,4 @@
+export USERNAME=
+export PASSWORD=
+export DOMAIN=
+export PORT=

.gitignore

@@ -1,3 +1,4 @@
+/.env
 /.sass-cache/
 /node_modules/
 /iisnode/

README.md

@@ -56,18 +56,17 @@ This application assumes you have:
     "proxy" : "http://localhost:8080"
     ```
     to whatever the IP of where express is running.  Typically you can use something similar to the default but you can change the IP and port as long as it coincides with what is in `server.js`.
-4. In `ui-react/`, open a terminal or cmd:
+4. In the root directory, open a terminal or cmd:
     ```
-    $ npm install
     $ npm run build
     ```
 5. In the root directory, open a terminal or cmd:
     ```
-    $ node server.js
+    $ npm start
     ```
-6. If you want to start the react development server, in `ui-react/` run:
+6. If you want to start the react development server, in the root directory run:
     ```
-    $ npm start
+    $ npm start-ui-dev
     ```
 
 ***
@@ -142,6 +141,14 @@ There are three main directories in the `ui-react/src/` folder:
     };
     ```
 
+* Alternatively, username, password and domain can be set as environment variable
+
+    ```bash
+    export USERNAME=svcacct_email@domain.com
+    export PASSWORD=password
+    export DOMAIN=domain.com
+    ```
+
 * In `/ui-react/src/config/flightboard.config.js`, manage your customizations:
 
     ```javascript

app/routes.js

@@ -22,6 +22,11 @@ module.exports = function(app) {
 		});
 	});
 
+	// heartbeat-service to check if server is alive
+  app.get('/api/heartbeat', function(req, res) {
+    res.json({ status: 'OK' });
+  });
+
 	// redirects everything else to our react app
 	app.get('*', function(req, res) {
 		res.sendFile(path.join(__dirname,'../ui-react/build/','index.html'));

config/auth.js

@@ -2,10 +2,10 @@
 module.exports = {
   // this user MUST have full access to all the room accounts
   'exchange' : {
-    'username'  : 'SVCACCT_EMAIL@DOMAIN.COM',
-    'password'  : 'PASSWORD',
+    'username'  : process.env.USERNAME || 'SVCACCT_EMAIL@DOMAIN.COM',
+    'password'  : process.env.PASSWORD || 'PASSWORD',
     'uri'       : 'https://outlook.office365.com/EWS/Exchange.asmx'
   },
   // Ex: CONTOSO.COM, Contoso.com, Contoso.co.uk, etc.
-  'domain' : 'DOMAIN.COM'
+  'domain' : process.env.DOMAIN || 'DOMAIN.COM'
 };