Merge branch 'master' of github.com:dap-ps/discover

.gitignore

@@ -7,6 +7,7 @@ coverage
 node_modules
 package-lock.json
 dist
+full-build
 
 # See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
 

build.sh

@@ -0,0 +1,11 @@
+echo "removing old full-build"
+rm -rf full-build
+echo "creating new full-build"
+mkdir full-build
+cp -r back-end/* full-build/
+echo "building new frontend"
+npm run build
+echo "copying new frontend"
+rm -rf full-build/frontend/*
+cp -r build/* full-build/frontend/
+echo "Finished. Use your full-build folder"

src/embarkArtifacts/contracts/index.js

@@ -1,14 +1,10 @@
 module.exports = {
-  Controlled: require('./Controlled').default,
-  BancorFormula: require('./BancorFormula').default,
-  ApproveAndCallFallBack: require('./ApproveAndCallFallBack').default,
   SafeMath: require('./SafeMath').default,
-  MiniMeTokenInterface: require('./MiniMeTokenInterface').default,
+  BancorFormula: require('./BancorFormula').default,
   ERC20Token: require('./ERC20Token').default,
   TestBancorFormula: require('./TestBancorFormula').default,
   MiniMeToken: require('./MiniMeToken').default,
-  TokenController: require('./TokenController').default,
-  TokenFactory: require('./TokenFactory').default,
+  Controlled: require('./Controlled').default,
+  MiniMeTokenInterface: require('./MiniMeTokenInterface').default,
   Discover: require('./Discover').default,
-  MiniMeTokenFactory: require('./MiniMeTokenFactory').default,
 }