major ant release (#171)

* major ant release * antd 3.0.1 * bumping more packages * provide some default styling * double to single quotes * eslint
jwkvam · Dec 12, 2017 · d4d2f2f · d4d2f2f
1 parent 140f030
commit d4d2f2f
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 10 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -28,7 +28,7 @@ install:
     - curl -o- https://raw.githubusercontent.com/creationix/nvm/master/install.sh | bash
     - source ~/.nvm/nvm.sh
     - nvm install node
-    - npm install -g webpack@3.8.1 yarn
+    - npm install -g webpack@3.10.0 yarn
     - npm install -g eslint babel-eslint eslint-plugin-react
     - make eslint
     - sudo apt-get update

diff --git a/Dockerfile b/Dockerfile
@@ -18,7 +18,7 @@ RUN echo "export PATH=/opt/conda/bin:$PATH" > /etc/profile.d/conda.sh && \
 
 ENV PATH /opt/conda/bin:$PATH
 
-RUN npm install -g webpack@3.8.1 yarn
+RUN npm install -g webpack@3.10.0 yarn
 RUN pip install flit
 
 WORKDIR /bowtie

diff --git a/bowtie/__init__.py b/bowtie/__init__.py
@@ -1,6 +1,6 @@
 """Interactive dashboard toolkit."""
 
-__version__ = '0.5.0-dev'
+__version__ = '0.5.1-dev'
 
 from bowtie._app import App, View
 from bowtie._command import command

diff --git a/bowtie/src/griddle.jsx b/bowtie/src/griddle.jsx
@@ -5,6 +5,25 @@ import { storeState } from './utils';
 
 var msgpack = require('msgpack-lite');
 
+const styleConfig = {
+    icons: {
+        TableHeadingCell: {
+            sortDescendingIcon: '▼',
+            sortAscendingIcon: '▲',
+        },
+    },
+    styles: {
+        TableHeadingCell: {
+            padding: '0.2em 0.5em',
+            border: '1px solid #555'
+        },
+        Cell: {
+            border: '1px solid #555',
+            padding: '0.2em 0.5em'
+        }
+    }
+};
+
 export default class SmartGrid extends React.Component {
 
     constructor(props) {
@@ -39,6 +58,7 @@ export default class SmartGrid extends React.Component {
         return (
             <Griddle
                 data={this.state.data}
+                styleConfig={styleConfig}
             />
         );
     }

diff --git a/bowtie/src/package.json b/bowtie/src/package.json
@@ -1,6 +1,6 @@
 {
   "dependencies": {
-    "antd": "^2.13.10",
+    "antd": "^3.0.1",
     "babel-core": "^6.26.0",
     "babel-loader": "^7.1.2",
     "babel-plugin-transform-object-rest-spread": "^6.26.0",
@@ -10,24 +10,24 @@
     "babel-preset-stage-0": "^6.24.1",
     "classnames": "^2.2.5",
     "compression-webpack-plugin": "^1.0.1",
-    "core-js": "^2.5.1",
+    "core-js": "^2.5.3",
     "css-loader": "^0.28.7",
     "extract-text-webpack-plugin": "^3.0.2",
     "less": "^2.7.3",
     "less-loader": "^4.0.5",
     "lodash.clonedeep": "^4.5.0",
     "msgpack-lite": "^0.1.26",
-    "node-sass": "^4.5.3",
+    "node-sass": "^4.7.2",
     "normalize.css": "^7.0.0",
     "postcss-modules-values": "^1.3.0",
     "prop-types": "^15.6.0",
-    "react": "^16.1.1",
-    "react-dom": "^16.1.1",
+    "react": "^16.2.0",
+    "react-dom": "^16.2.0",
     "react-router": "^4.2.0",
     "react-router-dom": "^4.2.2",
     "sass-loader": "^6.0.6",
     "socket.io-client": "^2.0.4",
     "style-loader": "^0.19.0",
-    "webpack": "^3.8.1"
+    "webpack": "^3.10.0"
   }
 }
diff --git a/bowtie/visual.py b/bowtie/visual.py
@@ -168,7 +168,7 @@ class SmartGrid(_Visual):
 
     _TEMPLATE = 'griddle.jsx'
     _COMPONENT = 'SmartGrid'
-    _PACKAGE = 'griddle-react@1.9.0'
+    _PACKAGE = 'griddle-react@1.10.1'
     _ATTRS = None #('columns={{{columns}}} '
 
     def __init__(self):