diff --git a/README.md b/README.md index d14d898..c96ea5d 100644 --- a/README.md +++ b/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) diff --git a/package.json b/package.json index d103955..43a763e 100644 --- a/package.json +++ b/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", diff --git a/screenshots/Comments.png b/screenshots/Comments.png index 46de808..0e8358f 100644 Binary files a/screenshots/Comments.png and b/screenshots/Comments.png differ diff --git a/server/router/fm.js b/server/router/fm.js index 8a10300..37d82f9 100644 --- a/server/router/fm.js +++ b/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 => { diff --git a/src/js/components/Controller/index.js b/src/js/components/Controller/index.js index c7bc350..ad75b23 100644 --- a/src/js/components/Controller/index.js +++ b/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 { diff --git a/src/js/components/Menu/index.js b/src/js/components/Menu/index.js index a0916d6..edb41d1 100644 --- a/src/js/components/Menu/index.js +++ b/src/js/components/Menu/index.js @@ -132,7 +132,7 @@ class Menu extends Component { - My FM + Made For You

diff --git a/src/js/stores/preferences.js b/src/js/stores/preferences.js index 74571c7..2fdcd73 100644 --- a/src/js/stores/preferences.js +++ b/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;