gridsane · gridsane · Mar 27, 2017 · Mar 15, 2016 · Mar 15, 2016 · Mar 17, 2016
diff --git a/.babelrc b/.babelrc
@@ -1,4 +1,4 @@
 {
   "presets": ["es2015", "stage-0", "react"],
-  "plugins": ["add-module-exports"]
+  "plugins": ["add-module-exports", "transform-decorators-legacy"]
 }
diff --git a/.dockerignore b/.dockerignore
@@ -0,0 +1 @@
+.env
diff --git a/.editorconfig b/.editorconfig
@@ -7,6 +7,6 @@ charset = utf-8
 end_of_line = lf
 insert_final_newline = true
 
-[*.{js,json,html,less}]
+[*.{js,json,html,scss}]
 indent_style = space
 indent_size = 2
diff --git a/.eslintrc b/.eslintrc
@@ -6,7 +6,8 @@
     "mocha": true
   },
   "globals": {
-    "expect": true
+    "expect": true,
+    "Promise": true
   },
   "plugins": [
     "react"

diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,20 @@
+language: node_js
+node_js:
+  - "6"
+  - "7"
+services:
+  - mongodb
+before_script:
+  - sleep 15
+  - mongo chdb_test --eval 'db.addUser("travis", "test");'
+env:
+  global:
+    - MONGO_URI=mongodb://travis:test@127.0.0.1:27017/chdb_test
+    - MONGO_URI_TEST=mongodb://travis:test@127.0.0.1:27017/chdb_test
+    - YOUTUBE_KEY=dummy-key
+install:
+  - npm install -g npm@latest
+  - npm install
+script:
+  - npm run lint
+  - npm test
diff --git a/Dockerfile b/Dockerfile
@@ -0,0 +1,9 @@
+from node:6
+
+ADD . /app
+
+WORKDIR /app
+
+ENV NODE_ENV=production
+
+CMD npm start
diff --git a/index.html b/index.html
@@ -4,59 +4,15 @@
   <meta charset="UTF-8">
   <title>Channel Hunter</title>
   <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
-  <link href="https://fonts.googleapis.com/icon?family=Roboto" rel="stylesheet">
-  <style>
-    body {
-      padding: 0;
-      margin: 0;
-      font-family: 'Roboto';
-      background-color: rgba(0,0,0, .05);
-      -webkit-font-smoothing: antialiased;
-    }
-
-    /* Yeah-yeah, there are no way to define keyframes using inline styles */
-    /* this is temporary workaround */
-    @keyframes CoverAppBar-background {
-        from { background-position-y: 0%; }
-        to { background-position-y: 100%; }
-    }
-
-    @keyframes IconButton-focused {
-      from { transform: scale(1); }
-      to {transform: scale(.8);}
-    }
-
-    @keyframes Progress-buffer {
-      0% { opacity: 1; background-position: 0px center; }
-      50% { opacity: 0; }
-      100% { opacity: 1; background-position: -200px center; }
-    }
-
-    @keyframes Loader-rotate {
-     100%{
-      transform: rotate(360deg);
-     }
-    }
-
-    @keyframes Loader-dash {
-     0%{
-      stroke-dasharray: 1,200;
-      stroke-dashoffset: 0;
-     }
-     50%{
-      stroke-dasharray: 89,200;
-      stroke-dashoffset: -35px;
-     }
-     100%{
-      stroke-dasharray: 89,200;
-      stroke-dashoffset: -124px;
-     }
-    }
-  </style>
+  <link href="https://fonts.googleapis.com/icon?family=Roboto:400,500" rel="stylesheet">
+  <link href="/assets/style.css" rel="stylesheet">
 </head>
 <body>
-  <div id="root"></div>
-  <script>window.INITIAL_STATE = %INITIAL_STATE%;</script>
+  <div id="app"></div>
+  <script>
+    window.INITIAL_STATE = %INITIAL_STATE%;
+    window.YOUTUBE_KEY = '%YOUTUBE_KEY%';
+  </script>
   <script src="/assets/bundle.js"></script>
   <script>
     (function (id) {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "channel-hunter",
-  "version": "0.3.0",
+  "version": "0.3.3",
   "description": "Music player built with ReactJS",
   "author": "gridsane <gridsane@gmail.com>",
   "license": "MIT",
@@ -14,59 +14,77 @@
     "build": "npm run clean && npm run build-client && npm run build-server",
     "build-client": "webpack --config webpack.config.prod.js",
     "build-server": "babel -d build src",
-    "start": "NODE_ENV=production node build/server.js",
+    "start": "NODE_ENV=production node --max-old-space-size=128 build/server.js",
     "nodemon": "nodemon -x 'babel-node' -w './src/server' src/server.js",
     "test": "NODE_ENV=test mocha --compilers=js:babel-core/register --require=babel-polyfill --require=./test/setup --recursive './test/**/*_test.js'",
     "test_wo_db": "npm run test -- --grep @database --invert",
+    "test_now": "npm run test -- --watch-extensions json --watch --grep @now",
     "lint": "eslint src test"
   },
   "engines": {
-    "node": "4.2.1",
-    "npm": "2.14.17"
+    "node": "6.9.0",
+    "npm": "3.10.8"
   },
   "dependencies": {
-    "babel": "^6.3.26",
-    "babel-cli": "^6.4.0",
-    "babel-core": "^6.4.0",
-    "babel-loader": "^6.2.1",
-    "babel-plugin-add-module-exports": "^0.1.2",
-    "babel-plugin-react-transform": "^2.0.0",
-    "babel-polyfill": "^6.2.0",
-    "babel-preset-es2015": "^6.3.13",
-    "babel-preset-react": "^6.3.13",
-    "babel-preset-stage-0": "^6.3.13",
-    "body-parser": "^1.14.1",
+    "autoprefixer": "^6.3.7",
+    "babel": "^6.5.2",
+    "babel-cli": "^6.10.1",
+    "babel-core": "^6.10.4",
+    "babel-loader": "^6.2.4",
+    "babel-plugin-add-module-exports": "^0.2.1",
+    "babel-plugin-react-transform": "^2.0.2",
+    "babel-plugin-transform-decorators-legacy": "^1.3.4",
+    "babel-polyfill": "^6.9.1",
+    "babel-preset-es2015": "^6.9.0",
+    "babel-preset-react": "^6.11.1",
+    "babel-preset-stage-0": "^6.5.0",
+    "body-parser": "^1.15.2",
     "brfs": "^1.4.3",
-    "express": "^4.13.3",
-    "mongodb": "^2.0.49",
-    "react": "^0.14.0",
-    "react-addons-update": "^0.14.0",
-    "react-dom": "^0.14.0",
-    "react-redux": "^4.0.0",
-    "redux": "^3.0.4",
-    "redux-persist": "^1.5.0",
-    "redux-thunk": "^1.0.0",
-    "superagent": "^1.4.0",
-    "superagent-jsonp": "0.0.6",
+    "classnames": "^2.2.5",
+    "color": "^0.11.3",
+    "css-loader": "^0.23.1",
+    "dotenv": "^4.0.0",
+    "express": "^4.14.0",
+    "extract-text-webpack-plugin": "^1.0.1",
+    "mongodb": "^2.1.20",
+    "node-sass": "^3.8.0",
+    "postcss-loader": "^0.9.1",
+    "react": "^15.2.0",
+    "react-addons-shallow-compare": "^15.2.0",
+    "react-addons-update": "^15.2.0",
+    "react-dom": "^15.2.0",
+    "react-player": "^0.7.4",
+    "react-redux": "^4.4.5",
+    "react-router": "^2.5.2",
+    "react-router-redux": "^4.0.5",
+    "react-sticky": "^5.0.5",
+    "redux": "^3.5.2",
+    "redux-persist": "^3.2.2",
+    "redux-thunk": "^2.1.0",
+    "sass-loader": "^4.0.0",
+    "style-loader": "^0.13.1",
+    "superagent": "^2.0.0",
+    "superagent-jsonp": "0.0.7",
     "transform-loader": "^0.2.3",
-    "webpack": "^1.12.2"
+    "webpack": "^1.13.1"
   },
   "devDependencies": {
-    "babel-eslint": "^5.0.0-beta6",
-    "eslint": "^1.9.0",
-    "eslint-plugin-react": "^3.8.0",
-    "expect": "^1.13.0",
-    "jsdom": "^7.0.2",
-    "mocha": "^2.3.3",
-    "nock": "^5.2.1",
-    "nodemon": "^1.8.1",
-    "react-addons-test-utils": "^0.14.0",
-    "react-shallow-testutils": "^0.7.1",
-    "react-transform-catch-errors": "^1.0.0",
-    "react-transform-hmr": "^1.0.1",
-    "redbox-react": "^1.1.1",
-    "webpack-dev-middleware": "^1.2.0",
-    "webpack-dev-server": "^1.12.1",
-    "webpack-hot-middleware": "^2.4.1"
+    "babel-eslint": "^6.1.0",
+    "css-modules-require-hook": "^4.0.1",
+    "eslint": "3.0.x",
+    "eslint-plugin-react": "^5.2.2",
+    "expect": "^1.20.2",
+    "jsdom": "^9.4.0",
+    "mocha": "^2.5.3",
+    "nock": "^8.0.0",
+    "nodemon": "^1.9.2",
+    "react-addons-test-utils": "^15.2.0",
+    "react-shallow-testutils": "^2.0.0",
+    "react-transform-catch-errors": "^1.0.2",
+    "react-transform-hmr": "^1.0.4",
+    "redbox-react": "^1.2.10",
+    "webpack-dev-middleware": "^1.6.1",
+    "webpack-dev-server": "^1.14.1",
+    "webpack-hot-middleware": "^2.12.0"
   }
 }
diff --git a/src/actions/actions-types.js b/src/actions/actions-types.js
@@ -0,0 +1,14 @@
+export const FEED_ADD_CHANNELS = 'FEED_ADD_CHANNELS';
+export const FEED_REMOVE_CHANNELS = 'FEED_REMOVE_CHANNELS';
+export const FEED_ADD_TRACKS = 'FEED_ADD_TRACKS';
+export const FEED_SET_PROPS_CHANNEL = 'FEED_SET_PROPS_CHANNEL';
+export const FEED_SET_LOADING_CHANNELS = 'FEED_SET_LOADING_CHANNELS';
+export const FEED_SET_SORT_TRACKS = 'FEED_SET_SORT_TRACKS';
+export const FEED_SET_ERROR_TRACK = 'FEED_SET_ERROR_TRACK';
+export const FEED_SET_CURRENT_TRACK = 'FEED_SET_CURRENT_TRACK';
+export const FEED_SELECT_NEXT_TRACK = 'FEED_SELECT_NEXT_TRACK';
+export const DISCOVER_SET_VISIBLE = 'DISCOVER_SET_VISIBLE';
+export const DISCOVER_SET_CHANNELS = 'DISCOVER_SET_CHANNELS';
+export const DISCOVER_SET_LOADING = 'DISCOVER_SET_LOADING';
+export const DISCOVER_SET_TAGS = 'DISCOVER_SET_TAGS';
+export const DISCOVER_SET_ERROR = 'DISCOVER_SET_ERROR';
diff --git a/src/actions/actionsTypes.js b/src/actions/actionsTypes.js
diff --git a/src/actions/channels.js b/src/actions/channels.js