Fix the Electron app - Closes #539

package.json

@@ -15,8 +15,8 @@
     "dist:win": "build --win --ia32 --x64",
     "dist:mac": "build --mac",
     "dist:linux": "build --linux --ia32 --x64 --armv7l",
-    "copy-files": "mkdir dist && cp -r ./src/index.html ./src/assets ./dist",
-    "clean": "del dist -f",
+    "copy-files": "mkdir app/dist && cp -r ./src/index.html ./app/dist",
+    "clean": "del app/dist -f",
     "eslint": "eslint ./src/ ./app/ ./features/",
     "storybook": "start-storybook -p 6006 -s ./src/",
     "build-storybook": "build-storybook"

src/assets/fonts/material-design-icons/style.css

@@ -5,12 +5,12 @@
   font-family: 'Material Icons';
   font-style: normal;
   font-weight: 400;
-  src: url('/assets/fonts/material-design-icons/MaterialIcons-Regular.eot'); /* For IE6-8 */
+  src: url('../../assets/fonts/material-design-icons/MaterialIcons-Regular.eot'); /* For IE6-8 */
   src: local('Material Icons'),
        local('MaterialIcons-Regular'),
-       url('/assets/fonts/material-design-icons/MaterialIcons-Regular.woff2') format('woff2'),
-       url('/assets/fonts/material-design-icons/MaterialIcons-Regular.woff') format('woff'),
-       url('/assets/fonts/material-design-icons/MaterialIcons-Regular.ttf') format('truetype');
+       url('../../assets/fonts/material-design-icons/MaterialIcons-Regular.woff2') format('woff2'),
+       url('../../assets/fonts/material-design-icons/MaterialIcons-Regular.woff') format('woff'),
+       url('../../assets/fonts/material-design-icons/MaterialIcons-Regular.ttf') format('truetype');
 }
 :global .material-icons {
   font-family: 'Material Icons';

src/assets/fonts/roboto-mono/style.css

@@ -6,37 +6,37 @@
   font-family: 'Roboto Mono';
   font-style: normal;
   font-weight: 400;
-  src: url('/assets/fonts/roboto-mono/roboto-mono-v4-latin-regular.eot'); /* IE9 Compat Modes */
+  src: url('../../assets/fonts/roboto-mono/roboto-mono-v4-latin-regular.eot'); /* IE9 Compat Modes */
   src: local('Roboto Mono'), local('RobotoMono-Regular'),
-       url('/assets/fonts/roboto-mono/roboto-mono-v4-latin-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
-       url('/assets/fonts/roboto-mono/roboto-mono-v4-latin-regular.woff2') format('woff2'), /* Super Modern Browsers */
-       url('/assets/fonts/roboto-mono/roboto-mono-v4-latin-regular.woff') format('woff'), /* Modern Browsers */
-       url('/assets/fonts/roboto-mono/roboto-mono-v4-latin-regular.ttf') format('truetype'), /* Safari, Android, iOS */
-       url('/assets/fonts/roboto-mono/roboto-mono-v4-latin-regular.svg#RobotoMono') format('svg'); /* Legacy iOS */
+       url('../../assets/fonts/roboto-mono/roboto-mono-v4-latin-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
+       url('../../assets/fonts/roboto-mono/roboto-mono-v4-latin-regular.woff2') format('woff2'), /* Super Modern Browsers */
+       url('../../assets/fonts/roboto-mono/roboto-mono-v4-latin-regular.woff') format('woff'), /* Modern Browsers */
+       url('../../assets/fonts/roboto-mono/roboto-mono-v4-latin-regular.ttf') format('truetype'), /* Safari, Android, iOS */
+       url('../../assets/fonts/roboto-mono/roboto-mono-v4-latin-regular.svg#RobotoMono') format('svg'); /* Legacy iOS */
 }
 /* roboto-mono-500 - latin */
 @font-face {
   font-family: 'Roboto Mono';
   font-style: normal;
   font-weight: 500;
-  src: url('/assets/fonts/roboto-mono/roboto-mono-v4-latin-500.eot'); /* IE9 Compat Modes */
+  src: url('../../assets/fonts/roboto-mono/roboto-mono-v4-latin-500.eot'); /* IE9 Compat Modes */
   src: local('Roboto Mono Medium'), local('RobotoMono-Medium'),
-       url('/assets/fonts/roboto-mono/roboto-mono-v4-latin-500.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
-       url('/assets/fonts/roboto-mono/roboto-mono-v4-latin-500.woff2') format('woff2'), /* Super Modern Browsers */
-       url('/assets/fonts/roboto-mono/roboto-mono-v4-latin-500.woff') format('woff'), /* Modern Browsers */
-       url('/assets/fonts/roboto-mono/roboto-mono-v4-latin-500.ttf') format('truetype'), /* Safari, Android, iOS */
-       url('/assets/fonts/roboto-mono/roboto-mono-v4-latin-500.svg#RobotoMono') format('svg'); /* Legacy iOS */
+       url('../../assets/fonts/roboto-mono/roboto-mono-v4-latin-500.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
+       url('../../assets/fonts/roboto-mono/roboto-mono-v4-latin-500.woff2') format('woff2'), /* Super Modern Browsers */
+       url('../../assets/fonts/roboto-mono/roboto-mono-v4-latin-500.woff') format('woff'), /* Modern Browsers */
+       url('../../assets/fonts/roboto-mono/roboto-mono-v4-latin-500.ttf') format('truetype'), /* Safari, Android, iOS */
+       url('../../assets/fonts/roboto-mono/roboto-mono-v4-latin-500.svg#RobotoMono') format('svg'); /* Legacy iOS */
 }
 /* roboto-mono-700 - latin */
 @font-face {
   font-family: 'Roboto Mono';
   font-style: normal;
   font-weight: 700;
-  src: url('/assets/fonts/roboto-mono/roboto-mono-v4-latin-700.eot'); /* IE9 Compat Modes */
+  src: url('../../assets/fonts/roboto-mono/roboto-mono-v4-latin-700.eot'); /* IE9 Compat Modes */
   src: local('Roboto Mono Bold'), local('RobotoMono-Bold'),
-       url('/assets/fonts/roboto-mono/roboto-mono-v4-latin-700.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
-       url('/assets/fonts/roboto-mono/roboto-mono-v4-latin-700.woff2') format('woff2'), /* Super Modern Browsers */
-       url('/assets/fonts/roboto-mono/roboto-mono-v4-latin-700.woff') format('woff'), /* Modern Browsers */
-       url('/assets/fonts/roboto-mono/roboto-mono-v4-latin-700.ttf') format('truetype'), /* Safari, Android, iOS */
-       url('/assets/fonts/roboto-mono/roboto-mono-v4-latin-700.svg#RobotoMono') format('svg'); /* Legacy iOS */
+       url('../../assets/fonts/roboto-mono/roboto-mono-v4-latin-700.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
+       url('../../assets/fonts/roboto-mono/roboto-mono-v4-latin-700.woff2') format('woff2'), /* Super Modern Browsers */
+       url('../../assets/fonts/roboto-mono/roboto-mono-v4-latin-700.woff') format('woff'), /* Modern Browsers */
+       url('../../assets/fonts/roboto-mono/roboto-mono-v4-latin-700.ttf') format('truetype'), /* Safari, Android, iOS */
+       url('../../assets/fonts/roboto-mono/roboto-mono-v4-latin-700.svg#RobotoMono') format('svg'); /* Legacy iOS */
 }

src/assets/fonts/roboto/style.css

@@ -6,37 +6,37 @@
   font-family: 'Roboto';
   font-style: normal;
   font-weight: 400;
-  src: url('/assets/fonts/roboto/roboto-v15-latin-regular.eot'); /* IE9 Compat Modes */
+  src: url('../../assets/fonts/roboto/roboto-v15-latin-regular.eot'); /* IE9 Compat Modes */
   src: local('Roboto'), local('Roboto-Regular'),
-       url('/assets/fonts/roboto/roboto-v15-latin-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
-       url('/assets/fonts/roboto/roboto-v15-latin-regular.woff2') format('woff2'), /* Super Modern Browsers */
-       url('/assets/fonts/roboto/roboto-v15-latin-regular.woff') format('woff'), /* Modern Browsers */
-       url('/assets/fonts/roboto/roboto-v15-latin-regular.ttf') format('truetype'), /* Safari, Android, iOS */
-       url('/assets/fonts/roboto/roboto-v15-latin-regular.svg#Roboto') format('svg'); /* Legacy iOS */
+       url('../../assets/fonts/roboto/roboto-v15-latin-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
+       url('../../assets/fonts/roboto/roboto-v15-latin-regular.woff2') format('woff2'), /* Super Modern Browsers */
+       url('../../assets/fonts/roboto/roboto-v15-latin-regular.woff') format('woff'), /* Modern Browsers */
+       url('../../assets/fonts/roboto/roboto-v15-latin-regular.ttf') format('truetype'), /* Safari, Android, iOS */
+       url('../../assets/fonts/roboto/roboto-v15-latin-regular.svg#Roboto') format('svg'); /* Legacy iOS */
 }
 /* roboto-500 - latin */
 @font-face {
   font-family: 'Roboto';
   font-style: normal;
   font-weight: 500;
-  src: url('/assets/fonts/roboto/roboto-v15-latin-500.eot'); /* IE9 Compat Modes */
+  src: url('../../assets/fonts/roboto/roboto-v15-latin-500.eot'); /* IE9 Compat Modes */
   src: local('Roboto Medium'), local('Roboto-Medium'),
-       url('/assets/fonts/roboto/roboto-v15-latin-500.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
-       url('/assets/fonts/roboto/roboto-v15-latin-500.woff2') format('woff2'), /* Super Modern Browsers */
-       url('/assets/fonts/roboto/roboto-v15-latin-500.woff') format('woff'), /* Modern Browsers */
-       url('/assets/fonts/roboto/roboto-v15-latin-500.ttf') format('truetype'), /* Safari, Android, iOS */
-       url('/assets/fonts/roboto/roboto-v15-latin-500.svg#Roboto') format('svg'); /* Legacy iOS */
+       url('../../assets/fonts/roboto/roboto-v15-latin-500.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
+       url('../../assets/fonts/roboto/roboto-v15-latin-500.woff2') format('woff2'), /* Super Modern Browsers */
+       url('../../assets/fonts/roboto/roboto-v15-latin-500.woff') format('woff'), /* Modern Browsers */
+       url('../../assets/fonts/roboto/roboto-v15-latin-500.ttf') format('truetype'), /* Safari, Android, iOS */
+       url('../../assets/fonts/roboto/roboto-v15-latin-500.svg#Roboto') format('svg'); /* Legacy iOS */
 }
 /* roboto-700 - latin */
 @font-face {
   font-family: 'Roboto';
   font-style: normal;
   font-weight: 700;
-  src: url('/assets/fonts/roboto/roboto-v15-latin-700.eot'); /* IE9 Compat Modes */
+  src: url('../../assets/fonts/roboto/roboto-v15-latin-700.eot'); /* IE9 Compat Modes */
   src: local('Roboto Bold'), local('Roboto-Bold'),
-       url('/assets/fonts/roboto/roboto-v15-latin-700.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
-       url('/assets/fonts/roboto/roboto-v15-latin-700.woff2') format('woff2'), /* Super Modern Browsers */
-       url('/assets/fonts/roboto/roboto-v15-latin-700.woff') format('woff'), /* Modern Browsers */
-       url('/assets/fonts/roboto/roboto-v15-latin-700.ttf') format('truetype'), /* Safari, Android, iOS */
-       url('/assets/fonts/roboto/roboto-v15-latin-700.svg#Roboto') format('svg'); /* Legacy iOS */
+       url('../../assets/fonts/roboto/roboto-v15-latin-700.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
+       url('../../assets/fonts/roboto/roboto-v15-latin-700.woff2') format('woff2'), /* Super Modern Browsers */
+       url('../../assets/fonts/roboto/roboto-v15-latin-700.woff') format('woff'), /* Modern Browsers */
+       url('../../assets/fonts/roboto/roboto-v15-latin-700.ttf') format('truetype'), /* Safari, Android, iOS */
+       url('../../assets/fonts/roboto/roboto-v15-latin-700.svg#Roboto') format('svg'); /* Legacy iOS */
 }

src/index.html

@@ -3,12 +3,12 @@
     <head>
         <meta charset="utf-8">
         <title>lisk nano</title>
-        <link rel="stylesheet" href="/styles.css">
+        <link rel="stylesheet" href="./styles.css">
     </head>
     <body>
         <div id="app"></div>
-        <script src="/bundle.vendor.js"></script>
-        <script src="/bundle.app.js"></script>
+        <script src="./bundle.vendor.js"></script>
+        <script src="./bundle.app.js"></script>
     </body>
     </body>
 </html>

src/main.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import ReactDOM from 'react-dom';
-import { BrowserRouter as Router } from 'react-router-dom';
+import { HashRouter as Router } from 'react-router-dom';
 import { Provider } from 'react-redux';
 import App from './components/app';
 import store from './store';

webpack.config.js

@@ -24,7 +24,7 @@ module.exports = (env) => {
   return {
     entry: entries,
     output: {
-      path: path.resolve(__dirname, 'dist'),
+      path: path.resolve(__dirname, 'app', 'dist'),
       filename: env.test ? 'bundle.js' : 'bundle.[name].js',
     },
     devServer: {
@@ -37,6 +37,10 @@ module.exports = (env) => {
       new webpack.DefinePlugin({
         PRODUCTION: env.prod,
         TEST: env.test,
+        // because of https://fb.me/react-minification
+        'process.env': {
+          NODE_ENV: env.prod ? JSON.stringify('production') : null,
+        },
       }),
       new ExtractTextPlugin({
         filename: 'styles.css',