Merge pull request #208 from CatalystCode/eladiw_fortis_ibex_seperation_merge

'fortis ibex seperation' merge with ibex-version-1.0

.gitignore

@@ -1,7 +1,7 @@
 # See http://help.github.com/ignore-files/ for more about ignoring files.
 
 # dependencies
-/node_modules
+node_modules/
 
 # testing
 /coverage
@@ -14,7 +14,7 @@ yarn-debug.log*
 yarn-error.log*
 
 # generated files
-src/**/*.css
+client/**/*.css
 
 # generated merge temp files
 *.orig

.travis.yml

@@ -4,6 +4,20 @@ language:
 node_js:
   - "7"
 
+sudo:
+  required
+
+before_install:
+  - curl -sL https://deb.nodesource.com/setup_6.x | sudo -E bash -
+  - sudo apt-key adv --keyserver pgp.mit.edu --recv D101F7899D41F3C3
+  - echo "deb http://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/yarn.list
+  - sudo apt-get update -qq
+  - sudo apt-get install -y -qq yarn
+
+cache:
+  directories:
+    - $HOME/.yarn-cache
+
 install:
   - .travis/setup.sh
 
@@ -12,4 +26,5 @@ script:
   - .travis/coverage.sh
 
 after_success:
+  - .travis/build.sh
   - .travis/push.sh

.travis/build.sh

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+pushd client
+yarn build
+rm -rf ../build
+mv build ..
+popd

.travis/ci.sh

@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 
-CI=true yarn lint
-CI=true yarn test
+(cd client; CI=true yarn lint)
+(cd client; CI=true yarn test)

.travis/coverage.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 min_coverage="${MIN_COVERAGE:-42}"
-line_coverage="$(CI=true yarn coverage | grep '^All files  *|' | cut -d'|' -f5 | tr -d ' ' | cut -d'.' -f1)"
+line_coverage="$((cd client; CI=true yarn coverage) | grep '^All files  *|' | cut -d'|' -f5 | tr -d ' ' | cut -d'.' -f1)"
 
 if [ ${line_coverage} -lt ${min_coverage} ]; then
   echo "Got test coverage of ${line_coverage} which is less than configured minimum of ${min_coverage}" >&2

.travis/push.sh

@@ -54,7 +54,6 @@ push_to_github() {
 }
 
 ensure_preconditions_met
-create_production_build
 setup_git
 commit_build_files
 push_to_github

.travis/setup.sh

@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 
-yarn install
-yarn run css:build
+(cd server; yarn install)
+(cd client; yarn install; yarn run css:build)

README.md

@@ -1,4 +1,5 @@
-# Ibex Dashboard
+# Ibex Dashboard [![Inline docs](http://inch-ci.org/github/CatalystCode/ibex-dashboard.svg?branch=master)](http://inch-ci.org/github/CatalystCode/ibex-dashboard)
+
 This is an application insights based project that displays a bots analytics dashboard.
 
 # Preview
@@ -11,9 +12,10 @@ This is an application insights based project that displays a bots analytics das
 1. Clone
 2. [Get an Application Insights App ID and Api Key](https://dev.applicationinsights.io/documentation/Authorization/API-key-and-App-ID)
 
-4. Run `yarn start:dev`
-5. Open **http://localhost:3000/**
-6. Run through setup and afterwards, fill in **API Key** and **Application ID**
+4. Run `cd server; yarn start`
+5. Run `cd client; yarn start`
+6. Open **http://localhost:3000/**
+7. Run through setup and afterwards, fill in **API Key** and **Application ID**
 
 ## Deploy To Azure
 
@@ -73,13 +75,15 @@ Thinking about integrating with:
 ```bash
 git clone https://github.com/CatalystCode/ibex-dashboard.git
 cd ibex-dashboard
-npm install -g yarn
-yarn
+(cd client; npm install -g yarn; yarn)
+(cd server; npm install -g yarn; yarn)
 ```
 
 ### Dev
+
 ```bash
-yarn start:dev
+(cd server; yarn start:dev)
+(cd client; yarn start:dev)
 ```
 
 ### Test Watcher
@@ -87,12 +91,24 @@ Runs the test watcher in an interactive mode.
 By default, runs tests related to files changes since the last commit.
 
 ```bash
+cd client
 yarn test
 ```
 
-### Build for Production
+Alternatively, you can also run the full commands that the Travis CI server
+will run to validate any changes.
+
 ```bash
-yarn build
+.travis/ci.sh
+```
+
+### Build for Production
+Our CI server Travis creates new production builds automatically for changes
+to master. If you need to create a build locally, you can execute the same
+commands as the CI server.
+
+```bash
+.travis/build.sh
 ```
 
 ## What’s Inside?

client/package.json

@@ -0,0 +1,66 @@
+{
+  "name": "ibex-dashboard-client",
+  "version": "0.1.0",
+  "private": true,
+  "proxy": "http://localhost:4000/",
+  "devDependencies": {
+    "@types/alt": "^0.16.32",
+    "@types/jest": "^19.2.2",
+    "@types/lodash": "^4.14.55",
+    "@types/nock": "^8.2.1",
+    "@types/node": "^7.0.8",
+    "@types/react": "^15.0.16",
+    "@types/react-addons-test-utils": "^0.14.17",
+    "@types/react-dom": "^0.14.23",
+    "@types/react-router": "^3.0.8",
+    "alt": "^0.18.6",
+    "alt-utils": "^1.0.0",
+    "leaflet": "^1.0.3",
+    "leaflet-geosearch": "^2.2.0",
+    "leaflet.markercluster": "^1.0.5",
+    "nock": "^9.0.9",
+    "node-sass": "^4.5.0",
+    "npm-run-all": "^4.0.2",
+    "react": "^15.4.2",
+    "react-addons-css-transition-group": "^15.4.2",
+    "react-addons-test-utils": "^15.4.2",
+    "react-addons-transition-group": "^15.4.2",
+    "react-dom": "^15.4.2",
+    "react-grid-layout": "^0.14.4",
+    "react-leaflet": "^1.1.6",
+    "react-leaflet-div-icon": "^1.0.2",
+    "react-leaflet-markercluster": "^1.1.5",
+    "react-md": "^1.0.10",
+    "react-render-html": "^0.1.6",
+    "react-router": "3.0.0",
+    "react-scripts-ts": "1.4",
+    "recharts": "^0.21.2",
+    "tslint": "^4.0.0"
+  },
+  "dependencies": {
+    "body-parser": "^1.17.1",
+    "cookie-parser": "^1.4.3",
+    "express": "^4.15.2",
+    "express-session": "^1.15.2",
+    "lodash": "^4.17.4",
+    "lodash.throttle": "^4.1.1",
+    "material-colors": "^1.2.5",
+    "moment": "^2.18.0",
+    "morgan": "^1.8.1",
+    "ms-rest-azure": "^2.1.2",
+    "passport": "^0.3.2",
+    "passport-azure-ad": "^3.0.5",
+    "react-json-tree": "^0.10.9",
+    "xhr-request": "^1.0.1"
+  },
+  "scripts": {
+    "css:build": "node-sass src/ -o src/",
+    "css:watch": "yarn run css:build && node-sass src/ -o src/ --watch --recursive",
+    "client:start": "react-scripts-ts start",
+    "start": "npm-run-all -p css:watch client:start",
+    "coverage": "react-scripts-ts test --env=jsdom --coverage --collectCoverageFrom=src/**/*.{ts,tsx} --collectCoverageFrom=!src/**/*.d.ts",
+    "lint": "tslint src",
+    "build": "yarn run css:build && react-scripts-ts build",
+    "test": "react-scripts-ts test --env=jsdom"
+  }
+}