Make files organisation clearer - Resolves #154

.gitignore

@@ -3,7 +3,9 @@ dist
 node_modules
 npm-debug.log
 src/.nyc_output
-src/coverage
+coverage
 src/e2e-test-screenshots
+app/report.html
+app/*.map
 *.sw[pon]
 app/app.js

src/Gruntfile.js → Gruntfile.js

@@ -9,7 +9,7 @@ module.exports = function (grunt) {
         fix: false,
       },
       all: {
-        src: ['app/**/*.js', 'spec/**/*.js', 'test/**/*.js', '*.js'],
+        src: ['src/**/*.js', 'e2e-test/**/*.js', 'test/**/*.js', '*.js'],
       },
     },
   });

src/karma.conf.js → karma.conf.js

@@ -5,8 +5,8 @@ const webpackConfig = require('./webpack.config.babel');
 const preprocessors = {};
 // preprocessors[entry] = ['webpack'];
 preprocessors['**/*.html'] = ['ng-html2js'];
-const libs = path.join(__dirname, 'app', 'libs.js');
-const app = path.join(__dirname, 'app', 'lisk-nano.js');
+const libs = path.join(__dirname, 'src', 'libs.js');
+const app = path.join(__dirname, 'src', 'liskNano.js');
 const testLibs = path.join(__dirname, 'test', 'libs.js');
 const test = path.join(__dirname, 'test', 'test.js');
 preprocessors[libs] = ['webpack'];

package.json

@@ -6,6 +6,11 @@
   "bugs": "https://github.com/LiskHQ/lisk-nano/issues",
   "main": "main.js",
   "scripts": {
+    "build": "webpack --profile --progress --display-modules --display-exclude --display-chunks --display-cached --display-cached-assets",
+    "dev": "webpack-dev-server --host 0.0.0.0 --profile --progress",
+    "e2e-test": "protractor e2e-test/conf.js",
+    "test": "grunt eslint && export NODE_ENV=test && karma start",
+    "test-live": "export NODE_ENV=test && export LIVE=true && karma start",
     "start": "electron app",
     "dist:win": "build --win",
     "dist:mac": "build --mac",
@@ -17,16 +22,109 @@
     "type": "git",
     "url": "https://github.com/LiskHQ/lisk-nano"
   },
+  "dependencies": {
+    "angular": "=1.5.8",
+    "angular-animate": "=1.5.8",
+    "angular-aria": "=1.5.8",
+    "angular-cookies": "=1.5.8",
+    "angular-material": "=1.1.1",
+    "angular-material-data-table": "=0.10.9",
+    "angular-messages": "=1.5.8",
+    "angular-ui-router": "=1.0.0-rc.1",
+    "angular-svg-round-progressbar": "=0.4.8",
+    "babel-polyfill": "=6.9.1",
+    "bignumber.js": "=4.0.0",
+    "bitcore-mnemonic": "=1.1.1",
+    "debug": "=2.2.0",
+    "jquery": "=2.2.4",
+    "lisk-js": "=0.4.1",
+    "lodash": "=4.16.4",
+    "moment": "=2.15.1",
+    "ng-infinite-scroll": "=1.3.0",
+    "numeral": "=1.5.3",
+    "jasmine-spec-reporter": "=3.3.0"
+  },
   "devDependencies": {
+    "angular-mocks": "=1.5.8",
+    "babel-core": "=6.9.1",
+    "babel-loader": "=6.2.4",
+    "babel-plugin-istanbul": "=4.0.0",
+    "babel-plugin-syntax-trailing-function-commas": "=6.22.0",
+    "babel-preset-es2015": "=6.9.0",
+    "chai": "=3.5.0",
+    "clean-webpack-plugin": "=0.1.9",
+    "css-loader": "=0.23.1",
     "electron": "=1.6.2",
-    "electron-builder": "=16.8.3"
+    "electron-builder": "=16.8.3",
+    "eslint-config-airbnb": "=14.1.0",
+    "eslint-config-google": "^0.7.1",
+    "eslint-plugin-html": "^2.0.3",
+    "eslint-plugin-import": "=2.2.0",
+    "exports-loader": "=0.6.3",
+    "extract-text-webpack-plugin": "=1.0.1",
+    "file-loader": "=0.9.0",
+    "grunt": "=1.0.1",
+    "grunt-eslint": "=19.0.0",
+    "grunt-newer": "=1.2.0",
+    "html-webpack-plugin": "=2.19.0",
+    "imports-loader": "=0.6.5",
+    "jit-grunt": "=0.10.0",
+    "json-loader": "=0.5.4",
+    "karma": "=1.4.1",
+    "karma-babel-preprocessor": "=6.0.1",
+    "karma-chai": "=0.1.0",
+    "karma-chrome-launcher": "=2.0.0",
+    "karma-coverage": "=1.1.1",
+    "karma-coveralls": "=1.1.2",
+    "karma-jenkins-reporter": "0.0.2",
+    "karma-mocha": "=1.3.0",
+    "karma-mocha-reporter": "=2.2.2",
+    "karma-ng-html2js-preprocessor": "=1.0.0",
+    "karma-phantomjs-launcher": "=1.0.4",
+    "karma-verbose-reporter": "=0.0.6",
+    "karma-webpack": "=2.0.2",
+    "less": "=2.7.1",
+    "less-loader": "=2.2.3",
+    "mocha": "=3.2.0",
+    "nyc": "=10.1.2",
+    "phantomjs": "=2.1.7",
+    "phantomjs-prebuilt": "=2.1.14",
+    "protractor": "=5.1.1",
+    "pug": "=2.0.0-beta11",
+    "pug-cli": "=1.0.0-alpha6",
+    "pug-loader": "=2.3.0",
+    "raw-loader": "=0.5.1",
+    "should": "=11.2.0",
+    "sinon": "=2.0.0",
+    "sinon-chai": "=2.8.0",
+    "style-loader": "=0.13.1",
+    "url-loader": "=0.5.7",
+    "webpack": "=1.13.1",
+    "webpack-bundle-analyzer": "=2.4.0",
+    "webpack-dev-server": "=1.14.1",
+    "webpack-merge": "=0.14.1",
+    "webpack-validator": "=2.2.6"
+  },
+  "babel": {
+    "presets": [
+      "es2015"
+    ],
+    "plugins": [
+      "syntax-trailing-function-commas"
+    ],
+    "env": {
+      "test": {
+        "plugins": [
+          "istanbul"
+        ]
+      }
+    }
   },
   "build": {
     "appId": "io.lisk.nano",
     "productName": "Lisk Nano",
     "win": {
       "target": "nsis"
     }
-  },
-  "license": "GPL-3.0"
+  }
 }

src/app/components/delegate-registration/delegateRegistration.pug → src/components/delegateRegistration/delegateRegistration.pug

@@ -18,7 +18,7 @@ div.dialog-delegate-registration(aria-label='Vote for delegates')
               div.fee Fee: {{$ctrl.form.fee}} LSK
           md-divider
           div(layout='row')
-            p.info-icon-wrapper 
+            p.info-icon-wrapper
               i.material-icons info
             p
               span Becoming a delegate requires registration. You may choose your own delegate name, which can be used to promote your delegate. Only the top 101 delegates are eligible to forge. All fees are shared equally between the top 101 delegates.

src/app/components/sign-verify/sign-message.js → src/components/signVerify/signMessage.js

@@ -1,7 +1,7 @@
 import lisk from 'lisk-js';
 
 app.component('signMessage', {
-  template: require('./sign-message.pug')(),
+  template: require('./signMessage.pug')(),
   controller: class signMessage {
     constructor($mdDialog, Account) {
       this.$mdDialog = $mdDialog;

src/app/components/sign-verify/verify-message.js → src/components/signVerify/verifyMessage.js

@@ -1,7 +1,7 @@
 import lisk from 'lisk-js';
 
 app.component('verifyMessage', {
-  template: require('./verify-message.pug')(),
+  template: require('./verifyMessage.pug')(),
   controllerAs: '$ctrl',
   controller: class verifyMessage {
     constructor($mdDialog, Account) {

src/app/index.js → src/index.js

@@ -1,5 +1,5 @@
 import './libs';
-import './lisk-nano';
+import './liskNano';
 
 angular.element(document).ready(() => {
   angular.bootstrap(document, ['app']);

src/app/lisk-nano.js → src/liskNano.js

@@ -18,15 +18,15 @@ import './components/lsk/lsk';
 import './components/forging/forging';
 import './components/delegates/delegates';
 import './components/delegates/vote';
-import './components/sign-verify/sign-message';
-import './components/sign-verify/verify-message';
-import './components/delegate-registration/delegateRegistration';
+import './components/signVerify/signMessage';
+import './components/signVerify/verifyMessage';
+import './components/delegateRegistration/delegateRegistration';
 
 import './services/api/peers';
 import './services/lsk';
 import './services/dialog';
 import './services/passphrase';
-import './services/sign-verify';
+import './services/signVerify';
 import './services/account';
 import './services/api/delegateApi';
 import './services/api/forgingApi';

src/test/test.js → test/test.js

@@ -12,12 +12,12 @@ require('./components/transfer/transferModalDirective.spec');
 require('./components/top/top.spec');
 require('./components/timestamp/timestamp.spec');
 require('./components/transactions/transactions.spec');
-require('./components/sign-verify/sign-message.spec');
-require('./components/sign-verify/verify-message.spec');
-require('./components/delegate-registration/delegateRegistration.spec.js');
+require('./components/signVerify/signMessage.spec');
+require('./components/signVerify/verifyMessage.spec');
+require('./components/delegateRegistration/delegateRegistration.spec.js');
 
 require('./services/passphrase.spec');
-require('./services/sign-verify.spec');
+require('./services/signVerify.spec');
 require('./services/lsk.spec');
 require('./services/api/peers.spec');
 require('./services/api/delegateApi.spec');

src/webpack.config.babel.js → webpack.config.babel.js

@@ -10,9 +10,9 @@ const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPl
 const nodeEnvironment = process.env.NODE_ENV;
 
 const PATHS = {
-  app: path.join(__dirname, 'app'),
-  build: path.resolve(__dirname, '..', 'app'),
-  spec: path.join(__dirname, 'spec'),
+  app: path.join(__dirname, 'src'),
+  build: path.resolve(__dirname, 'app'),
+  spec: path.join(__dirname, 'e2e-test'),
   test: path.join(__dirname, 'test'),
 };
 
@@ -47,7 +47,7 @@ const html = () => ({
   plugins: [
     new HtmlWebpackPlugin({
       filename: 'index.html',
-      template: 'app/index.pug',
+      template: path.resolve(PATHS.app, 'index.pug'),
       minify: {
         collapseWhitespace: true,
         minifyCSS: true,