From 473379fa11378991d018ed9b8fbfc488b437e35b Mon Sep 17 00:00:00 2001 From: Aleksey Popov Date: Sun, 14 May 2017 02:00:33 +0300 Subject: [PATCH 1/3] Make files organisation clearer --- src/.eslintrc.json => .eslintrc.json | 0 .gitignore | 4 +- src/Gruntfile.js => Gruntfile.js | 2 +- app/index.html | 1 - {src/spec => e2e-test}/.eslintrc.json | 0 {src/spec => e2e-test}/conf.js | 0 {src/spec => e2e-test}/setup.sh | 0 {src/spec => e2e-test}/spec.js | 0 src/karma.conf.js => karma.conf.js | 4 +- package.json | 104 ++++++++++++++++- src/{app => }/app.js | 0 .../MaterialIcons-Regular.eot | Bin .../MaterialIcons-Regular.ijmap | 0 .../MaterialIcons-Regular.svg | 0 .../MaterialIcons-Regular.ttf | Bin .../MaterialIcons-Regular.woff | Bin .../MaterialIcons-Regular.woff2 | Bin .../fonts/material-design-icons/style.less | 0 .../roboto-mono/roboto-mono-v4-latin-500.eot | Bin .../roboto-mono/roboto-mono-v4-latin-500.svg | 0 .../roboto-mono/roboto-mono-v4-latin-500.ttf | Bin .../roboto-mono/roboto-mono-v4-latin-500.woff | Bin .../roboto-mono-v4-latin-500.woff2 | Bin .../roboto-mono/roboto-mono-v4-latin-700.eot | Bin .../roboto-mono/roboto-mono-v4-latin-700.svg | 0 .../roboto-mono/roboto-mono-v4-latin-700.ttf | Bin .../roboto-mono/roboto-mono-v4-latin-700.woff | Bin .../roboto-mono-v4-latin-700.woff2 | Bin .../roboto-mono-v4-latin-regular.eot | Bin .../roboto-mono-v4-latin-regular.svg | 0 .../roboto-mono-v4-latin-regular.ttf | Bin .../roboto-mono-v4-latin-regular.woff | Bin .../roboto-mono-v4-latin-regular.woff2 | Bin .../assets/fonts/roboto-mono/style.less | 0 .../fonts/roboto/roboto-v15-latin-500.eot | Bin .../fonts/roboto/roboto-v15-latin-500.svg | 0 .../fonts/roboto/roboto-v15-latin-500.ttf | Bin .../fonts/roboto/roboto-v15-latin-500.woff | Bin .../fonts/roboto/roboto-v15-latin-500.woff2 | Bin .../fonts/roboto/roboto-v15-latin-700.eot | Bin .../fonts/roboto/roboto-v15-latin-700.svg | 0 .../fonts/roboto/roboto-v15-latin-700.ttf | Bin .../fonts/roboto/roboto-v15-latin-700.woff | Bin .../fonts/roboto/roboto-v15-latin-700.woff2 | Bin .../fonts/roboto/roboto-v15-latin-regular.eot | Bin .../fonts/roboto/roboto-v15-latin-regular.svg | 0 .../fonts/roboto/roboto-v15-latin-regular.ttf | Bin .../roboto/roboto-v15-latin-regular.woff | Bin .../roboto/roboto-v15-latin-regular.woff2 | Bin src/{app => }/assets/fonts/roboto/style.less | 0 src/{app => }/assets/images/LISK-alt.svg | 0 src/{app => }/assets/images/LISK-nano.png | Bin src/{app => }/assets/images/LISK.png | Bin src/{app => }/assets/images/LISK.svg | 0 .../delegateRegistration.js | 0 .../delegateRegistration.less | 0 .../delegateRegistration.pug | 2 +- .../components/delegates/delegates.js | 0 .../components/delegates/delegates.less | 0 .../components/delegates/delegates.pug | 0 src/{app => }/components/delegates/vote.js | 0 src/{app => }/components/delegates/vote.less | 0 src/{app => }/components/delegates/vote.pug | 0 src/{app => }/components/forging/forging.js | 0 src/{app => }/components/forging/forging.less | 0 src/{app => }/components/forging/forging.pug | 0 src/{app => }/components/header/header.js | 0 src/{app => }/components/header/header.less | 0 src/{app => }/components/header/header.pug | 0 src/{app => }/components/login/login.js | 0 src/{app => }/components/login/login.less | 0 src/{app => }/components/login/login.pug | 0 src/{app => }/components/login/passphrase.js | 0 .../components/login/passphrase.less | 0 src/{app => }/components/login/passphrase.pug | 0 src/{app => }/components/login/save.less | 0 src/{app => }/components/login/save.pug | 0 src/{app => }/components/lsk/lsk.js | 0 src/{app => }/components/lsk/lsk.less | 0 src/{app => }/components/lsk/lsk.pug | 0 src/{app => }/components/main/main.js | 0 src/{app => }/components/main/main.less | 0 src/{app => }/components/main/main.pug | 0 src/{app => }/components/main/secondPass.less | 0 src/{app => }/components/main/secondPass.pug | 0 .../components/main/setSecondPassDirective.js | 0 .../components/main/setSecondPassService.js | 0 .../signVerify/signMessage.js} | 2 +- .../signVerify/signMessage.pug} | 0 .../signVerify/verifyMessage.js} | 2 +- .../signVerify/verifyMessage.pug} | 0 .../components/timestamp/timestamp.js | 0 .../components/timestamp/timestamp.less | 0 .../components/timestamp/timestamp.pug | 0 src/{app => }/components/top/top.js | 0 src/{app => }/components/top/top.less | 0 src/{app => }/components/top/top.pug | 0 .../components/transactions/transactions.js | 0 .../components/transactions/transactions.less | 0 .../components/transactions/transactions.pug | 0 src/{app => }/components/transfer/second.pug | 0 src/{app => }/components/transfer/transfer.js | 0 .../components/transfer/transfer.less | 0 .../components/transfer/transfer.pug | 0 .../transfer/transferModalDirective.js | 0 .../transfer/transferModalService.js | 0 src/{app => }/filters/lsk.js | 0 src/{app => }/index.js | 2 +- src/{app => }/index.less | 0 src/{app => }/index.pug | 0 src/{app => }/libs.js | 0 src/{app/lisk-nano.js => liskNano.js} | 8 +- src/package.json | 108 ------------------ src/{app => }/run.js | 0 src/{app => }/services/account.js | 0 src/{app => }/services/api/accountApi.js | 0 src/{app => }/services/api/delegateApi.js | 0 src/{app => }/services/api/forgingApi.js | 0 src/{app => }/services/api/peers.js | 0 src/{app => }/services/dialog.js | 0 src/{app => }/services/lsk.js | 0 src/{app => }/services/passphrase.js | 0 .../sign-verify.js => services/signVerify.js} | 0 src/{app => }/states.js | 0 src/{app => }/theme/theme.js | 0 .../util/animateOnChange/animateOnChange.js | 0 {src/test => test}/.eslintrc.json | 0 .../delegateRegistration.spec.js | 0 .../components/delegates/delegates.spec.js | 0 .../components/delegates/vote.spec.js | 0 .../components/forging/forging.spec.js | 0 .../components/header/header.spec.js | 0 .../components/login/login.spec.js | 0 .../components/login/passphrase.spec.js | 0 .../components/main/main.spec.js | 0 .../main/setSecondPassDirective.spec.js | 0 .../main/setSecondPassService.spec.js | 0 .../components/signVerify/signMessage.spec.js | 0 .../signVerify/verifyMessage.spec.js | 0 .../components/timestamp/timestamp.spec.js | 0 {src/test => test}/components/top/top.spec.js | 0 .../transactions/transactions.spec.js | 0 .../components/transfer/transfer.spec.js | 0 .../transfer/transferModalDirective.spec.js | 0 {src/test => test}/libs.js | 0 {src/test => test}/run.spec.js | 0 {src/test => test}/services/account.spec.js | 0 .../services/api/accountApi.spec.js | 0 .../services/api/delegateApi.spec.js | 0 .../services/api/forgingApi.spec.js | 0 {src/test => test}/services/api/peers.spec.js | 0 {src/test => test}/services/lsk.spec.js | 0 .../test => test}/services/passphrase.spec.js | 0 .../services/signVerify.spec.js | 0 {src/test => test}/test.js | 8 +- .../animateOnChange/animateOnChange.spec.js | 0 ...config.babel.js => webpack.config.babel.js | 8 +- 157 files changed, 123 insertions(+), 132 deletions(-) rename src/.eslintrc.json => .eslintrc.json (100%) rename src/Gruntfile.js => Gruntfile.js (89%) delete mode 100644 app/index.html rename {src/spec => e2e-test}/.eslintrc.json (100%) rename {src/spec => e2e-test}/conf.js (100%) rename {src/spec => e2e-test}/setup.sh (100%) rename {src/spec => e2e-test}/spec.js (100%) rename src/karma.conf.js => karma.conf.js (96%) rename src/{app => }/app.js (100%) rename src/{app => }/assets/fonts/material-design-icons/MaterialIcons-Regular.eot (100%) rename src/{app => }/assets/fonts/material-design-icons/MaterialIcons-Regular.ijmap (100%) rename src/{app => }/assets/fonts/material-design-icons/MaterialIcons-Regular.svg (100%) rename src/{app => }/assets/fonts/material-design-icons/MaterialIcons-Regular.ttf (100%) rename src/{app => }/assets/fonts/material-design-icons/MaterialIcons-Regular.woff (100%) rename src/{app => }/assets/fonts/material-design-icons/MaterialIcons-Regular.woff2 (100%) rename src/{app => }/assets/fonts/material-design-icons/style.less (100%) rename src/{app => }/assets/fonts/roboto-mono/roboto-mono-v4-latin-500.eot (100%) rename src/{app => }/assets/fonts/roboto-mono/roboto-mono-v4-latin-500.svg (100%) rename src/{app => }/assets/fonts/roboto-mono/roboto-mono-v4-latin-500.ttf (100%) rename src/{app => }/assets/fonts/roboto-mono/roboto-mono-v4-latin-500.woff (100%) rename src/{app => }/assets/fonts/roboto-mono/roboto-mono-v4-latin-500.woff2 (100%) rename src/{app => }/assets/fonts/roboto-mono/roboto-mono-v4-latin-700.eot (100%) rename src/{app => }/assets/fonts/roboto-mono/roboto-mono-v4-latin-700.svg (100%) rename src/{app => }/assets/fonts/roboto-mono/roboto-mono-v4-latin-700.ttf (100%) rename src/{app => }/assets/fonts/roboto-mono/roboto-mono-v4-latin-700.woff (100%) rename src/{app => }/assets/fonts/roboto-mono/roboto-mono-v4-latin-700.woff2 (100%) rename src/{app => }/assets/fonts/roboto-mono/roboto-mono-v4-latin-regular.eot (100%) rename src/{app => }/assets/fonts/roboto-mono/roboto-mono-v4-latin-regular.svg (100%) rename src/{app => }/assets/fonts/roboto-mono/roboto-mono-v4-latin-regular.ttf (100%) rename src/{app => }/assets/fonts/roboto-mono/roboto-mono-v4-latin-regular.woff (100%) rename src/{app => }/assets/fonts/roboto-mono/roboto-mono-v4-latin-regular.woff2 (100%) rename src/{app => }/assets/fonts/roboto-mono/style.less (100%) rename src/{app => }/assets/fonts/roboto/roboto-v15-latin-500.eot (100%) rename src/{app => }/assets/fonts/roboto/roboto-v15-latin-500.svg (100%) rename src/{app => }/assets/fonts/roboto/roboto-v15-latin-500.ttf (100%) rename src/{app => }/assets/fonts/roboto/roboto-v15-latin-500.woff (100%) rename src/{app => }/assets/fonts/roboto/roboto-v15-latin-500.woff2 (100%) rename src/{app => }/assets/fonts/roboto/roboto-v15-latin-700.eot (100%) rename src/{app => }/assets/fonts/roboto/roboto-v15-latin-700.svg (100%) rename src/{app => }/assets/fonts/roboto/roboto-v15-latin-700.ttf (100%) rename src/{app => }/assets/fonts/roboto/roboto-v15-latin-700.woff (100%) rename src/{app => }/assets/fonts/roboto/roboto-v15-latin-700.woff2 (100%) rename src/{app => }/assets/fonts/roboto/roboto-v15-latin-regular.eot (100%) rename src/{app => }/assets/fonts/roboto/roboto-v15-latin-regular.svg (100%) rename src/{app => }/assets/fonts/roboto/roboto-v15-latin-regular.ttf (100%) rename src/{app => }/assets/fonts/roboto/roboto-v15-latin-regular.woff (100%) rename src/{app => }/assets/fonts/roboto/roboto-v15-latin-regular.woff2 (100%) rename src/{app => }/assets/fonts/roboto/style.less (100%) rename src/{app => }/assets/images/LISK-alt.svg (100%) rename src/{app => }/assets/images/LISK-nano.png (100%) rename src/{app => }/assets/images/LISK.png (100%) rename src/{app => }/assets/images/LISK.svg (100%) rename src/{app/components/delegate-registration => components/delegateRegistration}/delegateRegistration.js (100%) rename src/{app/components/delegate-registration => components/delegateRegistration}/delegateRegistration.less (100%) rename src/{app/components/delegate-registration => components/delegateRegistration}/delegateRegistration.pug (98%) rename src/{app => }/components/delegates/delegates.js (100%) rename src/{app => }/components/delegates/delegates.less (100%) rename src/{app => }/components/delegates/delegates.pug (100%) rename src/{app => }/components/delegates/vote.js (100%) rename src/{app => }/components/delegates/vote.less (100%) rename src/{app => }/components/delegates/vote.pug (100%) rename src/{app => }/components/forging/forging.js (100%) rename src/{app => }/components/forging/forging.less (100%) rename src/{app => }/components/forging/forging.pug (100%) rename src/{app => }/components/header/header.js (100%) rename src/{app => }/components/header/header.less (100%) rename src/{app => }/components/header/header.pug (100%) rename src/{app => }/components/login/login.js (100%) rename src/{app => }/components/login/login.less (100%) rename src/{app => }/components/login/login.pug (100%) rename src/{app => }/components/login/passphrase.js (100%) rename src/{app => }/components/login/passphrase.less (100%) rename src/{app => }/components/login/passphrase.pug (100%) rename src/{app => }/components/login/save.less (100%) rename src/{app => }/components/login/save.pug (100%) rename src/{app => }/components/lsk/lsk.js (100%) rename src/{app => }/components/lsk/lsk.less (100%) rename src/{app => }/components/lsk/lsk.pug (100%) rename src/{app => }/components/main/main.js (100%) rename src/{app => }/components/main/main.less (100%) rename src/{app => }/components/main/main.pug (100%) rename src/{app => }/components/main/secondPass.less (100%) rename src/{app => }/components/main/secondPass.pug (100%) rename src/{app => }/components/main/setSecondPassDirective.js (100%) rename src/{app => }/components/main/setSecondPassService.js (100%) rename src/{app/components/sign-verify/sign-message.js => components/signVerify/signMessage.js} (91%) rename src/{app/components/sign-verify/sign-message.pug => components/signVerify/signMessage.pug} (100%) rename src/{app/components/sign-verify/verify-message.js => components/signVerify/verifyMessage.js} (95%) rename src/{app/components/sign-verify/verify-message.pug => components/signVerify/verifyMessage.pug} (100%) rename src/{app => }/components/timestamp/timestamp.js (100%) rename src/{app => }/components/timestamp/timestamp.less (100%) rename src/{app => }/components/timestamp/timestamp.pug (100%) rename src/{app => }/components/top/top.js (100%) rename src/{app => }/components/top/top.less (100%) rename src/{app => }/components/top/top.pug (100%) rename src/{app => }/components/transactions/transactions.js (100%) rename src/{app => }/components/transactions/transactions.less (100%) rename src/{app => }/components/transactions/transactions.pug (100%) rename src/{app => }/components/transfer/second.pug (100%) rename src/{app => }/components/transfer/transfer.js (100%) rename src/{app => }/components/transfer/transfer.less (100%) rename src/{app => }/components/transfer/transfer.pug (100%) rename src/{app => }/components/transfer/transferModalDirective.js (100%) rename src/{app => }/components/transfer/transferModalService.js (100%) rename src/{app => }/filters/lsk.js (100%) rename src/{app => }/index.js (82%) rename src/{app => }/index.less (100%) rename src/{app => }/index.pug (100%) rename src/{app => }/libs.js (100%) rename src/{app/lisk-nano.js => liskNano.js} (84%) delete mode 100644 src/package.json rename src/{app => }/run.js (100%) rename src/{app => }/services/account.js (100%) rename src/{app => }/services/api/accountApi.js (100%) rename src/{app => }/services/api/delegateApi.js (100%) rename src/{app => }/services/api/forgingApi.js (100%) rename src/{app => }/services/api/peers.js (100%) rename src/{app => }/services/dialog.js (100%) rename src/{app => }/services/lsk.js (100%) rename src/{app => }/services/passphrase.js (100%) rename src/{app/services/sign-verify.js => services/signVerify.js} (100%) rename src/{app => }/states.js (100%) rename src/{app => }/theme/theme.js (100%) rename src/{app => }/util/animateOnChange/animateOnChange.js (100%) rename {src/test => test}/.eslintrc.json (100%) rename {src/test/components/delegate-registration => test/components/delegateRegistration}/delegateRegistration.spec.js (100%) rename {src/test => test}/components/delegates/delegates.spec.js (100%) rename {src/test => test}/components/delegates/vote.spec.js (100%) rename {src/test => test}/components/forging/forging.spec.js (100%) rename {src/test => test}/components/header/header.spec.js (100%) rename {src/test => test}/components/login/login.spec.js (100%) rename {src/test => test}/components/login/passphrase.spec.js (100%) rename {src/test => test}/components/main/main.spec.js (100%) rename {src/test => test}/components/main/setSecondPassDirective.spec.js (100%) rename {src/test => test}/components/main/setSecondPassService.spec.js (100%) rename src/test/components/sign-verify/sign-message.spec.js => test/components/signVerify/signMessage.spec.js (100%) rename src/test/components/sign-verify/verify-message.spec.js => test/components/signVerify/verifyMessage.spec.js (100%) rename {src/test => test}/components/timestamp/timestamp.spec.js (100%) rename {src/test => test}/components/top/top.spec.js (100%) rename {src/test => test}/components/transactions/transactions.spec.js (100%) rename {src/test => test}/components/transfer/transfer.spec.js (100%) rename {src/test => test}/components/transfer/transferModalDirective.spec.js (100%) rename {src/test => test}/libs.js (100%) rename {src/test => test}/run.spec.js (100%) rename {src/test => test}/services/account.spec.js (100%) rename {src/test => test}/services/api/accountApi.spec.js (100%) rename {src/test => test}/services/api/delegateApi.spec.js (100%) rename {src/test => test}/services/api/forgingApi.spec.js (100%) rename {src/test => test}/services/api/peers.spec.js (100%) rename {src/test => test}/services/lsk.spec.js (100%) rename {src/test => test}/services/passphrase.spec.js (100%) rename src/test/services/sign-verify.spec.js => test/services/signVerify.spec.js (100%) rename {src/test => test}/test.js (82%) rename {src/test => test}/util/animateOnChange/animateOnChange.spec.js (100%) rename src/webpack.config.babel.js => webpack.config.babel.js (94%) diff --git a/src/.eslintrc.json b/.eslintrc.json similarity index 100% rename from src/.eslintrc.json rename to .eslintrc.json diff --git a/.gitignore b/.gitignore index a41408fa0..718a0cc8a 100644 --- a/.gitignore +++ b/.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 diff --git a/src/Gruntfile.js b/Gruntfile.js similarity index 89% rename from src/Gruntfile.js rename to Gruntfile.js index 1d6e14479..44219649f 100644 --- a/src/Gruntfile.js +++ b/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'], }, }, }); diff --git a/app/index.html b/app/index.html deleted file mode 100644 index 9cfd80e88..000000000 --- a/app/index.html +++ /dev/null @@ -1 +0,0 @@ -Lisk Nano
SendLogout
 \ No newline at end of file diff --git a/src/spec/.eslintrc.json b/e2e-test/.eslintrc.json similarity index 100% rename from src/spec/.eslintrc.json rename to e2e-test/.eslintrc.json diff --git a/src/spec/conf.js b/e2e-test/conf.js similarity index 100% rename from src/spec/conf.js rename to e2e-test/conf.js diff --git a/src/spec/setup.sh b/e2e-test/setup.sh similarity index 100% rename from src/spec/setup.sh rename to e2e-test/setup.sh diff --git a/src/spec/spec.js b/e2e-test/spec.js similarity index 100% rename from src/spec/spec.js rename to e2e-test/spec.js diff --git a/src/karma.conf.js b/karma.conf.js similarity index 96% rename from src/karma.conf.js rename to karma.conf.js index d41bd107c..1d68bebf6 100644 --- a/src/karma.conf.js +++ b/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']; diff --git a/package.json b/package.json index a3ffdf313..f49509fa9 100644 --- a/package.json +++ b/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,9 +22,103 @@ "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", @@ -27,6 +126,5 @@ "win": { "target": "nsis" } - }, - "license": "GPL-3.0" + } } diff --git a/src/app/app.js b/src/app.js similarity index 100% rename from src/app/app.js rename to src/app.js diff --git a/src/app/assets/fonts/material-design-icons/MaterialIcons-Regular.eot b/src/assets/fonts/material-design-icons/MaterialIcons-Regular.eot similarity index 100% rename from src/app/assets/fonts/material-design-icons/MaterialIcons-Regular.eot rename to src/assets/fonts/material-design-icons/MaterialIcons-Regular.eot diff --git a/src/app/assets/fonts/material-design-icons/MaterialIcons-Regular.ijmap b/src/assets/fonts/material-design-icons/MaterialIcons-Regular.ijmap similarity index 100% rename from src/app/assets/fonts/material-design-icons/MaterialIcons-Regular.ijmap rename to src/assets/fonts/material-design-icons/MaterialIcons-Regular.ijmap diff --git a/src/app/assets/fonts/material-design-icons/MaterialIcons-Regular.svg b/src/assets/fonts/material-design-icons/MaterialIcons-Regular.svg similarity index 100% rename from src/app/assets/fonts/material-design-icons/MaterialIcons-Regular.svg rename to src/assets/fonts/material-design-icons/MaterialIcons-Regular.svg diff --git a/src/app/assets/fonts/material-design-icons/MaterialIcons-Regular.ttf b/src/assets/fonts/material-design-icons/MaterialIcons-Regular.ttf similarity index 100% rename from src/app/assets/fonts/material-design-icons/MaterialIcons-Regular.ttf rename to src/assets/fonts/material-design-icons/MaterialIcons-Regular.ttf diff --git a/src/app/assets/fonts/material-design-icons/MaterialIcons-Regular.woff b/src/assets/fonts/material-design-icons/MaterialIcons-Regular.woff similarity index 100% rename from src/app/assets/fonts/material-design-icons/MaterialIcons-Regular.woff rename to src/assets/fonts/material-design-icons/MaterialIcons-Regular.woff diff --git a/src/app/assets/fonts/material-design-icons/MaterialIcons-Regular.woff2 b/src/assets/fonts/material-design-icons/MaterialIcons-Regular.woff2 similarity index 100% rename from src/app/assets/fonts/material-design-icons/MaterialIcons-Regular.woff2 rename to src/assets/fonts/material-design-icons/MaterialIcons-Regular.woff2 diff --git a/src/app/assets/fonts/material-design-icons/style.less b/src/assets/fonts/material-design-icons/style.less similarity index 100% rename from src/app/assets/fonts/material-design-icons/style.less rename to src/assets/fonts/material-design-icons/style.less diff --git a/src/app/assets/fonts/roboto-mono/roboto-mono-v4-latin-500.eot b/src/assets/fonts/roboto-mono/roboto-mono-v4-latin-500.eot similarity index 100% rename from src/app/assets/fonts/roboto-mono/roboto-mono-v4-latin-500.eot rename to src/assets/fonts/roboto-mono/roboto-mono-v4-latin-500.eot diff --git a/src/app/assets/fonts/roboto-mono/roboto-mono-v4-latin-500.svg b/src/assets/fonts/roboto-mono/roboto-mono-v4-latin-500.svg similarity index 100% rename from src/app/assets/fonts/roboto-mono/roboto-mono-v4-latin-500.svg rename to src/assets/fonts/roboto-mono/roboto-mono-v4-latin-500.svg diff --git a/src/app/assets/fonts/roboto-mono/roboto-mono-v4-latin-500.ttf b/src/assets/fonts/roboto-mono/roboto-mono-v4-latin-500.ttf similarity index 100% rename from src/app/assets/fonts/roboto-mono/roboto-mono-v4-latin-500.ttf rename to src/assets/fonts/roboto-mono/roboto-mono-v4-latin-500.ttf diff --git a/src/app/assets/fonts/roboto-mono/roboto-mono-v4-latin-500.woff b/src/assets/fonts/roboto-mono/roboto-mono-v4-latin-500.woff similarity index 100% rename from src/app/assets/fonts/roboto-mono/roboto-mono-v4-latin-500.woff rename to src/assets/fonts/roboto-mono/roboto-mono-v4-latin-500.woff diff --git a/src/app/assets/fonts/roboto-mono/roboto-mono-v4-latin-500.woff2 b/src/assets/fonts/roboto-mono/roboto-mono-v4-latin-500.woff2 similarity index 100% rename from src/app/assets/fonts/roboto-mono/roboto-mono-v4-latin-500.woff2 rename to src/assets/fonts/roboto-mono/roboto-mono-v4-latin-500.woff2 diff --git a/src/app/assets/fonts/roboto-mono/roboto-mono-v4-latin-700.eot b/src/assets/fonts/roboto-mono/roboto-mono-v4-latin-700.eot similarity index 100% rename from src/app/assets/fonts/roboto-mono/roboto-mono-v4-latin-700.eot rename to src/assets/fonts/roboto-mono/roboto-mono-v4-latin-700.eot diff --git a/src/app/assets/fonts/roboto-mono/roboto-mono-v4-latin-700.svg b/src/assets/fonts/roboto-mono/roboto-mono-v4-latin-700.svg similarity index 100% rename from src/app/assets/fonts/roboto-mono/roboto-mono-v4-latin-700.svg rename to src/assets/fonts/roboto-mono/roboto-mono-v4-latin-700.svg diff --git a/src/app/assets/fonts/roboto-mono/roboto-mono-v4-latin-700.ttf b/src/assets/fonts/roboto-mono/roboto-mono-v4-latin-700.ttf similarity index 100% rename from src/app/assets/fonts/roboto-mono/roboto-mono-v4-latin-700.ttf rename to src/assets/fonts/roboto-mono/roboto-mono-v4-latin-700.ttf diff --git a/src/app/assets/fonts/roboto-mono/roboto-mono-v4-latin-700.woff b/src/assets/fonts/roboto-mono/roboto-mono-v4-latin-700.woff similarity index 100% rename from src/app/assets/fonts/roboto-mono/roboto-mono-v4-latin-700.woff rename to src/assets/fonts/roboto-mono/roboto-mono-v4-latin-700.woff diff --git a/src/app/assets/fonts/roboto-mono/roboto-mono-v4-latin-700.woff2 b/src/assets/fonts/roboto-mono/roboto-mono-v4-latin-700.woff2 similarity index 100% rename from src/app/assets/fonts/roboto-mono/roboto-mono-v4-latin-700.woff2 rename to src/assets/fonts/roboto-mono/roboto-mono-v4-latin-700.woff2 diff --git a/src/app/assets/fonts/roboto-mono/roboto-mono-v4-latin-regular.eot b/src/assets/fonts/roboto-mono/roboto-mono-v4-latin-regular.eot similarity index 100% rename from src/app/assets/fonts/roboto-mono/roboto-mono-v4-latin-regular.eot rename to src/assets/fonts/roboto-mono/roboto-mono-v4-latin-regular.eot diff --git a/src/app/assets/fonts/roboto-mono/roboto-mono-v4-latin-regular.svg b/src/assets/fonts/roboto-mono/roboto-mono-v4-latin-regular.svg similarity index 100% rename from src/app/assets/fonts/roboto-mono/roboto-mono-v4-latin-regular.svg rename to src/assets/fonts/roboto-mono/roboto-mono-v4-latin-regular.svg diff --git a/src/app/assets/fonts/roboto-mono/roboto-mono-v4-latin-regular.ttf b/src/assets/fonts/roboto-mono/roboto-mono-v4-latin-regular.ttf similarity index 100% rename from src/app/assets/fonts/roboto-mono/roboto-mono-v4-latin-regular.ttf rename to src/assets/fonts/roboto-mono/roboto-mono-v4-latin-regular.ttf diff --git a/src/app/assets/fonts/roboto-mono/roboto-mono-v4-latin-regular.woff b/src/assets/fonts/roboto-mono/roboto-mono-v4-latin-regular.woff similarity index 100% rename from src/app/assets/fonts/roboto-mono/roboto-mono-v4-latin-regular.woff rename to src/assets/fonts/roboto-mono/roboto-mono-v4-latin-regular.woff diff --git a/src/app/assets/fonts/roboto-mono/roboto-mono-v4-latin-regular.woff2 b/src/assets/fonts/roboto-mono/roboto-mono-v4-latin-regular.woff2 similarity index 100% rename from src/app/assets/fonts/roboto-mono/roboto-mono-v4-latin-regular.woff2 rename to src/assets/fonts/roboto-mono/roboto-mono-v4-latin-regular.woff2 diff --git a/src/app/assets/fonts/roboto-mono/style.less b/src/assets/fonts/roboto-mono/style.less similarity index 100% rename from src/app/assets/fonts/roboto-mono/style.less rename to src/assets/fonts/roboto-mono/style.less diff --git a/src/app/assets/fonts/roboto/roboto-v15-latin-500.eot b/src/assets/fonts/roboto/roboto-v15-latin-500.eot similarity index 100% rename from src/app/assets/fonts/roboto/roboto-v15-latin-500.eot rename to src/assets/fonts/roboto/roboto-v15-latin-500.eot diff --git a/src/app/assets/fonts/roboto/roboto-v15-latin-500.svg b/src/assets/fonts/roboto/roboto-v15-latin-500.svg similarity index 100% rename from src/app/assets/fonts/roboto/roboto-v15-latin-500.svg rename to src/assets/fonts/roboto/roboto-v15-latin-500.svg diff --git a/src/app/assets/fonts/roboto/roboto-v15-latin-500.ttf b/src/assets/fonts/roboto/roboto-v15-latin-500.ttf similarity index 100% rename from src/app/assets/fonts/roboto/roboto-v15-latin-500.ttf rename to src/assets/fonts/roboto/roboto-v15-latin-500.ttf diff --git a/src/app/assets/fonts/roboto/roboto-v15-latin-500.woff b/src/assets/fonts/roboto/roboto-v15-latin-500.woff similarity index 100% rename from src/app/assets/fonts/roboto/roboto-v15-latin-500.woff rename to src/assets/fonts/roboto/roboto-v15-latin-500.woff diff --git a/src/app/assets/fonts/roboto/roboto-v15-latin-500.woff2 b/src/assets/fonts/roboto/roboto-v15-latin-500.woff2 similarity index 100% rename from src/app/assets/fonts/roboto/roboto-v15-latin-500.woff2 rename to src/assets/fonts/roboto/roboto-v15-latin-500.woff2 diff --git a/src/app/assets/fonts/roboto/roboto-v15-latin-700.eot b/src/assets/fonts/roboto/roboto-v15-latin-700.eot similarity index 100% rename from src/app/assets/fonts/roboto/roboto-v15-latin-700.eot rename to src/assets/fonts/roboto/roboto-v15-latin-700.eot diff --git a/src/app/assets/fonts/roboto/roboto-v15-latin-700.svg b/src/assets/fonts/roboto/roboto-v15-latin-700.svg similarity index 100% rename from src/app/assets/fonts/roboto/roboto-v15-latin-700.svg rename to src/assets/fonts/roboto/roboto-v15-latin-700.svg diff --git a/src/app/assets/fonts/roboto/roboto-v15-latin-700.ttf b/src/assets/fonts/roboto/roboto-v15-latin-700.ttf similarity index 100% rename from src/app/assets/fonts/roboto/roboto-v15-latin-700.ttf rename to src/assets/fonts/roboto/roboto-v15-latin-700.ttf diff --git a/src/app/assets/fonts/roboto/roboto-v15-latin-700.woff b/src/assets/fonts/roboto/roboto-v15-latin-700.woff similarity index 100% rename from src/app/assets/fonts/roboto/roboto-v15-latin-700.woff rename to src/assets/fonts/roboto/roboto-v15-latin-700.woff diff --git a/src/app/assets/fonts/roboto/roboto-v15-latin-700.woff2 b/src/assets/fonts/roboto/roboto-v15-latin-700.woff2 similarity index 100% rename from src/app/assets/fonts/roboto/roboto-v15-latin-700.woff2 rename to src/assets/fonts/roboto/roboto-v15-latin-700.woff2 diff --git a/src/app/assets/fonts/roboto/roboto-v15-latin-regular.eot b/src/assets/fonts/roboto/roboto-v15-latin-regular.eot similarity index 100% rename from src/app/assets/fonts/roboto/roboto-v15-latin-regular.eot rename to src/assets/fonts/roboto/roboto-v15-latin-regular.eot diff --git a/src/app/assets/fonts/roboto/roboto-v15-latin-regular.svg b/src/assets/fonts/roboto/roboto-v15-latin-regular.svg similarity index 100% rename from src/app/assets/fonts/roboto/roboto-v15-latin-regular.svg rename to src/assets/fonts/roboto/roboto-v15-latin-regular.svg diff --git a/src/app/assets/fonts/roboto/roboto-v15-latin-regular.ttf b/src/assets/fonts/roboto/roboto-v15-latin-regular.ttf similarity index 100% rename from src/app/assets/fonts/roboto/roboto-v15-latin-regular.ttf rename to src/assets/fonts/roboto/roboto-v15-latin-regular.ttf diff --git a/src/app/assets/fonts/roboto/roboto-v15-latin-regular.woff b/src/assets/fonts/roboto/roboto-v15-latin-regular.woff similarity index 100% rename from src/app/assets/fonts/roboto/roboto-v15-latin-regular.woff rename to src/assets/fonts/roboto/roboto-v15-latin-regular.woff diff --git a/src/app/assets/fonts/roboto/roboto-v15-latin-regular.woff2 b/src/assets/fonts/roboto/roboto-v15-latin-regular.woff2 similarity index 100% rename from src/app/assets/fonts/roboto/roboto-v15-latin-regular.woff2 rename to src/assets/fonts/roboto/roboto-v15-latin-regular.woff2 diff --git a/src/app/assets/fonts/roboto/style.less b/src/assets/fonts/roboto/style.less similarity index 100% rename from src/app/assets/fonts/roboto/style.less rename to src/assets/fonts/roboto/style.less diff --git a/src/app/assets/images/LISK-alt.svg b/src/assets/images/LISK-alt.svg similarity index 100% rename from src/app/assets/images/LISK-alt.svg rename to src/assets/images/LISK-alt.svg diff --git a/src/app/assets/images/LISK-nano.png b/src/assets/images/LISK-nano.png similarity index 100% rename from src/app/assets/images/LISK-nano.png rename to src/assets/images/LISK-nano.png diff --git a/src/app/assets/images/LISK.png b/src/assets/images/LISK.png similarity index 100% rename from src/app/assets/images/LISK.png rename to src/assets/images/LISK.png diff --git a/src/app/assets/images/LISK.svg b/src/assets/images/LISK.svg similarity index 100% rename from src/app/assets/images/LISK.svg rename to src/assets/images/LISK.svg diff --git a/src/app/components/delegate-registration/delegateRegistration.js b/src/components/delegateRegistration/delegateRegistration.js similarity index 100% rename from src/app/components/delegate-registration/delegateRegistration.js rename to src/components/delegateRegistration/delegateRegistration.js diff --git a/src/app/components/delegate-registration/delegateRegistration.less b/src/components/delegateRegistration/delegateRegistration.less similarity index 100% rename from src/app/components/delegate-registration/delegateRegistration.less rename to src/components/delegateRegistration/delegateRegistration.less diff --git a/src/app/components/delegate-registration/delegateRegistration.pug b/src/components/delegateRegistration/delegateRegistration.pug similarity index 98% rename from src/app/components/delegate-registration/delegateRegistration.pug rename to src/components/delegateRegistration/delegateRegistration.pug index 40f07a72d..d39db6fc9 100644 --- a/src/app/components/delegate-registration/delegateRegistration.pug +++ b/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. diff --git a/src/app/components/delegates/delegates.js b/src/components/delegates/delegates.js similarity index 100% rename from src/app/components/delegates/delegates.js rename to src/components/delegates/delegates.js diff --git a/src/app/components/delegates/delegates.less b/src/components/delegates/delegates.less similarity index 100% rename from src/app/components/delegates/delegates.less rename to src/components/delegates/delegates.less diff --git a/src/app/components/delegates/delegates.pug b/src/components/delegates/delegates.pug similarity index 100% rename from src/app/components/delegates/delegates.pug rename to src/components/delegates/delegates.pug diff --git a/src/app/components/delegates/vote.js b/src/components/delegates/vote.js similarity index 100% rename from src/app/components/delegates/vote.js rename to src/components/delegates/vote.js diff --git a/src/app/components/delegates/vote.less b/src/components/delegates/vote.less similarity index 100% rename from src/app/components/delegates/vote.less rename to src/components/delegates/vote.less diff --git a/src/app/components/delegates/vote.pug b/src/components/delegates/vote.pug similarity index 100% rename from src/app/components/delegates/vote.pug rename to src/components/delegates/vote.pug diff --git a/src/app/components/forging/forging.js b/src/components/forging/forging.js similarity index 100% rename from src/app/components/forging/forging.js rename to src/components/forging/forging.js diff --git a/src/app/components/forging/forging.less b/src/components/forging/forging.less similarity index 100% rename from src/app/components/forging/forging.less rename to src/components/forging/forging.less diff --git a/src/app/components/forging/forging.pug b/src/components/forging/forging.pug similarity index 100% rename from src/app/components/forging/forging.pug rename to src/components/forging/forging.pug diff --git a/src/app/components/header/header.js b/src/components/header/header.js similarity index 100% rename from src/app/components/header/header.js rename to src/components/header/header.js diff --git a/src/app/components/header/header.less b/src/components/header/header.less similarity index 100% rename from src/app/components/header/header.less rename to src/components/header/header.less diff --git a/src/app/components/header/header.pug b/src/components/header/header.pug similarity index 100% rename from src/app/components/header/header.pug rename to src/components/header/header.pug diff --git a/src/app/components/login/login.js b/src/components/login/login.js similarity index 100% rename from src/app/components/login/login.js rename to src/components/login/login.js diff --git a/src/app/components/login/login.less b/src/components/login/login.less similarity index 100% rename from src/app/components/login/login.less rename to src/components/login/login.less diff --git a/src/app/components/login/login.pug b/src/components/login/login.pug similarity index 100% rename from src/app/components/login/login.pug rename to src/components/login/login.pug diff --git a/src/app/components/login/passphrase.js b/src/components/login/passphrase.js similarity index 100% rename from src/app/components/login/passphrase.js rename to src/components/login/passphrase.js diff --git a/src/app/components/login/passphrase.less b/src/components/login/passphrase.less similarity index 100% rename from src/app/components/login/passphrase.less rename to src/components/login/passphrase.less diff --git a/src/app/components/login/passphrase.pug b/src/components/login/passphrase.pug similarity index 100% rename from src/app/components/login/passphrase.pug rename to src/components/login/passphrase.pug diff --git a/src/app/components/login/save.less b/src/components/login/save.less similarity index 100% rename from src/app/components/login/save.less rename to src/components/login/save.less diff --git a/src/app/components/login/save.pug b/src/components/login/save.pug similarity index 100% rename from src/app/components/login/save.pug rename to src/components/login/save.pug diff --git a/src/app/components/lsk/lsk.js b/src/components/lsk/lsk.js similarity index 100% rename from src/app/components/lsk/lsk.js rename to src/components/lsk/lsk.js diff --git a/src/app/components/lsk/lsk.less b/src/components/lsk/lsk.less similarity index 100% rename from src/app/components/lsk/lsk.less rename to src/components/lsk/lsk.less diff --git a/src/app/components/lsk/lsk.pug b/src/components/lsk/lsk.pug similarity index 100% rename from src/app/components/lsk/lsk.pug rename to src/components/lsk/lsk.pug diff --git a/src/app/components/main/main.js b/src/components/main/main.js similarity index 100% rename from src/app/components/main/main.js rename to src/components/main/main.js diff --git a/src/app/components/main/main.less b/src/components/main/main.less similarity index 100% rename from src/app/components/main/main.less rename to src/components/main/main.less diff --git a/src/app/components/main/main.pug b/src/components/main/main.pug similarity index 100% rename from src/app/components/main/main.pug rename to src/components/main/main.pug diff --git a/src/app/components/main/secondPass.less b/src/components/main/secondPass.less similarity index 100% rename from src/app/components/main/secondPass.less rename to src/components/main/secondPass.less diff --git a/src/app/components/main/secondPass.pug b/src/components/main/secondPass.pug similarity index 100% rename from src/app/components/main/secondPass.pug rename to src/components/main/secondPass.pug diff --git a/src/app/components/main/setSecondPassDirective.js b/src/components/main/setSecondPassDirective.js similarity index 100% rename from src/app/components/main/setSecondPassDirective.js rename to src/components/main/setSecondPassDirective.js diff --git a/src/app/components/main/setSecondPassService.js b/src/components/main/setSecondPassService.js similarity index 100% rename from src/app/components/main/setSecondPassService.js rename to src/components/main/setSecondPassService.js diff --git a/src/app/components/sign-verify/sign-message.js b/src/components/signVerify/signMessage.js similarity index 91% rename from src/app/components/sign-verify/sign-message.js rename to src/components/signVerify/signMessage.js index dd9a86d85..585202750 100644 --- a/src/app/components/sign-verify/sign-message.js +++ b/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; diff --git a/src/app/components/sign-verify/sign-message.pug b/src/components/signVerify/signMessage.pug similarity index 100% rename from src/app/components/sign-verify/sign-message.pug rename to src/components/signVerify/signMessage.pug diff --git a/src/app/components/sign-verify/verify-message.js b/src/components/signVerify/verifyMessage.js similarity index 95% rename from src/app/components/sign-verify/verify-message.js rename to src/components/signVerify/verifyMessage.js index 9e963b301..3a7a9f739 100644 --- a/src/app/components/sign-verify/verify-message.js +++ b/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) { diff --git a/src/app/components/sign-verify/verify-message.pug b/src/components/signVerify/verifyMessage.pug similarity index 100% rename from src/app/components/sign-verify/verify-message.pug rename to src/components/signVerify/verifyMessage.pug diff --git a/src/app/components/timestamp/timestamp.js b/src/components/timestamp/timestamp.js similarity index 100% rename from src/app/components/timestamp/timestamp.js rename to src/components/timestamp/timestamp.js diff --git a/src/app/components/timestamp/timestamp.less b/src/components/timestamp/timestamp.less similarity index 100% rename from src/app/components/timestamp/timestamp.less rename to src/components/timestamp/timestamp.less diff --git a/src/app/components/timestamp/timestamp.pug b/src/components/timestamp/timestamp.pug similarity index 100% rename from src/app/components/timestamp/timestamp.pug rename to src/components/timestamp/timestamp.pug diff --git a/src/app/components/top/top.js b/src/components/top/top.js similarity index 100% rename from src/app/components/top/top.js rename to src/components/top/top.js diff --git a/src/app/components/top/top.less b/src/components/top/top.less similarity index 100% rename from src/app/components/top/top.less rename to src/components/top/top.less diff --git a/src/app/components/top/top.pug b/src/components/top/top.pug similarity index 100% rename from src/app/components/top/top.pug rename to src/components/top/top.pug diff --git a/src/app/components/transactions/transactions.js b/src/components/transactions/transactions.js similarity index 100% rename from src/app/components/transactions/transactions.js rename to src/components/transactions/transactions.js diff --git a/src/app/components/transactions/transactions.less b/src/components/transactions/transactions.less similarity index 100% rename from src/app/components/transactions/transactions.less rename to src/components/transactions/transactions.less diff --git a/src/app/components/transactions/transactions.pug b/src/components/transactions/transactions.pug similarity index 100% rename from src/app/components/transactions/transactions.pug rename to src/components/transactions/transactions.pug diff --git a/src/app/components/transfer/second.pug b/src/components/transfer/second.pug similarity index 100% rename from src/app/components/transfer/second.pug rename to src/components/transfer/second.pug diff --git a/src/app/components/transfer/transfer.js b/src/components/transfer/transfer.js similarity index 100% rename from src/app/components/transfer/transfer.js rename to src/components/transfer/transfer.js diff --git a/src/app/components/transfer/transfer.less b/src/components/transfer/transfer.less similarity index 100% rename from src/app/components/transfer/transfer.less rename to src/components/transfer/transfer.less diff --git a/src/app/components/transfer/transfer.pug b/src/components/transfer/transfer.pug similarity index 100% rename from src/app/components/transfer/transfer.pug rename to src/components/transfer/transfer.pug diff --git a/src/app/components/transfer/transferModalDirective.js b/src/components/transfer/transferModalDirective.js similarity index 100% rename from src/app/components/transfer/transferModalDirective.js rename to src/components/transfer/transferModalDirective.js diff --git a/src/app/components/transfer/transferModalService.js b/src/components/transfer/transferModalService.js similarity index 100% rename from src/app/components/transfer/transferModalService.js rename to src/components/transfer/transferModalService.js diff --git a/src/app/filters/lsk.js b/src/filters/lsk.js similarity index 100% rename from src/app/filters/lsk.js rename to src/filters/lsk.js diff --git a/src/app/index.js b/src/index.js similarity index 82% rename from src/app/index.js rename to src/index.js index 9dcc296c5..1ca3000a9 100644 --- a/src/app/index.js +++ b/src/index.js @@ -1,5 +1,5 @@ import './libs'; -import './lisk-nano'; +import './liskNano'; angular.element(document).ready(() => { angular.bootstrap(document, ['app']); diff --git a/src/app/index.less b/src/index.less similarity index 100% rename from src/app/index.less rename to src/index.less diff --git a/src/app/index.pug b/src/index.pug similarity index 100% rename from src/app/index.pug rename to src/index.pug diff --git a/src/app/libs.js b/src/libs.js similarity index 100% rename from src/app/libs.js rename to src/libs.js diff --git a/src/app/lisk-nano.js b/src/liskNano.js similarity index 84% rename from src/app/lisk-nano.js rename to src/liskNano.js index c6e28d899..7a14ffb81 100644 --- a/src/app/lisk-nano.js +++ b/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'; diff --git a/src/package.json b/src/package.json deleted file mode 100644 index 7389f5c45..000000000 --- a/src/package.json +++ /dev/null @@ -1,108 +0,0 @@ -{ - "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 , lightcurve GmbH ", - "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" - ] - } - } - } -} diff --git a/src/app/run.js b/src/run.js similarity index 100% rename from src/app/run.js rename to src/run.js diff --git a/src/app/services/account.js b/src/services/account.js similarity index 100% rename from src/app/services/account.js rename to src/services/account.js diff --git a/src/app/services/api/accountApi.js b/src/services/api/accountApi.js similarity index 100% rename from src/app/services/api/accountApi.js rename to src/services/api/accountApi.js diff --git a/src/app/services/api/delegateApi.js b/src/services/api/delegateApi.js similarity index 100% rename from src/app/services/api/delegateApi.js rename to src/services/api/delegateApi.js diff --git a/src/app/services/api/forgingApi.js b/src/services/api/forgingApi.js similarity index 100% rename from src/app/services/api/forgingApi.js rename to src/services/api/forgingApi.js diff --git a/src/app/services/api/peers.js b/src/services/api/peers.js similarity index 100% rename from src/app/services/api/peers.js rename to src/services/api/peers.js diff --git a/src/app/services/dialog.js b/src/services/dialog.js similarity index 100% rename from src/app/services/dialog.js rename to src/services/dialog.js diff --git a/src/app/services/lsk.js b/src/services/lsk.js similarity index 100% rename from src/app/services/lsk.js rename to src/services/lsk.js diff --git a/src/app/services/passphrase.js b/src/services/passphrase.js similarity index 100% rename from src/app/services/passphrase.js rename to src/services/passphrase.js diff --git a/src/app/services/sign-verify.js b/src/services/signVerify.js similarity index 100% rename from src/app/services/sign-verify.js rename to src/services/signVerify.js diff --git a/src/app/states.js b/src/states.js similarity index 100% rename from src/app/states.js rename to src/states.js diff --git a/src/app/theme/theme.js b/src/theme/theme.js similarity index 100% rename from src/app/theme/theme.js rename to src/theme/theme.js diff --git a/src/app/util/animateOnChange/animateOnChange.js b/src/util/animateOnChange/animateOnChange.js similarity index 100% rename from src/app/util/animateOnChange/animateOnChange.js rename to src/util/animateOnChange/animateOnChange.js diff --git a/src/test/.eslintrc.json b/test/.eslintrc.json similarity index 100% rename from src/test/.eslintrc.json rename to test/.eslintrc.json diff --git a/src/test/components/delegate-registration/delegateRegistration.spec.js b/test/components/delegateRegistration/delegateRegistration.spec.js similarity index 100% rename from src/test/components/delegate-registration/delegateRegistration.spec.js rename to test/components/delegateRegistration/delegateRegistration.spec.js diff --git a/src/test/components/delegates/delegates.spec.js b/test/components/delegates/delegates.spec.js similarity index 100% rename from src/test/components/delegates/delegates.spec.js rename to test/components/delegates/delegates.spec.js diff --git a/src/test/components/delegates/vote.spec.js b/test/components/delegates/vote.spec.js similarity index 100% rename from src/test/components/delegates/vote.spec.js rename to test/components/delegates/vote.spec.js diff --git a/src/test/components/forging/forging.spec.js b/test/components/forging/forging.spec.js similarity index 100% rename from src/test/components/forging/forging.spec.js rename to test/components/forging/forging.spec.js diff --git a/src/test/components/header/header.spec.js b/test/components/header/header.spec.js similarity index 100% rename from src/test/components/header/header.spec.js rename to test/components/header/header.spec.js diff --git a/src/test/components/login/login.spec.js b/test/components/login/login.spec.js similarity index 100% rename from src/test/components/login/login.spec.js rename to test/components/login/login.spec.js diff --git a/src/test/components/login/passphrase.spec.js b/test/components/login/passphrase.spec.js similarity index 100% rename from src/test/components/login/passphrase.spec.js rename to test/components/login/passphrase.spec.js diff --git a/src/test/components/main/main.spec.js b/test/components/main/main.spec.js similarity index 100% rename from src/test/components/main/main.spec.js rename to test/components/main/main.spec.js diff --git a/src/test/components/main/setSecondPassDirective.spec.js b/test/components/main/setSecondPassDirective.spec.js similarity index 100% rename from src/test/components/main/setSecondPassDirective.spec.js rename to test/components/main/setSecondPassDirective.spec.js diff --git a/src/test/components/main/setSecondPassService.spec.js b/test/components/main/setSecondPassService.spec.js similarity index 100% rename from src/test/components/main/setSecondPassService.spec.js rename to test/components/main/setSecondPassService.spec.js diff --git a/src/test/components/sign-verify/sign-message.spec.js b/test/components/signVerify/signMessage.spec.js similarity index 100% rename from src/test/components/sign-verify/sign-message.spec.js rename to test/components/signVerify/signMessage.spec.js diff --git a/src/test/components/sign-verify/verify-message.spec.js b/test/components/signVerify/verifyMessage.spec.js similarity index 100% rename from src/test/components/sign-verify/verify-message.spec.js rename to test/components/signVerify/verifyMessage.spec.js diff --git a/src/test/components/timestamp/timestamp.spec.js b/test/components/timestamp/timestamp.spec.js similarity index 100% rename from src/test/components/timestamp/timestamp.spec.js rename to test/components/timestamp/timestamp.spec.js diff --git a/src/test/components/top/top.spec.js b/test/components/top/top.spec.js similarity index 100% rename from src/test/components/top/top.spec.js rename to test/components/top/top.spec.js diff --git a/src/test/components/transactions/transactions.spec.js b/test/components/transactions/transactions.spec.js similarity index 100% rename from src/test/components/transactions/transactions.spec.js rename to test/components/transactions/transactions.spec.js diff --git a/src/test/components/transfer/transfer.spec.js b/test/components/transfer/transfer.spec.js similarity index 100% rename from src/test/components/transfer/transfer.spec.js rename to test/components/transfer/transfer.spec.js diff --git a/src/test/components/transfer/transferModalDirective.spec.js b/test/components/transfer/transferModalDirective.spec.js similarity index 100% rename from src/test/components/transfer/transferModalDirective.spec.js rename to test/components/transfer/transferModalDirective.spec.js diff --git a/src/test/libs.js b/test/libs.js similarity index 100% rename from src/test/libs.js rename to test/libs.js diff --git a/src/test/run.spec.js b/test/run.spec.js similarity index 100% rename from src/test/run.spec.js rename to test/run.spec.js diff --git a/src/test/services/account.spec.js b/test/services/account.spec.js similarity index 100% rename from src/test/services/account.spec.js rename to test/services/account.spec.js diff --git a/src/test/services/api/accountApi.spec.js b/test/services/api/accountApi.spec.js similarity index 100% rename from src/test/services/api/accountApi.spec.js rename to test/services/api/accountApi.spec.js diff --git a/src/test/services/api/delegateApi.spec.js b/test/services/api/delegateApi.spec.js similarity index 100% rename from src/test/services/api/delegateApi.spec.js rename to test/services/api/delegateApi.spec.js diff --git a/src/test/services/api/forgingApi.spec.js b/test/services/api/forgingApi.spec.js similarity index 100% rename from src/test/services/api/forgingApi.spec.js rename to test/services/api/forgingApi.spec.js diff --git a/src/test/services/api/peers.spec.js b/test/services/api/peers.spec.js similarity index 100% rename from src/test/services/api/peers.spec.js rename to test/services/api/peers.spec.js diff --git a/src/test/services/lsk.spec.js b/test/services/lsk.spec.js similarity index 100% rename from src/test/services/lsk.spec.js rename to test/services/lsk.spec.js diff --git a/src/test/services/passphrase.spec.js b/test/services/passphrase.spec.js similarity index 100% rename from src/test/services/passphrase.spec.js rename to test/services/passphrase.spec.js diff --git a/src/test/services/sign-verify.spec.js b/test/services/signVerify.spec.js similarity index 100% rename from src/test/services/sign-verify.spec.js rename to test/services/signVerify.spec.js diff --git a/src/test/test.js b/test/test.js similarity index 82% rename from src/test/test.js rename to test/test.js index d2f3a458b..9c5cfbe58 100644 --- a/src/test/test.js +++ b/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'); diff --git a/src/test/util/animateOnChange/animateOnChange.spec.js b/test/util/animateOnChange/animateOnChange.spec.js similarity index 100% rename from src/test/util/animateOnChange/animateOnChange.spec.js rename to test/util/animateOnChange/animateOnChange.spec.js diff --git a/src/webpack.config.babel.js b/webpack.config.babel.js similarity index 94% rename from src/webpack.config.babel.js rename to webpack.config.babel.js index 328b1e4fd..09c842a50 100644 --- a/src/webpack.config.babel.js +++ b/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, From 51330697d0800968fee02b469caa958b8063647b Mon Sep 17 00:00:00 2001 From: Aleksey Popov Date: Mon, 15 May 2017 15:44:45 +0300 Subject: [PATCH 2/3] update README.md and Jenkins config file --- Jenkinsfile | 2 +- README.md | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 4786858a8..3148fe9bd 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -43,7 +43,7 @@ pipeline { BUILD_ID=dontKillMe ~/start_lisk.sh # Build nano - cd $WORKSPACE/src + cd $WORKSPACE npm install # Add coveralls config file diff --git a/README.md b/README.md index 7f8b81d4a..283c2941b 100644 --- a/README.md +++ b/README.md @@ -10,8 +10,6 @@ git clone https://github.com/LiskHQ/lisk-nano.git cd lisk-nano npm install -cd src -npm install npm run dev ``` @@ -90,7 +88,6 @@ 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 ``` @@ -123,7 +120,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: From e24038931f14ed29bdfb4bf341a7525ded09fa80 Mon Sep 17 00:00:00 2001 From: Aleksey Popov Date: Mon, 15 May 2017 18:55:24 +0300 Subject: [PATCH 3/3] clean command now clean app/dist folder --- app/main.js | 2 +- src/index.pug | 1 - webpack.config.babel.js | 4 ++-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/app/main.js b/app/main.js index 8bd9ff699..b03c616d6 100644 --- a/app/main.js +++ b/app/main.js @@ -135,7 +135,7 @@ function createWindow() { const menu = Menu.buildFromTemplate(template); Menu.setApplicationMenu(menu); - win.loadURL(`file://${__dirname}/index.html`); + win.loadURL(`file://${__dirname}/dist/index.html`); win.on('closed', () => win = null); diff --git a/src/index.pug b/src/index.pug index 7bcae57c8..bfc84c9bf 100644 --- a/src/index.pug +++ b/src/index.pug @@ -3,7 +3,6 @@ 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; diff --git a/webpack.config.babel.js b/webpack.config.babel.js index 09c842a50..f232dd13e 100644 --- a/webpack.config.babel.js +++ b/webpack.config.babel.js @@ -22,7 +22,7 @@ const common = { app: PATHS.app, }, output: { - path: PATHS.build, + path: path.join(PATHS.build, 'dist'), filename: 'app.js', }, node: { @@ -169,7 +169,7 @@ let config; switch (process.env.npm_lifecycle_event) { case 'build': - config = merge(common, clean(path.join(PATHS.build, '*')), html(), provide(), babel(), pug(), less(), css(), json(), png(), fonts(), bundleAnalyzer()); + config = merge(common, clean(path.join(PATHS.build, 'dist')), html(), provide(), babel(), pug(), less(), css(), json(), png(), fonts(), bundleAnalyzer()); break; default: config = merge(common, devServer(), { devtool: 'eval-source-map' }, html(), provide(), babel(), pug(), less(), css(), json(), png(), fonts());