Simplify app layout

Author: martijnvermaat

.gitignore

@@ -1,4 +1,4 @@
 node_modules/
-dist/assets/
+dist/
 .tmp
 npm-debug.log

dist/index.html

@@ -14,6 +14,6 @@
   <div id="content">
     <h1>If you can see this, something is broken (or JS is not enabled)!!.</h1>
   </div>
-  <script type="text/javascript" src="assets/main.js"></script>
+  <script type="text/javascript" src="/dist/main.js"></script>
 </body>
 </html>

dev/index.html index.html

@@ -6,7 +6,7 @@
   "main": "src/scripts/index.js",
   "scripts": {
     "dev": "webpack-dev-server --progress --colors --port 8000 --config webpack.dev.config.js",
-    "clean": "rm -Rf dist/assets",
+    "clean": "rm -Rf dist",
     "dist": "npm run clean && webpack -p --config webpack.dist.config.js"
   },
   "repository": {

package.json

@@ -13,16 +13,15 @@ module.exports = {
 
   entry: [
     'webpack/hot/only-dev-server',
-    './src/scripts/index.jsx'
+    './scripts/init.jsx'
   ],
 
   output: {
     filename: 'main.js',
-    publicPath: '/assets/'
+    publicPath: '/dist/'
   },
 
   devServer: {
-    contentBase: './dev',
     hot: true
   },
 

src/scripts/Website.jsx scripts/Website.jsx

@@ -13,11 +13,11 @@ module.exports = {
     new webpack.optimize.AggressiveMergingPlugin()
   ],
 
-  entry: './src/scripts/index.jsx',
+  entry: './scripts/init.jsx',
 
   output: {
-    filename: 'nested-website.min.js',
-    path: 'dist/assets/'
+    filename: 'main.js',
+    path: 'dist/'
   },
 
   resolve: {