Merge b5fe104 into efa5677

.eslintrc

@@ -1,25 +1,27 @@
 {
-  "extends": "airbnb-base",
+  "extends": "airbnb",
+  "parser": "babel-eslint",
   "globals": {
     "Logger": true,
     "Settings": true,
     "Emitter": true,
     "WindowManager": true,
     "PlaybackAPI": true,
     "TranslationProvider": true,
-    "GPM": true,
-    "$": true
+    "GPM": true
   },
   "env": {
     "mocha": true
   },
   "rules": {
-    "max-len": [1, 120],
+    "max-len": [1, 160],
     "import/no-extraneous-dependencies": 0,
     "import/no-unresolved": 0,
     "import/prefer-default-export": 0,
     "global-require": 0,
     "no-underscore-dangle": 0,
-    "consistent-return": 0
+    "consistent-return": 0,
+    "react/no-multi-comp": 0,
+    "react/prefer-stateless-function": 0
   }
 }

.travis.yml

@@ -22,7 +22,8 @@ script:
   - npm run test
   - if [[ $TRAVIS_PULL_REQUEST == "false" ]]; then ./sig/import.sh && npm run make:darwin && node ./sig/publish-mac.js; fi
   - if [[ $TRAVIS_PULL_REQUEST != "false" ]]; then npm run package:darwin; fi
-  - npm run test-electron
+  - npm run test-electron-coverage
+  - npm run _coveralls
   - npm run test-spectron
 
 notifications:

appveyor.yml

@@ -46,7 +46,8 @@ test_script:
   - npm --version
   # run tests
   - npm test
-  - npm run test-electron -- -R mocha-appveyor-reporter
+  - npm run test-electron-main -- -R mocha-appveyor-reporter
+  - npm run test-electron-renderer -- -R mocha-appveyor-reporter
 
 build_script:
 - cmd: npm run make:win

gulpfile.babel.js

@@ -109,6 +109,10 @@ const winstallerConfig = {
   remoteReleases: 'https://github.com/MarshallOfSound/Google-Play-Music-Desktop-Player-UNOFFICIAL-',
 };
 
+if (process.env.APPVEYOR) {
+  delete winstallerConfig.remoteReleases;
+}
+
 const appdmgConf = {
   target: `dist/${packageJSON.productName}-darwin-x64/${packageJSON.productName}.dmg`,
   basepath: __dirname,

package.json

@@ -26,14 +26,22 @@
     "postinstall": "node vendor/rebuild.js --instant",
     "test": "npm run lint",
     "pretest-electron": "npm run build",
-    "pretest-electron-coverage": "istanbul instrument src --output cov --no-compact --complete-copy --es-modules",
+    "pretest-electron-coverage": "cross-env NODE_ENV=coverage npm run build",
     "pretest-spectron": "npm run build",
-    "test-electron": "electron-mocha ./test/electron/**/*_spec.js --recursive --compilers js:babel-core/register --timeout 10000 -R spec-xunit-file",
-    "test-electron-coverage": "npm run test-electron -- -r test/electron/util/coverage.js -R test/istanbul-reporter",
+    "test-electron": "npm run test-electron-main && npm run test-electron-renderer",
+    "test-electron-main": "electron-mocha ./test/electron/*_spec.js ./test/electron/**/*_spec.js --compilers js:babel-core/register --timeout 10000 -R spec-xunit-file",
+    "test-electron-renderer": "electron-mocha ./test/electron-renderer/**/*_spec.js ./test/electron-renderer/*_spec.js --renderer --compilers js:babel-core/register --timeout 10000 -R spec-xunit-file",
+    "test-electron-coverage": "npm run test-electron-main-coverage && npm run test-electron-renderer-coverage",
+    "test-electron-main-coverage": "cross-env NODE_ENV=coverage npm run test-electron-main -- -R test/istanbul-reporter",
+    "test-electron-renderer-coverage": "cross-env NODE_ENV=coverage npm run test-electron-renderer -- -R test/istanbul-reporter",
+    "posttest-electron-main-coverage": "npm run _remap",
+    "posttest-electron-renderer-coverage": "npm run _remap",
     "test-spectron": "mocha ./test/spectron --compilers js:babel-core/register -R spec-xunit-file --timeout 10000",
     "prestart": "pre-flight && node vendor/mac_patch_dev.js",
     "start": "electron . --dev",
-    "watch": "gulp watch"
+    "watch": "gulp watch",
+    "_remap": "remap-istanbul -i coverage/coverage-final.json -o coverage -t html && remap-istanbul -i coverage/coverage-final.json -o coverage/lcov.info -t lcovonly",
+    "_coveralls": "node test/istanbul-patch-lcov.js | node node_modules/coveralls/bin/coveralls.js"
   },
   "repository": {
     "type": "git",
@@ -49,7 +57,7 @@
   "dependencies": {
     "archiver": "^1.0.1",
     "auto-launch": "^4.0.0",
-    "electron": "1.3.4",
+    "electron": "^1.3.5",
     "electron-chromecast": "^1.0.14",
     "gmusic-mini-player.js": "^2.0.6",
     "gmusic-theme.js": "^2.0.1",
@@ -58,10 +66,14 @@
     "html-entities": "^1.2.0",
     "lastfm": "^0.9.2",
     "lodash": "^4.12.0",
+    "material-ui": "^0.15.4",
     "mdns": "^2.3.3",
     "mkdirp": "^0.5.1",
     "node-fetch": "^1.5.2",
     "pretty-colorwheel": "^1.0.1",
+    "react": "^15.3.1",
+    "react-dom": "^15.3.1",
+    "react-tap-event-plugin": "^1.0.0",
     "request": "^2.72.0",
     "runas": "^3.1.1",
     "universal-analytics": "^0.4.2",
@@ -73,20 +85,31 @@
     "yargs": "^4.7.0"
   },
   "devDependencies": {
+    "babel-eslint": "^6.1.2",
+    "babel-plugin-istanbul": "^2.0.1",
+    "babel-plugin-transform-class-properties": "^6.11.5",
     "babel-preset-es2015": "^6.6.0",
+    "babel-preset-react": "^6.11.1",
     "babel-register": "^6.8.0",
     "chai": "^3.5.0",
     "chai-as-promised": "^5.3.0",
     "chai-fs": "chaijs/chai-fs",
+    "coveralls": "^2.11.12",
+    "cross-env": "^2.0.1",
     "devtron": "^1.0.1",
+    "electron-devtools-installer": "^2.0.1",
     "electron-mocha": "^3.0.0",
     "electron-packager": "^8.0.0",
     "electron-rebuild": "^1.1.4",
     "electron-winstaller": "2.2.0",
-    "eslint": "^3.1.1",
-    "eslint-config-airbnb-base": "^5.0.0",
-    "eslint-plugin-import": "^1.12.0",
+    "enzyme": "^2.4.1",
+    "eslint": "^2.10.2",
+    "eslint-config-airbnb": "^9.0.1",
+    "eslint-plugin-import": "^1.14.0",
+    "eslint-plugin-jsx-a11y": "^1.5.5",
+    "eslint-plugin-react": "^5.2.2",
     "fs-extra": "^0.30.0",
+    "glob": "^7.0.6",
     "gulp": "^3.9.1",
     "gulp-babel": "^6.1.2",
     "gulp-clean": "^0.3.2",
@@ -106,9 +129,11 @@
     "plist": "^2.0.1",
     "pre-commit": "^1.1.2",
     "pre-flight": "^1.0.2",
+    "react-addons-test-utils": "^15.3.1",
+    "remap-istanbul": "^0.6.4",
     "request": "^2.72.0",
     "run-sequence": "^1.1.5",
-    "sinon": "^1.17.4",
+    "sinon": "^1.17.5",
     "sinon-chai": "^2.8.0",
     "spec-xunit-file": "0.0.1-3",
     "spectron": "^3.2.3"
@@ -124,7 +149,24 @@
   },
   "babel": {
     "presets": [
-      "es2015"
-    ]
+      "es2015",
+      "react"
+    ],
+    "plugins": [
+      "transform-class-properties"
+    ],
+    "env": {
+      "coverage": {
+        "plugins": [
+          [
+            "istanbul",
+            {
+              "ignore": "test/"
+            }
+          ]
+        ],
+        "sourceMaps": "inline"
+      }
+    }
   }
 }

src/_locales/de.json

@@ -3,7 +3,7 @@
   "audio-device-default": "Standardgerät",
   "audio-device-unknown": "Unbekanntes Gerät",
 
-  "button-test-ok": "OK",
+  "button-text-ok": "OK",
   "button-text-close": "Schließen",
   "button-text-dont-tell-me-again": "Sag mir das nicht nochmal",
   "button-text-lets-do-this": "Lass uns starten!!",

src/_locales/en-US.json

@@ -3,7 +3,7 @@
   "audio-device-default": "System Default",
   "audio-device-unknown": "Unknown Device",
 
-  "button-test-ok": "OK",
+  "button-text-ok": "OK",
   "button-text-close": "Close",
   "button-text-dont-tell-me-again": "Don't tell me again",
   "button-text-lets-do-this": "Let's do this!!",

src/_locales/nl-NL.json

@@ -3,7 +3,7 @@
   "audio-device-default": "Systeem Standaard",
   "audio-device-unknown": "Onbekend apparaat",
 
-  "button-test-ok": "OK",
+  "button-text-ok": "OK",
   "button-text-close": "Sluit",
   "button-text-dont-tell-me-again": "Meld het niet nog een keer",
   "button-text-lets-do-this": "Laten we het doen!!",

src/_locales/pl-PL.json

@@ -3,7 +3,7 @@
   "audio-device-default": "Domyślne urządzenie",
   "audio-device-unknown": "Nieznane urządzenie",
 
-  "button-test-ok": "OK",
+  "button-text-ok": "OK",
   "button-text-close": "Zamknij",
   "button-text-dont-tell-me-again": "Nie pokazuj więcej",
   "button-text-lets-do-this": "Zróbmy to!!",

src/_locales/pt-BR.json

@@ -3,7 +3,7 @@
   "audio-device-default": "Dispositivo padrão",
   "audio-device-unknown": "Dispositivo desconhecido",
 
-  "button-test-ok": "OK",
+  "button-text-ok": "OK",
   "button-text-close": "Fechar",
   "button-text-dont-tell-me-again": "Não notificar novamente",
   "button-text-lets-do-this": "Vamos nessa!!",

src/_locales/sk.json

@@ -3,7 +3,7 @@
   "audio-device-default": "Predvolené systémom",
   "audio-device-unknown": "Neznáme zariadnie",
 
-  "button-test-ok": "OK",
+  "button-text-ok": "OK",
   "button-text-close": "Zavrieť",
   "button-text-dont-tell-me-again": "Nabudúce neoznamovať",
   "button-text-lets-do-this": "Tak poďme na to!!",

src/assets/less/_material.less

@@ -1,5 +1,46 @@
-@import (inline) "../../../node_modules/materialize-css/dist/css/materialize.css";
-@import (inline) "../../../node_modules/materialize-css/extras/noUiSlider/nouislider.css";
+// @import (inline) "../../../node_modules/materialize-css/dist/css/materialize.css";
+// @import (inline) "../../../node_modules/materialize-css/extras/noUiSlider/nouislider.css";
+
+@font-face {
+    font-family: Roboto;
+    src: local('Roboto Thin'), url('../fonts/roboto/Roboto-Thin.eot');
+    src: url('../fonts/roboto/Roboto-Thin.eot?#iefix') format("embedded-opentype"), url('../fonts/roboto/Roboto-Thin.woff2') format("woff2"),url('../fonts/roboto/Roboto-Thin.woff') format("woff"),url('../fonts/roboto/Roboto-Thin.ttf') format("truetype");
+    font-weight: 200
+}
+
+@font-face {
+    font-family: Roboto;
+    src: local(Roboto Light),url('../fonts/roboto/Roboto-Light.eot');
+    src: url('../fonts/roboto/Roboto-Light.eot?#iefix') format("embedded-opentype"),url('../fonts/roboto/Roboto-Light.woff2') format("woff2"),url('../fonts/roboto/Roboto-Light.woff') format("woff"),url('../fonts/roboto/Roboto-Light.ttf') format("truetype");
+    font-weight: 300
+}
+
+@font-face {
+    font-family: Roboto;
+    src: local(Roboto Regular),url('../fonts/roboto/Roboto-Regular.eot');
+    src: url('../fonts/roboto/Roboto-Regular.eot?#iefix') format("embedded-opentype"),url('../fonts/roboto/Roboto-Regular.woff2') format("woff2"),url('../fonts/roboto/Roboto-Regular.woff') format("woff"),url('../fonts/roboto/Roboto-Regular.ttf') format("truetype");
+    font-weight: 400
+}
+
+@font-face {
+    font-family: Roboto;
+    src: url('../fonts/roboto/Roboto-Medium.eot');
+    src: url('../fonts/roboto/Roboto-Medium.eot?#iefix') format("embedded-opentype"),url('../fonts/roboto/Roboto-Medium.woff2') format("woff2"),url('../fonts/roboto/Roboto-Medium.woff') format("woff"),url('../fonts/roboto/Roboto-Medium.ttf') format("truetype");
+    font-weight: 500
+}
+
+@font-face {
+    font-family: Roboto;
+    src: url('../fonts/roboto/Roboto-Bold.eot');
+    src: url('../fonts/roboto/Roboto-Bold.eot?#iefix') format("embedded-opentype"),url('../fonts/roboto/Roboto-Bold.woff2') format("woff2"),url('../fonts/roboto/Roboto-Bold.woff') format("woff"),url('../fonts/roboto/Roboto-Bold.ttf') format("truetype");
+    font-weight: 700
+}
+
+html {
+    line-height: 1.5;
+    font-family: Roboto,sans-serif;
+    color: rgba(0,0,0,.87)
+}
 
 @font-face {
     font-family: 'Material Icons';

src/assets/less/dialog_window.less

@@ -42,6 +42,11 @@
       padding: 0 40px;
     }
 
+    h5 {
+      margin: 8px 0;
+      font-size: 18px;
+    }
+
     .color-square-wrapper {
       text-align: center;
 
@@ -51,6 +56,37 @@
         display: inline-block;
         margin: 0.3em;
         cursor: pointer;
+
+        &.red {
+          background-color: #f44336;
+        }
+        &.cyan {
+          background-color: #00bcd4;
+        }
+        &.purple {
+          background-color: #9c27b0;
+        }
+        &.lime {
+          background-color: #d4e157;
+        }
+        &.indigo {
+          background-color: #3f51b5;
+        }
+        &.pink {
+          background-color: #e91e63;
+        }
+        &.teal {
+          background-color: #009688;
+        }
+        &.green {
+          background-color: #4caf50;
+        }
+        &.orange {
+          background-color: #ff9800;
+        }
+        &.deep-purple {
+          background-color: #673ab7;
+        }
       }
     }
 
@@ -71,11 +107,3 @@
     }
   }
 }
-
-.windows-only {
-  display: none;
-
-  .win32 & {
-    display: block;
-  }
-}