Merge pull request #29 from TeoTN/release/2.2.0

v2.2.0
TeoTN · Nov 2, 2017 · 5c49963 · 5c49963
2 parents a46363b + 4c72950
commit 5c49963
Show file tree

Hide file tree

Showing 119 changed files with 2,863 additions and 2,249 deletions.
diff --git a/.gitignore b/.gitignore
@@ -8,6 +8,7 @@ coverage
 
 # production
 build
+tfoostrap/build
 
 # misc
 .DS_Store

diff --git a/.travis.yml b/.travis.yml
@@ -3,9 +3,6 @@ node_js:
   - "6"
 before_install:
   - npm install -g babel-cli rimraf
-  - cd redux-saga-router
-  - npm install
-  - cd ..
 script:
   - npm test -- --coverage
   - npm build
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "tfoosball",
-  "version": "2.1.1",
+  "version": "2.2.0",
   "private": true,
   "devDependencies": {
     "autoprefixer": "6.5.1",
@@ -45,6 +45,7 @@
     "http-proxy-middleware": "0.17.2",
     "jest": "17.0.2",
     "json-loader": "0.5.4",
+    "npm-run-all": "^4.0.2",
     "object-assign": "4.1.0",
     "path-exists": "2.1.0",
     "postcss-loader": "1.0.0",
@@ -74,14 +75,17 @@
     "react-redux": "^5.0.3",
     "react-router": "^3.0.2",
     "react-router-bootstrap": "^0.23.1",
+    "react-select": "^1.0.0-rc.5",
     "redux": "^3.6.0",
     "redux-form": "^6.6.1",
     "redux-saga": "^0.14.3",
-    "redux-saga-router": "file:./redux-saga-router"
+    "redux-saga-router": "^2.1.0"
   },
   "scripts": {
-    "heroku-prebuild": "npm install -g babel-cli rimraf && cd redux-saga-router && npm install && cd ..",
-    "start": "node scripts/start.js",
+    "heroku-prebuild": "cd tfoostrap && npm i && npm run build && npm link && cd .. && npm link @tfoosball/tfoostrap",
+    "start": "npm-run-all --parallel start:webserver start:tfoostrap",
+    "start:webserver": "node scripts/start.js",
+    "start:tfoostrap": "cd tfoostrap && npm start",
     "build": "node scripts/build.js",
     "test": "node scripts/test.js --env=jsdom"
   },

diff --git a/public/favicon.ico b/public/favicon.ico
diff --git a/public/index.html b/public/index.html
@@ -2,6 +2,7 @@
 <html lang="en">
   <head>
     <meta charset="utf-8">
+    <meta name="author" content="Piotr Staniów">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <title>TFoosball</title>
   </head>

diff --git a/redux-saga-router/.babelrc b/redux-saga-router/.babelrc
diff --git a/redux-saga-router/.eslintrc.json b/redux-saga-router/.eslintrc.json
diff --git a/redux-saga-router/.gitignore b/redux-saga-router/.gitignore
diff --git a/redux-saga-router/.travis.yml b/redux-saga-router/.travis.yml
diff --git a/redux-saga-router/CHANGELOG.md b/redux-saga-router/CHANGELOG.md
diff --git a/redux-saga-router/LICENSE b/redux-saga-router/LICENSE