Merge pull request #195 from inowas/dev

Merge dev to master

Dockerfile

@@ -11,6 +11,12 @@ COPY . .
 RUN yarn install
 RUN yarn run build
 
+RUN \
+  VERSION=$(git describe --tags --always --dirty=+) && \
+  DATE=$(date +%Y-%m-%dT%H:%M:%S) && \
+  sed -i "s/@@__VERSION__@@/${VERSION}/g;s/@@__BUILT__@@/${DATE}/g" ./dist/index.html
+
+
 # Install `serve` to run the application.
 RUN npm install -g serve
 

package.json

@@ -20,22 +20,32 @@
     "dependencies": {
         "@turf/turf": "^5.0.4",
         "axios": "^0.15.3",
+        "bessel": "^1.0.2",
         "classnames": "^2.2.5",
         "gwflowjs": "https://github.com/inowas/gwflowjs.git#master",
+        "incomplete-gamma": "^1.0.1",
         "js-md5": "^0.6.0",
+        "leaflet": "^1.2.0",
         "leaflet-control-geocoder": "^1.5.8",
+        "leaflet-draw": "^0.4.10",
         "leaflet-geometryutil": "^0.8.0",
         "lodash": "^4.17.4",
         "moment": "^2.18.1",
         "normalizr": "^3.2.2",
+        "npm": "^5.8.0",
         "papaparse": "^4.3.6",
         "percentile": "^1.2.0",
         "prop-types": "latest",
+        "radium": "^0.18.1",
         "rainbowvis.js": "https://github.com/inowas/RainbowVis-JS.git#master",
         "raw-loader": "^0.5.1",
         "react": "^15.4.2",
+        "react-c3js": "<=0.1.13",
         "react-dom": "^15.4.2",
         "react-edit": "^6.3.0",
+        "react-iframe": "^0.0.4",
+        "react-leaflet": "^1.5.0",
+        "react-leaflet-draw": "^0.16.0",
         "react-leaflet-fullscreen": "^0.0.5",
         "react-list": "^0.8.6",
         "react-paginate": "^4.4.3",
@@ -47,17 +57,23 @@
         "reactabular-sticky": "^8.9.0",
         "reactabular-table": "^8.9.0",
         "reactabular-virtualized": "^8.10.1",
+        "recharts": "^0.21.2",
         "recompose": "^0.26.0",
+        "redbox-react": "^1.5.0",
         "redux": "^3.6.0",
+        "redux-persist": "^4.5.0",
         "redux-promise-middleware": "^4.2.0",
         "redux-saga": "^0.15.4",
         "redux-thunk": "^2.2.0",
         "reselect": "^3.0.1",
         "searchtabular": "^1.5.1",
         "selectabular": "^2.0.1",
+        "semantic-ui-css": "^2.2.12",
         "semantic-ui-react": "^0.75.1",
         "sortabular": "^1.4.1",
-        "table-resolver": "^3.1.1"
+        "table-resolver": "^3.1.1",
+        "uglifyjs-webpack-plugin": "^1.2.3",
+        "uuid": "^3.1.0"
     },
     "devDependencies": {
         "autoprefixer": "^6.7.7",
@@ -86,36 +102,24 @@
         "html-webpack-plugin": "^2.28.0",
         "imagemin-webpack-plugin": "^1.4.4",
         "json-loader": "^0.5.4",
-        "leaflet": "^1.2.0",
-        "leaflet-draw": "^0.4.10",
         "less": "^2.7.2",
         "less-loader": "^4.0.3",
-        "levenshtein": "^1.0.5",
         "optimize-css-assets-webpack-plugin": "^1.3.0",
         "postcss-loader": "^1.3.3",
-        "radium": "^0.18.1",
         "radium-plugin-linter": "^1.0.1",
         "radium-plugin-prefix-all": "^1.0.1",
         "radium-plugin-validity-pseudos": "^1.0.0",
         "react-addons-transition-group": "^15.4.2",
         "react-autocomplete-cli": "^0.0.3",
-        "react-c3js": "<=0.1.13",
         "react-hot-loader": "next",
-        "react-iframe": "^0.0.4",
-        "react-leaflet": "^1.5.0",
-        "react-leaflet-draw": "^0.16.0",
         "react-svg-loader": "^1.1.1",
-        "recharts": "^0.21.2",
         "redux-devtools-extension": "2.13",
         "redux-logger": "^3.0.1",
-        "redux-persist": "^4.5.0",
         "rimraf": "^2.6.0",
-        "semantic-ui-css": "^2.2.12",
         "source-map-loader": "^0.2.1",
         "stats-webpack-plugin": "^0.4.3",
         "style-loader": "^0.16.1",
         "url-loader": "^0.5.7",
-        "uuid": "^3.1.0",
         "webpack": "^2.2.1",
         "webpack-dev-server": "^2.5.1"
     }