Revert "Make files organisation clearer - Resolves #154"

.gitignore

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

Jenkinsfile

@@ -43,7 +43,7 @@ pipeline {
               BUILD_ID=dontKillMe ~/start_lisk.sh
 
               # Build nano
-              cd $WORKSPACE
+              cd $WORKSPACE/src
               npm install
 
               # Add coveralls config file

README.md

@@ -10,6 +10,8 @@
 git clone https://github.com/LiskHQ/lisk-nano.git
 cd lisk-nano
 npm install
+cd src
+npm install
 npm run dev
 ```
 
@@ -88,6 +90,7 @@ Make sure that the Lisk version of the node matches version in https://github.co
 Start the development version of lisk-nano:
 
 ```
+cd src
 npm run dev
 ```
 
@@ -120,7 +123,7 @@ You should have received a copy of the [GNU General Public License](https://gith
 
 This program also incorporates work previously released with lisk-nano `0.1.2` (and earlier) versions under the [MIT License](https://opensource.org/licenses/MIT). To comply with the requirements of that license, the following permission notice, applicable to those parts of the code only, is included below:
 
-Copyright © 2016-2017 Lisk Foundation
+Copyright © 2016-2017 Lisk Foundation  
 Copyright © 2015 Crypti
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

app/main.js

@@ -135,7 +135,7 @@ function createWindow() {
   const menu = Menu.buildFromTemplate(template);
   Menu.setApplicationMenu(menu);
 
-  win.loadURL(`file://${__dirname}/dist/index.html`);
+  win.loadURL(`file://${__dirname}/index.html`);
 
   win.on('closed', () => win = null);
 

package.json

@@ -6,11 +6,6 @@
   "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",
@@ -22,109 +17,16 @@
     "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",
-    "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"
-        ]
-      }
-    }
+    "electron-builder": "=16.8.3"
   },
   "build": {
     "appId": "io.lisk.nano",
     "productName": "Lisk Nano",
     "win": {
       "target": "nsis"
     }
-  }
+  },
+  "license": "GPL-3.0"
 }

Gruntfile.js → src/Gruntfile.js

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

src/components/delegateRegistration/delegateRegistration.pug → src/app/components/delegate-registration/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/components/signVerify/signMessage.js → src/app/components/sign-verify/sign-message.js

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

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

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

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

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

src/index.pug → src/app/index.pug

@@ -3,6 +3,7 @@ html
   head
     meta(name="viewport" content="width=device-width, user-scalable=no")
     title Lisk Nano
+    base(href='/')
     style(type='text/css').
       body {
         background-color: #eee !important;

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

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

karma.conf.js → src/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, 'src', 'libs.js');
-const app = path.join(__dirname, 'src', 'liskNano.js');
+const libs = path.join(__dirname, 'app', 'libs.js');
+const app = path.join(__dirname, 'app', 'lisk-nano.js');
 const testLibs = path.join(__dirname, 'test', 'libs.js');
 const test = path.join(__dirname, 'test', 'test.js');
 preprocessors[libs] = ['webpack'];

src/package.json

@@ -0,0 +1,108 @@
+{
+  "name": "lisk-nano",
+  "version": "0.2.1",
+  "description": "Lisk Nano",
+  "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 spec/conf.js",
+    "test": "grunt eslint && export NODE_ENV=test && karma start",
+    "test-live": "export NODE_ENV=test && export LIVE=true && karma start"
+  },
+  "author": "Lisk Foundation <[email protected]>, lightcurve GmbH <[email protected]>",
+  "license": "GPL-3.0",
+  "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"
+  },
+  "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",
+    "eslint-config-airbnb": "=14.1.0",
+    "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",
+    "jasmine-spec-reporter": "=3.3.0",
+    "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"
+        ]
+      }
+    }
+  }
+}

test/test.js → src/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/signVerify/signMessage.spec');
-require('./components/signVerify/verifyMessage.spec');
-require('./components/delegateRegistration/delegateRegistration.spec.js');
+require('./components/sign-verify/sign-message.spec');
+require('./components/sign-verify/verify-message.spec');
+require('./components/delegate-registration/delegateRegistration.spec.js');
 
 require('./services/passphrase.spec');
-require('./services/signVerify.spec');
+require('./services/sign-verify.spec');
 require('./services/lsk.spec');
 require('./services/api/peers.spec');
 require('./services/api/delegateApi.spec');