Development (#320)

* Refactor components to use CSS Modules (#307) * Refactor App, backdropprovider, marketDetail, notifications * Remove react-modal * Refactor App container * Fix eslint warnings * Fix notification icon * Update packages, fix animation * MenuAccountDropdown css modules * Trying to fix build * Trying to fix build * Configure bootstrap loader * Add normalize.css * Task/use css modules everywhere (#311) * Refactor App, backdropprovider, marketDetail, notifications * Remove react-modal * Refactor App container * Fix eslint warnings * Fix notification icon * Update packages, fix animation * MenuAccountDropdown css modules * Trying to fix build * Trying to fix build * Configure bootstrap loader * Add normalize.css * Load bootstrap table styles * Use oracle.outcome instead of inexisting oracle.winningOutcome PM-587 (#314) * Task PM-586: Use CSS modules in components (#313) * PM-586 Refactor TransactionFloater * Transaction floater proptypes fixPM-586 * Fix NoMarkets component PM-586 * Remove react-immutable-proptypes in prod PM-586 * master to dev (#318) * Development to master (#312) * Refactor components to use CSS Modules (#307) * Refactor App, backdropprovider, marketDetail, notifications * Remove react-modal * Refactor App container * Fix eslint warnings * Fix notification icon * Update packages, fix animation * MenuAccountDropdown css modules * Trying to fix build * Trying to fix build * Configure bootstrap loader * Add normalize.css * Task/use css modules everywhere (#311) * Refactor App, backdropprovider, marketDetail, notifications * Remove react-modal * Refactor App container * Fix eslint warnings * Fix notification icon * Update packages, fix animation * MenuAccountDropdown css modules * Trying to fix build * Trying to fix build * Configure bootstrap loader * Add normalize.css * Load bootstrap table styles * add lauti to whitelist * fix casing for lautis address * Update README.md * updated dockerfile and added docker-compose (#315) * Fix icon name PM-595 (#317)
gnosis · May 3, 2018 · dd26452 · dd26452
1 parent 1c05128
commit dd26452
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 10 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,8 +1,8 @@
-FROM node:8.2.1
-RUN apt-get update && apt-get install -y git
+FROM node:9.11.1-alpine
+RUN apk update && apk --no-cache add git python alpine-sdk
 RUN npm install -g webpack babel-cli truffle-contract
 ADD package.json /tmp/package.json
-RUN cd /tmp && npm install -s && npm install truffle-contract && npm install --only=dev -s
+RUN cd /tmp && npm install && npm install truffle-contract && npm install --only=dev 
 
 RUN mkdir -p /app && cp -a /tmp/node_modules /app/
 

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -0,0 +1,7 @@
+version: '3'
+services:
+  web:
+    command: npm run start-prod
+    build:
+      context: .
+      dockerfile: Dockerfile
diff --git a/package.json b/package.json
@@ -8,7 +8,7 @@
     "build-prod": "./node_modules/.bin/webpack -p --config webpack.prod.config.js",
     "build": "if test \"$NODE_ENV\" = \"production\" ; then npm run build-prod; else npm run build-dev; fi ",
     "start": "node_modules/.bin/webpack-dev-server --hot --host 0.0.0.0 --client-log-level info --config webpack.dev.config.js --progress",
-    "start-prod": "node_modules/.bin/webpack-dev-server --host 0.0.0.0 --client-log-level info -p --progress --config webpack.prod.config.js",	
+    "start-prod": "node_modules/.bin/webpack-dev-server --host 0.0.0.0 --client-log-level info -p --progress --config webpack.prod.config.js",
     "lint": "eslint ./src --quiet",
     "lint:fix": "eslint ./src --fix --quiet",
     "test": "jest --no-cache",
@@ -132,11 +132,11 @@
     "resolve-url-loader": "^2.0.3",
     "sass-loader": "^7.0.1",
     "style-loader": "^0.21.0",
-    "truffle-hdwallet-provider": "0.0.3",
+    "truffle-hdwallet-provider": "0.0.5",
     "uglifyjs-webpack-plugin": "^1.2.5",
     "url-loader": "^1.0.1",
     "webpack": "^4.6.0",
-    "webpack-cli": "^2.0.15",
-    "webpack-dev-server": "^3.1.1"
+    "webpack-cli": "^2.1.2",
+    "webpack-dev-server": "^3.1.4"
   }
 }
diff --git a/src/actions/notifications.js b/src/actions/notifications.js
@@ -43,7 +43,7 @@ export const createNotificationFromTransaction = (transactionId, type = 'START')
   } else if (type === 'CLOSE') {
     const success = didTransactionSucceed(state, transactionId)
     message = `Transaction ${success ? 'finished successfully' : 'did not finish, errors occured'}`
-    icon = success ? 'checkmark' : 'error'
+    icon = success ? 'checkmark' : 'cross'
   }
 
   dispatch(createNotification(title, message, icon))

diff --git a/src/components/Spinner/Transaction.js b/src/components/Spinner/Transaction.js
@@ -6,7 +6,7 @@ import { TRANSACTION_COMPLETE_STATUS } from 'utils/constants'
 import IndefiniteSpinner from './Indefinite'
 
 const ProgressIndicator = ({ completed, completionStatus, progress }) => {
-  const iconType = completionStatus === TRANSACTION_COMPLETE_STATUS.NO_ERROR ? 'checkmark' : 'error'
+  const iconType = completionStatus === TRANSACTION_COMPLETE_STATUS.NO_ERROR ? 'checkmark' : 'cross'
   const iconStyle = {
     top: '50%',
     marginTop: -24,

diff --git a/src/components/TransactionFloater/index.js b/src/components/TransactionFloater/index.js
@@ -84,7 +84,7 @@ const TransactionFloater = ({
               ? moment(transaction.startTime).to(moment(transaction.endTime), true)
               : undefined
 
-          const icon = transaction.completionStatus === TRANSACTION_COMPLETE_STATUS.NO_ERROR ? 'checkmark' : 'error'
+          const icon = transaction.completionStatus === TRANSACTION_COMPLETE_STATUS.NO_ERROR ? 'checkmark' : 'cross'
           return (
             <div key={transaction.id} className={cx('transactionLog')}>
               <Icon type={icon} className={cx('progressIcon')} />