diff --git a/README.md b/README.md index 48c965c1..2a892ffb 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# WebTorrent.app +#   WebTorrent.app [![Gitter][webtorrent-gitter-image]][webtorrent-gitter-url] [![Travis Build][webtorrent-app-travis-image]][webtorrent-app-travis-url] @@ -11,7 +11,7 @@ #### WebTorrent, the streaming torrent client. For OS X, Windows, and Linux.

- screenshot + screenshot

## How to Contribute diff --git a/bin/package.js b/bin/package.js index 5eed935a..f5a188f2 100755 --- a/bin/package.js +++ b/bin/package.js @@ -28,7 +28,7 @@ var all = { // Pattern which specifies which files to ignore when copying files to create the // package(s). - ignore: /^\/(dist|resources\/screenshot.png)$/, + ignore: /^\/(dist|static\/screenshot.png)$/, // The base directory where the finished package(s) are created. out: path.join(__dirname, '..', 'dist'), diff --git a/config.js b/config.js index 5d3911a4..39ac4c2a 100644 --- a/config.js +++ b/config.js @@ -4,12 +4,12 @@ module.exports = { APP_NAME: 'WebTorrent', APP_ICON: path.join(__dirname, 'WebTorrent.png'), INDEX: 'file://' + path.join(__dirname, 'renderer', 'index.html'), - SOUND_ADD: 'file://' + path.join(__dirname, 'resources', 'sound', 'add.wav'), - SOUND_DELETE: 'file://' + path.join(__dirname, 'resources', 'sound', 'delete.wav'), - SOUND_DISABLE: 'file://' + path.join(__dirname, 'resources', 'sound', 'disable.wav'), - SOUND_DONE: 'file://' + path.join(__dirname, 'resources', 'sound', 'done.wav'), - SOUND_ENABLE: 'file://' + path.join(__dirname, 'resources', 'sound', 'enable.wav'), - SOUND_ERROR: 'file://' + path.join(__dirname, 'resources', 'sound', 'error.wav'), - SOUND_PLAY: 'file://' + path.join(__dirname, 'resources', 'sound', 'play.wav'), - SOUND_STARTUP: 'file://' + path.join(__dirname, 'resources', 'sound', 'startup.wav') + SOUND_ADD: 'file://' + path.join(__dirname, 'static', 'sound', 'add.wav'), + SOUND_DELETE: 'file://' + path.join(__dirname, 'static', 'sound', 'delete.wav'), + SOUND_DISABLE: 'file://' + path.join(__dirname, 'static', 'sound', 'disable.wav'), + SOUND_DONE: 'file://' + path.join(__dirname, 'static', 'sound', 'done.wav'), + SOUND_ENABLE: 'file://' + path.join(__dirname, 'static', 'sound', 'enable.wav'), + SOUND_ERROR: 'file://' + path.join(__dirname, 'static', 'sound', 'error.wav'), + SOUND_PLAY: 'file://' + path.join(__dirname, 'static', 'sound', 'play.wav'), + SOUND_STARTUP: 'file://' + path.join(__dirname, 'static', 'sound', 'startup.wav') } diff --git a/renderer/index.css b/renderer/index.css index c0adf45d..9caaf685 100644 --- a/renderer/index.css +++ b/renderer/index.css @@ -103,7 +103,7 @@ body { font-weight: 400; src: local('Material Icons'), local('MaterialIcons-Regular'), - url(../vendor/MaterialIcons-Regular.woff2) format('woff2'); + url(../static/MaterialIcons-Regular.woff2) format('woff2'); } .icon { diff --git a/renderer/state.js b/renderer/state.js index 3d7906ab..a028e01e 100644 --- a/renderer/state.js +++ b/renderer/state.js @@ -60,19 +60,19 @@ module.exports = { status: 'paused', infoHash: 'f84b51f0d2c3455ab5dabb6643b4340234cd036e', displayName: 'Big Buck Bunny', - posterURL: '../resources/bigBuckBunny.jpg' + posterURL: path.join(__dirname, '..', 'static', 'bigBuckBunny.jpg') }, { status: 'paused', infoHash: '6a9759bffd5c0af65319979fb7832189f4f3c35d', displayName: 'Sintel', - posterURL: '../resources/sintel.jpg' + posterURL: path.join(__dirname, '..', 'static', 'sintel.jpg') }, { status: 'paused', infoHash: '02767050e0be2fd4db9a2ad6c12416ac806ed6ed', displayName: 'Tears of Steel', - posterURL: '../resources/tearsOfSteel.jpg' + posterURL: path.join(__dirname, '..', 'static', 'tearsOfSteel.jpg') } ], downloadPath: path.join(os.homedir(), 'Downloads') diff --git a/resources/BigBuckBunny_archive.torrent b/static/BigBuckBunny_archive.torrent similarity index 100% rename from resources/BigBuckBunny_archive.torrent rename to static/BigBuckBunny_archive.torrent diff --git a/vendor/MaterialIcons-Regular.woff2 b/static/MaterialIcons-Regular.woff2 similarity index 100% rename from vendor/MaterialIcons-Regular.woff2 rename to static/MaterialIcons-Regular.woff2 diff --git a/resources/TearsOfSteel_archive.torrent b/static/TearsOfSteel_archive.torrent similarity index 100% rename from resources/TearsOfSteel_archive.torrent rename to static/TearsOfSteel_archive.torrent diff --git a/resources/bigBuckBunny.jpg b/static/bigBuckBunny.jpg similarity index 100% rename from resources/bigBuckBunny.jpg rename to static/bigBuckBunny.jpg diff --git a/resources/screenshot.png b/static/screenshot.png similarity index 100% rename from resources/screenshot.png rename to static/screenshot.png diff --git a/resources/sintel.jpg b/static/sintel.jpg similarity index 100% rename from resources/sintel.jpg rename to static/sintel.jpg diff --git a/resources/sintel.torrent b/static/sintel.torrent similarity index 100% rename from resources/sintel.torrent rename to static/sintel.torrent diff --git a/resources/sound/add.wav b/static/sound/add.wav similarity index 100% rename from resources/sound/add.wav rename to static/sound/add.wav diff --git a/resources/sound/delete.wav b/static/sound/delete.wav similarity index 100% rename from resources/sound/delete.wav rename to static/sound/delete.wav diff --git a/resources/sound/disable.wav b/static/sound/disable.wav similarity index 100% rename from resources/sound/disable.wav rename to static/sound/disable.wav diff --git a/resources/sound/done.wav b/static/sound/done.wav similarity index 100% rename from resources/sound/done.wav rename to static/sound/done.wav diff --git a/resources/sound/enable.wav b/static/sound/enable.wav similarity index 100% rename from resources/sound/enable.wav rename to static/sound/enable.wav diff --git a/resources/sound/error.wav b/static/sound/error.wav similarity index 100% rename from resources/sound/error.wav rename to static/sound/error.wav diff --git a/resources/sound/play.wav b/static/sound/play.wav similarity index 100% rename from resources/sound/play.wav rename to static/sound/play.wav diff --git a/resources/sound/startup.wav b/static/sound/startup.wav similarity index 100% rename from resources/sound/startup.wav rename to static/sound/startup.wav diff --git a/resources/tearsOfSteel.jpg b/static/tearsOfSteel.jpg similarity index 100% rename from resources/tearsOfSteel.jpg rename to static/tearsOfSteel.jpg