resolve package-lock conflicts

src/renderer/pages/app.js

@@ -12,10 +12,10 @@ const Header = require('../components/header')
 const TorrentListPage = require('./torrent-list-page')
 
 const Views = {
-  'home': createGetter(() => TorrentListPage),
-  'player': createGetter(() => require('./player-page')),
+  home: createGetter(() => TorrentListPage),
+  player: createGetter(() => require('./player-page')),
   'create-torrent': createGetter(() => require('./create-torrent-page')),
-  'preferences': createGetter(() => require('./preferences-page'))
+  preferences: createGetter(() => require('./preferences-page'))
 }
 
 const Modals = {

src/renderer/pages/player-page.js

@@ -543,9 +543,9 @@ function renderPlayerControls (state) {
 
   // Add the cast buttons. Icons for each cast type, connected/disconnected:
   const buttonIcons = {
-    'chromecast': { true: 'cast_connected', false: 'cast' },
-    'airplay': { true: 'airplay', false: 'airplay' },
-    'dlna': { true: 'tv', false: 'tv' }
+    chromecast: { true: 'cast_connected', false: 'cast' },
+    airplay: { true: 'airplay', false: 'airplay' },
+    dlna: { true: 'tv', false: 'tv' }
   }
   castTypes.forEach(function (castType) {
     // Do we show this button (eg. the Chromecast button) at all?

src/renderer/pages/preferences-page.js

@@ -37,7 +37,7 @@ class PreferencesPage extends React.Component {
         <PathSelector
           dialog={{
             title: 'Select download directory',
-            properties: [ 'openDirectory' ]
+            properties: ['openDirectory']
           }}
           onChange={this.handleDownloadPathChange}
           title='Download location'
@@ -98,7 +98,7 @@ class PreferencesPage extends React.Component {
         <PathSelector
           dialog={{
             title: 'Select media player app',
-            properties: [ 'openFile' ]
+            properties: ['openFile']
           }}
           displayValue={playerName}
           onChange={this.handleExternalPlayerPathChange}
@@ -151,7 +151,7 @@ class PreferencesPage extends React.Component {
         <PathSelector
           dialog={{
             title: 'Select folder to watch for new torrents',
-            properties: [ 'openDirectory' ]
+            properties: ['openDirectory']
           }}
           displayValue={torrentsFolderPath || ''}
           onChange={this.handletorrentsFolderPathChange}