Merge branch 'master' into customer/top-drawer

Author: Jeff Mataya

.gitignore

@@ -13,6 +13,7 @@
 # Keys
 ashes/public_key.pem
 .env.local
+/foxcomm-staging.json
 
 # target folder
 middlewarehouse/consumers/shipstation/shipstation-consumer

README.md

@@ -52,7 +52,9 @@ will have been created. You can exit the VM.
 The appliance VM (a single VM containing all services) can be run either on your
 local environment through VirtualBox or VMWare Fusion, or in the cloud through
 Google Compute Engine. If you have sufficient hardware resources, a local VM
-will give you the most flexibility and performance.
+will give you the most flexibility and performance. Currently, the VM is
+configured to use 8 GB of memory and 4 vCPUs, so it’s not worth trying unless
+you have 12+ GB of RAM.
 
 **Local VM**
 
@@ -115,17 +117,5 @@ Edit your hosts file so that `local.foxcommerce.com` points to the new box using
 | [ashes](ashes)                         | The Admin UI, written in React.js.                                                                           |
 | [api-js](api-js)                       | A JavaScript library for interacting with the FoxCommerce API.                                               |
 | [firebrand](firebrand)                 | A demo storefront used to show off the capabilities of FoxCommerce APIs.                                     |
-| [integration-tests](integration-tests) | Our tests for hitting the system as a black box at the API level.                                            |
 | [prov-shit](prov-shit)                 | All of our DevOps tools for deploying the application to both development and production.                    |
 | [api-docs](api-docs)                   | Our API documentation in API Blueprint format and Postman query collections.                                 |
-
-## Usage
-
-### Updating from Upstream
-
-Updating from upstream will pull in all commits on each project's `master`
-branch. All commit history in each repository will be cloned into this repo.
-
-```
-$ make update
-```

ashes/.flowconfig

@@ -28,6 +28,7 @@
 
 [libs]
 src/interfaces/
+src/interfaces/paragons/
 
 [options]
 unsafe.enable_getters_and_setters=true

ashes/.gitignore

@@ -6,6 +6,7 @@ logs
 pids
 *.pid
 *.seed
+.git-rev
 
 # Directory for precompiled es7 sources
 lib

ashes/Makefile

@@ -38,11 +38,24 @@ run-staging: setup stop
 run-production: setup stop
 	export NODE_ENV=production; nohup ./node_modules/.bin/gulp server 2>&1 &
 
+hooks:
+	./node_modules/.bin/gulp hooks
+
+rev:
+	git describe --always | cat > .git-rev
+
+dev d: rev
+	test -f .env && export eval `cat .env` || true && ./node_modules/.bin/gulp dev
+
+prod p:
+	test -f .env && export eval `cat .env` || true && NODE_ENV=production ./node_modules/.bin/gulp build
+	test -f .env && export eval `cat .env` || true && NODE_ENV=production node boot.js
+
 build-dev: setup
 	./node_modules/.bin/flow check
 	test -f .env && export eval `cat .env` || true && ON_SERVER=true ./node_modules/.bin/gulp build
 
-build:
+build: rev
 	$(call header, Building)
 	make setup
 	./node_modules/.bin/flow check
@@ -57,4 +70,4 @@ docker-push:
 	docker tag $(DOCKER_TAG) $(DOCKER_REPO)/$(DOCKER_TAG):$(DOCKER_BRANCH)
 	docker push $(DOCKER_REPO)/$(DOCKER_TAG):$(DOCKER_BRANCH)
 
-.PHONY: build test test-cov tag docker docker-push
+.PHONY: hooks rev dev d prod p build test test-cov tag docker docker-push

ashes/README.md

@@ -5,7 +5,7 @@
 * node
 
 5.1.0 or above is required version for Ashes.
-To install this or anothers versions of node you can use [nvm](https://github.com/creationix/nvm) or [n](https://github.com/tj/n) node version manager.
+To install this or anothers versions of node you can use [brew](http://brew.sh), [nvm](https://github.com/creationix/nvm) or [n](https://github.com/tj/n) node version manager.
 
 If using nvm, run the following to install the version listed in `.nvmrc`. For example, if using node `v5.1.0`, follow these commands:
 
@@ -40,16 +40,25 @@ npm install
 
 ### Get certificate to communicate with Phoenix
 
-You can clone `prov-shit` repository and use `${PROV_SHIT_HOME}/ansible/roles/secret_keys/files/public_key.pem`. It is encrypted by ansible and you'll have to decrypt it.
+You can clone `prov-shit` repository and use `${PROV_SHIT_HOME}/ansible/roles/secret_keys/files/public_key.pem`. It is encrypted by ansible and you'll have to decrypt it. Add it to `.env` file: `export PHOENIX_PUBLIC_KEY=${PATH_TO_KEY}`.
+
+or just add `export DEV_SKIP_JWT_VERIFY=1` to `.env` file for non-production usage.
 
 ### Run the dev server
 
 ```
-PHOENIX_PUBLIC_KEY=${PATH_TO_KEY} npm run dev
+make d
 ```
 
-By default, gulp run tests before starting node-server, but you can define env variable ASHES_NO_TEST_FOR_DEV
-for disable this behaviour.
+By default, gulp run tests before starting node-server, but you can define env variable `ASHES_NO_TEST_FOR_DEV`
+for disable this behaviour. Also, see `ASHES_NO_WATCH_FOR_TEST`:
+
+```
+# disable watching of test files
+export ASHES_NO_WATCH_FOR_TEST=1
+# disable all tests while developing
+export ASHES_NO_TEST_FOR_DEV=1
+```
 
 Also gulp can notify you about tasks completion if env variable ASHES_NOTIFY_ABOUT_TASKS is defined.
 
@@ -59,33 +68,36 @@ or completely override watchify options via `.watchifyrc` file in project root.
 ### Pointing to Phoenix
 
 By default, Ashes looks locally for phoenix and ElasticSearch `http://localhost`. If you want to change
-which phoenix and ES Ashes uses, you can set the `API_URL` environment variable.
+which phoenix and ES Ashes uses, you can set the `API_URL` environment variable `export API_URL=...` to `.env` file.
 
 ```
 export API_URL=http://10.240.0.3
 npm run dev
 ```
 
+### Run the production server
+
+```
+make p
+```
+
 ### Stripe.js
 
 In order to Stripe.js to work (used for creating credit cards in Stripe) you need to provide publishable key for stripe (https://stripe.com/docs/stripe.js#setting-publishable-key)
-You can set Stripe key by exporting `STRIPE_PUBLISHABLE_KEY` variable, or setting it in your `.env` file if you're using foreman, or run dev command with it:
+You can set Stripe key by exporting `STRIPE_PUBLISHABLE_KEY` variable, or setting it in your `.env`:
 
   `export STRIPE_PUBLISHABLE_KEY=pk_test_r6t0niqmG9OOZhhaSkacUUU1`
 
-  `STRIPE_PUBLISHABLE_KEY=pk_test_r6t0niqmG9OOZhhaSkacUUU1 npm run dev`
-
-
 ### Git Hooks
 
 If you want to setup some Git hooks, run the following:
 
 ```
-./node_modules/.bin/gulp hooks
+make hooks
 ```
 
 Now, installed hook runs tests and prevents push if they haven't passed.
-If you prefer skip test run on each file change you can define env variable ASHES_NO_WATCH_FOR_TEST.
+If you prefer skip test run on each file change you can define env variable `ASHES_NO_WATCH_FOR_TEST`.
 
 ### Vagrant setup
 

ashes/package.json

@@ -38,7 +38,7 @@
   "contributors": "https://github.com/FoxComm/highlander/graphs/contributors",
   "homepage": "https://github.com/FoxComm/highlander#readme",
   "dependencies": {
-    "@foxcomm/wings": "^1.7.1",
+    "@foxcomm/wings": "^1.9.0",
     "babel-polyfill": "^6.13.0",
     "browserHistory": "file:src/opt/browserHistory",
     "chance": "^0.7.6",
@@ -122,13 +122,13 @@
     "canvas": "^1.4.0",
     "chai": "^3.0.0",
     "co-mocha": "^1.1.2",
-    "css-modulesify": "0.25.1",
+    "css-modulesify": "^0.26.0",
     "cssnano": "^3.7.3",
     "envify": "^3.4.0",
     "eslint": "^3.4.0",
     "eslint-plugin-lodash-fp": "^2.0.1",
     "eslint-plugin-react": "^6.2.0",
-    "flow-bin": "0.25.0",
+    "flow-bin": "^0.25.0",
     "gulp": "^3.9.0",
     "gulp-concat": "^2.6.0",
     "gulp-cssnano": "^2.1.2",

ashes/server/middleware.js

@@ -32,8 +32,6 @@ module.exports = function(app) {
     }
   });
 
-  const publicKey = loadPublicKey(config);
-
   function getToken(ctx) {
     const jwtToken = ctx.cookies.get(config.api.auth.cookieName);
     if (!jwtToken) {
@@ -46,7 +44,7 @@ module.exports = function(app) {
         console.info('DEV_SKIP_JWT_VERIFY is enabled, JWT is not verified');
         token = jwt.decode(jwtToken);
       } else {
-        token = jwt.verify(jwtToken, publicKey, {
+        token = jwt.verify(jwtToken, loadPublicKey(config), {
           issuer: 'FC',
           audience: 'user',
           algorithms: ['RS256', 'RS384', 'RS512']

ashes/src/components/activity-trail/activities/assignments/index.jsx

@@ -2,7 +2,7 @@
 import React from 'react';
 import types from '../base/types';
 import { joinEntities } from '../base/utils';
-import { assignmentTypes } from '../../../../paragons/watcher';
+import { assignmentTypes } from 'paragons/participants';
 
 // components
 import CordTarget from '../base/cord-target';

ashes/src/components/activity-trail/activities/base/types.js

@@ -1,5 +1,5 @@
 
-// list of all available types 
+// list of all available types
 // https://github.com/FoxComm/phoenix-scala/tree/master/app/services/activity
 
 const types = {
@@ -105,6 +105,16 @@ const types = {
   /* SKUs */
   FULL_SKU_CREATED: 'full_sku_created',
   FULL_SKU_UPDATED: 'full_sku_updated',
+
+  /* Coupons */
+
+  COUPON_CREATED: 'coupon_created',
+  COUPON_UPDATED: 'coupon_updated',
+
+  /* Promotions */
+
+  PROMOTION_CREATED: 'promotion_created',
+  PROMOTION_UPDATED: 'promotion_updated',
 };
 
 export const derivedTypes = {