Merge pull request #200 from trazyn/dev

Dev

README.md

@@ -4,7 +4,8 @@
 ![License](https://img.shields.io/github/license/trazyn/ieaseMusic.svg?style=flat-square)
 [![Travis CI status](https://img.shields.io/travis/trazyn/ieaseMusic/dev.svg?style=flat-square)](https://travis-ci.org/trazyn/ieaseMusic/branches)
 [![Dependencies Status](https://david-dm.org/trazyn/ieaseMusic/status.svg?style=flat-square)](https://david-dm.org/trazyn/ieaseMusic)
-[![js-standard-style](https://img.shields.io/badge/code%20style-standard-brightgreen.svg?style=flat-square)](http://standardjs.com)
+[![DevDependencies Status](https://david-dm.org/trazyn/ieaseMusic/dev-status.svg?style=flat-square)](https://david-dm.org/trazyn/ieaseMusic?type=dev)
+[![JS Standard Style](https://img.shields.io/badge/code%20style-standard-brightgreen.svg?style=flat-square)](http://standardjs.com)
 
 
 <img src="https://github.com/trazyn/ieaseMusic/blob/master/resource/128x128.png" />

package.json

@@ -84,7 +84,7 @@
   "devDependencies": {
     "babel-core": "^6.26.0",
     "babel-eslint": "^8.0.3",
-    "babel-loader": "^7.1.2",
+    "babel-loader": "^7.1.5",
     "babel-plugin-add-module-exports": "^0.2.1",
     "babel-plugin-transform-async-to-generator": "^6.24.1",
     "babel-plugin-transform-decorators-legacy": "^1.3.4",
@@ -99,8 +99,8 @@
     "cross-env": "^5.2.0",
     "css-loader": "^0.28.4",
     "electron": "^1.8.7",
-    "electron-builder": "^20.15.1",
-    "eslint": "^4.13.1",
+    "electron-builder": "^20.19.2",
+    "eslint": "^5.0.1",
     "eslint-config-standard": "^11.0.0",
     "eslint-config-standard-react": "^6.0.0",
     "eslint-formatter-pretty": "^1.3.0",
@@ -117,18 +117,18 @@
     "svg-inline-loader": "^0.8.0",
     "uglifyjs-webpack-plugin": "^1.1.8",
     "url-loader": "^1.0.1",
-    "webpack": "^4.12.0",
+    "webpack": "^4.15.1",
     "webpack-dev-middleware": "^3.1.3",
     "webpack-hot-middleware": "^2.21.0",
     "webpack-sources": "^1.1.0"
   },
   "dependencies": {
-    "apicache": "^1.2.0",
+    "apicache": "^1.2.3",
     "axios": "^0.18.0",
     "big-integer": "^1.6.25",
     "classname": "0.0.0",
     "cookie-parser": "^1.4.3",
-    "debug": "^3.0.1",
+    "debug": "^3.1.0",
     "delegate": "^3.1.3",
     "electron-json-storage": "^4.0.2",
     "electron-updater": "^2.18.2",
@@ -139,7 +139,7 @@
     "md5": "^2.2.1",
     "mobx": "^5.0.3",
     "mobx-react": "^5.2.3",
-    "moment": "^2.18.1",
+    "moment": "^2.22.2",
     "perdido": "^2.0.1",
     "prop-types": "^15.6.2",
     "react": "^16.4.1",

server/router/fm.js

@@ -27,7 +27,7 @@ router.get('/', async(req, res) => {
 
     res.send({
         id: 'PERSONAL_FM',
-        name: 'My FM',
+        name: 'Made For You',
         link: '/fm',
         size: songs.length,
         songs: songs.map(e => {

src/js/components/Controller/index.js

@@ -210,10 +210,7 @@ class Controller extends Component {
                                 className={classes.text}
                                 to="/comments"
                             >
-                                {
-                                    helper.humanNumber(comments)
-                                }
-                                Comments
+                                { helper.humanNumber(comments) } Comments
                             </Link>
 
                             {

src/js/components/Menu/index.js

@@ -132,7 +132,7 @@ class Menu extends Component {
                                 <Link
                                     onClick={close}
                                     to="/fm">
-                                    My FM
+                                    Made For You
                                 </Link>
                             </p>
                         </div>

src/js/stores/preferences.js

@@ -11,8 +11,8 @@ import lastfm from 'utils/lastfm';
 
 class Preferences {
     @observable show = false;
-    @observable showTray = true;
-    @observable alwaysOnTop = true;
+    @observable showTray = false;
+    @observable alwaysOnTop = false;
     @observable showNotification = true;
     @observable autoPlay = true;
     @observable naturalScroll = true;