Merge branch 'dev' into 35-register-validation

Author: khoadnguyen

.travis.yml

@@ -1,22 +1,30 @@
 language: node_js
 node_js:
-  - "8.9.4"
-
+- 8.9.4
+cache:
+  directories:
+    - $HOME/.npm
 branches:
   only:
-    - master
-
+  - master
+  - dev
+install:
+  - npm i -g npm@5.7.1
+  - npm ci
 before_script:
-  - npm install -g ionic cordova jest
-
+- npm install -g ionic cordova jest
+notifications:
+  webhooks:
+    urls:
+    - https://hooks.glip.com/webhook/6d688e2d-f076-4521-8213-f2479e99afe6
+    on_success: never
+    on_failure: always
+    on_start: never
 script:
-  - ionic cordova build browser --prod
-
+- npm run test-ci
 deploy:
-  provider: pages
-  skip-cleanup: true
-  github-token: $GITHUB_TOKEN  # Set in travis-ci.org dashboard, marked secure
-  keep-history: true
+  provider: heroku
+  api_key: $HEROKU_KEY
+  app: ssf-reboot
   on:
-    branch: master
-  local_dir: www
+    repo: SoftStackFactory/reboot

Procfile

@@ -1 +1 @@
-web: npm run build:dev && npm start
+web: npm run build:dev && npm start

README.md

@@ -1,6 +1,9 @@
+![Travis CI Status](https://travis-ci.org/SoftStackFactory/reboot.svg?branch=master "Travis CI Status")
+
+
 # Reboot
 
-Reboot is:
+Reboot is an ionic application that assists verterans reintegrate into civilian life by assisting them and providing information and resources along the way. 
 
 ## Getting Started
 

config/webpack.config.js

@@ -0,0 +1,35 @@
+var chalk = require("chalk");
+var fs = require('fs');
+var path = require('path');
+var useDefaultConfig = require('@ionic/app-scripts/config/webpack.config.js');
+
+var env = process.env.IONIC_ENV;
+
+useDefaultConfig.prod.resolve.alias = {
+  "@app/env": path.resolve(environmentPath('prod'))
+};
+
+useDefaultConfig.dev.resolve.alias = {
+  "@app/env": path.resolve(environmentPath('dev'))
+};
+
+if (env !== 'prod' && env !== 'dev') {
+  // Default to dev config
+  useDefaultConfig[env] = useDefaultConfig.dev;
+  useDefaultConfig[env].resolve.alias = {
+    "@app/env": path.resolve(environmentPath(env))
+  };
+}
+
+function environmentPath(env) {
+  var filePath = './src/environments/environments' + (env === 'prod' ? '' : '.' + env) + '.ts';
+  if (!fs.existsSync(filePath)) {
+    console.log(chalk.red('\n' + filePath + ' does not exist!'));
+  } else {
+    return filePath;
+  }
+}
+
+module.exports = function () {
+  return useDefaultConfig;
+};