Merge branch 'master' of https://github.com/nukeop/nuclear

README.md

@@ -47,6 +47,10 @@ This will be updated as the program evolves.
 
 ![album display](http://i.imgur.com/t5V0kXG.jpg)
 
+![dashboard](http://i.imgur.com/rVBAGLG.png)
+
+![artist view](http://i.imgur.com/EOd1auB.png)
+
 ![playlist view](http://i.imgur.com/KYFwu7P.jpg)
 
 ![legacy search](http://i.imgur.com/WKBVq1u.jpg)

app/api/Globals.js

@@ -9,7 +9,7 @@ module.exports = {
     settings: "settings.json"
   },
   ytApiKey: "AIzaSyCIM4EzNqi1in22f4Z3Ru3iYvLaY8tc3bo",
-  soundcloudApiKey: "fDoItMDbsbZz8dY16ZzARCZmzgHBPotA",
+  soundcloudApiKey: "69b6a6bc4f7d483fd21b170137a9cd51",
   lastfmApiKey: "2b75dcb291e2b0c9a2c994aca522ac14",
   lastfmApiSecret: "2ee49e35f08b837d43b2824198171fc8",
   vimeoClientId: "8c997e332f00ecae0f200cb23d117a56cac00803",

app/components/Dashboard.js

@@ -21,6 +21,7 @@ export default class Dashboard extends Component {
             return (
               <PitchforkReviewMini
                 album={el}
+                switchToArtistView={this.props.switchToArtistView}
               />
             )
           })

app/components/Home.js

@@ -44,7 +44,7 @@ export default class Home extends Component {
       seekFromPosition: 0,
       songStreamLoading: false,
       sidebarContents: enums.SidebarMenuItemEnum.DEFAULT,
-      mainContents: enums.MainContentItemEnum.ALBUMS
+      mainContents: enums.MainContentItemEnum.DASHBOARD
     };
 
     this.alertOptions = {

app/components/MainContent.js

@@ -217,7 +217,7 @@ export default class MainContent extends Component {
       case enums.MainContentItemEnum.DASHBOARD:
       return (
         <DashboardContainer
-
+          switchToArtistView={this.switchToArtistView.bind(this)}
         />
       );
       default:

app/components/PitchforkReviewMini.css

@@ -35,6 +35,10 @@
   color: #95a5a6;
 }
 
+.review_artist_name_link {
+  color: #95a5a6;
+}
+
 .review_score_cell {
   display: inline-block;
   text-align: right;

app/components/PitchforkReviewMini.js

@@ -23,7 +23,7 @@ export default class PitchforkReviewMini extends Component {
                 <td className={styles.review_album_details_cell}>
                   <div className={styles.review_album_details_container}>
                     <div>{this.props.album.title}</div>
-                    <div className={styles.review_artist_name}>by {this.props.album.artist}</div>
+                    <div className={styles.review_artist_name}>by <a href='#' onClick={this.props.switchToArtistView.bind(null, this.props.album.artist)} className={styles.review_artist_name_link}>{this.props.album.artist}</a></div>
                     <div>Genre: {this.props.album.genres.join(', ')}</div>
                   </div>
                   <div className={styles.review_score}>{this.props.album.details.score}</div>

app/components/Player.js

@@ -1,5 +1,6 @@
 import React, { Component } from 'react';
 import Sound from 'react-sound';
+const { BrowserWindow, globalShortcut } = require('electron').remote;
 
 import styles from './Player.css';
 
@@ -8,6 +9,19 @@ export default class Player extends Component {
     super(props);
   }
 
+  componentDidMount() {
+    // Register media key shortcuts
+    if (!globalShortcut.isRegistered('mediaplaypause'))
+      globalShortcut.register('mediaplaypause', this.props.togglePlayCallback);
+
+    if (!globalShortcut.isRegistered('medianexttrack'))
+      globalShortcut.register('medianexttrack', this.props.nextSongCallback);
+
+    if (!globalShortcut.isRegistered('mediaprevioustrack'))
+      globalShortcut.register('mediaprevioustrack', this.props.prevSongCallback);
+
+  }
+
   onClickSeek(event, value){
     var progressBar = document.getElementById("progress_bar");
     var percent = (event.clientX - progressBar.offsetLeft)/(progressBar.offsetWidth);

app/containers/DashboardContainer.js

@@ -25,6 +25,7 @@ export default class DashboardContainer extends Component {
       ? <div style={{lineHeight: '750px', height: '100%', width: '100%', fontSize: '48px'}}><i className='fa fa-spinner fa-pulse fa-fw' /></div>
       : <Dashboard
           bestNewAlbums={this.state.bestNewAlbums}
+          switchToArtistView={this.props.switchToArtistView}
         />
     );
   }

app/package.json

@@ -1,7 +1,7 @@
 {
   "name": "nuclear",
   "productName": "nuclear",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "description": " An Electron-based, multiplatform music player app that streams from multiple sources ",
   "main": "./main.js",
   "author": {

package.json

@@ -1,7 +1,7 @@
 {
   "name": "nuclear",
   "productName": "nuclear",
-  "version": "0.1.0",
+  "version": "0.3.0",
   "description": " An Electron-based, multiplatform music player app that streams from multiple sources ",
   "main": "main.js",
   "scripts": {
@@ -62,13 +62,14 @@
         "tar.gz",
         "deb",
         "AppImage"
-      ]
+      ],
+      "icon": "build/icons"
+    },
+    "directories": {
+      "buildResources": "resources",
+      "output": "release"
     }
   },
-  "directories": {
-    "buildResources": "resources",
-    "output": "release"
-  },
   "bin": {
     "electron": "./node_modules/.bin/electron"
   },
@@ -93,6 +94,7 @@
   "homepage": "http://nuclear.gumblert.tech",
   "devDependencies": {
     "asar": "^0.12.3",
+    "axios": "^0.9.1",
     "babel-core": "^6.21.0",
     "babel-eslint": "^7.1.1",
     "babel-loader": "^6.2.10",
@@ -108,15 +110,18 @@
     "babel-preset-stage-0": "^6.16.0",
     "babel-register": "^6.18.0",
     "babili-webpack-plugin": "^0.0.7",
+    "bandcamp-scraper": "^1.0.1",
     "boiler-room-custodian": "^0.4.2",
     "chai": "^3.5.0",
+    "cheerio": "^0.22.0",
     "concurrently": "^3.1.0",
     "cross-env": "^3.1.3",
     "css-loader": "^0.26.1",
     "devtron": "^1.4.0",
-    "electron": "^1.4.12",
-    "electron-builder": "^10.8.1",
+    "electron": "^1.6.2",
+    "electron-builder": "^16.6.1",
     "electron-devtools-installer": "^2.0.1",
+    "electron-simple-updater": "^1.2.0",
     "enzyme": "^2.6.0",
     "eslint": "^3.12.2",
     "eslint-config-airbnb": "^13.0.0",
@@ -134,46 +139,41 @@
     "file-loader": "^0.9.0",
     "flow-bin": "^0.37.1",
     "html-webpack-plugin": "^2.24.1",
+    "jquery": "^2.2.3",
     "jsdom": "^9.9.1",
     "json-loader": "^0.5.4",
+    "jsonfile": "^2.4.0",
+    "md5": "^2.2.1",
     "minimist": "^1.2.0",
     "mocha": "^3.2.0",
+    "mp3monkey": "^1.0.1",
+    "musicbrainz": "^0.2.6",
     "react-addons-test-utils": "^15.4.1",
+    "react-alert": "^1.0.14",
+    "react-aria-modal": "^2.4.0",
+    "react-bootstrap-multiselect": "^2.3.0",
+    "react-coverflow": "^0.2.3",
+    "react-debounce-input": "^2.4.2",
+    "react-popover": "^0.4.4",
+    "react-sortable-hoc": "^0.5.0",
+    "react-sound": "^0.5.2",
     "redux-logger": "^2.7.4",
+    "request": "^2.79.0",
     "sinon": "^1.17.6",
+    "soundmanager2": "^2.97.20150601-a",
     "spectron": "^3.4.0",
+    "string-similarity": "^1.1.0",
     "style-loader": "^0.13.1",
     "tcomb": "^3.2.15",
     "url-loader": "^0.5.7",
+    "vimeo": "^1.2.0",
     "webpack": "^1.14.0",
     "webpack-dev-middleware": "^1.9.0",
     "webpack-hot-middleware": "^2.13.2",
     "webpack-merge": "^2.0.0",
     "webpack-validator": "^2.3.0",
-    "react-sound": "^0.4.0",
-    "soundmanager2": "^2.97.20150601-a",
     "youtube-dl": "^1.11.1",
-    "react-bootstrap-multiselect": "^2.3.0",
-    "axios": "^0.9.1",
-    "jquery": "^2.2.3",
-    "react-alert": "^1.0.14",
-    "ytdl-core": "^0.7.24",
-    "react-sound": "^0.5.2",
-    "react-popover": "^0.4.4",
-    "react-coverflow": "^0.2.3",
-    "jsonfile": "^2.4.0",
-    "react-aria-modal": "^2.4.0",
-    "md5": "^2.2.1",
-    "bandcamp-scraper": "^1.0.1",
-    "request": "^2.79.0",
-    "electron-simple-updater": "^1.2.0",
-    "mp3monkey": "^1.0.1",
-    "musicbrainz": "^0.2.6",
-    "react-debounce-input": "^2.4.2",
-    "react-sortable-hoc": "^0.5.0",
-    "string-similarity": "^1.1.0",
-    "vimeo": "^1.2.0",
-    "cheerio": "^0.22.0"
+    "ytdl-core": "^0.7.24"
   },
   "dependencies": {
     "electron-debug": "^1.1.0",