finalizing distributing

industral · Apr 5, 2016 · cfca492 · cfca492
1 parent 5f0297f
commit cfca492
Show file tree

Hide file tree

Showing 24 changed files with 10 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -27,6 +27,7 @@
       "icon": "build/icon.icns",
       "icon-size": 80,
       "background": "build/background.png",
+      "ignore": "bundle.js.map",
       "contents": [
         {
           "x": 410,

diff --git a/app/app.js → src/app.js b/app/app.js → src/app.js
diff --git a/app/assets/css/photon.css → src/assets/css/photon.css b/app/assets/css/photon.css → src/assets/css/photon.css
diff --git a/app/assets/css/style.css → src/assets/css/style.css b/app/assets/css/style.css → src/assets/css/style.css
diff --git a/app/assets/fonts/photon-entypo.woff → src/assets/fonts/photon-entypo.woff b/app/assets/fonts/photon-entypo.woff → src/assets/fonts/photon-entypo.woff
diff --git a/app/assets/js/devTools.js → src/assets/js/DevTools.js b/app/assets/js/devTools.js → src/assets/js/DevTools.js
diff --git a/app/components/layout/Main/index.js → src/components/layout/Main/index.js b/app/components/layout/Main/index.js → src/components/layout/Main/index.js
diff --git a/app/components/layout/Main/styles/style.scss → src/components/layout/Main/styles/style.scss b/app/components/layout/Main/styles/style.scss → src/components/layout/Main/styles/style.scss
diff --git a/app/components/page/Main/index.js → src/components/page/Main/index.js b/app/components/page/Main/index.js → src/components/page/Main/index.js
diff --git a/app/components/page/Main/styles/style.scss → src/components/page/Main/styles/style.scss b/app/components/page/Main/styles/style.scss → src/components/page/Main/styles/style.scss
diff --git a/app/components/widget/AlbumList/index.js → src/components/widget/AlbumList/index.js b/app/components/widget/AlbumList/index.js → src/components/widget/AlbumList/index.js
diff --git a/app/components/widget/ArtistList/index.js → src/components/widget/ArtistList/index.js b/app/components/widget/ArtistList/index.js → src/components/widget/ArtistList/index.js
diff --git a/app/components/widget/Controls/index.js → src/components/widget/Controls/index.js b/app/components/widget/Controls/index.js → src/components/widget/Controls/index.js
diff --git a/...ponents/widget/Controls/styles/style.scss → ...ponents/widget/Controls/styles/style.scss b/...ponents/widget/Controls/styles/style.scss → ...ponents/widget/Controls/styles/style.scss
diff --git a/...get/LibraryProcess/images/ajax-loader.gif → ...get/LibraryProcess/images/ajax-loader.gif b/...get/LibraryProcess/images/ajax-loader.gif → ...get/LibraryProcess/images/ajax-loader.gif
diff --git a/...components/widget/LibraryProcess/index.js → ...components/widget/LibraryProcess/index.js b/...components/widget/LibraryProcess/index.js → ...components/widget/LibraryProcess/index.js
diff --git a/...s/widget/LibraryProcess/styles/style.scss → ...s/widget/LibraryProcess/styles/style.scss b/...s/widget/LibraryProcess/styles/style.scss → ...s/widget/LibraryProcess/styles/style.scss
diff --git a/app/components/widget/SongList/index.js → src/components/widget/SongList/index.js b/app/components/widget/SongList/index.js → src/components/widget/SongList/index.js
diff --git a/...mponents/widget/SongList/styles/style.css → ...mponents/widget/SongList/styles/style.css b/...mponents/widget/SongList/styles/style.css → ...mponents/widget/SongList/styles/style.css
diff --git a/app/components/widget/SongList/trackItem.js → src/components/widget/SongList/trackItem.js b/app/components/widget/SongList/trackItem.js → src/components/widget/SongList/trackItem.js
diff --git a/app/context/Player.js → src/context/Player.js b/app/context/Player.js → src/context/Player.js
@@ -14,8 +14,7 @@ class Player {
     this.player = null;
 
     this.state = {
-      isPlaying: false,
-      currentTrack: null
+      isPlaying: false
     };
 
     this.store = window._store;

diff --git a/app/context/db.js → src/context/db.js b/app/context/db.js → src/context/db.js
diff --git a/app/reducers/index.js → src/reducers/index.js b/app/reducers/index.js → src/reducers/index.js
diff --git a/webpack.config.js b/webpack.config.js
@@ -1,5 +1,6 @@
 var webpack = require('webpack');
 var fs = require('fs');
+var path = require('path');
 
 var nodeModules = {};
 fs.readdirSync('node_modules')
@@ -19,12 +20,17 @@ fs.readdirSync('app/node_modules')
   });
 
 module.exports = {
-  entry: './app/app.js',
+  entry: './src/app.js',
   output: {
     filename: './app/bundle.js'
   },
   target: 'electron',
   devtool: 'source-map',
+  resolve: {
+    root: [
+      path.resolve('./app/node_modules')
+    ]
+  },
   module: {
     loaders: [
       {
@@ -50,7 +56,7 @@ module.exports = {
     ]
   },
   sassLoader: {
-    includePaths: ['app/assets']
+    includePaths: ['src/assets']
   },
   externals: [nodeModules]
 };