diff --git a/web/.babelrc b/.babelrc similarity index 100% rename from web/.babelrc rename to .babelrc diff --git a/.gitignore b/.gitignore index 4b67907ebc..ca312b08bc 100644 --- a/.gitignore +++ b/.gitignore @@ -2,17 +2,21 @@ .idea */node_modules */npm-debug.log -cli/bundle *.map *.log -cli/examples.txt -dist -web/electron -web/app/components/Exchange/exchange.css -cli/bundle.js -web/dist-prod -web/stats* -web/hash-history +build +app/electron +app/components/Exchange/exchange.css +stats* +hash-history docs/_build/ *.swp *.python-version + +app/.sass-cache +node_modules +app/bower_components +app/bundle +app/stats-dev.json +app/stats-prod.json +app/test/MarketClasses.js diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000000..5d024b244f --- /dev/null +++ b/.travis.yml @@ -0,0 +1,44 @@ +language: node_js +node_js: 7 +matrix: + include: + - os: linux + dist: trusty + - os: osx + osx_image: xcode8.3 +env: + global: + - GITHUB_REPO: bitshares/bitshares-ui + - CXX=g++-4.8 + - secure: g+Q6hF5/zJnFlk1KrI0VABR+0efzGQqtIj3XlmqTLLWCyopxNQoBOsUsK5wBqLYA3LGMTtAsOLhhItx1CSF7/Ij/uDEOluXrxLYASziIzYF4cJ5YRALZ2k/mgrUw2dSSMZ7iL4DIDH/8UTiw0Ld1mrbHn+W/Dkgkct7egDJmn93N4tI1gKJ+AArSUNIFLKzEbPnjVHX9n64KIlNs8tuwfaXOzy8WdIWxsbwzRWmrcrBOG52o3MgtClaSO8pD13Cz1F3ES4clxH7s104EF5LttTmqz3bpM3CtRAjQ6rwX8E/x5K6L8GCpeeYM5cCPbttap1olD1f4GP+nSzqP/L1OKIuzCwK4qknlbfNlDG4WhsXDzTTmu1goQKuUU8w9K0aGTgI1NPJaxFrijZ/ofSOSHz3RH8xd6XLsFTyJllnY7/Y6oyul9RNd29yLcJVCko9tM1LoUhvEH45yWCTc4R5Ow+E4+IYTm0RniGQtgW+gPYquveALFPHzGkAwcShcYNDWpCyMQq3QWFu8GWK3PWp0GtLe02Rryjy08tasQR0DRRmFUESMSZPikyTM75M+bKrIFlsf9Q3H2uDc8Z4qcG5vrYFVdB6qeekwdkae4C1yC872AHvDvu+CnB1VZ7qvuDJkFBn3FrxzKgZ9rVWvVb7X6y+a95Wey32KzSqKvU+E4ec= +cache: + directories: + - "node_modules" +addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - gcc-4.8 + - g++-4.8 + - icnsutils + - graphicsmagick + - xz-utils +before_install: "./install.sh" +script: "./build.sh" +after_success: "./deploy.sh" +deploy: + provider: releases + tag_name: $TRAVIS_TAG + name: $TRAVIS_TAG + body: Automated release from Travis CI with added files from AppVeyor build + api_key: + secure: K+62i3Rky9rXJyO6UMTLyY+GHfQtRMpEX9bLQFyZERSdmPK5l0Xq3ivBfESczoGsIxoPuVvWLOx/ZAh+I+67izS28i5LowQKLFQQ1h1b82ilexlprkj+Gf5QE3CWk04rR4OiIv4eXJLShqnGOQ7SuyI/UHW7iwTqAOt22YWWWPazlM75JwXQBYdHZ5vY2axXW493WGnRcLqzmRBwo2Ggkieqt8QiYYtvdk4yA81qbtIK6TxLzz6pc9fW/q+r+HoB0s81djlHmOByughEgc/mW+7xB3mM2uB8katNVbGa2qgZ/NS031b04ZSe8V8JHzC6UIBU8IKuFrxm3cpFN7onYDDfKs+6x+u5LCavw3VanHCgTd4dA4Jisew2Q19YhqymYYHmhMuwLh8y8XW8V7BrNNi9qjknKodaB8SFN1PZYe29LnG07hmZWwnBkVEIXf2QwcL+yfZtJ9NmLWyktnCpj4urtz3qQOG4nkbrn9mGx+jINgfzk4bpN6jNk0wwe9yqFy7nsZxow8vHf31hICwZZl8borz6fZhW9WVDqS9bZs/Ts4Qk3U4WREdmB24eIV8W5DIliSH/5qFh0RIRDCHKisom8r2XdBATe7hJ1t+YZR0N80q2IPwgTPdVtUuHTE1YkPcu0eILgA/YUAWNu1yoSNQUYScKA2i382gOBl06CS0= + file_glob: true + file: build/binaries/BitShares* + skip_cleanup: true + draft: true + on: + repo: bitshares/bitshares-ui + branch: 224-build-automation + tags: true diff --git a/README.md b/README.md index cf369a2481..f66203e807 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ BitShares-UI ============ This is a light wallet that connects to a BitShares API provided by the *witness_node* executable. - + It *stores all keys locally* in the browser, *never exposing your keys to anyone* as it signs transactions locally before transmitting them to the API server which then broadcasts them to the blockchain network. The wallet is encrypted with a password of your choosing and encrypted in a browser database. @@ -37,11 +37,10 @@ git clone https://github.com/bitshares/bitshares-ui.git cd bitshares-ui ``` -Before launching the GUI you will need to install the npm packages for each subdirectory: +Before launching the GUI you will need to install the npm packages: >在装载GUI前，你需要为每一子目录安装npm包: ``` -cd web npm install ``` @@ -88,18 +87,20 @@ This will create a bundle in the /dist folder that can be hosted with the web se ### Installable wallets We use Electron to provide installable wallets, available for Windows, OSX and Linux Debian platforms such as Ubuntu. First, make sure your local python version is 2.7.x, as a dependency requires this. -OSX / Linux instructions: +On Linux you will need to install the following packages to handle icon generation: -``` -cd electron -npm install -cd ../web -npm run electron -cd ../electron -npm run release -``` +`sudo apt-get install --no-install-recommends -y icnsutils graphicsmagick xz-utils` -This will compile the UI with some special modifications for use with Electron, and copy the result to the root `electron/build` folder. +For building, each architecture has it's own script that you can use to build your native binary: + +__Linux__ +`npm run package-deb` +__Windows__ +`npm run package-win` +__Mac__ +`npm run package-mac` + +This will compile the UI with some special modifications for use with Electron, generate installable binaries with Electron and copy the result to the root `build/binaries` folder. ## 可安装钱包 我们使用Electron来提供可安装钱包，Windows, OSX 和Linux平台如Ubuntu都可以使用。首先，在'electron'文件夹里安装需要的封包。然后到'web'文件夹里运行`npm run electron`。这样就会在编译UI的同时针对Electron做一些特殊的改进，并将结果粘贴至根文件夹 `electron/build`。现在，为了创建一个钱包到你的平台上，回到`electron`文件夹并运行`npm run release`。 @@ -107,7 +108,7 @@ This will compile the UI with some special modifications for use with Electron, ## Contributing -The Bitshares UI team is supported by this [worker proposal](http://www.bitshares.foundation/workers/2017-08-bill-butler). It provides the funds needed to pay the coordinator and the bounties and the Bitshares Foundation. +The Bitshares UI team is supported by this [worker proposal](http://www.bitshares.foundation/workers/2017-08-bill-butler). It provides the funds needed to pay the coordinator and the bounties and the Bitshares Foundation. If you would like to get involved, we have a [Telegram chatroom](https://t.me/BitSharesDEX) where you can ask questions and get help. You may also join [BitShares on Discord](https://discord.gg/GsjQfAJ) @@ -167,4 +168,3 @@ We strongly encourage to use _eslint_ to make sure the code adhere to our style - 在花括号里的空格是随意的 我们强烈鼓励用  _eslint_ 确保代码依附于我们的代码风格指南 - diff --git a/web/.htaccess.example b/app/.htaccess.example similarity index 100% rename from web/.htaccess.example rename to app/.htaccess.example diff --git a/web/app/App.jsx b/app/App.jsx similarity index 100% rename from web/app/App.jsx rename to app/App.jsx diff --git a/web/app/Main-dev.js b/app/Main-dev.js similarity index 100% rename from web/app/Main-dev.js rename to app/Main-dev.js diff --git a/web/app/Main.js b/app/Main.js similarity index 100% rename from web/app/Main.js rename to app/Main.js diff --git a/web/app/Routes-dev.jsx b/app/Routes-dev.jsx similarity index 100% rename from web/app/Routes-dev.jsx rename to app/Routes-dev.jsx diff --git a/web/app/Routes.jsx b/app/Routes.jsx similarity index 100% rename from web/app/Routes.jsx rename to app/Routes.jsx diff --git a/web/__tests__/components/Account/Identicon-test.jsx b/app/__tests__/components/Account/Identicon-test.jsx similarity index 100% rename from web/__tests__/components/Account/Identicon-test.jsx rename to app/__tests__/components/Account/Identicon-test.jsx diff --git a/web/__tests__/components/Utility/FormattedAsset-test.jsx b/app/__tests__/components/Utility/FormattedAsset-test.jsx similarity index 100% rename from web/__tests__/components/Utility/FormattedAsset-test.jsx rename to app/__tests__/components/Utility/FormattedAsset-test.jsx diff --git a/web/__tests__/jest-preprocessor.js b/app/__tests__/jest-preprocessor.js similarity index 100% rename from web/__tests__/jest-preprocessor.js rename to app/__tests__/jest-preprocessor.js diff --git a/web/__tests__/utils/stub_router_context.js b/app/__tests__/utils/stub_router_context.js similarity index 100% rename from web/__tests__/utils/stub_router_context.js rename to app/__tests__/utils/stub_router_context.js diff --git a/web/__tests__/wallets/bts0-9_key-export-fjfjfjfj1.json b/app/__tests__/wallets/bts0-9_key-export-fjfjfjfj1.json similarity index 100% rename from web/__tests__/wallets/bts0-9_key-export-fjfjfjfj1.json rename to app/__tests__/wallets/bts0-9_key-export-fjfjfjfj1.json diff --git a/web/__tests__/wallets/test-wif-import.txt b/app/__tests__/wallets/test-wif-import.txt similarity index 100% rename from web/__tests__/wallets/test-wif-import.txt rename to app/__tests__/wallets/test-wif-import.txt diff --git a/web/__tests__/wallets/testnet-shared-private-keys-export.json b/app/__tests__/wallets/testnet-shared-private-keys-export.json similarity index 100% rename from web/__tests__/wallets/testnet-shared-private-keys-export.json rename to app/__tests__/wallets/testnet-shared-private-keys-export.json diff --git a/web/__tests__/wallets/wallet_bts0-9_password.json b/app/__tests__/wallets/wallet_bts0-9_password.json similarity index 100% rename from web/__tests__/wallets/wallet_bts0-9_password.json rename to app/__tests__/wallets/wallet_bts0-9_password.json diff --git a/web/app/actions/AccountActions.js b/app/actions/AccountActions.js similarity index 100% rename from web/app/actions/AccountActions.js rename to app/actions/AccountActions.js diff --git a/web/app/actions/AssetActions.js b/app/actions/AssetActions.js similarity index 100% rename from web/app/actions/AssetActions.js rename to app/actions/AssetActions.js diff --git a/web/app/actions/BackupActions.js b/app/actions/BackupActions.js similarity index 100% rename from web/app/actions/BackupActions.js rename to app/actions/BackupActions.js diff --git a/web/app/actions/BalanceClaimActiveActions.js b/app/actions/BalanceClaimActiveActions.js similarity index 100% rename from web/app/actions/BalanceClaimActiveActions.js rename to app/actions/BalanceClaimActiveActions.js diff --git a/web/app/actions/BlockchainActions.js b/app/actions/BlockchainActions.js similarity index 100% rename from web/app/actions/BlockchainActions.js rename to app/actions/BlockchainActions.js diff --git a/web/app/actions/BrainkeyActions.js b/app/actions/BrainkeyActions.js similarity index 100% rename from web/app/actions/BrainkeyActions.js rename to app/actions/BrainkeyActions.js diff --git a/web/app/actions/CachedPropertyActions.js b/app/actions/CachedPropertyActions.js similarity index 100% rename from web/app/actions/CachedPropertyActions.js rename to app/actions/CachedPropertyActions.js diff --git a/web/app/actions/GatewayActions.js b/app/actions/GatewayActions.js similarity index 100% rename from web/app/actions/GatewayActions.js rename to app/actions/GatewayActions.js diff --git a/web/app/actions/IntlActions.js b/app/actions/IntlActions.js similarity index 100% rename from web/app/actions/IntlActions.js rename to app/actions/IntlActions.js diff --git a/web/app/actions/MarketsActions.js b/app/actions/MarketsActions.js similarity index 100% rename from web/app/actions/MarketsActions.js rename to app/actions/MarketsActions.js diff --git a/web/app/actions/NotificationActions.js b/app/actions/NotificationActions.js similarity index 100% rename from web/app/actions/NotificationActions.js rename to app/actions/NotificationActions.js diff --git a/web/app/actions/PrivateKeyActions.js b/app/actions/PrivateKeyActions.js similarity index 100% rename from web/app/actions/PrivateKeyActions.js rename to app/actions/PrivateKeyActions.js diff --git a/web/app/actions/SettingsActions.js b/app/actions/SettingsActions.js similarity index 100% rename from web/app/actions/SettingsActions.js rename to app/actions/SettingsActions.js diff --git a/web/app/actions/TransactionConfirmActions.js b/app/actions/TransactionConfirmActions.js similarity index 100% rename from web/app/actions/TransactionConfirmActions.js rename to app/actions/TransactionConfirmActions.js diff --git a/web/app/actions/VoteActions.js b/app/actions/VoteActions.js similarity index 100% rename from web/app/actions/VoteActions.js rename to app/actions/VoteActions.js diff --git a/web/app/actions/WalletActions.js b/app/actions/WalletActions.js similarity index 100% rename from web/app/actions/WalletActions.js rename to app/actions/WalletActions.js diff --git a/web/app/actions/WalletUnlockActions.js b/app/actions/WalletUnlockActions.js similarity index 100% rename from web/app/actions/WalletUnlockActions.js rename to app/actions/WalletUnlockActions.js diff --git a/web/app/alt-instance.js b/app/alt-instance.js similarity index 100% rename from web/app/alt-instance.js rename to app/alt-instance.js diff --git a/web/app/api/ApplicationApi.js b/app/api/ApplicationApi.js similarity index 100% rename from web/app/api/ApplicationApi.js rename to app/api/ApplicationApi.js diff --git a/web/app/api/DebugApi.js b/app/api/DebugApi.js similarity index 100% rename from web/app/api/DebugApi.js rename to app/api/DebugApi.js diff --git a/web/app/api/WalletApi.js b/app/api/WalletApi.js similarity index 100% rename from web/app/api/WalletApi.js rename to app/api/WalletApi.js diff --git a/web/app/api/accountApi.js b/app/api/accountApi.js similarity index 100% rename from web/app/api/accountApi.js rename to app/api/accountApi.js diff --git a/web/app/api/apiConfig.js b/app/api/apiConfig.js similarity index 100% rename from web/app/api/apiConfig.js rename to app/api/apiConfig.js diff --git a/web/app/assets/asset-symbols/bkt.png b/app/assets/asset-symbols/bkt.png similarity index 100% rename from web/app/assets/asset-symbols/bkt.png rename to app/assets/asset-symbols/bkt.png diff --git a/web/app/assets/asset-symbols/blockpay.png b/app/assets/asset-symbols/blockpay.png similarity index 100% rename from web/app/assets/asset-symbols/blockpay.png rename to app/assets/asset-symbols/blockpay.png diff --git a/web/app/assets/asset-symbols/btc.png b/app/assets/asset-symbols/btc.png similarity index 100% rename from web/app/assets/asset-symbols/btc.png rename to app/assets/asset-symbols/btc.png diff --git a/web/app/assets/asset-symbols/bts.png b/app/assets/asset-symbols/bts.png similarity index 100% rename from web/app/assets/asset-symbols/bts.png rename to app/assets/asset-symbols/bts.png diff --git a/web/app/assets/asset-symbols/btsr.png b/app/assets/asset-symbols/btsr.png similarity index 100% rename from web/app/assets/asset-symbols/btsr.png rename to app/assets/asset-symbols/btsr.png diff --git a/web/app/assets/asset-symbols/btwty.png b/app/assets/asset-symbols/btwty.png similarity index 100% rename from web/app/assets/asset-symbols/btwty.png rename to app/assets/asset-symbols/btwty.png diff --git a/web/app/assets/asset-symbols/cny.png b/app/assets/asset-symbols/cny.png similarity index 100% rename from web/app/assets/asset-symbols/cny.png rename to app/assets/asset-symbols/cny.png diff --git a/web/app/assets/asset-symbols/dao.png b/app/assets/asset-symbols/dao.png similarity index 100% rename from web/app/assets/asset-symbols/dao.png rename to app/assets/asset-symbols/dao.png diff --git a/web/app/assets/asset-symbols/dash.png b/app/assets/asset-symbols/dash.png similarity index 100% rename from web/app/assets/asset-symbols/dash.png rename to app/assets/asset-symbols/dash.png diff --git a/web/app/assets/asset-symbols/dct.png b/app/assets/asset-symbols/dct.png similarity index 100% rename from web/app/assets/asset-symbols/dct.png rename to app/assets/asset-symbols/dct.png diff --git a/web/app/assets/asset-symbols/dgd.png b/app/assets/asset-symbols/dgd.png similarity index 100% rename from web/app/assets/asset-symbols/dgd.png rename to app/assets/asset-symbols/dgd.png diff --git a/web/app/assets/asset-symbols/eos.png b/app/assets/asset-symbols/eos.png similarity index 100% rename from web/app/assets/asset-symbols/eos.png rename to app/assets/asset-symbols/eos.png diff --git a/web/app/assets/asset-symbols/eth.png b/app/assets/asset-symbols/eth.png similarity index 100% rename from web/app/assets/asset-symbols/eth.png rename to app/assets/asset-symbols/eth.png diff --git a/web/app/assets/asset-symbols/eur.png b/app/assets/asset-symbols/eur.png similarity index 100% rename from web/app/assets/asset-symbols/eur.png rename to app/assets/asset-symbols/eur.png diff --git a/web/app/assets/asset-symbols/eurt.png b/app/assets/asset-symbols/eurt.png similarity index 100% rename from web/app/assets/asset-symbols/eurt.png rename to app/assets/asset-symbols/eurt.png diff --git a/web/app/assets/asset-symbols/game.png b/app/assets/asset-symbols/game.png similarity index 100% rename from web/app/assets/asset-symbols/game.png rename to app/assets/asset-symbols/game.png diff --git a/web/app/assets/asset-symbols/gold.png b/app/assets/asset-symbols/gold.png similarity index 100% rename from web/app/assets/asset-symbols/gold.png rename to app/assets/asset-symbols/gold.png diff --git a/web/app/assets/asset-symbols/grc.png b/app/assets/asset-symbols/grc.png similarity index 100% rename from web/app/assets/asset-symbols/grc.png rename to app/assets/asset-symbols/grc.png diff --git a/web/app/assets/asset-symbols/hempsweet.png b/app/assets/asset-symbols/hempsweet.png similarity index 100% rename from web/app/assets/asset-symbols/hempsweet.png rename to app/assets/asset-symbols/hempsweet.png diff --git a/web/app/assets/asset-symbols/hero.png b/app/assets/asset-symbols/hero.png similarity index 100% rename from web/app/assets/asset-symbols/hero.png rename to app/assets/asset-symbols/hero.png diff --git a/web/app/assets/asset-symbols/icoo.png b/app/assets/asset-symbols/icoo.png similarity index 100% rename from web/app/assets/asset-symbols/icoo.png rename to app/assets/asset-symbols/icoo.png diff --git a/web/app/assets/asset-symbols/incnt.png b/app/assets/asset-symbols/incnt.png similarity index 100% rename from web/app/assets/asset-symbols/incnt.png rename to app/assets/asset-symbols/incnt.png diff --git a/web/app/assets/asset-symbols/lisk.png b/app/assets/asset-symbols/lisk.png similarity index 100% rename from web/app/assets/asset-symbols/lisk.png rename to app/assets/asset-symbols/lisk.png diff --git a/web/app/assets/asset-symbols/mkr.png b/app/assets/asset-symbols/mkr.png similarity index 100% rename from web/app/assets/asset-symbols/mkr.png rename to app/assets/asset-symbols/mkr.png diff --git a/web/app/assets/asset-symbols/nxc.png b/app/assets/asset-symbols/nxc.png similarity index 100% rename from web/app/assets/asset-symbols/nxc.png rename to app/assets/asset-symbols/nxc.png diff --git a/web/app/assets/asset-symbols/obits.png b/app/assets/asset-symbols/obits.png similarity index 100% rename from web/app/assets/asset-symbols/obits.png rename to app/assets/asset-symbols/obits.png diff --git a/web/app/assets/asset-symbols/oct.png b/app/assets/asset-symbols/oct.png similarity index 100% rename from web/app/assets/asset-symbols/oct.png rename to app/assets/asset-symbols/oct.png diff --git a/web/app/assets/asset-symbols/open.btc.png b/app/assets/asset-symbols/open.btc.png similarity index 100% rename from web/app/assets/asset-symbols/open.btc.png rename to app/assets/asset-symbols/open.btc.png diff --git a/web/app/assets/asset-symbols/peerplays.png b/app/assets/asset-symbols/peerplays.png similarity index 100% rename from web/app/assets/asset-symbols/peerplays.png rename to app/assets/asset-symbols/peerplays.png diff --git a/web/app/assets/asset-symbols/ruble.png b/app/assets/asset-symbols/ruble.png similarity index 100% rename from web/app/assets/asset-symbols/ruble.png rename to app/assets/asset-symbols/ruble.png diff --git a/web/app/assets/asset-symbols/silver.png b/app/assets/asset-symbols/silver.png similarity index 100% rename from web/app/assets/asset-symbols/silver.png rename to app/assets/asset-symbols/silver.png diff --git a/web/app/assets/asset-symbols/steem.png b/app/assets/asset-symbols/steem.png similarity index 100% rename from web/app/assets/asset-symbols/steem.png rename to app/assets/asset-symbols/steem.png diff --git a/web/app/assets/asset-symbols/symbols.js b/app/assets/asset-symbols/symbols.js similarity index 100% rename from web/app/assets/asset-symbols/symbols.js rename to app/assets/asset-symbols/symbols.js diff --git a/web/app/assets/asset-symbols/usd.png b/app/assets/asset-symbols/usd.png similarity index 100% rename from web/app/assets/asset-symbols/usd.png rename to app/assets/asset-symbols/usd.png diff --git a/web/app/assets/asset-symbols/usdt.png b/app/assets/asset-symbols/usdt.png similarity index 100% rename from web/app/assets/asset-symbols/usdt.png rename to app/assets/asset-symbols/usdt.png diff --git a/web/app/assets/asset-symbols/yoyow.png b/app/assets/asset-symbols/yoyow.png similarity index 100% rename from web/app/assets/asset-symbols/yoyow.png rename to app/assets/asset-symbols/yoyow.png diff --git a/web/app/assets/bts_genesiskeys_bloom.dat b/app/assets/bts_genesiskeys_bloom.dat similarity index 100% rename from web/app/assets/bts_genesiskeys_bloom.dat rename to app/assets/bts_genesiskeys_bloom.dat diff --git a/web/app/assets/colors.js b/app/assets/colors.js similarity index 100% rename from web/app/assets/colors.js rename to app/assets/colors.js diff --git a/web/app/assets/favicon.ico b/app/assets/favicon.ico similarity index 100% rename from web/app/assets/favicon.ico rename to app/assets/favicon.ico diff --git a/web/app/assets/fresh-bolt2.png b/app/assets/fresh-bolt2.png similarity index 100% rename from web/app/assets/fresh-bolt2.png rename to app/assets/fresh-bolt2.png diff --git a/web/app/assets/index-dev.html b/app/assets/index-dev.html similarity index 100% rename from web/app/assets/index-dev.html rename to app/assets/index-dev.html diff --git a/web/app/assets/index-electron.html b/app/assets/index-electron.html similarity index 100% rename from web/app/assets/index-electron.html rename to app/assets/index-electron.html diff --git a/web/app/assets/index.html b/app/assets/index.html similarity index 100% rename from web/app/assets/index.html rename to app/assets/index.html diff --git a/web/app/assets/intl-data/en.json b/app/assets/intl-data/en.json similarity index 100% rename from web/app/assets/intl-data/en.json rename to app/assets/intl-data/en.json diff --git a/web/app/assets/language-dropdown/FR.png b/app/assets/language-dropdown/FR.png similarity index 100% rename from web/app/assets/language-dropdown/FR.png rename to app/assets/language-dropdown/FR.png diff --git a/web/app/assets/language-dropdown/US.png b/app/assets/language-dropdown/US.png similarity index 100% rename from web/app/assets/language-dropdown/US.png rename to app/assets/language-dropdown/US.png diff --git a/web/app/assets/language-dropdown/flagConstants.js b/app/assets/language-dropdown/flagConstants.js similarity index 100% rename from web/app/assets/language-dropdown/flagConstants.js rename to app/assets/language-dropdown/flagConstants.js diff --git a/web/app/assets/language-dropdown/flags.js b/app/assets/language-dropdown/flags.js similarity index 100% rename from web/app/assets/language-dropdown/flags.js rename to app/assets/language-dropdown/flags.js diff --git a/web/app/assets/language-dropdown/img/AD.png b/app/assets/language-dropdown/img/AD.png similarity index 100% rename from web/app/assets/language-dropdown/img/AD.png rename to app/assets/language-dropdown/img/AD.png diff --git a/web/app/assets/language-dropdown/img/AE.png b/app/assets/language-dropdown/img/AE.png similarity index 100% rename from web/app/assets/language-dropdown/img/AE.png rename to app/assets/language-dropdown/img/AE.png diff --git a/web/app/assets/language-dropdown/img/AF.png b/app/assets/language-dropdown/img/AF.png similarity index 100% rename from web/app/assets/language-dropdown/img/AF.png rename to app/assets/language-dropdown/img/AF.png diff --git a/web/app/assets/language-dropdown/img/AG.png b/app/assets/language-dropdown/img/AG.png similarity index 100% rename from web/app/assets/language-dropdown/img/AG.png rename to app/assets/language-dropdown/img/AG.png diff --git a/web/app/assets/language-dropdown/img/AI.png b/app/assets/language-dropdown/img/AI.png similarity index 100% rename from web/app/assets/language-dropdown/img/AI.png rename to app/assets/language-dropdown/img/AI.png diff --git a/web/app/assets/language-dropdown/img/AL.png b/app/assets/language-dropdown/img/AL.png similarity index 100% rename from web/app/assets/language-dropdown/img/AL.png rename to app/assets/language-dropdown/img/AL.png diff --git a/web/app/assets/language-dropdown/img/AM.png b/app/assets/language-dropdown/img/AM.png similarity index 100% rename from web/app/assets/language-dropdown/img/AM.png rename to app/assets/language-dropdown/img/AM.png diff --git a/web/app/assets/language-dropdown/img/AN.png b/app/assets/language-dropdown/img/AN.png similarity index 100% rename from web/app/assets/language-dropdown/img/AN.png rename to app/assets/language-dropdown/img/AN.png diff --git a/web/app/assets/language-dropdown/img/AO.png b/app/assets/language-dropdown/img/AO.png similarity index 100% rename from web/app/assets/language-dropdown/img/AO.png rename to app/assets/language-dropdown/img/AO.png diff --git a/web/app/assets/language-dropdown/img/AQ.png b/app/assets/language-dropdown/img/AQ.png similarity index 100% rename from web/app/assets/language-dropdown/img/AQ.png rename to app/assets/language-dropdown/img/AQ.png diff --git a/web/app/assets/language-dropdown/img/AR.png b/app/assets/language-dropdown/img/AR.png similarity index 100% rename from web/app/assets/language-dropdown/img/AR.png rename to app/assets/language-dropdown/img/AR.png diff --git a/web/app/assets/language-dropdown/img/AS.png b/app/assets/language-dropdown/img/AS.png similarity index 100% rename from web/app/assets/language-dropdown/img/AS.png rename to app/assets/language-dropdown/img/AS.png diff --git a/web/app/assets/language-dropdown/img/AT.png b/app/assets/language-dropdown/img/AT.png similarity index 100% rename from web/app/assets/language-dropdown/img/AT.png rename to app/assets/language-dropdown/img/AT.png diff --git a/web/app/assets/language-dropdown/img/AU.png b/app/assets/language-dropdown/img/AU.png similarity index 100% rename from web/app/assets/language-dropdown/img/AU.png rename to app/assets/language-dropdown/img/AU.png diff --git a/web/app/assets/language-dropdown/img/AW.png b/app/assets/language-dropdown/img/AW.png similarity index 100% rename from web/app/assets/language-dropdown/img/AW.png rename to app/assets/language-dropdown/img/AW.png diff --git a/web/app/assets/language-dropdown/img/AX.png b/app/assets/language-dropdown/img/AX.png similarity index 100% rename from web/app/assets/language-dropdown/img/AX.png rename to app/assets/language-dropdown/img/AX.png diff --git a/web/app/assets/language-dropdown/img/AZ.png b/app/assets/language-dropdown/img/AZ.png similarity index 100% rename from web/app/assets/language-dropdown/img/AZ.png rename to app/assets/language-dropdown/img/AZ.png diff --git a/web/app/assets/language-dropdown/img/BA.png b/app/assets/language-dropdown/img/BA.png similarity index 100% rename from web/app/assets/language-dropdown/img/BA.png rename to app/assets/language-dropdown/img/BA.png diff --git a/web/app/assets/language-dropdown/img/BB.png b/app/assets/language-dropdown/img/BB.png similarity index 100% rename from web/app/assets/language-dropdown/img/BB.png rename to app/assets/language-dropdown/img/BB.png diff --git a/web/app/assets/language-dropdown/img/BD.png b/app/assets/language-dropdown/img/BD.png similarity index 100% rename from web/app/assets/language-dropdown/img/BD.png rename to app/assets/language-dropdown/img/BD.png diff --git a/web/app/assets/language-dropdown/img/BE.png b/app/assets/language-dropdown/img/BE.png similarity index 100% rename from web/app/assets/language-dropdown/img/BE.png rename to app/assets/language-dropdown/img/BE.png diff --git a/web/app/assets/language-dropdown/img/BF.png b/app/assets/language-dropdown/img/BF.png similarity index 100% rename from web/app/assets/language-dropdown/img/BF.png rename to app/assets/language-dropdown/img/BF.png diff --git a/web/app/assets/language-dropdown/img/BG.png b/app/assets/language-dropdown/img/BG.png similarity index 100% rename from web/app/assets/language-dropdown/img/BG.png rename to app/assets/language-dropdown/img/BG.png diff --git a/web/app/assets/language-dropdown/img/BH.png b/app/assets/language-dropdown/img/BH.png similarity index 100% rename from web/app/assets/language-dropdown/img/BH.png rename to app/assets/language-dropdown/img/BH.png diff --git a/web/app/assets/language-dropdown/img/BI.png b/app/assets/language-dropdown/img/BI.png similarity index 100% rename from web/app/assets/language-dropdown/img/BI.png rename to app/assets/language-dropdown/img/BI.png diff --git a/web/app/assets/language-dropdown/img/BJ.png b/app/assets/language-dropdown/img/BJ.png similarity index 100% rename from web/app/assets/language-dropdown/img/BJ.png rename to app/assets/language-dropdown/img/BJ.png diff --git a/web/app/assets/language-dropdown/img/BL.png b/app/assets/language-dropdown/img/BL.png similarity index 100% rename from web/app/assets/language-dropdown/img/BL.png rename to app/assets/language-dropdown/img/BL.png diff --git a/web/app/assets/language-dropdown/img/BM.png b/app/assets/language-dropdown/img/BM.png similarity index 100% rename from web/app/assets/language-dropdown/img/BM.png rename to app/assets/language-dropdown/img/BM.png diff --git a/web/app/assets/language-dropdown/img/BN.png b/app/assets/language-dropdown/img/BN.png similarity index 100% rename from web/app/assets/language-dropdown/img/BN.png rename to app/assets/language-dropdown/img/BN.png diff --git a/web/app/assets/language-dropdown/img/BO.png b/app/assets/language-dropdown/img/BO.png similarity index 100% rename from web/app/assets/language-dropdown/img/BO.png rename to app/assets/language-dropdown/img/BO.png diff --git a/web/app/assets/language-dropdown/img/BR.png b/app/assets/language-dropdown/img/BR.png similarity index 100% rename from web/app/assets/language-dropdown/img/BR.png rename to app/assets/language-dropdown/img/BR.png diff --git a/web/app/assets/language-dropdown/img/BS.png b/app/assets/language-dropdown/img/BS.png similarity index 100% rename from web/app/assets/language-dropdown/img/BS.png rename to app/assets/language-dropdown/img/BS.png diff --git a/web/app/assets/language-dropdown/img/BT.png b/app/assets/language-dropdown/img/BT.png similarity index 100% rename from web/app/assets/language-dropdown/img/BT.png rename to app/assets/language-dropdown/img/BT.png diff --git a/web/app/assets/language-dropdown/img/BW.png b/app/assets/language-dropdown/img/BW.png similarity index 100% rename from web/app/assets/language-dropdown/img/BW.png rename to app/assets/language-dropdown/img/BW.png diff --git a/web/app/assets/language-dropdown/img/BY.png b/app/assets/language-dropdown/img/BY.png similarity index 100% rename from web/app/assets/language-dropdown/img/BY.png rename to app/assets/language-dropdown/img/BY.png diff --git a/web/app/assets/language-dropdown/img/BZ.png b/app/assets/language-dropdown/img/BZ.png similarity index 100% rename from web/app/assets/language-dropdown/img/BZ.png rename to app/assets/language-dropdown/img/BZ.png diff --git a/web/app/assets/language-dropdown/img/CA.png b/app/assets/language-dropdown/img/CA.png similarity index 100% rename from web/app/assets/language-dropdown/img/CA.png rename to app/assets/language-dropdown/img/CA.png diff --git a/web/app/assets/language-dropdown/img/CC.png b/app/assets/language-dropdown/img/CC.png similarity index 100% rename from web/app/assets/language-dropdown/img/CC.png rename to app/assets/language-dropdown/img/CC.png diff --git a/web/app/assets/language-dropdown/img/CD.png b/app/assets/language-dropdown/img/CD.png similarity index 100% rename from web/app/assets/language-dropdown/img/CD.png rename to app/assets/language-dropdown/img/CD.png diff --git a/web/app/assets/language-dropdown/img/CF.png b/app/assets/language-dropdown/img/CF.png similarity index 100% rename from web/app/assets/language-dropdown/img/CF.png rename to app/assets/language-dropdown/img/CF.png diff --git a/web/app/assets/language-dropdown/img/CG.png b/app/assets/language-dropdown/img/CG.png similarity index 100% rename from web/app/assets/language-dropdown/img/CG.png rename to app/assets/language-dropdown/img/CG.png diff --git a/web/app/assets/language-dropdown/img/CH.png b/app/assets/language-dropdown/img/CH.png similarity index 100% rename from web/app/assets/language-dropdown/img/CH.png rename to app/assets/language-dropdown/img/CH.png diff --git a/web/app/assets/language-dropdown/img/CI.png b/app/assets/language-dropdown/img/CI.png similarity index 100% rename from web/app/assets/language-dropdown/img/CI.png rename to app/assets/language-dropdown/img/CI.png diff --git a/web/app/assets/language-dropdown/img/CK.png b/app/assets/language-dropdown/img/CK.png similarity index 100% rename from web/app/assets/language-dropdown/img/CK.png rename to app/assets/language-dropdown/img/CK.png diff --git a/web/app/assets/language-dropdown/img/CL.png b/app/assets/language-dropdown/img/CL.png similarity index 100% rename from web/app/assets/language-dropdown/img/CL.png rename to app/assets/language-dropdown/img/CL.png diff --git a/web/app/assets/language-dropdown/img/CM.png b/app/assets/language-dropdown/img/CM.png similarity index 100% rename from web/app/assets/language-dropdown/img/CM.png rename to app/assets/language-dropdown/img/CM.png diff --git a/web/app/assets/language-dropdown/img/CN.png b/app/assets/language-dropdown/img/CN.png similarity index 100% rename from web/app/assets/language-dropdown/img/CN.png rename to app/assets/language-dropdown/img/CN.png diff --git a/web/app/assets/language-dropdown/img/CO.png b/app/assets/language-dropdown/img/CO.png similarity index 100% rename from web/app/assets/language-dropdown/img/CO.png rename to app/assets/language-dropdown/img/CO.png diff --git a/web/app/assets/language-dropdown/img/CR.png b/app/assets/language-dropdown/img/CR.png similarity index 100% rename from web/app/assets/language-dropdown/img/CR.png rename to app/assets/language-dropdown/img/CR.png diff --git a/web/app/assets/language-dropdown/img/CU.png b/app/assets/language-dropdown/img/CU.png similarity index 100% rename from web/app/assets/language-dropdown/img/CU.png rename to app/assets/language-dropdown/img/CU.png diff --git a/web/app/assets/language-dropdown/img/CV.png b/app/assets/language-dropdown/img/CV.png similarity index 100% rename from web/app/assets/language-dropdown/img/CV.png rename to app/assets/language-dropdown/img/CV.png diff --git a/web/app/assets/language-dropdown/img/CW.png b/app/assets/language-dropdown/img/CW.png similarity index 100% rename from web/app/assets/language-dropdown/img/CW.png rename to app/assets/language-dropdown/img/CW.png diff --git a/web/app/assets/language-dropdown/img/CX.png b/app/assets/language-dropdown/img/CX.png similarity index 100% rename from web/app/assets/language-dropdown/img/CX.png rename to app/assets/language-dropdown/img/CX.png diff --git a/web/app/assets/language-dropdown/img/CY.png b/app/assets/language-dropdown/img/CY.png similarity index 100% rename from web/app/assets/language-dropdown/img/CY.png rename to app/assets/language-dropdown/img/CY.png diff --git a/web/app/assets/language-dropdown/img/CZ.png b/app/assets/language-dropdown/img/CZ.png similarity index 100% rename from web/app/assets/language-dropdown/img/CZ.png rename to app/assets/language-dropdown/img/CZ.png diff --git a/web/app/assets/language-dropdown/img/DE.png b/app/assets/language-dropdown/img/DE.png similarity index 100% rename from web/app/assets/language-dropdown/img/DE.png rename to app/assets/language-dropdown/img/DE.png diff --git a/web/app/assets/language-dropdown/img/DJ.png b/app/assets/language-dropdown/img/DJ.png similarity index 100% rename from web/app/assets/language-dropdown/img/DJ.png rename to app/assets/language-dropdown/img/DJ.png diff --git a/web/app/assets/language-dropdown/img/DK.png b/app/assets/language-dropdown/img/DK.png similarity index 100% rename from web/app/assets/language-dropdown/img/DK.png rename to app/assets/language-dropdown/img/DK.png diff --git a/web/app/assets/language-dropdown/img/DM.png b/app/assets/language-dropdown/img/DM.png similarity index 100% rename from web/app/assets/language-dropdown/img/DM.png rename to app/assets/language-dropdown/img/DM.png diff --git a/web/app/assets/language-dropdown/img/DO.png b/app/assets/language-dropdown/img/DO.png similarity index 100% rename from web/app/assets/language-dropdown/img/DO.png rename to app/assets/language-dropdown/img/DO.png diff --git a/web/app/assets/language-dropdown/img/DZ.png b/app/assets/language-dropdown/img/DZ.png similarity index 100% rename from web/app/assets/language-dropdown/img/DZ.png rename to app/assets/language-dropdown/img/DZ.png diff --git a/web/app/assets/language-dropdown/img/EC.png b/app/assets/language-dropdown/img/EC.png similarity index 100% rename from web/app/assets/language-dropdown/img/EC.png rename to app/assets/language-dropdown/img/EC.png diff --git a/web/app/assets/language-dropdown/img/EE.png b/app/assets/language-dropdown/img/EE.png similarity index 100% rename from web/app/assets/language-dropdown/img/EE.png rename to app/assets/language-dropdown/img/EE.png diff --git a/web/app/assets/language-dropdown/img/EG.png b/app/assets/language-dropdown/img/EG.png similarity index 100% rename from web/app/assets/language-dropdown/img/EG.png rename to app/assets/language-dropdown/img/EG.png diff --git a/web/app/assets/language-dropdown/img/EH.png b/app/assets/language-dropdown/img/EH.png similarity index 100% rename from web/app/assets/language-dropdown/img/EH.png rename to app/assets/language-dropdown/img/EH.png diff --git a/web/app/assets/language-dropdown/img/ER.png b/app/assets/language-dropdown/img/ER.png similarity index 100% rename from web/app/assets/language-dropdown/img/ER.png rename to app/assets/language-dropdown/img/ER.png diff --git a/web/app/assets/language-dropdown/img/ES.png b/app/assets/language-dropdown/img/ES.png similarity index 100% rename from web/app/assets/language-dropdown/img/ES.png rename to app/assets/language-dropdown/img/ES.png diff --git a/web/app/assets/language-dropdown/img/ET.png b/app/assets/language-dropdown/img/ET.png similarity index 100% rename from web/app/assets/language-dropdown/img/ET.png rename to app/assets/language-dropdown/img/ET.png diff --git a/web/app/assets/language-dropdown/img/EU.png b/app/assets/language-dropdown/img/EU.png similarity index 100% rename from web/app/assets/language-dropdown/img/EU.png rename to app/assets/language-dropdown/img/EU.png diff --git a/web/app/assets/language-dropdown/img/FI.png b/app/assets/language-dropdown/img/FI.png similarity index 100% rename from web/app/assets/language-dropdown/img/FI.png rename to app/assets/language-dropdown/img/FI.png diff --git a/web/app/assets/language-dropdown/img/FJ.png b/app/assets/language-dropdown/img/FJ.png similarity index 100% rename from web/app/assets/language-dropdown/img/FJ.png rename to app/assets/language-dropdown/img/FJ.png diff --git a/web/app/assets/language-dropdown/img/FK.png b/app/assets/language-dropdown/img/FK.png similarity index 100% rename from web/app/assets/language-dropdown/img/FK.png rename to app/assets/language-dropdown/img/FK.png diff --git a/web/app/assets/language-dropdown/img/FM.png b/app/assets/language-dropdown/img/FM.png similarity index 100% rename from web/app/assets/language-dropdown/img/FM.png rename to app/assets/language-dropdown/img/FM.png diff --git a/web/app/assets/language-dropdown/img/FO.png b/app/assets/language-dropdown/img/FO.png similarity index 100% rename from web/app/assets/language-dropdown/img/FO.png rename to app/assets/language-dropdown/img/FO.png diff --git a/web/app/assets/language-dropdown/img/FR.png b/app/assets/language-dropdown/img/FR.png similarity index 100% rename from web/app/assets/language-dropdown/img/FR.png rename to app/assets/language-dropdown/img/FR.png diff --git a/web/app/assets/language-dropdown/img/GA.png b/app/assets/language-dropdown/img/GA.png similarity index 100% rename from web/app/assets/language-dropdown/img/GA.png rename to app/assets/language-dropdown/img/GA.png diff --git a/web/app/assets/language-dropdown/img/GB.png b/app/assets/language-dropdown/img/GB.png similarity index 100% rename from web/app/assets/language-dropdown/img/GB.png rename to app/assets/language-dropdown/img/GB.png diff --git a/web/app/assets/language-dropdown/img/GD.png b/app/assets/language-dropdown/img/GD.png similarity index 100% rename from web/app/assets/language-dropdown/img/GD.png rename to app/assets/language-dropdown/img/GD.png diff --git a/web/app/assets/language-dropdown/img/GE.png b/app/assets/language-dropdown/img/GE.png similarity index 100% rename from web/app/assets/language-dropdown/img/GE.png rename to app/assets/language-dropdown/img/GE.png diff --git a/web/app/assets/language-dropdown/img/GG.png b/app/assets/language-dropdown/img/GG.png similarity index 100% rename from web/app/assets/language-dropdown/img/GG.png rename to app/assets/language-dropdown/img/GG.png diff --git a/web/app/assets/language-dropdown/img/GH.png b/app/assets/language-dropdown/img/GH.png similarity index 100% rename from web/app/assets/language-dropdown/img/GH.png rename to app/assets/language-dropdown/img/GH.png diff --git a/web/app/assets/language-dropdown/img/GI.png b/app/assets/language-dropdown/img/GI.png similarity index 100% rename from web/app/assets/language-dropdown/img/GI.png rename to app/assets/language-dropdown/img/GI.png diff --git a/web/app/assets/language-dropdown/img/GL.png b/app/assets/language-dropdown/img/GL.png similarity index 100% rename from web/app/assets/language-dropdown/img/GL.png rename to app/assets/language-dropdown/img/GL.png diff --git a/web/app/assets/language-dropdown/img/GM.png b/app/assets/language-dropdown/img/GM.png similarity index 100% rename from web/app/assets/language-dropdown/img/GM.png rename to app/assets/language-dropdown/img/GM.png diff --git a/web/app/assets/language-dropdown/img/GN.png b/app/assets/language-dropdown/img/GN.png similarity index 100% rename from web/app/assets/language-dropdown/img/GN.png rename to app/assets/language-dropdown/img/GN.png diff --git a/web/app/assets/language-dropdown/img/GQ.png b/app/assets/language-dropdown/img/GQ.png similarity index 100% rename from web/app/assets/language-dropdown/img/GQ.png rename to app/assets/language-dropdown/img/GQ.png diff --git a/web/app/assets/language-dropdown/img/GR.png b/app/assets/language-dropdown/img/GR.png similarity index 100% rename from web/app/assets/language-dropdown/img/GR.png rename to app/assets/language-dropdown/img/GR.png diff --git a/web/app/assets/language-dropdown/img/GS.png b/app/assets/language-dropdown/img/GS.png similarity index 100% rename from web/app/assets/language-dropdown/img/GS.png rename to app/assets/language-dropdown/img/GS.png diff --git a/web/app/assets/language-dropdown/img/GT.png b/app/assets/language-dropdown/img/GT.png similarity index 100% rename from web/app/assets/language-dropdown/img/GT.png rename to app/assets/language-dropdown/img/GT.png diff --git a/web/app/assets/language-dropdown/img/GU.png b/app/assets/language-dropdown/img/GU.png similarity index 100% rename from web/app/assets/language-dropdown/img/GU.png rename to app/assets/language-dropdown/img/GU.png diff --git a/web/app/assets/language-dropdown/img/GW.png b/app/assets/language-dropdown/img/GW.png similarity index 100% rename from web/app/assets/language-dropdown/img/GW.png rename to app/assets/language-dropdown/img/GW.png diff --git a/web/app/assets/language-dropdown/img/GY.png b/app/assets/language-dropdown/img/GY.png similarity index 100% rename from web/app/assets/language-dropdown/img/GY.png rename to app/assets/language-dropdown/img/GY.png diff --git a/web/app/assets/language-dropdown/img/HK.png b/app/assets/language-dropdown/img/HK.png similarity index 100% rename from web/app/assets/language-dropdown/img/HK.png rename to app/assets/language-dropdown/img/HK.png diff --git a/web/app/assets/language-dropdown/img/HN.png b/app/assets/language-dropdown/img/HN.png similarity index 100% rename from web/app/assets/language-dropdown/img/HN.png rename to app/assets/language-dropdown/img/HN.png diff --git a/web/app/assets/language-dropdown/img/HR.png b/app/assets/language-dropdown/img/HR.png similarity index 100% rename from web/app/assets/language-dropdown/img/HR.png rename to app/assets/language-dropdown/img/HR.png diff --git a/web/app/assets/language-dropdown/img/HT.png b/app/assets/language-dropdown/img/HT.png similarity index 100% rename from web/app/assets/language-dropdown/img/HT.png rename to app/assets/language-dropdown/img/HT.png diff --git a/web/app/assets/language-dropdown/img/HU.png b/app/assets/language-dropdown/img/HU.png similarity index 100% rename from web/app/assets/language-dropdown/img/HU.png rename to app/assets/language-dropdown/img/HU.png diff --git a/web/app/assets/language-dropdown/img/IC.png b/app/assets/language-dropdown/img/IC.png similarity index 100% rename from web/app/assets/language-dropdown/img/IC.png rename to app/assets/language-dropdown/img/IC.png diff --git a/web/app/assets/language-dropdown/img/ID.png b/app/assets/language-dropdown/img/ID.png similarity index 100% rename from web/app/assets/language-dropdown/img/ID.png rename to app/assets/language-dropdown/img/ID.png diff --git a/web/app/assets/language-dropdown/img/IE.png b/app/assets/language-dropdown/img/IE.png similarity index 100% rename from web/app/assets/language-dropdown/img/IE.png rename to app/assets/language-dropdown/img/IE.png diff --git a/web/app/assets/language-dropdown/img/IL.png b/app/assets/language-dropdown/img/IL.png similarity index 100% rename from web/app/assets/language-dropdown/img/IL.png rename to app/assets/language-dropdown/img/IL.png diff --git a/web/app/assets/language-dropdown/img/IM.png b/app/assets/language-dropdown/img/IM.png similarity index 100% rename from web/app/assets/language-dropdown/img/IM.png rename to app/assets/language-dropdown/img/IM.png diff --git a/web/app/assets/language-dropdown/img/IN.png b/app/assets/language-dropdown/img/IN.png similarity index 100% rename from web/app/assets/language-dropdown/img/IN.png rename to app/assets/language-dropdown/img/IN.png diff --git a/web/app/assets/language-dropdown/img/IQ.png b/app/assets/language-dropdown/img/IQ.png similarity index 100% rename from web/app/assets/language-dropdown/img/IQ.png rename to app/assets/language-dropdown/img/IQ.png diff --git a/web/app/assets/language-dropdown/img/IR.png b/app/assets/language-dropdown/img/IR.png similarity index 100% rename from web/app/assets/language-dropdown/img/IR.png rename to app/assets/language-dropdown/img/IR.png diff --git a/web/app/assets/language-dropdown/img/IS.png b/app/assets/language-dropdown/img/IS.png similarity index 100% rename from web/app/assets/language-dropdown/img/IS.png rename to app/assets/language-dropdown/img/IS.png diff --git a/web/app/assets/language-dropdown/img/IT.png b/app/assets/language-dropdown/img/IT.png similarity index 100% rename from web/app/assets/language-dropdown/img/IT.png rename to app/assets/language-dropdown/img/IT.png diff --git a/web/app/assets/language-dropdown/img/JE.png b/app/assets/language-dropdown/img/JE.png similarity index 100% rename from web/app/assets/language-dropdown/img/JE.png rename to app/assets/language-dropdown/img/JE.png diff --git a/web/app/assets/language-dropdown/img/JM.png b/app/assets/language-dropdown/img/JM.png similarity index 100% rename from web/app/assets/language-dropdown/img/JM.png rename to app/assets/language-dropdown/img/JM.png diff --git a/web/app/assets/language-dropdown/img/JO.png b/app/assets/language-dropdown/img/JO.png similarity index 100% rename from web/app/assets/language-dropdown/img/JO.png rename to app/assets/language-dropdown/img/JO.png diff --git a/web/app/assets/language-dropdown/img/JP.png b/app/assets/language-dropdown/img/JP.png similarity index 100% rename from web/app/assets/language-dropdown/img/JP.png rename to app/assets/language-dropdown/img/JP.png diff --git a/web/app/assets/language-dropdown/img/KE.png b/app/assets/language-dropdown/img/KE.png similarity index 100% rename from web/app/assets/language-dropdown/img/KE.png rename to app/assets/language-dropdown/img/KE.png diff --git a/web/app/assets/language-dropdown/img/KG.png b/app/assets/language-dropdown/img/KG.png similarity index 100% rename from web/app/assets/language-dropdown/img/KG.png rename to app/assets/language-dropdown/img/KG.png diff --git a/web/app/assets/language-dropdown/img/KH.png b/app/assets/language-dropdown/img/KH.png similarity index 100% rename from web/app/assets/language-dropdown/img/KH.png rename to app/assets/language-dropdown/img/KH.png diff --git a/web/app/assets/language-dropdown/img/KI.png b/app/assets/language-dropdown/img/KI.png similarity index 100% rename from web/app/assets/language-dropdown/img/KI.png rename to app/assets/language-dropdown/img/KI.png diff --git a/web/app/assets/language-dropdown/img/KM.png b/app/assets/language-dropdown/img/KM.png similarity index 100% rename from web/app/assets/language-dropdown/img/KM.png rename to app/assets/language-dropdown/img/KM.png diff --git a/web/app/assets/language-dropdown/img/KN.png b/app/assets/language-dropdown/img/KN.png similarity index 100% rename from web/app/assets/language-dropdown/img/KN.png rename to app/assets/language-dropdown/img/KN.png diff --git a/web/app/assets/language-dropdown/img/KP.png b/app/assets/language-dropdown/img/KP.png similarity index 100% rename from web/app/assets/language-dropdown/img/KP.png rename to app/assets/language-dropdown/img/KP.png diff --git a/web/app/assets/language-dropdown/img/KR.png b/app/assets/language-dropdown/img/KR.png similarity index 100% rename from web/app/assets/language-dropdown/img/KR.png rename to app/assets/language-dropdown/img/KR.png diff --git a/web/app/assets/language-dropdown/img/KW.png b/app/assets/language-dropdown/img/KW.png similarity index 100% rename from web/app/assets/language-dropdown/img/KW.png rename to app/assets/language-dropdown/img/KW.png diff --git a/web/app/assets/language-dropdown/img/KY.png b/app/assets/language-dropdown/img/KY.png similarity index 100% rename from web/app/assets/language-dropdown/img/KY.png rename to app/assets/language-dropdown/img/KY.png diff --git a/web/app/assets/language-dropdown/img/KZ.png b/app/assets/language-dropdown/img/KZ.png similarity index 100% rename from web/app/assets/language-dropdown/img/KZ.png rename to app/assets/language-dropdown/img/KZ.png diff --git a/web/app/assets/language-dropdown/img/LA.png b/app/assets/language-dropdown/img/LA.png similarity index 100% rename from web/app/assets/language-dropdown/img/LA.png rename to app/assets/language-dropdown/img/LA.png diff --git a/web/app/assets/language-dropdown/img/LB.png b/app/assets/language-dropdown/img/LB.png similarity index 100% rename from web/app/assets/language-dropdown/img/LB.png rename to app/assets/language-dropdown/img/LB.png diff --git a/web/app/assets/language-dropdown/img/LC.png b/app/assets/language-dropdown/img/LC.png similarity index 100% rename from web/app/assets/language-dropdown/img/LC.png rename to app/assets/language-dropdown/img/LC.png diff --git a/web/app/assets/language-dropdown/img/LI.png b/app/assets/language-dropdown/img/LI.png similarity index 100% rename from web/app/assets/language-dropdown/img/LI.png rename to app/assets/language-dropdown/img/LI.png diff --git a/web/app/assets/language-dropdown/img/LK.png b/app/assets/language-dropdown/img/LK.png similarity index 100% rename from web/app/assets/language-dropdown/img/LK.png rename to app/assets/language-dropdown/img/LK.png diff --git a/web/app/assets/language-dropdown/img/LR.png b/app/assets/language-dropdown/img/LR.png similarity index 100% rename from web/app/assets/language-dropdown/img/LR.png rename to app/assets/language-dropdown/img/LR.png diff --git a/web/app/assets/language-dropdown/img/LS.png b/app/assets/language-dropdown/img/LS.png similarity index 100% rename from web/app/assets/language-dropdown/img/LS.png rename to app/assets/language-dropdown/img/LS.png diff --git a/web/app/assets/language-dropdown/img/LT.png b/app/assets/language-dropdown/img/LT.png similarity index 100% rename from web/app/assets/language-dropdown/img/LT.png rename to app/assets/language-dropdown/img/LT.png diff --git a/web/app/assets/language-dropdown/img/LU.png b/app/assets/language-dropdown/img/LU.png similarity index 100% rename from web/app/assets/language-dropdown/img/LU.png rename to app/assets/language-dropdown/img/LU.png diff --git a/web/app/assets/language-dropdown/img/LV.png b/app/assets/language-dropdown/img/LV.png similarity index 100% rename from web/app/assets/language-dropdown/img/LV.png rename to app/assets/language-dropdown/img/LV.png diff --git a/web/app/assets/language-dropdown/img/LY.png b/app/assets/language-dropdown/img/LY.png similarity index 100% rename from web/app/assets/language-dropdown/img/LY.png rename to app/assets/language-dropdown/img/LY.png diff --git a/web/app/assets/language-dropdown/img/MA.png b/app/assets/language-dropdown/img/MA.png similarity index 100% rename from web/app/assets/language-dropdown/img/MA.png rename to app/assets/language-dropdown/img/MA.png diff --git a/web/app/assets/language-dropdown/img/MC.png b/app/assets/language-dropdown/img/MC.png similarity index 100% rename from web/app/assets/language-dropdown/img/MC.png rename to app/assets/language-dropdown/img/MC.png diff --git a/web/app/assets/language-dropdown/img/MD.png b/app/assets/language-dropdown/img/MD.png similarity index 100% rename from web/app/assets/language-dropdown/img/MD.png rename to app/assets/language-dropdown/img/MD.png diff --git a/web/app/assets/language-dropdown/img/ME.png b/app/assets/language-dropdown/img/ME.png similarity index 100% rename from web/app/assets/language-dropdown/img/ME.png rename to app/assets/language-dropdown/img/ME.png diff --git a/web/app/assets/language-dropdown/img/MF.png b/app/assets/language-dropdown/img/MF.png similarity index 100% rename from web/app/assets/language-dropdown/img/MF.png rename to app/assets/language-dropdown/img/MF.png diff --git a/web/app/assets/language-dropdown/img/MG.png b/app/assets/language-dropdown/img/MG.png similarity index 100% rename from web/app/assets/language-dropdown/img/MG.png rename to app/assets/language-dropdown/img/MG.png diff --git a/web/app/assets/language-dropdown/img/MH.png b/app/assets/language-dropdown/img/MH.png similarity index 100% rename from web/app/assets/language-dropdown/img/MH.png rename to app/assets/language-dropdown/img/MH.png diff --git a/web/app/assets/language-dropdown/img/MK.png b/app/assets/language-dropdown/img/MK.png similarity index 100% rename from web/app/assets/language-dropdown/img/MK.png rename to app/assets/language-dropdown/img/MK.png diff --git a/web/app/assets/language-dropdown/img/ML.png b/app/assets/language-dropdown/img/ML.png similarity index 100% rename from web/app/assets/language-dropdown/img/ML.png rename to app/assets/language-dropdown/img/ML.png diff --git a/web/app/assets/language-dropdown/img/MM.png b/app/assets/language-dropdown/img/MM.png similarity index 100% rename from web/app/assets/language-dropdown/img/MM.png rename to app/assets/language-dropdown/img/MM.png diff --git a/web/app/assets/language-dropdown/img/MN.png b/app/assets/language-dropdown/img/MN.png similarity index 100% rename from web/app/assets/language-dropdown/img/MN.png rename to app/assets/language-dropdown/img/MN.png diff --git a/web/app/assets/language-dropdown/img/MO.png b/app/assets/language-dropdown/img/MO.png similarity index 100% rename from web/app/assets/language-dropdown/img/MO.png rename to app/assets/language-dropdown/img/MO.png diff --git a/web/app/assets/language-dropdown/img/MP.png b/app/assets/language-dropdown/img/MP.png similarity index 100% rename from web/app/assets/language-dropdown/img/MP.png rename to app/assets/language-dropdown/img/MP.png diff --git a/web/app/assets/language-dropdown/img/MQ.png b/app/assets/language-dropdown/img/MQ.png similarity index 100% rename from web/app/assets/language-dropdown/img/MQ.png rename to app/assets/language-dropdown/img/MQ.png diff --git a/web/app/assets/language-dropdown/img/MR.png b/app/assets/language-dropdown/img/MR.png similarity index 100% rename from web/app/assets/language-dropdown/img/MR.png rename to app/assets/language-dropdown/img/MR.png diff --git a/web/app/assets/language-dropdown/img/MS.png b/app/assets/language-dropdown/img/MS.png similarity index 100% rename from web/app/assets/language-dropdown/img/MS.png rename to app/assets/language-dropdown/img/MS.png diff --git a/web/app/assets/language-dropdown/img/MT.png b/app/assets/language-dropdown/img/MT.png similarity index 100% rename from web/app/assets/language-dropdown/img/MT.png rename to app/assets/language-dropdown/img/MT.png diff --git a/web/app/assets/language-dropdown/img/MU.png b/app/assets/language-dropdown/img/MU.png similarity index 100% rename from web/app/assets/language-dropdown/img/MU.png rename to app/assets/language-dropdown/img/MU.png diff --git a/web/app/assets/language-dropdown/img/MV.png b/app/assets/language-dropdown/img/MV.png similarity index 100% rename from web/app/assets/language-dropdown/img/MV.png rename to app/assets/language-dropdown/img/MV.png diff --git a/web/app/assets/language-dropdown/img/MW.png b/app/assets/language-dropdown/img/MW.png similarity index 100% rename from web/app/assets/language-dropdown/img/MW.png rename to app/assets/language-dropdown/img/MW.png diff --git a/web/app/assets/language-dropdown/img/MX.png b/app/assets/language-dropdown/img/MX.png similarity index 100% rename from web/app/assets/language-dropdown/img/MX.png rename to app/assets/language-dropdown/img/MX.png diff --git a/web/app/assets/language-dropdown/img/MY.png b/app/assets/language-dropdown/img/MY.png similarity index 100% rename from web/app/assets/language-dropdown/img/MY.png rename to app/assets/language-dropdown/img/MY.png diff --git a/web/app/assets/language-dropdown/img/MZ.png b/app/assets/language-dropdown/img/MZ.png similarity index 100% rename from web/app/assets/language-dropdown/img/MZ.png rename to app/assets/language-dropdown/img/MZ.png diff --git a/web/app/assets/language-dropdown/img/NA.png b/app/assets/language-dropdown/img/NA.png similarity index 100% rename from web/app/assets/language-dropdown/img/NA.png rename to app/assets/language-dropdown/img/NA.png diff --git a/web/app/assets/language-dropdown/img/NC.png b/app/assets/language-dropdown/img/NC.png similarity index 100% rename from web/app/assets/language-dropdown/img/NC.png rename to app/assets/language-dropdown/img/NC.png diff --git a/web/app/assets/language-dropdown/img/NE.png b/app/assets/language-dropdown/img/NE.png similarity index 100% rename from web/app/assets/language-dropdown/img/NE.png rename to app/assets/language-dropdown/img/NE.png diff --git a/web/app/assets/language-dropdown/img/NF.png b/app/assets/language-dropdown/img/NF.png similarity index 100% rename from web/app/assets/language-dropdown/img/NF.png rename to app/assets/language-dropdown/img/NF.png diff --git a/web/app/assets/language-dropdown/img/NG.png b/app/assets/language-dropdown/img/NG.png similarity index 100% rename from web/app/assets/language-dropdown/img/NG.png rename to app/assets/language-dropdown/img/NG.png diff --git a/web/app/assets/language-dropdown/img/NI.png b/app/assets/language-dropdown/img/NI.png similarity index 100% rename from web/app/assets/language-dropdown/img/NI.png rename to app/assets/language-dropdown/img/NI.png diff --git a/web/app/assets/language-dropdown/img/NL.png b/app/assets/language-dropdown/img/NL.png similarity index 100% rename from web/app/assets/language-dropdown/img/NL.png rename to app/assets/language-dropdown/img/NL.png diff --git a/web/app/assets/language-dropdown/img/NO.png b/app/assets/language-dropdown/img/NO.png similarity index 100% rename from web/app/assets/language-dropdown/img/NO.png rename to app/assets/language-dropdown/img/NO.png diff --git a/web/app/assets/language-dropdown/img/NP.png b/app/assets/language-dropdown/img/NP.png similarity index 100% rename from web/app/assets/language-dropdown/img/NP.png rename to app/assets/language-dropdown/img/NP.png diff --git a/web/app/assets/language-dropdown/img/NR.png b/app/assets/language-dropdown/img/NR.png similarity index 100% rename from web/app/assets/language-dropdown/img/NR.png rename to app/assets/language-dropdown/img/NR.png diff --git a/web/app/assets/language-dropdown/img/NU.png b/app/assets/language-dropdown/img/NU.png similarity index 100% rename from web/app/assets/language-dropdown/img/NU.png rename to app/assets/language-dropdown/img/NU.png diff --git a/web/app/assets/language-dropdown/img/NZ.png b/app/assets/language-dropdown/img/NZ.png similarity index 100% rename from web/app/assets/language-dropdown/img/NZ.png rename to app/assets/language-dropdown/img/NZ.png diff --git a/web/app/assets/language-dropdown/img/OM.png b/app/assets/language-dropdown/img/OM.png similarity index 100% rename from web/app/assets/language-dropdown/img/OM.png rename to app/assets/language-dropdown/img/OM.png diff --git a/web/app/assets/language-dropdown/img/PA.png b/app/assets/language-dropdown/img/PA.png similarity index 100% rename from web/app/assets/language-dropdown/img/PA.png rename to app/assets/language-dropdown/img/PA.png diff --git a/web/app/assets/language-dropdown/img/PE.png b/app/assets/language-dropdown/img/PE.png similarity index 100% rename from web/app/assets/language-dropdown/img/PE.png rename to app/assets/language-dropdown/img/PE.png diff --git a/web/app/assets/language-dropdown/img/PF.png b/app/assets/language-dropdown/img/PF.png similarity index 100% rename from web/app/assets/language-dropdown/img/PF.png rename to app/assets/language-dropdown/img/PF.png diff --git a/web/app/assets/language-dropdown/img/PG.png b/app/assets/language-dropdown/img/PG.png similarity index 100% rename from web/app/assets/language-dropdown/img/PG.png rename to app/assets/language-dropdown/img/PG.png diff --git a/web/app/assets/language-dropdown/img/PH.png b/app/assets/language-dropdown/img/PH.png similarity index 100% rename from web/app/assets/language-dropdown/img/PH.png rename to app/assets/language-dropdown/img/PH.png diff --git a/web/app/assets/language-dropdown/img/PK.png b/app/assets/language-dropdown/img/PK.png similarity index 100% rename from web/app/assets/language-dropdown/img/PK.png rename to app/assets/language-dropdown/img/PK.png diff --git a/web/app/assets/language-dropdown/img/PL.png b/app/assets/language-dropdown/img/PL.png similarity index 100% rename from web/app/assets/language-dropdown/img/PL.png rename to app/assets/language-dropdown/img/PL.png diff --git a/web/app/assets/language-dropdown/img/PN.png b/app/assets/language-dropdown/img/PN.png similarity index 100% rename from web/app/assets/language-dropdown/img/PN.png rename to app/assets/language-dropdown/img/PN.png diff --git a/web/app/assets/language-dropdown/img/PR.png b/app/assets/language-dropdown/img/PR.png similarity index 100% rename from web/app/assets/language-dropdown/img/PR.png rename to app/assets/language-dropdown/img/PR.png diff --git a/web/app/assets/language-dropdown/img/PS.png b/app/assets/language-dropdown/img/PS.png similarity index 100% rename from web/app/assets/language-dropdown/img/PS.png rename to app/assets/language-dropdown/img/PS.png diff --git a/web/app/assets/language-dropdown/img/PT.png b/app/assets/language-dropdown/img/PT.png similarity index 100% rename from web/app/assets/language-dropdown/img/PT.png rename to app/assets/language-dropdown/img/PT.png diff --git a/web/app/assets/language-dropdown/img/PW.png b/app/assets/language-dropdown/img/PW.png similarity index 100% rename from web/app/assets/language-dropdown/img/PW.png rename to app/assets/language-dropdown/img/PW.png diff --git a/web/app/assets/language-dropdown/img/PY.png b/app/assets/language-dropdown/img/PY.png similarity index 100% rename from web/app/assets/language-dropdown/img/PY.png rename to app/assets/language-dropdown/img/PY.png diff --git a/web/app/assets/language-dropdown/img/QA.png b/app/assets/language-dropdown/img/QA.png similarity index 100% rename from web/app/assets/language-dropdown/img/QA.png rename to app/assets/language-dropdown/img/QA.png diff --git a/web/app/assets/language-dropdown/img/RO.png b/app/assets/language-dropdown/img/RO.png similarity index 100% rename from web/app/assets/language-dropdown/img/RO.png rename to app/assets/language-dropdown/img/RO.png diff --git a/web/app/assets/language-dropdown/img/RS.png b/app/assets/language-dropdown/img/RS.png similarity index 100% rename from web/app/assets/language-dropdown/img/RS.png rename to app/assets/language-dropdown/img/RS.png diff --git a/web/app/assets/language-dropdown/img/RU.png b/app/assets/language-dropdown/img/RU.png similarity index 100% rename from web/app/assets/language-dropdown/img/RU.png rename to app/assets/language-dropdown/img/RU.png diff --git a/web/app/assets/language-dropdown/img/RW.png b/app/assets/language-dropdown/img/RW.png similarity index 100% rename from web/app/assets/language-dropdown/img/RW.png rename to app/assets/language-dropdown/img/RW.png diff --git a/web/app/assets/language-dropdown/img/SA.png b/app/assets/language-dropdown/img/SA.png similarity index 100% rename from web/app/assets/language-dropdown/img/SA.png rename to app/assets/language-dropdown/img/SA.png diff --git a/web/app/assets/language-dropdown/img/SB.png b/app/assets/language-dropdown/img/SB.png similarity index 100% rename from web/app/assets/language-dropdown/img/SB.png rename to app/assets/language-dropdown/img/SB.png diff --git a/web/app/assets/language-dropdown/img/SC.png b/app/assets/language-dropdown/img/SC.png similarity index 100% rename from web/app/assets/language-dropdown/img/SC.png rename to app/assets/language-dropdown/img/SC.png diff --git a/web/app/assets/language-dropdown/img/SD.png b/app/assets/language-dropdown/img/SD.png similarity index 100% rename from web/app/assets/language-dropdown/img/SD.png rename to app/assets/language-dropdown/img/SD.png diff --git a/web/app/assets/language-dropdown/img/SE.png b/app/assets/language-dropdown/img/SE.png similarity index 100% rename from web/app/assets/language-dropdown/img/SE.png rename to app/assets/language-dropdown/img/SE.png diff --git a/web/app/assets/language-dropdown/img/SG.png b/app/assets/language-dropdown/img/SG.png similarity index 100% rename from web/app/assets/language-dropdown/img/SG.png rename to app/assets/language-dropdown/img/SG.png diff --git a/web/app/assets/language-dropdown/img/SH.png b/app/assets/language-dropdown/img/SH.png similarity index 100% rename from web/app/assets/language-dropdown/img/SH.png rename to app/assets/language-dropdown/img/SH.png diff --git a/web/app/assets/language-dropdown/img/SI.png b/app/assets/language-dropdown/img/SI.png similarity index 100% rename from web/app/assets/language-dropdown/img/SI.png rename to app/assets/language-dropdown/img/SI.png diff --git a/web/app/assets/language-dropdown/img/SK.png b/app/assets/language-dropdown/img/SK.png similarity index 100% rename from web/app/assets/language-dropdown/img/SK.png rename to app/assets/language-dropdown/img/SK.png diff --git a/web/app/assets/language-dropdown/img/SL.png b/app/assets/language-dropdown/img/SL.png similarity index 100% rename from web/app/assets/language-dropdown/img/SL.png rename to app/assets/language-dropdown/img/SL.png diff --git a/web/app/assets/language-dropdown/img/SM.png b/app/assets/language-dropdown/img/SM.png similarity index 100% rename from web/app/assets/language-dropdown/img/SM.png rename to app/assets/language-dropdown/img/SM.png diff --git a/web/app/assets/language-dropdown/img/SN.png b/app/assets/language-dropdown/img/SN.png similarity index 100% rename from web/app/assets/language-dropdown/img/SN.png rename to app/assets/language-dropdown/img/SN.png diff --git a/web/app/assets/language-dropdown/img/SO.png b/app/assets/language-dropdown/img/SO.png similarity index 100% rename from web/app/assets/language-dropdown/img/SO.png rename to app/assets/language-dropdown/img/SO.png diff --git a/web/app/assets/language-dropdown/img/SR.png b/app/assets/language-dropdown/img/SR.png similarity index 100% rename from web/app/assets/language-dropdown/img/SR.png rename to app/assets/language-dropdown/img/SR.png diff --git a/web/app/assets/language-dropdown/img/SS.png b/app/assets/language-dropdown/img/SS.png similarity index 100% rename from web/app/assets/language-dropdown/img/SS.png rename to app/assets/language-dropdown/img/SS.png diff --git a/web/app/assets/language-dropdown/img/ST.png b/app/assets/language-dropdown/img/ST.png similarity index 100% rename from web/app/assets/language-dropdown/img/ST.png rename to app/assets/language-dropdown/img/ST.png diff --git a/web/app/assets/language-dropdown/img/SV.png b/app/assets/language-dropdown/img/SV.png similarity index 100% rename from web/app/assets/language-dropdown/img/SV.png rename to app/assets/language-dropdown/img/SV.png diff --git a/web/app/assets/language-dropdown/img/SY.png b/app/assets/language-dropdown/img/SY.png similarity index 100% rename from web/app/assets/language-dropdown/img/SY.png rename to app/assets/language-dropdown/img/SY.png diff --git a/web/app/assets/language-dropdown/img/SZ.png b/app/assets/language-dropdown/img/SZ.png similarity index 100% rename from web/app/assets/language-dropdown/img/SZ.png rename to app/assets/language-dropdown/img/SZ.png diff --git a/web/app/assets/language-dropdown/img/TC.png b/app/assets/language-dropdown/img/TC.png similarity index 100% rename from web/app/assets/language-dropdown/img/TC.png rename to app/assets/language-dropdown/img/TC.png diff --git a/web/app/assets/language-dropdown/img/TD.png b/app/assets/language-dropdown/img/TD.png similarity index 100% rename from web/app/assets/language-dropdown/img/TD.png rename to app/assets/language-dropdown/img/TD.png diff --git a/web/app/assets/language-dropdown/img/TF.png b/app/assets/language-dropdown/img/TF.png similarity index 100% rename from web/app/assets/language-dropdown/img/TF.png rename to app/assets/language-dropdown/img/TF.png diff --git a/web/app/assets/language-dropdown/img/TG.png b/app/assets/language-dropdown/img/TG.png similarity index 100% rename from web/app/assets/language-dropdown/img/TG.png rename to app/assets/language-dropdown/img/TG.png diff --git a/web/app/assets/language-dropdown/img/TH.png b/app/assets/language-dropdown/img/TH.png similarity index 100% rename from web/app/assets/language-dropdown/img/TH.png rename to app/assets/language-dropdown/img/TH.png diff --git a/web/app/assets/language-dropdown/img/TJ.png b/app/assets/language-dropdown/img/TJ.png similarity index 100% rename from web/app/assets/language-dropdown/img/TJ.png rename to app/assets/language-dropdown/img/TJ.png diff --git a/web/app/assets/language-dropdown/img/TK.png b/app/assets/language-dropdown/img/TK.png similarity index 100% rename from web/app/assets/language-dropdown/img/TK.png rename to app/assets/language-dropdown/img/TK.png diff --git a/web/app/assets/language-dropdown/img/TL.png b/app/assets/language-dropdown/img/TL.png similarity index 100% rename from web/app/assets/language-dropdown/img/TL.png rename to app/assets/language-dropdown/img/TL.png diff --git a/web/app/assets/language-dropdown/img/TM.png b/app/assets/language-dropdown/img/TM.png similarity index 100% rename from web/app/assets/language-dropdown/img/TM.png rename to app/assets/language-dropdown/img/TM.png diff --git a/web/app/assets/language-dropdown/img/TN.png b/app/assets/language-dropdown/img/TN.png similarity index 100% rename from web/app/assets/language-dropdown/img/TN.png rename to app/assets/language-dropdown/img/TN.png diff --git a/web/app/assets/language-dropdown/img/TO.png b/app/assets/language-dropdown/img/TO.png similarity index 100% rename from web/app/assets/language-dropdown/img/TO.png rename to app/assets/language-dropdown/img/TO.png diff --git a/web/app/assets/language-dropdown/img/TR.png b/app/assets/language-dropdown/img/TR.png similarity index 100% rename from web/app/assets/language-dropdown/img/TR.png rename to app/assets/language-dropdown/img/TR.png diff --git a/web/app/assets/language-dropdown/img/TT.png b/app/assets/language-dropdown/img/TT.png similarity index 100% rename from web/app/assets/language-dropdown/img/TT.png rename to app/assets/language-dropdown/img/TT.png diff --git a/web/app/assets/language-dropdown/img/TV.png b/app/assets/language-dropdown/img/TV.png similarity index 100% rename from web/app/assets/language-dropdown/img/TV.png rename to app/assets/language-dropdown/img/TV.png diff --git a/web/app/assets/language-dropdown/img/TW.png b/app/assets/language-dropdown/img/TW.png similarity index 100% rename from web/app/assets/language-dropdown/img/TW.png rename to app/assets/language-dropdown/img/TW.png diff --git a/web/app/assets/language-dropdown/img/TZ.png b/app/assets/language-dropdown/img/TZ.png similarity index 100% rename from web/app/assets/language-dropdown/img/TZ.png rename to app/assets/language-dropdown/img/TZ.png diff --git a/web/app/assets/language-dropdown/img/UA.png b/app/assets/language-dropdown/img/UA.png similarity index 100% rename from web/app/assets/language-dropdown/img/UA.png rename to app/assets/language-dropdown/img/UA.png diff --git a/web/app/assets/language-dropdown/img/UG.png b/app/assets/language-dropdown/img/UG.png similarity index 100% rename from web/app/assets/language-dropdown/img/UG.png rename to app/assets/language-dropdown/img/UG.png diff --git a/web/app/assets/language-dropdown/img/US.png b/app/assets/language-dropdown/img/US.png similarity index 100% rename from web/app/assets/language-dropdown/img/US.png rename to app/assets/language-dropdown/img/US.png diff --git a/web/app/assets/language-dropdown/img/UY.png b/app/assets/language-dropdown/img/UY.png similarity index 100% rename from web/app/assets/language-dropdown/img/UY.png rename to app/assets/language-dropdown/img/UY.png diff --git a/web/app/assets/language-dropdown/img/UZ.png b/app/assets/language-dropdown/img/UZ.png similarity index 100% rename from web/app/assets/language-dropdown/img/UZ.png rename to app/assets/language-dropdown/img/UZ.png diff --git a/web/app/assets/language-dropdown/img/VA.png b/app/assets/language-dropdown/img/VA.png similarity index 100% rename from web/app/assets/language-dropdown/img/VA.png rename to app/assets/language-dropdown/img/VA.png diff --git a/web/app/assets/language-dropdown/img/VC.png b/app/assets/language-dropdown/img/VC.png similarity index 100% rename from web/app/assets/language-dropdown/img/VC.png rename to app/assets/language-dropdown/img/VC.png diff --git a/web/app/assets/language-dropdown/img/VE.png b/app/assets/language-dropdown/img/VE.png similarity index 100% rename from web/app/assets/language-dropdown/img/VE.png rename to app/assets/language-dropdown/img/VE.png diff --git a/web/app/assets/language-dropdown/img/VG.png b/app/assets/language-dropdown/img/VG.png similarity index 100% rename from web/app/assets/language-dropdown/img/VG.png rename to app/assets/language-dropdown/img/VG.png diff --git a/web/app/assets/language-dropdown/img/VI.png b/app/assets/language-dropdown/img/VI.png similarity index 100% rename from web/app/assets/language-dropdown/img/VI.png rename to app/assets/language-dropdown/img/VI.png diff --git a/web/app/assets/language-dropdown/img/VN.png b/app/assets/language-dropdown/img/VN.png similarity index 100% rename from web/app/assets/language-dropdown/img/VN.png rename to app/assets/language-dropdown/img/VN.png diff --git a/web/app/assets/language-dropdown/img/VU.png b/app/assets/language-dropdown/img/VU.png similarity index 100% rename from web/app/assets/language-dropdown/img/VU.png rename to app/assets/language-dropdown/img/VU.png diff --git a/web/app/assets/language-dropdown/img/WF.png b/app/assets/language-dropdown/img/WF.png similarity index 100% rename from web/app/assets/language-dropdown/img/WF.png rename to app/assets/language-dropdown/img/WF.png diff --git a/web/app/assets/language-dropdown/img/WS.png b/app/assets/language-dropdown/img/WS.png similarity index 100% rename from web/app/assets/language-dropdown/img/WS.png rename to app/assets/language-dropdown/img/WS.png diff --git a/web/app/assets/language-dropdown/img/YE.png b/app/assets/language-dropdown/img/YE.png similarity index 100% rename from web/app/assets/language-dropdown/img/YE.png rename to app/assets/language-dropdown/img/YE.png diff --git a/web/app/assets/language-dropdown/img/YT.png b/app/assets/language-dropdown/img/YT.png similarity index 100% rename from web/app/assets/language-dropdown/img/YT.png rename to app/assets/language-dropdown/img/YT.png diff --git a/web/app/assets/language-dropdown/img/ZA.png b/app/assets/language-dropdown/img/ZA.png similarity index 100% rename from web/app/assets/language-dropdown/img/ZA.png rename to app/assets/language-dropdown/img/ZA.png diff --git a/web/app/assets/language-dropdown/img/ZM.png b/app/assets/language-dropdown/img/ZM.png similarity index 100% rename from web/app/assets/language-dropdown/img/ZM.png rename to app/assets/language-dropdown/img/ZM.png diff --git a/web/app/assets/language-dropdown/img/ZW.png b/app/assets/language-dropdown/img/ZW.png similarity index 100% rename from web/app/assets/language-dropdown/img/ZW.png rename to app/assets/language-dropdown/img/ZW.png diff --git a/web/app/assets/loader-dev.js b/app/assets/loader-dev.js similarity index 100% rename from web/app/assets/loader-dev.js rename to app/assets/loader-dev.js diff --git a/web/app/assets/loader.js b/app/assets/loader.js similarity index 100% rename from web/app/assets/loader.js rename to app/assets/loader.js diff --git a/web/app/assets/locales/locale-cn.json b/app/assets/locales/locale-cn.json similarity index 100% rename from web/app/assets/locales/locale-cn.json rename to app/assets/locales/locale-cn.json diff --git a/web/app/assets/locales/locale-de.json b/app/assets/locales/locale-de.json similarity index 100% rename from web/app/assets/locales/locale-de.json rename to app/assets/locales/locale-de.json diff --git a/web/app/assets/locales/locale-en.json b/app/assets/locales/locale-en.json similarity index 100% rename from web/app/assets/locales/locale-en.json rename to app/assets/locales/locale-en.json diff --git a/web/app/assets/locales/locale-es.json b/app/assets/locales/locale-es.json similarity index 100% rename from web/app/assets/locales/locale-es.json rename to app/assets/locales/locale-es.json diff --git a/web/app/assets/locales/locale-fr.json b/app/assets/locales/locale-fr.json similarity index 100% rename from web/app/assets/locales/locale-fr.json rename to app/assets/locales/locale-fr.json diff --git a/web/app/assets/locales/locale-ko.json b/app/assets/locales/locale-ko.json similarity index 100% rename from web/app/assets/locales/locale-ko.json rename to app/assets/locales/locale-ko.json diff --git a/web/app/assets/locales/locale-ru.json b/app/assets/locales/locale-ru.json similarity index 100% rename from web/app/assets/locales/locale-ru.json rename to app/assets/locales/locale-ru.json diff --git a/web/app/assets/locales/locale-tr.json b/app/assets/locales/locale-tr.json similarity index 100% rename from web/app/assets/locales/locale-tr.json rename to app/assets/locales/locale-tr.json diff --git a/web/app/assets/locales/locales.js b/app/assets/locales/locales.js similarity index 100% rename from web/app/assets/locales/locales.js rename to app/assets/locales/locales.js diff --git a/web/app/assets/logo-ico-blue.png b/app/assets/logo-ico-blue.png similarity index 100% rename from web/app/assets/logo-ico-blue.png rename to app/assets/logo-ico-blue.png diff --git a/web/app/assets/stylesheets/_shame.scss b/app/assets/stylesheets/_shame.scss similarity index 100% rename from web/app/assets/stylesheets/_shame.scss rename to app/assets/stylesheets/_shame.scss diff --git a/web/app/assets/stylesheets/app.scss b/app/assets/stylesheets/app.scss similarity index 100% rename from web/app/assets/stylesheets/app.scss rename to app/assets/stylesheets/app.scss diff --git a/web/app/assets/stylesheets/base/_all.scss b/app/assets/stylesheets/base/_all.scss similarity index 100% rename from web/app/assets/stylesheets/base/_all.scss rename to app/assets/stylesheets/base/_all.scss diff --git a/web/app/assets/stylesheets/base/_colors.scss b/app/assets/stylesheets/base/_colors.scss similarity index 100% rename from web/app/assets/stylesheets/base/_colors.scss rename to app/assets/stylesheets/base/_colors.scss diff --git a/web/app/assets/stylesheets/base/_fonts.scss b/app/assets/stylesheets/base/_fonts.scss similarity index 100% rename from web/app/assets/stylesheets/base/_fonts.scss rename to app/assets/stylesheets/base/_fonts.scss diff --git a/web/app/assets/stylesheets/components/_account-create.scss b/app/assets/stylesheets/components/_account-create.scss similarity index 100% rename from web/app/assets/stylesheets/components/_account-create.scss rename to app/assets/stylesheets/components/_account-create.scss diff --git a/web/app/assets/stylesheets/components/_account.scss b/app/assets/stylesheets/components/_account.scss similarity index 100% rename from web/app/assets/stylesheets/components/_account.scss rename to app/assets/stylesheets/components/_account.scss diff --git a/web/app/assets/stylesheets/components/_all.scss b/app/assets/stylesheets/components/_all.scss similarity index 100% rename from web/app/assets/stylesheets/components/_all.scss rename to app/assets/stylesheets/components/_all.scss diff --git a/web/app/assets/stylesheets/components/_bitkapital.scss b/app/assets/stylesheets/components/_bitkapital.scss similarity index 100% rename from web/app/assets/stylesheets/components/_bitkapital.scss rename to app/assets/stylesheets/components/_bitkapital.scss diff --git a/web/app/assets/stylesheets/components/_blocktrades.scss b/app/assets/stylesheets/components/_blocktrades.scss similarity index 100% rename from web/app/assets/stylesheets/components/_blocktrades.scss rename to app/assets/stylesheets/components/_blocktrades.scss diff --git a/web/app/assets/stylesheets/components/_cards.scss b/app/assets/stylesheets/components/_cards.scss similarity index 100% rename from web/app/assets/stylesheets/components/_cards.scss rename to app/assets/stylesheets/components/_cards.scss diff --git a/web/app/assets/stylesheets/components/_chatbox.scss b/app/assets/stylesheets/components/_chatbox.scss similarity index 100% rename from web/app/assets/stylesheets/components/_chatbox.scss rename to app/assets/stylesheets/components/_chatbox.scss diff --git a/web/app/assets/stylesheets/components/_console.scss b/app/assets/stylesheets/components/_console.scss similarity index 100% rename from web/app/assets/stylesheets/components/_console.scss rename to app/assets/stylesheets/components/_console.scss diff --git a/web/app/assets/stylesheets/components/_dashboard.scss b/app/assets/stylesheets/components/_dashboard.scss similarity index 100% rename from web/app/assets/stylesheets/components/_dashboard.scss rename to app/assets/stylesheets/components/_dashboard.scss diff --git a/web/app/assets/stylesheets/components/_exchange.scss b/app/assets/stylesheets/components/_exchange.scss similarity index 100% rename from web/app/assets/stylesheets/components/_exchange.scss rename to app/assets/stylesheets/components/_exchange.scss diff --git a/web/app/assets/stylesheets/components/_existing_accounts.scss b/app/assets/stylesheets/components/_existing_accounts.scss similarity index 100% rename from web/app/assets/stylesheets/components/_existing_accounts.scss rename to app/assets/stylesheets/components/_existing_accounts.scss diff --git a/web/app/assets/stylesheets/components/_footer.scss b/app/assets/stylesheets/components/_footer.scss similarity index 100% rename from web/app/assets/stylesheets/components/_footer.scss rename to app/assets/stylesheets/components/_footer.scss diff --git a/web/app/assets/stylesheets/components/_forms.scss b/app/assets/stylesheets/components/_forms.scss similarity index 100% rename from web/app/assets/stylesheets/components/_forms.scss rename to app/assets/stylesheets/components/_forms.scss diff --git a/web/app/assets/stylesheets/components/_header.scss b/app/assets/stylesheets/components/_header.scss similarity index 100% rename from web/app/assets/stylesheets/components/_header.scss rename to app/assets/stylesheets/components/_header.scss diff --git a/web/app/assets/stylesheets/components/_help.scss b/app/assets/stylesheets/components/_help.scss similarity index 100% rename from web/app/assets/stylesheets/components/_help.scss rename to app/assets/stylesheets/components/_help.scss diff --git a/web/app/assets/stylesheets/components/_loading-indicator.scss b/app/assets/stylesheets/components/_loading-indicator.scss similarity index 100% rename from web/app/assets/stylesheets/components/_loading-indicator.scss rename to app/assets/stylesheets/components/_loading-indicator.scss diff --git a/web/app/assets/stylesheets/components/_pagination.scss b/app/assets/stylesheets/components/_pagination.scss similarity index 100% rename from web/app/assets/stylesheets/components/_pagination.scss rename to app/assets/stylesheets/components/_pagination.scss diff --git a/web/app/assets/stylesheets/components/_settings.scss b/app/assets/stylesheets/components/_settings.scss similarity index 100% rename from web/app/assets/stylesheets/components/_settings.scss rename to app/assets/stylesheets/components/_settings.scss diff --git a/web/app/assets/stylesheets/components/_tables.scss b/app/assets/stylesheets/components/_tables.scss similarity index 100% rename from web/app/assets/stylesheets/components/_tables.scss rename to app/assets/stylesheets/components/_tables.scss diff --git a/web/app/assets/stylesheets/components/_wallet.scss b/app/assets/stylesheets/components/_wallet.scss similarity index 100% rename from web/app/assets/stylesheets/components/_wallet.scss rename to app/assets/stylesheets/components/_wallet.scss diff --git a/web/app/assets/stylesheets/layout/_all.scss b/app/assets/stylesheets/layout/_all.scss similarity index 100% rename from web/app/assets/stylesheets/layout/_all.scss rename to app/assets/stylesheets/layout/_all.scss diff --git a/web/app/assets/stylesheets/layout/_page_layout.scss b/app/assets/stylesheets/layout/_page_layout.scss similarity index 100% rename from web/app/assets/stylesheets/layout/_page_layout.scss rename to app/assets/stylesheets/layout/_page_layout.scss diff --git a/web/app/assets/stylesheets/themes/_all.scss b/app/assets/stylesheets/themes/_all.scss similarity index 100% rename from web/app/assets/stylesheets/themes/_all.scss rename to app/assets/stylesheets/themes/_all.scss diff --git a/web/app/assets/stylesheets/themes/_dark-theme.scss b/app/assets/stylesheets/themes/_dark-theme.scss similarity index 100% rename from web/app/assets/stylesheets/themes/_dark-theme.scss rename to app/assets/stylesheets/themes/_dark-theme.scss diff --git a/web/app/assets/stylesheets/themes/_light-theme.scss b/app/assets/stylesheets/themes/_light-theme.scss similarity index 100% rename from web/app/assets/stylesheets/themes/_light-theme.scss rename to app/assets/stylesheets/themes/_light-theme.scss diff --git a/web/app/assets/stylesheets/themes/_ol-dark-theme.scss b/app/assets/stylesheets/themes/_ol-dark-theme.scss similarity index 100% rename from web/app/assets/stylesheets/themes/_ol-dark-theme.scss rename to app/assets/stylesheets/themes/_ol-dark-theme.scss diff --git a/web/app/assets/stylesheets/themes/_theme-template.scss b/app/assets/stylesheets/themes/_theme-template.scss similarity index 100% rename from web/app/assets/stylesheets/themes/_theme-template.scss rename to app/assets/stylesheets/themes/_theme-template.scss diff --git a/web/app/assets/stylesheets/utils/_all.scss b/app/assets/stylesheets/utils/_all.scss similarity index 100% rename from web/app/assets/stylesheets/utils/_all.scss rename to app/assets/stylesheets/utils/_all.scss diff --git a/web/app/assets/stylesheets/utils/_utils.scss b/app/assets/stylesheets/utils/_utils.scss similarity index 100% rename from web/app/assets/stylesheets/utils/_utils.scss rename to app/assets/stylesheets/utils/_utils.scss diff --git a/web/app/assets/stylesheets/vendors/Roboto-Light.woff b/app/assets/stylesheets/vendors/Roboto-Light.woff similarity index 100% rename from web/app/assets/stylesheets/vendors/Roboto-Light.woff rename to app/assets/stylesheets/vendors/Roboto-Light.woff diff --git a/web/app/assets/stylesheets/vendors/Roboto-Regular.woff b/app/assets/stylesheets/vendors/Roboto-Regular.woff similarity index 100% rename from web/app/assets/stylesheets/vendors/Roboto-Regular.woff rename to app/assets/stylesheets/vendors/Roboto-Regular.woff diff --git a/web/app/assets/stylesheets/vendors/RobotoCondensed-Regular.woff b/app/assets/stylesheets/vendors/RobotoCondensed-Regular.woff similarity index 100% rename from web/app/assets/stylesheets/vendors/RobotoCondensed-Regular.woff rename to app/assets/stylesheets/vendors/RobotoCondensed-Regular.woff diff --git a/web/app/assets/stylesheets/vendors/_all.scss b/app/assets/stylesheets/vendors/_all.scss similarity index 100% rename from web/app/assets/stylesheets/vendors/_all.scss rename to app/assets/stylesheets/vendors/_all.scss diff --git a/web/app/assets/stylesheets/vendors/_foundation_overrides.scss b/app/assets/stylesheets/vendors/_foundation_overrides.scss similarity index 100% rename from web/app/assets/stylesheets/vendors/_foundation_overrides.scss rename to app/assets/stylesheets/vendors/_foundation_overrides.scss diff --git a/web/app/assets/stylesheets/vendors/_foundation_settings.scss b/app/assets/stylesheets/vendors/_foundation_settings.scss similarity index 100% rename from web/app/assets/stylesheets/vendors/_foundation_settings.scss rename to app/assets/stylesheets/vendors/_foundation_settings.scss diff --git a/web/app/assets/stylesheets/vendors/_perfect-scrollbar.scss b/app/assets/stylesheets/vendors/_perfect-scrollbar.scss similarity index 100% rename from web/app/assets/stylesheets/vendors/_perfect-scrollbar.scss rename to app/assets/stylesheets/vendors/_perfect-scrollbar.scss diff --git a/web/app/components/Account/AccountAssetCreate.jsx b/app/components/Account/AccountAssetCreate.jsx similarity index 100% rename from web/app/components/Account/AccountAssetCreate.jsx rename to app/components/Account/AccountAssetCreate.jsx diff --git a/web/app/components/Account/AccountAssetUpdate.jsx b/app/components/Account/AccountAssetUpdate.jsx similarity index 100% rename from web/app/components/Account/AccountAssetUpdate.jsx rename to app/components/Account/AccountAssetUpdate.jsx diff --git a/web/app/components/Account/AccountAssets.jsx b/app/components/Account/AccountAssets.jsx similarity index 100% rename from web/app/components/Account/AccountAssets.jsx rename to app/components/Account/AccountAssets.jsx diff --git a/web/app/components/Account/AccountBalance.jsx b/app/components/Account/AccountBalance.jsx similarity index 100% rename from web/app/components/Account/AccountBalance.jsx rename to app/components/Account/AccountBalance.jsx diff --git a/web/app/components/Account/AccountDepositWithdraw.jsx b/app/components/Account/AccountDepositWithdraw.jsx similarity index 100% rename from web/app/components/Account/AccountDepositWithdraw.jsx rename to app/components/Account/AccountDepositWithdraw.jsx diff --git a/web/app/components/Account/AccountImage.jsx b/app/components/Account/AccountImage.jsx similarity index 100% rename from web/app/components/Account/AccountImage.jsx rename to app/components/Account/AccountImage.jsx diff --git a/web/app/components/Account/AccountInfo.jsx b/app/components/Account/AccountInfo.jsx similarity index 100% rename from web/app/components/Account/AccountInfo.jsx rename to app/components/Account/AccountInfo.jsx diff --git a/web/app/components/Account/AccountLeftPanel.jsx b/app/components/Account/AccountLeftPanel.jsx similarity index 100% rename from web/app/components/Account/AccountLeftPanel.jsx rename to app/components/Account/AccountLeftPanel.jsx diff --git a/web/app/components/Account/AccountMembership.jsx b/app/components/Account/AccountMembership.jsx similarity index 100% rename from web/app/components/Account/AccountMembership.jsx rename to app/components/Account/AccountMembership.jsx diff --git a/web/app/components/Account/AccountOrders.jsx b/app/components/Account/AccountOrders.jsx similarity index 100% rename from web/app/components/Account/AccountOrders.jsx rename to app/components/Account/AccountOrders.jsx diff --git a/web/app/components/Account/AccountOverview.jsx b/app/components/Account/AccountOverview.jsx similarity index 100% rename from web/app/components/Account/AccountOverview.jsx rename to app/components/Account/AccountOverview.jsx diff --git a/web/app/components/Account/AccountPage.jsx b/app/components/Account/AccountPage.jsx similarity index 100% rename from web/app/components/Account/AccountPage.jsx rename to app/components/Account/AccountPage.jsx diff --git a/web/app/components/Account/AccountPermissions.jsx b/app/components/Account/AccountPermissions.jsx similarity index 100% rename from web/app/components/Account/AccountPermissions.jsx rename to app/components/Account/AccountPermissions.jsx diff --git a/web/app/components/Account/AccountPermissionsList.jsx b/app/components/Account/AccountPermissionsList.jsx similarity index 100% rename from web/app/components/Account/AccountPermissionsList.jsx rename to app/components/Account/AccountPermissionsList.jsx diff --git a/web/app/components/Account/AccountPermissionsMigrate.jsx b/app/components/Account/AccountPermissionsMigrate.jsx similarity index 100% rename from web/app/components/Account/AccountPermissionsMigrate.jsx rename to app/components/Account/AccountPermissionsMigrate.jsx diff --git a/web/app/components/Account/AccountSelector.jsx b/app/components/Account/AccountSelector.jsx similarity index 100% rename from web/app/components/Account/AccountSelector.jsx rename to app/components/Account/AccountSelector.jsx diff --git a/web/app/components/Account/AccountVesting.jsx b/app/components/Account/AccountVesting.jsx similarity index 100% rename from web/app/components/Account/AccountVesting.jsx rename to app/components/Account/AccountVesting.jsx diff --git a/web/app/components/Account/AccountVoting.jsx b/app/components/Account/AccountVoting.jsx similarity index 100% rename from web/app/components/Account/AccountVoting.jsx rename to app/components/Account/AccountVoting.jsx diff --git a/web/app/components/Account/AccountVotingProxy.jsx b/app/components/Account/AccountVotingProxy.jsx similarity index 100% rename from web/app/components/Account/AccountVotingProxy.jsx rename to app/components/Account/AccountVotingProxy.jsx diff --git a/web/app/components/Account/AccountWhitelist.jsx b/app/components/Account/AccountWhitelist.jsx similarity index 100% rename from web/app/components/Account/AccountWhitelist.jsx rename to app/components/Account/AccountWhitelist.jsx diff --git a/web/app/components/Account/AccountsList.jsx b/app/components/Account/AccountsList.jsx similarity index 100% rename from web/app/components/Account/AccountsList.jsx rename to app/components/Account/AccountsList.jsx diff --git a/web/app/components/Account/Connections.jsx b/app/components/Account/Connections.jsx similarity index 100% rename from web/app/components/Account/Connections.jsx rename to app/components/Account/Connections.jsx diff --git a/web/app/components/Account/CreateAccount.jsx b/app/components/Account/CreateAccount.jsx similarity index 100% rename from web/app/components/Account/CreateAccount.jsx rename to app/components/Account/CreateAccount.jsx diff --git a/web/app/components/Account/CreateAccountPassword.jsx b/app/components/Account/CreateAccountPassword.jsx similarity index 100% rename from web/app/components/Account/CreateAccountPassword.jsx rename to app/components/Account/CreateAccountPassword.jsx diff --git a/web/app/components/Account/CreateWorker.jsx b/app/components/Account/CreateWorker.jsx similarity index 100% rename from web/app/components/Account/CreateWorker.jsx rename to app/components/Account/CreateWorker.jsx diff --git a/web/app/components/Account/Identicon.jsx b/app/components/Account/Identicon.jsx similarity index 100% rename from web/app/components/Account/Identicon.jsx rename to app/components/Account/Identicon.jsx diff --git a/web/app/components/Account/NestedApprovalState.jsx b/app/components/Account/NestedApprovalState.jsx similarity index 100% rename from web/app/components/Account/NestedApprovalState.jsx rename to app/components/Account/NestedApprovalState.jsx diff --git a/web/app/components/Account/Proposals.jsx b/app/components/Account/Proposals.jsx similarity index 100% rename from web/app/components/Account/Proposals.jsx rename to app/components/Account/Proposals.jsx diff --git a/web/app/components/Account/RecentTransactions.jsx b/app/components/Account/RecentTransactions.jsx similarity index 100% rename from web/app/components/Account/RecentTransactions.jsx rename to app/components/Account/RecentTransactions.jsx diff --git a/web/app/components/Account/Statistics.jsx b/app/components/Account/Statistics.jsx similarity index 100% rename from web/app/components/Account/Statistics.jsx rename to app/components/Account/Statistics.jsx diff --git a/web/app/components/Account/WorkerApproval.jsx b/app/components/Account/WorkerApproval.jsx similarity index 100% rename from web/app/components/Account/WorkerApproval.jsx rename to app/components/Account/WorkerApproval.jsx diff --git a/web/app/components/BaseComponent.jsx b/app/components/BaseComponent.jsx similarity index 100% rename from web/app/components/BaseComponent.jsx rename to app/components/BaseComponent.jsx diff --git a/web/app/components/Blockchain/Asset.jsx b/app/components/Blockchain/Asset.jsx similarity index 100% rename from web/app/components/Blockchain/Asset.jsx rename to app/components/Blockchain/Asset.jsx diff --git a/web/app/components/Blockchain/AssetContainer.jsx b/app/components/Blockchain/AssetContainer.jsx similarity index 100% rename from web/app/components/Blockchain/AssetContainer.jsx rename to app/components/Blockchain/AssetContainer.jsx diff --git a/web/app/components/Blockchain/Block.jsx b/app/components/Blockchain/Block.jsx similarity index 100% rename from web/app/components/Blockchain/Block.jsx rename to app/components/Blockchain/Block.jsx diff --git a/web/app/components/Blockchain/BlockContainer.jsx b/app/components/Blockchain/BlockContainer.jsx similarity index 100% rename from web/app/components/Blockchain/BlockContainer.jsx rename to app/components/Blockchain/BlockContainer.jsx diff --git a/web/app/components/Blockchain/BlockTime.jsx b/app/components/Blockchain/BlockTime.jsx similarity index 100% rename from web/app/components/Blockchain/BlockTime.jsx rename to app/components/Blockchain/BlockTime.jsx diff --git a/web/app/components/Blockchain/CollateralPosition.jsx b/app/components/Blockchain/CollateralPosition.jsx similarity index 100% rename from web/app/components/Blockchain/CollateralPosition.jsx rename to app/components/Blockchain/CollateralPosition.jsx diff --git a/web/app/components/Blockchain/Fees.jsx b/app/components/Blockchain/Fees.jsx similarity index 100% rename from web/app/components/Blockchain/Fees.jsx rename to app/components/Blockchain/Fees.jsx diff --git a/web/app/components/Blockchain/FeesContainer.jsx b/app/components/Blockchain/FeesContainer.jsx similarity index 100% rename from web/app/components/Blockchain/FeesContainer.jsx rename to app/components/Blockchain/FeesContainer.jsx diff --git a/web/app/components/Blockchain/LinkToAccountById.jsx b/app/components/Blockchain/LinkToAccountById.jsx similarity index 100% rename from web/app/components/Blockchain/LinkToAccountById.jsx rename to app/components/Blockchain/LinkToAccountById.jsx diff --git a/web/app/components/Blockchain/LinkToAssetById.jsx b/app/components/Blockchain/LinkToAssetById.jsx similarity index 100% rename from web/app/components/Blockchain/LinkToAssetById.jsx rename to app/components/Blockchain/LinkToAssetById.jsx diff --git a/web/app/components/Blockchain/LinkToWitnessById.jsx b/app/components/Blockchain/LinkToWitnessById.jsx similarity index 100% rename from web/app/components/Blockchain/LinkToWitnessById.jsx rename to app/components/Blockchain/LinkToWitnessById.jsx diff --git a/web/app/components/Blockchain/MemoText.jsx b/app/components/Blockchain/MemoText.jsx similarity index 100% rename from web/app/components/Blockchain/MemoText.jsx rename to app/components/Blockchain/MemoText.jsx diff --git a/web/app/components/Blockchain/Operation.jsx b/app/components/Blockchain/Operation.jsx similarity index 100% rename from web/app/components/Blockchain/Operation.jsx rename to app/components/Blockchain/Operation.jsx diff --git a/web/app/components/Blockchain/ProposedOperation.jsx b/app/components/Blockchain/ProposedOperation.jsx similarity index 100% rename from web/app/components/Blockchain/ProposedOperation.jsx rename to app/components/Blockchain/ProposedOperation.jsx diff --git a/web/app/components/Blockchain/Transaction.jsx b/app/components/Blockchain/Transaction.jsx similarity index 100% rename from web/app/components/Blockchain/Transaction.jsx rename to app/components/Blockchain/Transaction.jsx diff --git a/web/app/components/Blockchain/TransactionConfirm.jsx b/app/components/Blockchain/TransactionConfirm.jsx similarity index 100% rename from web/app/components/Blockchain/TransactionConfirm.jsx rename to app/components/Blockchain/TransactionConfirm.jsx diff --git a/web/app/components/Blockchain/json-inspector.scss b/app/components/Blockchain/json-inspector.scss similarity index 100% rename from web/app/components/Blockchain/json-inspector.scss rename to app/components/Blockchain/json-inspector.scss diff --git a/web/app/components/Blockchain/operations.scss b/app/components/Blockchain/operations.scss similarity index 100% rename from web/app/components/Blockchain/operations.scss rename to app/components/Blockchain/operations.scss diff --git a/web/app/components/BuySell/BuySell.jsx b/app/components/BuySell/BuySell.jsx similarity index 100% rename from web/app/components/BuySell/BuySell.jsx rename to app/components/BuySell/BuySell.jsx diff --git a/web/app/components/BuySell/BuySell.scss b/app/components/BuySell/BuySell.scss similarity index 100% rename from web/app/components/BuySell/BuySell.scss rename to app/components/BuySell/BuySell.scss diff --git a/web/app/components/Chat/ChatWrapper.jsx b/app/components/Chat/ChatWrapper.jsx similarity index 100% rename from web/app/components/Chat/ChatWrapper.jsx rename to app/components/Chat/ChatWrapper.jsx diff --git a/web/app/components/Console/Console.jsx b/app/components/Console/Console.jsx similarity index 100% rename from web/app/components/Console/Console.jsx rename to app/components/Console/Console.jsx diff --git a/web/app/components/Dashboard/AccountCard.jsx b/app/components/Dashboard/AccountCard.jsx similarity index 100% rename from web/app/components/Dashboard/AccountCard.jsx rename to app/components/Dashboard/AccountCard.jsx diff --git a/web/app/components/Dashboard/Dashboard.jsx b/app/components/Dashboard/Dashboard.jsx similarity index 100% rename from web/app/components/Dashboard/Dashboard.jsx rename to app/components/Dashboard/Dashboard.jsx diff --git a/web/app/components/Dashboard/DashboardContainer.jsx b/app/components/Dashboard/DashboardContainer.jsx similarity index 100% rename from web/app/components/Dashboard/DashboardContainer.jsx rename to app/components/Dashboard/DashboardContainer.jsx diff --git a/web/app/components/Dashboard/DashboardList.jsx b/app/components/Dashboard/DashboardList.jsx similarity index 100% rename from web/app/components/Dashboard/DashboardList.jsx rename to app/components/Dashboard/DashboardList.jsx diff --git a/web/app/components/Dashboard/MarketCard.jsx b/app/components/Dashboard/MarketCard.jsx similarity index 100% rename from web/app/components/Dashboard/MarketCard.jsx rename to app/components/Dashboard/MarketCard.jsx diff --git a/web/app/components/Dashboard/SimpleDepositBlocktradesBridge.jsx b/app/components/Dashboard/SimpleDepositBlocktradesBridge.jsx similarity index 100% rename from web/app/components/Dashboard/SimpleDepositBlocktradesBridge.jsx rename to app/components/Dashboard/SimpleDepositBlocktradesBridge.jsx diff --git a/web/app/components/Dashboard/SimpleDepositWithdraw.jsx b/app/components/Dashboard/SimpleDepositWithdraw.jsx similarity index 100% rename from web/app/components/Dashboard/SimpleDepositWithdraw.jsx rename to app/components/Dashboard/SimpleDepositWithdraw.jsx diff --git a/web/app/components/DepositWithdraw/BitKapital.jsx b/app/components/DepositWithdraw/BitKapital.jsx similarity index 100% rename from web/app/components/DepositWithdraw/BitKapital.jsx rename to app/components/DepositWithdraw/BitKapital.jsx diff --git a/web/app/components/DepositWithdraw/BlockTradesGateway.jsx b/app/components/DepositWithdraw/BlockTradesGateway.jsx similarity index 100% rename from web/app/components/DepositWithdraw/BlockTradesGateway.jsx rename to app/components/DepositWithdraw/BlockTradesGateway.jsx diff --git a/web/app/components/DepositWithdraw/WithdrawModal.jsx b/app/components/DepositWithdraw/WithdrawModal.jsx similarity index 100% rename from web/app/components/DepositWithdraw/WithdrawModal.jsx rename to app/components/DepositWithdraw/WithdrawModal.jsx diff --git a/web/app/components/DepositWithdraw/blocktrades/BlockTradesBridgeDepositRequest.jsx b/app/components/DepositWithdraw/blocktrades/BlockTradesBridgeDepositRequest.jsx similarity index 100% rename from web/app/components/DepositWithdraw/blocktrades/BlockTradesBridgeDepositRequest.jsx rename to app/components/DepositWithdraw/blocktrades/BlockTradesBridgeDepositRequest.jsx diff --git a/web/app/components/DepositWithdraw/blocktrades/BlockTradesGatewayDepositRequest.jsx b/app/components/DepositWithdraw/blocktrades/BlockTradesGatewayDepositRequest.jsx similarity index 100% rename from web/app/components/DepositWithdraw/blocktrades/BlockTradesGatewayDepositRequest.jsx rename to app/components/DepositWithdraw/blocktrades/BlockTradesGatewayDepositRequest.jsx diff --git a/web/app/components/DepositWithdraw/blocktrades/WithdrawModalBlocktrades.jsx b/app/components/DepositWithdraw/blocktrades/WithdrawModalBlocktrades.jsx similarity index 100% rename from web/app/components/DepositWithdraw/blocktrades/WithdrawModalBlocktrades.jsx rename to app/components/DepositWithdraw/blocktrades/WithdrawModalBlocktrades.jsx diff --git a/web/app/components/DepositWithdraw/openledger/DepositFiatOpenLedger.jsx b/app/components/DepositWithdraw/openledger/DepositFiatOpenLedger.jsx similarity index 100% rename from web/app/components/DepositWithdraw/openledger/DepositFiatOpenLedger.jsx rename to app/components/DepositWithdraw/openledger/DepositFiatOpenLedger.jsx diff --git a/web/app/components/DepositWithdraw/openledger/OpenLedgerFiatDepositWithdrawal.jsx b/app/components/DepositWithdraw/openledger/OpenLedgerFiatDepositWithdrawal.jsx similarity index 100% rename from web/app/components/DepositWithdraw/openledger/OpenLedgerFiatDepositWithdrawal.jsx rename to app/components/DepositWithdraw/openledger/OpenLedgerFiatDepositWithdrawal.jsx diff --git a/web/app/components/DepositWithdraw/openledger/OpenLedgerFiatTransactionHistory.jsx b/app/components/DepositWithdraw/openledger/OpenLedgerFiatTransactionHistory.jsx similarity index 100% rename from web/app/components/DepositWithdraw/openledger/OpenLedgerFiatTransactionHistory.jsx rename to app/components/DepositWithdraw/openledger/OpenLedgerFiatTransactionHistory.jsx diff --git a/web/app/components/DepositWithdraw/openledger/WithdrawFiatOpenLedger.jsx b/app/components/DepositWithdraw/openledger/WithdrawFiatOpenLedger.jsx similarity index 100% rename from web/app/components/DepositWithdraw/openledger/WithdrawFiatOpenLedger.jsx rename to app/components/DepositWithdraw/openledger/WithdrawFiatOpenLedger.jsx diff --git a/web/app/components/DepositWithdraw/openledger/gatewayCoins.json b/app/components/DepositWithdraw/openledger/gatewayCoins.json similarity index 100% rename from web/app/components/DepositWithdraw/openledger/gatewayCoins.json rename to app/components/DepositWithdraw/openledger/gatewayCoins.json diff --git a/web/app/components/DepositWithdraw/transwiser/TranswiserDepositModal.jsx b/app/components/DepositWithdraw/transwiser/TranswiserDepositModal.jsx similarity index 100% rename from web/app/components/DepositWithdraw/transwiser/TranswiserDepositModal.jsx rename to app/components/DepositWithdraw/transwiser/TranswiserDepositModal.jsx diff --git a/web/app/components/DepositWithdraw/transwiser/TranswiserDepositWithdraw.jsx b/app/components/DepositWithdraw/transwiser/TranswiserDepositWithdraw.jsx similarity index 100% rename from web/app/components/DepositWithdraw/transwiser/TranswiserDepositWithdraw.jsx rename to app/components/DepositWithdraw/transwiser/TranswiserDepositWithdraw.jsx diff --git a/web/app/components/DepositWithdraw/transwiser/TranswiserWithdrawModal.jsx b/app/components/DepositWithdraw/transwiser/TranswiserWithdrawModal.jsx similarity index 100% rename from web/app/components/DepositWithdraw/transwiser/TranswiserWithdrawModal.jsx rename to app/components/DepositWithdraw/transwiser/TranswiserWithdrawModal.jsx diff --git a/web/app/components/Exchange/BuySell.jsx b/app/components/Exchange/BuySell.jsx similarity index 100% rename from web/app/components/Exchange/BuySell.jsx rename to app/components/Exchange/BuySell.jsx diff --git a/web/app/components/Exchange/ConfirmOrderModal.jsx b/app/components/Exchange/ConfirmOrderModal.jsx similarity index 100% rename from web/app/components/Exchange/ConfirmOrderModal.jsx rename to app/components/Exchange/ConfirmOrderModal.jsx diff --git a/web/app/components/Exchange/DepthHighChart.jsx b/app/components/Exchange/DepthHighChart.jsx similarity index 100% rename from web/app/components/Exchange/DepthHighChart.jsx rename to app/components/Exchange/DepthHighChart.jsx diff --git a/web/app/components/Exchange/Exchange.jsx b/app/components/Exchange/Exchange.jsx similarity index 100% rename from web/app/components/Exchange/Exchange.jsx rename to app/components/Exchange/Exchange.jsx diff --git a/web/app/components/Exchange/ExchangeContainer.jsx b/app/components/Exchange/ExchangeContainer.jsx similarity index 100% rename from web/app/components/Exchange/ExchangeContainer.jsx rename to app/components/Exchange/ExchangeContainer.jsx diff --git a/web/app/components/Exchange/ExchangeHeader.jsx b/app/components/Exchange/ExchangeHeader.jsx similarity index 100% rename from web/app/components/Exchange/ExchangeHeader.jsx rename to app/components/Exchange/ExchangeHeader.jsx diff --git a/web/app/components/Exchange/ExchangeInput.jsx b/app/components/Exchange/ExchangeInput.jsx similarity index 100% rename from web/app/components/Exchange/ExchangeInput.jsx rename to app/components/Exchange/ExchangeInput.jsx diff --git a/web/app/components/Exchange/IndicatorModal.jsx b/app/components/Exchange/IndicatorModal.jsx similarity index 100% rename from web/app/components/Exchange/IndicatorModal.jsx rename to app/components/Exchange/IndicatorModal.jsx diff --git a/web/app/components/Exchange/MarketCard.jsx b/app/components/Exchange/MarketCard.jsx similarity index 100% rename from web/app/components/Exchange/MarketCard.jsx rename to app/components/Exchange/MarketCard.jsx diff --git a/web/app/components/Exchange/MarketHistory.jsx b/app/components/Exchange/MarketHistory.jsx similarity index 100% rename from web/app/components/Exchange/MarketHistory.jsx rename to app/components/Exchange/MarketHistory.jsx diff --git a/web/app/components/Exchange/MarketRow.jsx b/app/components/Exchange/MarketRow.jsx similarity index 100% rename from web/app/components/Exchange/MarketRow.jsx rename to app/components/Exchange/MarketRow.jsx diff --git a/web/app/components/Exchange/Markets.jsx b/app/components/Exchange/Markets.jsx similarity index 100% rename from web/app/components/Exchange/Markets.jsx rename to app/components/Exchange/Markets.jsx diff --git a/web/app/components/Exchange/MarketsContainer.jsx b/app/components/Exchange/MarketsContainer.jsx similarity index 100% rename from web/app/components/Exchange/MarketsContainer.jsx rename to app/components/Exchange/MarketsContainer.jsx diff --git a/web/app/components/Exchange/MyMarkets.jsx b/app/components/Exchange/MyMarkets.jsx similarity index 100% rename from web/app/components/Exchange/MyMarkets.jsx rename to app/components/Exchange/MyMarkets.jsx diff --git a/web/app/components/Exchange/MyOpenOrders.jsx b/app/components/Exchange/MyOpenOrders.jsx similarity index 100% rename from web/app/components/Exchange/MyOpenOrders.jsx rename to app/components/Exchange/MyOpenOrders.jsx diff --git a/web/app/components/Exchange/OpenSettleOrders.jsx b/app/components/Exchange/OpenSettleOrders.jsx similarity index 100% rename from web/app/components/Exchange/OpenSettleOrders.jsx rename to app/components/Exchange/OpenSettleOrders.jsx diff --git a/web/app/components/Exchange/OrderBook.jsx b/app/components/Exchange/OrderBook.jsx similarity index 100% rename from web/app/components/Exchange/OrderBook.jsx rename to app/components/Exchange/OrderBook.jsx diff --git a/web/app/components/Exchange/PriceChart.jsx b/app/components/Exchange/PriceChart.jsx similarity index 100% rename from web/app/components/Exchange/PriceChart.jsx rename to app/components/Exchange/PriceChart.jsx diff --git a/web/app/components/Exchange/PriceChartD3.jsx b/app/components/Exchange/PriceChartD3.jsx similarity index 100% rename from web/app/components/Exchange/PriceChartD3.jsx rename to app/components/Exchange/PriceChartD3.jsx diff --git a/web/app/components/Exchange/PriceStat.jsx b/app/components/Exchange/PriceStat.jsx similarity index 100% rename from web/app/components/Exchange/PriceStat.jsx rename to app/components/Exchange/PriceStat.jsx diff --git a/web/app/components/Exchange/highcharts-plugins/atr.js b/app/components/Exchange/highcharts-plugins/atr.js similarity index 100% rename from web/app/components/Exchange/highcharts-plugins/atr.js rename to app/components/Exchange/highcharts-plugins/atr.js diff --git a/web/app/components/Exchange/highcharts-plugins/ema.js b/app/components/Exchange/highcharts-plugins/ema.js similarity index 100% rename from web/app/components/Exchange/highcharts-plugins/ema.js rename to app/components/Exchange/highcharts-plugins/ema.js diff --git a/web/app/components/Exchange/highcharts-plugins/highstock-current-price-indicator.js b/app/components/Exchange/highcharts-plugins/highstock-current-price-indicator.js similarity index 100% rename from web/app/components/Exchange/highcharts-plugins/highstock-current-price-indicator.js rename to app/components/Exchange/highcharts-plugins/highstock-current-price-indicator.js diff --git a/web/app/components/Exchange/highcharts-plugins/indicators.css b/app/components/Exchange/highcharts-plugins/indicators.css similarity index 100% rename from web/app/components/Exchange/highcharts-plugins/indicators.css rename to app/components/Exchange/highcharts-plugins/indicators.css diff --git a/web/app/components/Exchange/highcharts-plugins/oxymoronic-candlesticks.js b/app/components/Exchange/highcharts-plugins/oxymoronic-candlesticks.js similarity index 100% rename from web/app/components/Exchange/highcharts-plugins/oxymoronic-candlesticks.js rename to app/components/Exchange/highcharts-plugins/oxymoronic-candlesticks.js diff --git a/web/app/components/Exchange/highcharts-plugins/rsi.js b/app/components/Exchange/highcharts-plugins/rsi.js similarity index 100% rename from web/app/components/Exchange/highcharts-plugins/rsi.js rename to app/components/Exchange/highcharts-plugins/rsi.js diff --git a/web/app/components/Exchange/highcharts-plugins/sma.js b/app/components/Exchange/highcharts-plugins/sma.js similarity index 100% rename from web/app/components/Exchange/highcharts-plugins/sma.js rename to app/components/Exchange/highcharts-plugins/sma.js diff --git a/web/app/components/Exchange/highcharts-plugins/technical-indicators.src.js b/app/components/Exchange/highcharts-plugins/technical-indicators.src.js similarity index 100% rename from web/app/components/Exchange/highcharts-plugins/technical-indicators.src.js rename to app/components/Exchange/highcharts-plugins/technical-indicators.src.js diff --git a/web/app/components/Explorer/Accounts.jsx b/app/components/Explorer/Accounts.jsx similarity index 100% rename from web/app/components/Explorer/Accounts.jsx rename to app/components/Explorer/Accounts.jsx diff --git a/web/app/components/Explorer/AccountsContainer.jsx b/app/components/Explorer/AccountsContainer.jsx similarity index 100% rename from web/app/components/Explorer/AccountsContainer.jsx rename to app/components/Explorer/AccountsContainer.jsx diff --git a/web/app/components/Explorer/Assets.jsx b/app/components/Explorer/Assets.jsx similarity index 100% rename from web/app/components/Explorer/Assets.jsx rename to app/components/Explorer/Assets.jsx diff --git a/web/app/components/Explorer/AssetsContainer.jsx b/app/components/Explorer/AssetsContainer.jsx similarity index 100% rename from web/app/components/Explorer/AssetsContainer.jsx rename to app/components/Explorer/AssetsContainer.jsx diff --git a/web/app/components/Explorer/Blocks.jsx b/app/components/Explorer/Blocks.jsx similarity index 100% rename from web/app/components/Explorer/Blocks.jsx rename to app/components/Explorer/Blocks.jsx diff --git a/web/app/components/Explorer/BlocksContainer.jsx b/app/components/Explorer/BlocksContainer.jsx similarity index 100% rename from web/app/components/Explorer/BlocksContainer.jsx rename to app/components/Explorer/BlocksContainer.jsx diff --git a/web/app/components/Explorer/BlocktimeChart.jsx b/app/components/Explorer/BlocktimeChart.jsx similarity index 100% rename from web/app/components/Explorer/BlocktimeChart.jsx rename to app/components/Explorer/BlocktimeChart.jsx diff --git a/web/app/components/Explorer/CommitteeMembers.jsx b/app/components/Explorer/CommitteeMembers.jsx similarity index 100% rename from web/app/components/Explorer/CommitteeMembers.jsx rename to app/components/Explorer/CommitteeMembers.jsx diff --git a/web/app/components/Explorer/Explorer.jsx b/app/components/Explorer/Explorer.jsx similarity index 100% rename from web/app/components/Explorer/Explorer.jsx rename to app/components/Explorer/Explorer.jsx diff --git a/web/app/components/Explorer/TransactionChart.jsx b/app/components/Explorer/TransactionChart.jsx similarity index 100% rename from web/app/components/Explorer/TransactionChart.jsx rename to app/components/Explorer/TransactionChart.jsx diff --git a/web/app/components/Explorer/Witnesses.jsx b/app/components/Explorer/Witnesses.jsx similarity index 100% rename from web/app/components/Explorer/Witnesses.jsx rename to app/components/Explorer/Witnesses.jsx diff --git a/web/app/components/Explorer/witnesses.scss b/app/components/Explorer/witnesses.scss similarity index 100% rename from web/app/components/Explorer/witnesses.scss rename to app/components/Explorer/witnesses.scss diff --git a/web/app/components/Forms/AccountNameInput.jsx b/app/components/Forms/AccountNameInput.jsx similarity index 100% rename from web/app/components/Forms/AccountNameInput.jsx rename to app/components/Forms/AccountNameInput.jsx diff --git a/web/app/components/Forms/AccountSelect.jsx b/app/components/Forms/AccountSelect.jsx similarity index 100% rename from web/app/components/Forms/AccountSelect.jsx rename to app/components/Forms/AccountSelect.jsx diff --git a/web/app/components/Forms/AutocompleteInput.jsx b/app/components/Forms/AutocompleteInput.jsx similarity index 100% rename from web/app/components/Forms/AutocompleteInput.jsx rename to app/components/Forms/AutocompleteInput.jsx diff --git a/web/app/components/Forms/MyAccounts.jsx b/app/components/Forms/MyAccounts.jsx similarity index 100% rename from web/app/components/Forms/MyAccounts.jsx rename to app/components/Forms/MyAccounts.jsx diff --git a/web/app/components/Forms/PasswordInput.jsx b/app/components/Forms/PasswordInput.jsx similarity index 100% rename from web/app/components/Forms/PasswordInput.jsx rename to app/components/Forms/PasswordInput.jsx diff --git a/web/app/components/Forms/PubKeyInput.jsx b/app/components/Forms/PubKeyInput.jsx similarity index 100% rename from web/app/components/Forms/PubKeyInput.jsx rename to app/components/Forms/PubKeyInput.jsx diff --git a/web/app/components/Forms/RefcodeInput.jsx b/app/components/Forms/RefcodeInput.jsx similarity index 100% rename from web/app/components/Forms/RefcodeInput.jsx rename to app/components/Forms/RefcodeInput.jsx diff --git a/web/app/components/Help.jsx b/app/components/Help.jsx similarity index 100% rename from web/app/components/Help.jsx rename to app/components/Help.jsx diff --git a/web/app/components/Icon/Icon.jsx b/app/components/Icon/Icon.jsx similarity index 100% rename from web/app/components/Icon/Icon.jsx rename to app/components/Icon/Icon.jsx diff --git a/web/app/components/Icon/accounts.svg b/app/components/Icon/accounts.svg similarity index 100% rename from web/app/components/Icon/accounts.svg rename to app/components/Icon/accounts.svg diff --git a/web/app/components/Icon/assets.svg b/app/components/Icon/assets.svg similarity index 100% rename from web/app/components/Icon/assets.svg rename to app/components/Icon/assets.svg diff --git a/web/app/components/Icon/b-logo.svg b/app/components/Icon/b-logo.svg similarity index 100% rename from web/app/components/Icon/b-logo.svg rename to app/components/Icon/b-logo.svg diff --git a/web/app/components/Icon/blocks.svg b/app/components/Icon/blocks.svg similarity index 100% rename from web/app/components/Icon/blocks.svg rename to app/components/Icon/blocks.svg diff --git a/web/app/components/Icon/checkmark-circle.svg b/app/components/Icon/checkmark-circle.svg similarity index 100% rename from web/app/components/Icon/checkmark-circle.svg rename to app/components/Icon/checkmark-circle.svg diff --git a/web/app/components/Icon/checkmark.svg b/app/components/Icon/checkmark.svg similarity index 100% rename from web/app/components/Icon/checkmark.svg rename to app/components/Icon/checkmark.svg diff --git a/web/app/components/Icon/chevron-down.svg b/app/components/Icon/chevron-down.svg similarity index 100% rename from web/app/components/Icon/chevron-down.svg rename to app/components/Icon/chevron-down.svg diff --git a/web/app/components/Icon/clippy.svg b/app/components/Icon/clippy.svg similarity index 100% rename from web/app/components/Icon/clippy.svg rename to app/components/Icon/clippy.svg diff --git a/web/app/components/Icon/clock.svg b/app/components/Icon/clock.svg similarity index 100% rename from web/app/components/Icon/clock.svg rename to app/components/Icon/clock.svg diff --git a/web/app/components/Icon/cog.svg b/app/components/Icon/cog.svg similarity index 100% rename from web/app/components/Icon/cog.svg rename to app/components/Icon/cog.svg diff --git a/web/app/components/Icon/committee_members.svg b/app/components/Icon/committee_members.svg similarity index 100% rename from web/app/components/Icon/committee_members.svg rename to app/components/Icon/committee_members.svg diff --git a/web/app/components/Icon/cross-circle.svg b/app/components/Icon/cross-circle.svg similarity index 100% rename from web/app/components/Icon/cross-circle.svg rename to app/components/Icon/cross-circle.svg diff --git a/web/app/components/Icon/database.svg b/app/components/Icon/database.svg similarity index 100% rename from web/app/components/Icon/database.svg rename to app/components/Icon/database.svg diff --git a/web/app/components/Icon/fees.svg b/app/components/Icon/fees.svg similarity index 100% rename from web/app/components/Icon/fees.svg rename to app/components/Icon/fees.svg diff --git a/web/app/components/Icon/fi-star.svg b/app/components/Icon/fi-star.svg similarity index 100% rename from web/app/components/Icon/fi-star.svg rename to app/components/Icon/fi-star.svg diff --git a/web/app/components/Icon/icon.scss b/app/components/Icon/icon.scss similarity index 100% rename from web/app/components/Icon/icon.scss rename to app/components/Icon/icon.scss diff --git a/web/app/components/Icon/key.svg b/app/components/Icon/key.svg similarity index 100% rename from web/app/components/Icon/key.svg rename to app/components/Icon/key.svg diff --git a/web/app/components/Icon/layers.svg b/app/components/Icon/layers.svg similarity index 100% rename from web/app/components/Icon/layers.svg rename to app/components/Icon/layers.svg diff --git a/web/app/components/Icon/locked.svg b/app/components/Icon/locked.svg similarity index 100% rename from web/app/components/Icon/locked.svg rename to app/components/Icon/locked.svg diff --git a/web/app/components/Icon/markets.svg b/app/components/Icon/markets.svg similarity index 100% rename from web/app/components/Icon/markets.svg rename to app/components/Icon/markets.svg diff --git a/web/app/components/Icon/menu.svg b/app/components/Icon/menu.svg similarity index 100% rename from web/app/components/Icon/menu.svg rename to app/components/Icon/menu.svg diff --git a/web/app/components/Icon/piggy.svg b/app/components/Icon/piggy.svg similarity index 100% rename from web/app/components/Icon/piggy.svg rename to app/components/Icon/piggy.svg diff --git a/web/app/components/Icon/plus-circle.svg b/app/components/Icon/plus-circle.svg similarity index 100% rename from web/app/components/Icon/plus-circle.svg rename to app/components/Icon/plus-circle.svg diff --git a/web/app/components/Icon/proposals.svg b/app/components/Icon/proposals.svg similarity index 100% rename from web/app/components/Icon/proposals.svg rename to app/components/Icon/proposals.svg diff --git a/web/app/components/Icon/question-circle.svg b/app/components/Icon/question-circle.svg similarity index 100% rename from web/app/components/Icon/question-circle.svg rename to app/components/Icon/question-circle.svg diff --git a/web/app/components/Icon/search.svg b/app/components/Icon/search.svg similarity index 100% rename from web/app/components/Icon/search.svg rename to app/components/Icon/search.svg diff --git a/web/app/components/Icon/thumb-tack.svg b/app/components/Icon/thumb-tack.svg similarity index 100% rename from web/app/components/Icon/thumb-tack.svg rename to app/components/Icon/thumb-tack.svg diff --git a/web/app/components/Icon/trash.svg b/app/components/Icon/trash.svg similarity index 100% rename from web/app/components/Icon/trash.svg rename to app/components/Icon/trash.svg diff --git a/web/app/components/Icon/unlocked.svg b/app/components/Icon/unlocked.svg similarity index 100% rename from web/app/components/Icon/unlocked.svg rename to app/components/Icon/unlocked.svg diff --git a/web/app/components/Icon/user.svg b/app/components/Icon/user.svg similarity index 100% rename from web/app/components/Icon/user.svg rename to app/components/Icon/user.svg diff --git a/web/app/components/Icon/users.svg b/app/components/Icon/users.svg similarity index 100% rename from web/app/components/Icon/users.svg rename to app/components/Icon/users.svg diff --git a/web/app/components/Icon/wand.svg b/app/components/Icon/wand.svg similarity index 100% rename from web/app/components/Icon/wand.svg rename to app/components/Icon/wand.svg diff --git a/web/app/components/Icon/witnesses.svg b/app/components/Icon/witnesses.svg similarity index 100% rename from web/app/components/Icon/witnesses.svg rename to app/components/Icon/witnesses.svg diff --git a/web/app/components/Icon/workers.svg b/app/components/Icon/workers.svg similarity index 100% rename from web/app/components/Icon/workers.svg rename to app/components/Icon/workers.svg diff --git a/web/app/components/InitError.jsx b/app/components/InitError.jsx similarity index 100% rename from web/app/components/InitError.jsx rename to app/components/InitError.jsx diff --git a/web/app/components/Layout/Footer.jsx b/app/components/Layout/Footer.jsx similarity index 100% rename from web/app/components/Layout/Footer.jsx rename to app/components/Layout/Footer.jsx diff --git a/web/app/components/Layout/Header.jsx b/app/components/Layout/Header.jsx similarity index 100% rename from web/app/components/Layout/Header.jsx rename to app/components/Layout/Header.jsx diff --git a/web/app/components/Layout/MobileMenu.jsx b/app/components/Layout/MobileMenu.jsx similarity index 100% rename from web/app/components/Layout/MobileMenu.jsx rename to app/components/Layout/MobileMenu.jsx diff --git a/web/app/components/LoadingIndicator.jsx b/app/components/LoadingIndicator.jsx similarity index 100% rename from web/app/components/LoadingIndicator.jsx rename to app/components/LoadingIndicator.jsx diff --git a/web/app/components/LoginSelector.jsx b/app/components/LoginSelector.jsx similarity index 100% rename from web/app/components/LoginSelector.jsx rename to app/components/LoginSelector.jsx diff --git a/web/app/components/Modal/BaseModal.jsx b/app/components/Modal/BaseModal.jsx similarity index 100% rename from web/app/components/Modal/BaseModal.jsx rename to app/components/Modal/BaseModal.jsx diff --git a/web/app/components/Modal/BorrowModal.jsx b/app/components/Modal/BorrowModal.jsx similarity index 100% rename from web/app/components/Modal/BorrowModal.jsx rename to app/components/Modal/BorrowModal.jsx diff --git a/web/app/components/Modal/BrowserSupportModal.jsx b/app/components/Modal/BrowserSupportModal.jsx similarity index 100% rename from web/app/components/Modal/BrowserSupportModal.jsx rename to app/components/Modal/BrowserSupportModal.jsx diff --git a/web/app/components/Modal/ConfirmModal.jsx b/app/components/Modal/ConfirmModal.jsx similarity index 100% rename from web/app/components/Modal/ConfirmModal.jsx rename to app/components/Modal/ConfirmModal.jsx diff --git a/web/app/components/Modal/IssueModal.jsx b/app/components/Modal/IssueModal.jsx similarity index 100% rename from web/app/components/Modal/IssueModal.jsx rename to app/components/Modal/IssueModal.jsx diff --git a/web/app/components/Modal/ProposalApproveModal.jsx b/app/components/Modal/ProposalApproveModal.jsx similarity index 100% rename from web/app/components/Modal/ProposalApproveModal.jsx rename to app/components/Modal/ProposalApproveModal.jsx diff --git a/web/app/components/Modal/ReserveAssetModal.jsx b/app/components/Modal/ReserveAssetModal.jsx similarity index 100% rename from web/app/components/Modal/ReserveAssetModal.jsx rename to app/components/Modal/ReserveAssetModal.jsx diff --git a/web/app/components/Modal/SettleModal.jsx b/app/components/Modal/SettleModal.jsx similarity index 100% rename from web/app/components/Modal/SettleModal.jsx rename to app/components/Modal/SettleModal.jsx diff --git a/web/app/components/Notifier/Notifier.jsx b/app/components/Notifier/Notifier.jsx similarity index 100% rename from web/app/components/Notifier/Notifier.jsx rename to app/components/Notifier/Notifier.jsx diff --git a/web/app/components/Notifier/NotifierContainer.jsx b/app/components/Notifier/NotifierContainer.jsx similarity index 100% rename from web/app/components/Notifier/NotifierContainer.jsx rename to app/components/Notifier/NotifierContainer.jsx diff --git a/web/app/components/PrivateKeyView.jsx b/app/components/PrivateKeyView.jsx similarity index 100% rename from web/app/components/PrivateKeyView.jsx rename to app/components/PrivateKeyView.jsx diff --git a/web/app/components/Settings/AccessSettings.jsx b/app/components/Settings/AccessSettings.jsx similarity index 100% rename from web/app/components/Settings/AccessSettings.jsx rename to app/components/Settings/AccessSettings.jsx diff --git a/web/app/components/Settings/AccountsSettings.jsx b/app/components/Settings/AccountsSettings.jsx similarity index 100% rename from web/app/components/Settings/AccountsSettings.jsx rename to app/components/Settings/AccountsSettings.jsx diff --git a/web/app/components/Settings/BackupSettings.jsx b/app/components/Settings/BackupSettings.jsx similarity index 100% rename from web/app/components/Settings/BackupSettings.jsx rename to app/components/Settings/BackupSettings.jsx diff --git a/web/app/components/Settings/PasswordSettings.jsx b/app/components/Settings/PasswordSettings.jsx similarity index 100% rename from web/app/components/Settings/PasswordSettings.jsx rename to app/components/Settings/PasswordSettings.jsx diff --git a/web/app/components/Settings/RestoreSettings.jsx b/app/components/Settings/RestoreSettings.jsx similarity index 100% rename from web/app/components/Settings/RestoreSettings.jsx rename to app/components/Settings/RestoreSettings.jsx diff --git a/web/app/components/Settings/Settings.jsx b/app/components/Settings/Settings.jsx similarity index 100% rename from web/app/components/Settings/Settings.jsx rename to app/components/Settings/Settings.jsx diff --git a/web/app/components/Settings/SettingsContainer.jsx b/app/components/Settings/SettingsContainer.jsx similarity index 100% rename from web/app/components/Settings/SettingsContainer.jsx rename to app/components/Settings/SettingsContainer.jsx diff --git a/web/app/components/Settings/SettingsEntry.jsx b/app/components/Settings/SettingsEntry.jsx similarity index 100% rename from web/app/components/Settings/SettingsEntry.jsx rename to app/components/Settings/SettingsEntry.jsx diff --git a/web/app/components/Settings/WalletSettings.jsx b/app/components/Settings/WalletSettings.jsx similarity index 100% rename from web/app/components/Settings/WalletSettings.jsx rename to app/components/Settings/WalletSettings.jsx diff --git a/web/app/components/Settings/WebsocketAddModal.jsx b/app/components/Settings/WebsocketAddModal.jsx similarity index 100% rename from web/app/components/Settings/WebsocketAddModal.jsx rename to app/components/Settings/WebsocketAddModal.jsx diff --git a/web/app/components/SyncError.jsx b/app/components/SyncError.jsx similarity index 100% rename from web/app/components/SyncError.jsx rename to app/components/SyncError.jsx diff --git a/web/app/components/Transfer/Invoice.jsx b/app/components/Transfer/Invoice.jsx similarity index 100% rename from web/app/components/Transfer/Invoice.jsx rename to app/components/Transfer/Invoice.jsx diff --git a/web/app/components/Transfer/Transfer.jsx b/app/components/Transfer/Transfer.jsx similarity index 100% rename from web/app/components/Transfer/Transfer.jsx rename to app/components/Transfer/Transfer.jsx diff --git a/web/app/components/Transfer/transfer.scss b/app/components/Transfer/transfer.scss similarity index 100% rename from web/app/components/Transfer/transfer.scss rename to app/components/Transfer/transfer.scss diff --git a/web/app/components/Utility/AccountName.jsx b/app/components/Utility/AccountName.jsx similarity index 100% rename from web/app/components/Utility/AccountName.jsx rename to app/components/Utility/AccountName.jsx diff --git a/web/app/components/Utility/AmountSelector.jsx b/app/components/Utility/AmountSelector.jsx similarity index 100% rename from web/app/components/Utility/AmountSelector.jsx rename to app/components/Utility/AmountSelector.jsx diff --git a/web/app/components/Utility/AssetName.jsx b/app/components/Utility/AssetName.jsx similarity index 100% rename from web/app/components/Utility/AssetName.jsx rename to app/components/Utility/AssetName.jsx diff --git a/web/app/components/Utility/AssetSelector.jsx b/app/components/Utility/AssetSelector.jsx similarity index 100% rename from web/app/components/Utility/AssetSelector.jsx rename to app/components/Utility/AssetSelector.jsx diff --git a/web/app/components/Utility/BalanceComponent.jsx b/app/components/Utility/BalanceComponent.jsx similarity index 100% rename from web/app/components/Utility/BalanceComponent.jsx rename to app/components/Utility/BalanceComponent.jsx diff --git a/web/app/components/Utility/BindToChainState.jsx b/app/components/Utility/BindToChainState.jsx similarity index 100% rename from web/app/components/Utility/BindToChainState.jsx rename to app/components/Utility/BindToChainState.jsx diff --git a/web/app/components/Utility/ChainResolveComponents.jsx b/app/components/Utility/ChainResolveComponents.jsx similarity index 100% rename from web/app/components/Utility/ChainResolveComponents.jsx rename to app/components/Utility/ChainResolveComponents.jsx diff --git a/web/app/components/Utility/ChainTypes.js b/app/components/Utility/ChainTypes.js similarity index 100% rename from web/app/components/Utility/ChainTypes.js rename to app/components/Utility/ChainTypes.js diff --git a/web/app/components/Utility/CopyButton.jsx b/app/components/Utility/CopyButton.jsx similarity index 100% rename from web/app/components/Utility/CopyButton.jsx rename to app/components/Utility/CopyButton.jsx diff --git a/web/app/components/Utility/EquivalentValueComponent.jsx b/app/components/Utility/EquivalentValueComponent.jsx similarity index 100% rename from web/app/components/Utility/EquivalentValueComponent.jsx rename to app/components/Utility/EquivalentValueComponent.jsx diff --git a/web/app/components/Utility/FloatingDropdown.jsx b/app/components/Utility/FloatingDropdown.jsx similarity index 100% rename from web/app/components/Utility/FloatingDropdown.jsx rename to app/components/Utility/FloatingDropdown.jsx diff --git a/web/app/components/Utility/FormattedAsset.jsx b/app/components/Utility/FormattedAsset.jsx similarity index 100% rename from web/app/components/Utility/FormattedAsset.jsx rename to app/components/Utility/FormattedAsset.jsx diff --git a/web/app/components/Utility/FormattedFee.jsx b/app/components/Utility/FormattedFee.jsx similarity index 100% rename from web/app/components/Utility/FormattedFee.jsx rename to app/components/Utility/FormattedFee.jsx diff --git a/web/app/components/Utility/FormattedPrice.jsx b/app/components/Utility/FormattedPrice.jsx similarity index 100% rename from web/app/components/Utility/FormattedPrice.jsx rename to app/components/Utility/FormattedPrice.jsx diff --git a/web/app/components/Utility/HelpContent.jsx b/app/components/Utility/HelpContent.jsx similarity index 97% rename from web/app/components/Utility/HelpContent.jsx rename to app/components/Utility/HelpContent.jsx index f5e36dd08f..b7ffba5dda 100644 --- a/web/app/components/Utility/HelpContent.jsx +++ b/app/components/Utility/HelpContent.jsx @@ -1,10 +1,10 @@ import React from "react"; -import {reduce, zipObject} from "lodash"; +import { zipObject } from "lodash"; import counterpart from "counterpart"; import utils from "common/utils"; import {withRouter} from "react-router"; -let req = require.context("../../../../help", true, /\.md/); +let req = require.context("../../help", true, /\.md/); let HelpData = {}; function endsWith(str, suffix) { diff --git a/web/app/components/Utility/MarketLink.jsx b/app/components/Utility/MarketLink.jsx similarity index 100% rename from web/app/components/Utility/MarketLink.jsx rename to app/components/Utility/MarketLink.jsx diff --git a/web/app/components/Utility/PriceText.jsx b/app/components/Utility/PriceText.jsx similarity index 100% rename from web/app/components/Utility/PriceText.jsx rename to app/components/Utility/PriceText.jsx diff --git a/web/app/components/Utility/Prototypes.js b/app/components/Utility/Prototypes.js similarity index 100% rename from web/app/components/Utility/Prototypes.js rename to app/components/Utility/Prototypes.js diff --git a/web/app/components/Utility/Tabs.jsx b/app/components/Utility/Tabs.jsx similarity index 100% rename from web/app/components/Utility/Tabs.jsx rename to app/components/Utility/Tabs.jsx diff --git a/web/app/components/Utility/TimeAgo.jsx b/app/components/Utility/TimeAgo.jsx similarity index 100% rename from web/app/components/Utility/TimeAgo.jsx rename to app/components/Utility/TimeAgo.jsx diff --git a/web/app/components/Utility/TotalBalanceValue.jsx b/app/components/Utility/TotalBalanceValue.jsx similarity index 100% rename from web/app/components/Utility/TotalBalanceValue.jsx rename to app/components/Utility/TotalBalanceValue.jsx diff --git a/web/app/components/Utility/TransitionWrapper.jsx b/app/components/Utility/TransitionWrapper.jsx similarity index 100% rename from web/app/components/Utility/TransitionWrapper.jsx rename to app/components/Utility/TransitionWrapper.jsx diff --git a/web/app/components/Utility/TranslateWithLinks.jsx b/app/components/Utility/TranslateWithLinks.jsx similarity index 100% rename from web/app/components/Utility/TranslateWithLinks.jsx rename to app/components/Utility/TranslateWithLinks.jsx diff --git a/web/app/components/Utility/VestingBalance.jsx b/app/components/Utility/VestingBalance.jsx similarity index 100% rename from web/app/components/Utility/VestingBalance.jsx rename to app/components/Utility/VestingBalance.jsx diff --git a/web/app/components/Utility/intlData.js b/app/components/Utility/intlData.js similarity index 100% rename from web/app/components/Utility/intlData.js rename to app/components/Utility/intlData.js diff --git a/web/app/components/Wallet/Backup.jsx b/app/components/Wallet/Backup.jsx similarity index 100% rename from web/app/components/Wallet/Backup.jsx rename to app/components/Wallet/Backup.jsx diff --git a/web/app/components/Wallet/BackupBrainkey.jsx b/app/components/Wallet/BackupBrainkey.jsx similarity index 100% rename from web/app/components/Wallet/BackupBrainkey.jsx rename to app/components/Wallet/BackupBrainkey.jsx diff --git a/web/app/components/Wallet/BalanceClaimActive.jsx b/app/components/Wallet/BalanceClaimActive.jsx similarity index 100% rename from web/app/components/Wallet/BalanceClaimActive.jsx rename to app/components/Wallet/BalanceClaimActive.jsx diff --git a/web/app/components/Wallet/BalanceClaimAssetTotal.jsx b/app/components/Wallet/BalanceClaimAssetTotal.jsx similarity index 100% rename from web/app/components/Wallet/BalanceClaimAssetTotal.jsx rename to app/components/Wallet/BalanceClaimAssetTotal.jsx diff --git a/web/app/components/Wallet/BalanceClaimByAsset.jsx b/app/components/Wallet/BalanceClaimByAsset.jsx similarity index 100% rename from web/app/components/Wallet/BalanceClaimByAsset.jsx rename to app/components/Wallet/BalanceClaimByAsset.jsx diff --git a/web/app/components/Wallet/BalanceClaimSelector.jsx b/app/components/Wallet/BalanceClaimSelector.jsx similarity index 100% rename from web/app/components/Wallet/BalanceClaimSelector.jsx rename to app/components/Wallet/BalanceClaimSelector.jsx diff --git a/web/app/components/Wallet/Brainkey.jsx b/app/components/Wallet/Brainkey.jsx similarity index 100% rename from web/app/components/Wallet/Brainkey.jsx rename to app/components/Wallet/Brainkey.jsx diff --git a/web/app/components/Wallet/BrainkeyInput.jsx b/app/components/Wallet/BrainkeyInput.jsx similarity index 100% rename from web/app/components/Wallet/BrainkeyInput.jsx rename to app/components/Wallet/BrainkeyInput.jsx diff --git a/web/app/components/Wallet/ExistingAccount.jsx b/app/components/Wallet/ExistingAccount.jsx similarity index 100% rename from web/app/components/Wallet/ExistingAccount.jsx rename to app/components/Wallet/ExistingAccount.jsx diff --git a/web/app/components/Wallet/ImportKeys.jsx b/app/components/Wallet/ImportKeys.jsx similarity index 100% rename from web/app/components/Wallet/ImportKeys.jsx rename to app/components/Wallet/ImportKeys.jsx diff --git a/web/app/components/Wallet/ImportKeys.scss b/app/components/Wallet/ImportKeys.scss similarity index 100% rename from web/app/components/Wallet/ImportKeys.scss rename to app/components/Wallet/ImportKeys.scss diff --git a/web/app/components/Wallet/PasswordConfirm.jsx b/app/components/Wallet/PasswordConfirm.jsx similarity index 100% rename from web/app/components/Wallet/PasswordConfirm.jsx rename to app/components/Wallet/PasswordConfirm.jsx diff --git a/web/app/components/Wallet/WalletChangePassword.jsx b/app/components/Wallet/WalletChangePassword.jsx similarity index 100% rename from web/app/components/Wallet/WalletChangePassword.jsx rename to app/components/Wallet/WalletChangePassword.jsx diff --git a/web/app/components/Wallet/WalletCreate.jsx b/app/components/Wallet/WalletCreate.jsx similarity index 100% rename from web/app/components/Wallet/WalletCreate.jsx rename to app/components/Wallet/WalletCreate.jsx diff --git a/web/app/components/Wallet/WalletManager.jsx b/app/components/Wallet/WalletManager.jsx similarity index 100% rename from web/app/components/Wallet/WalletManager.jsx rename to app/components/Wallet/WalletManager.jsx diff --git a/web/app/components/Wallet/WalletUnlockModal.jsx b/app/components/Wallet/WalletUnlockModal.jsx similarity index 100% rename from web/app/components/Wallet/WalletUnlockModal.jsx rename to app/components/Wallet/WalletUnlockModal.jsx diff --git a/web/app/counterpart-instance.js b/app/counterpart-instance.js similarity index 100% rename from web/app/counterpart-instance.js rename to app/counterpart-instance.js diff --git a/web/app/dl_cli_index.js b/app/dl_cli_index.js similarity index 100% rename from web/app/dl_cli_index.js rename to app/dl_cli_index.js diff --git a/web/app/electron_imports.js b/app/electron_imports.js similarity index 100% rename from web/app/electron_imports.js rename to app/electron_imports.js diff --git a/help/cn/accounts/general.md b/app/help/cn/accounts/general.md similarity index 100% rename from help/cn/accounts/general.md rename to app/help/cn/accounts/general.md diff --git a/help/cn/accounts/membership.md b/app/help/cn/accounts/membership.md similarity index 100% rename from help/cn/accounts/membership.md rename to app/help/cn/accounts/membership.md diff --git a/help/cn/accounts/permissions.md b/app/help/cn/accounts/permissions.md similarity index 100% rename from help/cn/accounts/permissions.md rename to app/help/cn/accounts/permissions.md diff --git a/help/cn/assets/EUR.md b/app/help/cn/assets/EUR.md similarity index 100% rename from help/cn/assets/EUR.md rename to app/help/cn/assets/EUR.md diff --git a/help/cn/assets/USD.md b/app/help/cn/assets/USD.md similarity index 100% rename from help/cn/assets/USD.md rename to app/help/cn/assets/USD.md diff --git a/help/cn/assets/mpa.md b/app/help/cn/assets/mpa.md similarity index 100% rename from help/cn/assets/mpa.md rename to app/help/cn/assets/mpa.md diff --git a/help/cn/assets/privbitassets.md b/app/help/cn/assets/privbitassets.md similarity index 100% rename from help/cn/assets/privbitassets.md rename to app/help/cn/assets/privbitassets.md diff --git a/help/cn/assets/uia.md b/app/help/cn/assets/uia.md similarity index 100% rename from help/cn/assets/uia.md rename to app/help/cn/assets/uia.md diff --git a/help/cn/components/AccountAssetCreate.md b/app/help/cn/components/AccountAssetCreate.md similarity index 100% rename from help/cn/components/AccountAssetCreate.md rename to app/help/cn/components/AccountAssetCreate.md diff --git a/help/cn/components/AccountMembership.md b/app/help/cn/components/AccountMembership.md similarity index 100% rename from help/cn/components/AccountMembership.md rename to app/help/cn/components/AccountMembership.md diff --git a/help/cn/components/AccountPermActive.md b/app/help/cn/components/AccountPermActive.md similarity index 100% rename from help/cn/components/AccountPermActive.md rename to app/help/cn/components/AccountPermActive.md diff --git a/help/cn/components/AccountPermMemo.md b/app/help/cn/components/AccountPermMemo.md similarity index 100% rename from help/cn/components/AccountPermMemo.md rename to app/help/cn/components/AccountPermMemo.md diff --git a/help/cn/components/AccountPermOwner.md b/app/help/cn/components/AccountPermOwner.md similarity index 100% rename from help/cn/components/AccountPermOwner.md rename to app/help/cn/components/AccountPermOwner.md diff --git a/help/cn/components/AccountVoting.md b/app/help/cn/components/AccountVoting.md similarity index 100% rename from help/cn/components/AccountVoting.md rename to app/help/cn/components/AccountVoting.md diff --git a/help/cn/components/AccountVotingCommittee.md b/app/help/cn/components/AccountVotingCommittee.md similarity index 100% rename from help/cn/components/AccountVotingCommittee.md rename to app/help/cn/components/AccountVotingCommittee.md diff --git a/help/cn/components/AccountVotingProxy.md b/app/help/cn/components/AccountVotingProxy.md similarity index 100% rename from help/cn/components/AccountVotingProxy.md rename to app/help/cn/components/AccountVotingProxy.md diff --git a/help/cn/components/AccountVotingWitnesses.md b/app/help/cn/components/AccountVotingWitnesses.md similarity index 100% rename from help/cn/components/AccountVotingWitnesses.md rename to app/help/cn/components/AccountVotingWitnesses.md diff --git a/help/cn/components/AccountVotingWorkers.md b/app/help/cn/components/AccountVotingWorkers.md similarity index 100% rename from help/cn/components/AccountVotingWorkers.md rename to app/help/cn/components/AccountVotingWorkers.md diff --git a/help/cn/components/BorrowModal.md b/app/help/cn/components/BorrowModal.md similarity index 100% rename from help/cn/components/BorrowModal.md rename to app/help/cn/components/BorrowModal.md diff --git a/help/cn/components/DepositWithdraw.md b/app/help/cn/components/DepositWithdraw.md similarity index 100% rename from help/cn/components/DepositWithdraw.md rename to app/help/cn/components/DepositWithdraw.md diff --git a/help/cn/components/Fees.md b/app/help/cn/components/Fees.md similarity index 100% rename from help/cn/components/Fees.md rename to app/help/cn/components/Fees.md diff --git a/help/cn/components/InitError.md b/app/help/cn/components/InitError.md similarity index 100% rename from help/cn/components/InitError.md rename to app/help/cn/components/InitError.md diff --git a/help/cn/dex/introduction.md b/app/help/cn/dex/introduction.md similarity index 100% rename from help/cn/dex/introduction.md rename to app/help/cn/dex/introduction.md diff --git a/help/cn/dex/shorting.md b/app/help/cn/dex/shorting.md similarity index 100% rename from help/cn/dex/shorting.md rename to app/help/cn/dex/shorting.md diff --git a/help/cn/dex/trading.md b/app/help/cn/dex/trading.md similarity index 100% rename from help/cn/dex/trading.md rename to app/help/cn/dex/trading.md diff --git a/help/cn/glossary.md b/app/help/cn/glossary.md similarity index 100% rename from help/cn/glossary.md rename to app/help/cn/glossary.md diff --git a/help/cn/index.md b/app/help/cn/index.md similarity index 100% rename from help/cn/index.md rename to app/help/cn/index.md diff --git a/help/cn/introduction/backups.md b/app/help/cn/introduction/backups.md similarity index 100% rename from help/cn/introduction/backups.md rename to app/help/cn/introduction/backups.md diff --git a/help/cn/introduction/bitshares.md b/app/help/cn/introduction/bitshares.md similarity index 100% rename from help/cn/introduction/bitshares.md rename to app/help/cn/introduction/bitshares.md diff --git a/help/cn/introduction/blockchain.md b/app/help/cn/introduction/blockchain.md similarity index 100% rename from help/cn/introduction/blockchain.md rename to app/help/cn/introduction/blockchain.md diff --git a/help/cn/introduction/bridges_gateways.md b/app/help/cn/introduction/bridges_gateways.md similarity index 100% rename from help/cn/introduction/bridges_gateways.md rename to app/help/cn/introduction/bridges_gateways.md diff --git a/help/cn/introduction/committee.md b/app/help/cn/introduction/committee.md similarity index 100% rename from help/cn/introduction/committee.md rename to app/help/cn/introduction/committee.md diff --git a/help/cn/introduction/wallets.md b/app/help/cn/introduction/wallets.md similarity index 100% rename from help/cn/introduction/wallets.md rename to app/help/cn/introduction/wallets.md diff --git a/help/cn/introduction/witness.md b/app/help/cn/introduction/witness.md similarity index 100% rename from help/cn/introduction/witness.md rename to app/help/cn/introduction/witness.md diff --git a/help/cn/introduction/workers.md b/app/help/cn/introduction/workers.md similarity index 100% rename from help/cn/introduction/workers.md rename to app/help/cn/introduction/workers.md diff --git a/help/cn/toc.md b/app/help/cn/toc.md similarity index 100% rename from help/cn/toc.md rename to app/help/cn/toc.md diff --git a/help/en/accounts/general.md b/app/help/en/accounts/general.md similarity index 100% rename from help/en/accounts/general.md rename to app/help/en/accounts/general.md diff --git a/help/en/accounts/membership.md b/app/help/en/accounts/membership.md similarity index 100% rename from help/en/accounts/membership.md rename to app/help/en/accounts/membership.md diff --git a/help/en/accounts/permissions.md b/app/help/en/accounts/permissions.md similarity index 100% rename from help/en/accounts/permissions.md rename to app/help/en/accounts/permissions.md diff --git a/help/en/assets/Asset.md b/app/help/en/assets/Asset.md similarity index 100% rename from help/en/assets/Asset.md rename to app/help/en/assets/Asset.md diff --git a/help/en/assets/EUR.md b/app/help/en/assets/EUR.md similarity index 100% rename from help/en/assets/EUR.md rename to app/help/en/assets/EUR.md diff --git a/help/en/assets/USD.md b/app/help/en/assets/USD.md similarity index 100% rename from help/en/assets/USD.md rename to app/help/en/assets/USD.md diff --git a/help/en/assets/mpa.md b/app/help/en/assets/mpa.md similarity index 100% rename from help/en/assets/mpa.md rename to app/help/en/assets/mpa.md diff --git a/help/en/assets/privbitassets.md b/app/help/en/assets/privbitassets.md similarity index 100% rename from help/en/assets/privbitassets.md rename to app/help/en/assets/privbitassets.md diff --git a/help/en/assets/uia.md b/app/help/en/assets/uia.md similarity index 100% rename from help/en/assets/uia.md rename to app/help/en/assets/uia.md diff --git a/help/en/components/AccountAssetCreate.md b/app/help/en/components/AccountAssetCreate.md similarity index 100% rename from help/en/components/AccountAssetCreate.md rename to app/help/en/components/AccountAssetCreate.md diff --git a/help/en/components/AccountMembership.md b/app/help/en/components/AccountMembership.md similarity index 100% rename from help/en/components/AccountMembership.md rename to app/help/en/components/AccountMembership.md diff --git a/help/en/components/AccountPermActive.md b/app/help/en/components/AccountPermActive.md similarity index 100% rename from help/en/components/AccountPermActive.md rename to app/help/en/components/AccountPermActive.md diff --git a/help/en/components/AccountPermMemo.md b/app/help/en/components/AccountPermMemo.md similarity index 100% rename from help/en/components/AccountPermMemo.md rename to app/help/en/components/AccountPermMemo.md diff --git a/help/en/components/AccountPermOwner.md b/app/help/en/components/AccountPermOwner.md similarity index 100% rename from help/en/components/AccountPermOwner.md rename to app/help/en/components/AccountPermOwner.md diff --git a/help/en/components/AccountVoting.md b/app/help/en/components/AccountVoting.md similarity index 100% rename from help/en/components/AccountVoting.md rename to app/help/en/components/AccountVoting.md diff --git a/help/en/components/AccountVotingCommittee.md b/app/help/en/components/AccountVotingCommittee.md similarity index 100% rename from help/en/components/AccountVotingCommittee.md rename to app/help/en/components/AccountVotingCommittee.md diff --git a/help/en/components/AccountVotingProxy.md b/app/help/en/components/AccountVotingProxy.md similarity index 100% rename from help/en/components/AccountVotingProxy.md rename to app/help/en/components/AccountVotingProxy.md diff --git a/help/en/components/AccountVotingWitnesses.md b/app/help/en/components/AccountVotingWitnesses.md similarity index 100% rename from help/en/components/AccountVotingWitnesses.md rename to app/help/en/components/AccountVotingWitnesses.md diff --git a/help/en/components/AccountVotingWorkers.md b/app/help/en/components/AccountVotingWorkers.md similarity index 100% rename from help/en/components/AccountVotingWorkers.md rename to app/help/en/components/AccountVotingWorkers.md diff --git a/help/en/components/BorrowModal.md b/app/help/en/components/BorrowModal.md similarity index 100% rename from help/en/components/BorrowModal.md rename to app/help/en/components/BorrowModal.md diff --git a/help/en/components/BorrowModalPrediction.md b/app/help/en/components/BorrowModalPrediction.md similarity index 100% rename from help/en/components/BorrowModalPrediction.md rename to app/help/en/components/BorrowModalPrediction.md diff --git a/help/en/components/DepositWithdraw.md b/app/help/en/components/DepositWithdraw.md similarity index 100% rename from help/en/components/DepositWithdraw.md rename to app/help/en/components/DepositWithdraw.md diff --git a/help/en/components/Fees.md b/app/help/en/components/Fees.md similarity index 100% rename from help/en/components/Fees.md rename to app/help/en/components/Fees.md diff --git a/help/en/components/InitError.md b/app/help/en/components/InitError.md similarity index 100% rename from help/en/components/InitError.md rename to app/help/en/components/InitError.md diff --git a/help/en/dex/introduction.md b/app/help/en/dex/introduction.md similarity index 100% rename from help/en/dex/introduction.md rename to app/help/en/dex/introduction.md diff --git a/help/en/dex/shorting.md b/app/help/en/dex/shorting.md similarity index 100% rename from help/en/dex/shorting.md rename to app/help/en/dex/shorting.md diff --git a/help/en/dex/trading.md b/app/help/en/dex/trading.md similarity index 100% rename from help/en/dex/trading.md rename to app/help/en/dex/trading.md diff --git a/help/en/glossary.md b/app/help/en/glossary.md similarity index 100% rename from help/en/glossary.md rename to app/help/en/glossary.md diff --git a/help/en/index.md b/app/help/en/index.md similarity index 100% rename from help/en/index.md rename to app/help/en/index.md diff --git a/help/en/introduction/backups.md b/app/help/en/introduction/backups.md similarity index 100% rename from help/en/introduction/backups.md rename to app/help/en/introduction/backups.md diff --git a/help/en/introduction/bitshares.md b/app/help/en/introduction/bitshares.md similarity index 100% rename from help/en/introduction/bitshares.md rename to app/help/en/introduction/bitshares.md diff --git a/help/en/introduction/blockchain.md b/app/help/en/introduction/blockchain.md similarity index 100% rename from help/en/introduction/blockchain.md rename to app/help/en/introduction/blockchain.md diff --git a/help/en/introduction/bridges_gateways.md b/app/help/en/introduction/bridges_gateways.md similarity index 100% rename from help/en/introduction/bridges_gateways.md rename to app/help/en/introduction/bridges_gateways.md diff --git a/help/en/introduction/committee.md b/app/help/en/introduction/committee.md similarity index 100% rename from help/en/introduction/committee.md rename to app/help/en/introduction/committee.md diff --git a/help/en/introduction/wallets.md b/app/help/en/introduction/wallets.md similarity index 100% rename from help/en/introduction/wallets.md rename to app/help/en/introduction/wallets.md diff --git a/help/en/introduction/witness.md b/app/help/en/introduction/witness.md similarity index 100% rename from help/en/introduction/witness.md rename to app/help/en/introduction/witness.md diff --git a/help/en/introduction/workers.md b/app/help/en/introduction/workers.md similarity index 100% rename from help/en/introduction/workers.md rename to app/help/en/introduction/workers.md diff --git a/help/en/toc.md b/app/help/en/toc.md similarity index 100% rename from help/en/toc.md rename to app/help/en/toc.md diff --git a/help/es/accounts/general.md b/app/help/es/accounts/general.md similarity index 100% rename from help/es/accounts/general.md rename to app/help/es/accounts/general.md diff --git a/help/es/toc.md b/app/help/es/toc.md similarity index 100% rename from help/es/toc.md rename to app/help/es/toc.md diff --git a/help/ru/accounts/general.md b/app/help/ru/accounts/general.md similarity index 100% rename from help/ru/accounts/general.md rename to app/help/ru/accounts/general.md diff --git a/help/ru/accounts/membership.md b/app/help/ru/accounts/membership.md similarity index 100% rename from help/ru/accounts/membership.md rename to app/help/ru/accounts/membership.md diff --git a/help/ru/accounts/permissions.md b/app/help/ru/accounts/permissions.md similarity index 100% rename from help/ru/accounts/permissions.md rename to app/help/ru/accounts/permissions.md diff --git a/help/ru/assets/Asset.md b/app/help/ru/assets/Asset.md similarity index 100% rename from help/ru/assets/Asset.md rename to app/help/ru/assets/Asset.md diff --git a/help/ru/assets/EUR.md b/app/help/ru/assets/EUR.md similarity index 100% rename from help/ru/assets/EUR.md rename to app/help/ru/assets/EUR.md diff --git a/help/ru/assets/USD.md b/app/help/ru/assets/USD.md similarity index 100% rename from help/ru/assets/USD.md rename to app/help/ru/assets/USD.md diff --git a/help/ru/assets/mpa.md b/app/help/ru/assets/mpa.md similarity index 100% rename from help/ru/assets/mpa.md rename to app/help/ru/assets/mpa.md diff --git a/help/ru/assets/privbitassets.md b/app/help/ru/assets/privbitassets.md similarity index 100% rename from help/ru/assets/privbitassets.md rename to app/help/ru/assets/privbitassets.md diff --git a/help/ru/assets/uia.md b/app/help/ru/assets/uia.md similarity index 100% rename from help/ru/assets/uia.md rename to app/help/ru/assets/uia.md diff --git a/help/ru/components/AccountAssetCreate.md b/app/help/ru/components/AccountAssetCreate.md similarity index 100% rename from help/ru/components/AccountAssetCreate.md rename to app/help/ru/components/AccountAssetCreate.md diff --git a/help/ru/components/AccountMembership.md b/app/help/ru/components/AccountMembership.md similarity index 100% rename from help/ru/components/AccountMembership.md rename to app/help/ru/components/AccountMembership.md diff --git a/help/ru/components/AccountPermActive.md b/app/help/ru/components/AccountPermActive.md similarity index 100% rename from help/ru/components/AccountPermActive.md rename to app/help/ru/components/AccountPermActive.md diff --git a/help/ru/components/AccountPermMemo.md b/app/help/ru/components/AccountPermMemo.md similarity index 100% rename from help/ru/components/AccountPermMemo.md rename to app/help/ru/components/AccountPermMemo.md diff --git a/help/ru/components/AccountPermOwner.md b/app/help/ru/components/AccountPermOwner.md similarity index 100% rename from help/ru/components/AccountPermOwner.md rename to app/help/ru/components/AccountPermOwner.md diff --git a/help/ru/components/AccountVoting.md b/app/help/ru/components/AccountVoting.md similarity index 100% rename from help/ru/components/AccountVoting.md rename to app/help/ru/components/AccountVoting.md diff --git a/help/ru/components/AccountVotingCommittee.md b/app/help/ru/components/AccountVotingCommittee.md similarity index 100% rename from help/ru/components/AccountVotingCommittee.md rename to app/help/ru/components/AccountVotingCommittee.md diff --git a/help/ru/components/AccountVotingProxy.md b/app/help/ru/components/AccountVotingProxy.md similarity index 100% rename from help/ru/components/AccountVotingProxy.md rename to app/help/ru/components/AccountVotingProxy.md diff --git a/help/ru/components/AccountVotingWitnesses.md b/app/help/ru/components/AccountVotingWitnesses.md similarity index 100% rename from help/ru/components/AccountVotingWitnesses.md rename to app/help/ru/components/AccountVotingWitnesses.md diff --git a/help/ru/components/AccountVotingWorkers.md b/app/help/ru/components/AccountVotingWorkers.md similarity index 100% rename from help/ru/components/AccountVotingWorkers.md rename to app/help/ru/components/AccountVotingWorkers.md diff --git a/help/ru/components/BorrowModal.md b/app/help/ru/components/BorrowModal.md similarity index 100% rename from help/ru/components/BorrowModal.md rename to app/help/ru/components/BorrowModal.md diff --git a/help/ru/components/BorrowModalPrediction.md b/app/help/ru/components/BorrowModalPrediction.md similarity index 100% rename from help/ru/components/BorrowModalPrediction.md rename to app/help/ru/components/BorrowModalPrediction.md diff --git a/help/ru/components/DepositWithdraw.md b/app/help/ru/components/DepositWithdraw.md similarity index 100% rename from help/ru/components/DepositWithdraw.md rename to app/help/ru/components/DepositWithdraw.md diff --git a/help/ru/components/Fees.md b/app/help/ru/components/Fees.md similarity index 100% rename from help/ru/components/Fees.md rename to app/help/ru/components/Fees.md diff --git a/help/ru/components/InitError.md b/app/help/ru/components/InitError.md similarity index 100% rename from help/ru/components/InitError.md rename to app/help/ru/components/InitError.md diff --git a/help/ru/dex/introduction.md b/app/help/ru/dex/introduction.md similarity index 100% rename from help/ru/dex/introduction.md rename to app/help/ru/dex/introduction.md diff --git a/help/ru/dex/shorting.md b/app/help/ru/dex/shorting.md similarity index 100% rename from help/ru/dex/shorting.md rename to app/help/ru/dex/shorting.md diff --git a/help/ru/dex/trading.md b/app/help/ru/dex/trading.md similarity index 100% rename from help/ru/dex/trading.md rename to app/help/ru/dex/trading.md diff --git a/help/ru/glossary.md b/app/help/ru/glossary.md similarity index 100% rename from help/ru/glossary.md rename to app/help/ru/glossary.md diff --git a/help/ru/index.md b/app/help/ru/index.md similarity index 100% rename from help/ru/index.md rename to app/help/ru/index.md diff --git a/help/ru/introduction/backups.md b/app/help/ru/introduction/backups.md similarity index 100% rename from help/ru/introduction/backups.md rename to app/help/ru/introduction/backups.md diff --git a/help/ru/introduction/bitshares.md b/app/help/ru/introduction/bitshares.md similarity index 100% rename from help/ru/introduction/bitshares.md rename to app/help/ru/introduction/bitshares.md diff --git a/help/ru/introduction/blockchain.md b/app/help/ru/introduction/blockchain.md similarity index 100% rename from help/ru/introduction/blockchain.md rename to app/help/ru/introduction/blockchain.md diff --git a/help/ru/introduction/bridges_gateways.md b/app/help/ru/introduction/bridges_gateways.md similarity index 100% rename from help/ru/introduction/bridges_gateways.md rename to app/help/ru/introduction/bridges_gateways.md diff --git a/help/ru/introduction/committee.md b/app/help/ru/introduction/committee.md similarity index 100% rename from help/ru/introduction/committee.md rename to app/help/ru/introduction/committee.md diff --git a/help/ru/introduction/wallets.md b/app/help/ru/introduction/wallets.md similarity index 100% rename from help/ru/introduction/wallets.md rename to app/help/ru/introduction/wallets.md diff --git a/help/ru/introduction/witness.md b/app/help/ru/introduction/witness.md similarity index 100% rename from help/ru/introduction/witness.md rename to app/help/ru/introduction/witness.md diff --git a/help/ru/introduction/workers.md b/app/help/ru/introduction/workers.md similarity index 100% rename from help/ru/introduction/workers.md rename to app/help/ru/introduction/workers.md diff --git a/help/ru/toc.md b/app/help/ru/toc.md similarity index 100% rename from help/ru/toc.md rename to app/help/ru/toc.md diff --git a/help/tr/accounts/general.md b/app/help/tr/accounts/general.md similarity index 100% rename from help/tr/accounts/general.md rename to app/help/tr/accounts/general.md diff --git a/help/tr/accounts/membership.md b/app/help/tr/accounts/membership.md similarity index 100% rename from help/tr/accounts/membership.md rename to app/help/tr/accounts/membership.md diff --git a/help/tr/accounts/permissions.md b/app/help/tr/accounts/permissions.md similarity index 100% rename from help/tr/accounts/permissions.md rename to app/help/tr/accounts/permissions.md diff --git a/help/tr/assets/Asset.md b/app/help/tr/assets/Asset.md similarity index 100% rename from help/tr/assets/Asset.md rename to app/help/tr/assets/Asset.md diff --git a/help/tr/assets/EUR.md b/app/help/tr/assets/EUR.md similarity index 100% rename from help/tr/assets/EUR.md rename to app/help/tr/assets/EUR.md diff --git a/help/tr/assets/USD.md b/app/help/tr/assets/USD.md similarity index 100% rename from help/tr/assets/USD.md rename to app/help/tr/assets/USD.md diff --git a/help/tr/assets/mpa.md b/app/help/tr/assets/mpa.md similarity index 100% rename from help/tr/assets/mpa.md rename to app/help/tr/assets/mpa.md diff --git a/help/tr/assets/privbitassets.md b/app/help/tr/assets/privbitassets.md similarity index 100% rename from help/tr/assets/privbitassets.md rename to app/help/tr/assets/privbitassets.md diff --git a/help/tr/assets/uia.md b/app/help/tr/assets/uia.md similarity index 100% rename from help/tr/assets/uia.md rename to app/help/tr/assets/uia.md diff --git a/help/tr/components/AccountAssetCreate.md b/app/help/tr/components/AccountAssetCreate.md similarity index 100% rename from help/tr/components/AccountAssetCreate.md rename to app/help/tr/components/AccountAssetCreate.md diff --git a/help/tr/components/AccountMembership.md b/app/help/tr/components/AccountMembership.md similarity index 100% rename from help/tr/components/AccountMembership.md rename to app/help/tr/components/AccountMembership.md diff --git a/help/tr/components/AccountPermActive.md b/app/help/tr/components/AccountPermActive.md similarity index 100% rename from help/tr/components/AccountPermActive.md rename to app/help/tr/components/AccountPermActive.md diff --git a/help/tr/components/AccountPermMemo.md b/app/help/tr/components/AccountPermMemo.md similarity index 100% rename from help/tr/components/AccountPermMemo.md rename to app/help/tr/components/AccountPermMemo.md diff --git a/help/tr/components/AccountPermOwner.md b/app/help/tr/components/AccountPermOwner.md similarity index 100% rename from help/tr/components/AccountPermOwner.md rename to app/help/tr/components/AccountPermOwner.md diff --git a/help/tr/components/AccountVoting.md b/app/help/tr/components/AccountVoting.md similarity index 100% rename from help/tr/components/AccountVoting.md rename to app/help/tr/components/AccountVoting.md diff --git a/help/tr/components/AccountVotingCommittee.md b/app/help/tr/components/AccountVotingCommittee.md similarity index 100% rename from help/tr/components/AccountVotingCommittee.md rename to app/help/tr/components/AccountVotingCommittee.md diff --git a/help/tr/components/AccountVotingProxy.md b/app/help/tr/components/AccountVotingProxy.md similarity index 100% rename from help/tr/components/AccountVotingProxy.md rename to app/help/tr/components/AccountVotingProxy.md diff --git a/help/tr/components/AccountVotingWitnesses.md b/app/help/tr/components/AccountVotingWitnesses.md similarity index 100% rename from help/tr/components/AccountVotingWitnesses.md rename to app/help/tr/components/AccountVotingWitnesses.md diff --git a/help/tr/components/AccountVotingWorkers.md b/app/help/tr/components/AccountVotingWorkers.md similarity index 100% rename from help/tr/components/AccountVotingWorkers.md rename to app/help/tr/components/AccountVotingWorkers.md diff --git a/help/tr/components/BorrowModal.md b/app/help/tr/components/BorrowModal.md similarity index 100% rename from help/tr/components/BorrowModal.md rename to app/help/tr/components/BorrowModal.md diff --git a/help/tr/components/DepositWithdraw.md b/app/help/tr/components/DepositWithdraw.md similarity index 100% rename from help/tr/components/DepositWithdraw.md rename to app/help/tr/components/DepositWithdraw.md diff --git a/help/tr/components/Fees.md b/app/help/tr/components/Fees.md similarity index 100% rename from help/tr/components/Fees.md rename to app/help/tr/components/Fees.md diff --git a/help/tr/components/InitError.md b/app/help/tr/components/InitError.md similarity index 100% rename from help/tr/components/InitError.md rename to app/help/tr/components/InitError.md diff --git a/help/tr/dex/introduction.md b/app/help/tr/dex/introduction.md similarity index 100% rename from help/tr/dex/introduction.md rename to app/help/tr/dex/introduction.md diff --git a/help/tr/dex/shorting.md b/app/help/tr/dex/shorting.md similarity index 100% rename from help/tr/dex/shorting.md rename to app/help/tr/dex/shorting.md diff --git a/help/tr/dex/trading.md b/app/help/tr/dex/trading.md similarity index 100% rename from help/tr/dex/trading.md rename to app/help/tr/dex/trading.md diff --git a/help/tr/glossary.md b/app/help/tr/glossary.md similarity index 100% rename from help/tr/glossary.md rename to app/help/tr/glossary.md diff --git a/help/tr/index.md b/app/help/tr/index.md similarity index 100% rename from help/tr/index.md rename to app/help/tr/index.md diff --git a/help/tr/introduction/backups.md b/app/help/tr/introduction/backups.md similarity index 100% rename from help/tr/introduction/backups.md rename to app/help/tr/introduction/backups.md diff --git a/help/tr/introduction/bitshares.md b/app/help/tr/introduction/bitshares.md similarity index 100% rename from help/tr/introduction/bitshares.md rename to app/help/tr/introduction/bitshares.md diff --git a/help/tr/introduction/blockchain.md b/app/help/tr/introduction/blockchain.md similarity index 100% rename from help/tr/introduction/blockchain.md rename to app/help/tr/introduction/blockchain.md diff --git a/help/tr/introduction/committee.md b/app/help/tr/introduction/committee.md similarity index 100% rename from help/tr/introduction/committee.md rename to app/help/tr/introduction/committee.md diff --git a/help/tr/introduction/wallets.md b/app/help/tr/introduction/wallets.md similarity index 100% rename from help/tr/introduction/wallets.md rename to app/help/tr/introduction/wallets.md diff --git a/help/tr/introduction/witness.md b/app/help/tr/introduction/witness.md similarity index 100% rename from help/tr/introduction/witness.md rename to app/help/tr/introduction/witness.md diff --git a/help/tr/introduction/workers.md b/app/help/tr/introduction/workers.md similarity index 100% rename from help/tr/introduction/workers.md rename to app/help/tr/introduction/workers.md diff --git a/help/tr/toc.md b/app/help/tr/toc.md similarity index 100% rename from help/tr/toc.md rename to app/help/tr/toc.md diff --git a/web/app/idb-helper.js b/app/idb-helper.js similarity index 100% rename from web/app/idb-helper.js rename to app/idb-helper.js diff --git a/web/app/idb-instance.js b/app/idb-instance.js similarity index 100% rename from web/app/idb-instance.js rename to app/idb-instance.js diff --git a/web/app/idb-root.js b/app/idb-root.js similarity index 100% rename from web/app/idb-root.js rename to app/idb-root.js diff --git a/web/app/index-dev.js b/app/index-dev.js similarity index 100% rename from web/app/index-dev.js rename to app/index-dev.js diff --git a/web/app/index.js b/app/index.js similarity index 100% rename from web/app/index.js rename to app/index.js diff --git a/web/lib/chain/GenesisFilter.js b/app/lib/chain/GenesisFilter.js similarity index 100% rename from web/lib/chain/GenesisFilter.js rename to app/lib/chain/GenesisFilter.js diff --git a/web/lib/chain/account_constants.js b/app/lib/chain/account_constants.js similarity index 100% rename from web/lib/chain/account_constants.js rename to app/lib/chain/account_constants.js diff --git a/web/lib/chain/asset_constants.js b/app/lib/chain/asset_constants.js similarity index 100% rename from web/lib/chain/asset_constants.js rename to app/lib/chain/asset_constants.js diff --git a/web/lib/chain/serializer_config.coffee b/app/lib/chain/serializer_config.coffee similarity index 100% rename from web/lib/chain/serializer_config.coffee rename to app/lib/chain/serializer_config.coffee diff --git a/web/lib/common/BlockTradesDepositAddressCache.js b/app/lib/common/BlockTradesDepositAddressCache.js similarity index 100% rename from web/lib/common/BlockTradesDepositAddressCache.js rename to app/lib/common/BlockTradesDepositAddressCache.js diff --git a/web/lib/common/Counterpart.js b/app/lib/common/Counterpart.js similarity index 100% rename from web/lib/common/Counterpart.js rename to app/lib/common/Counterpart.js diff --git a/web/lib/common/MarketClasses.js b/app/lib/common/MarketClasses.js similarity index 100% rename from web/lib/common/MarketClasses.js rename to app/lib/common/MarketClasses.js diff --git a/web/lib/common/account_utils.js b/app/lib/common/account_utils.js similarity index 100% rename from web/lib/common/account_utils.js rename to app/lib/common/account_utils.js diff --git a/web/lib/common/asset_utils.js b/app/lib/common/asset_utils.js similarity index 100% rename from web/lib/common/asset_utils.js rename to app/lib/common/asset_utils.js diff --git a/web/lib/common/base58.coffee b/app/lib/common/base58.coffee similarity index 100% rename from web/lib/common/base58.coffee rename to app/lib/common/base58.coffee diff --git a/web/lib/common/blockTradesMethods.js b/app/lib/common/blockTradesMethods.js similarity index 100% rename from web/lib/common/blockTradesMethods.js rename to app/lib/common/blockTradesMethods.js diff --git a/web/lib/common/dictionary_en.json b/app/lib/common/dictionary_en.json similarity index 100% rename from web/lib/common/dictionary_en.json rename to app/lib/common/dictionary_en.json diff --git a/web/lib/common/formPost.js b/app/lib/common/formPost.js similarity index 100% rename from web/lib/common/formPost.js rename to app/lib/common/formPost.js diff --git a/web/lib/common/localStorage.js b/app/lib/common/localStorage.js similarity index 100% rename from web/lib/common/localStorage.js rename to app/lib/common/localStorage.js diff --git a/web/lib/common/localStorageImpl.js b/app/lib/common/localStorageImpl.js similarity index 100% rename from web/lib/common/localStorageImpl.js rename to app/lib/common/localStorageImpl.js diff --git a/web/lib/common/market_utils.js b/app/lib/common/market_utils.js similarity index 100% rename from web/lib/common/market_utils.js rename to app/lib/common/market_utils.js diff --git a/web/lib/common/permission_utils.js b/app/lib/common/permission_utils.js similarity index 100% rename from web/lib/common/permission_utils.js rename to app/lib/common/permission_utils.js diff --git a/web/lib/common/qr-image.coffee b/app/lib/common/qr-image.coffee similarity index 100% rename from web/lib/common/qr-image.coffee rename to app/lib/common/qr-image.coffee diff --git a/web/lib/common/secureRandom.coffee b/app/lib/common/secureRandom.coffee similarity index 100% rename from web/lib/common/secureRandom.coffee rename to app/lib/common/secureRandom.coffee diff --git a/web/lib/common/trxHelper.js b/app/lib/common/trxHelper.js similarity index 100% rename from web/lib/common/trxHelper.js rename to app/lib/common/trxHelper.js diff --git a/web/lib/common/utils.js b/app/lib/common/utils.js similarity index 100% rename from web/lib/common/utils.js rename to app/lib/common/utils.js diff --git a/web/lib/workers/AddressIndexWorker.js b/app/lib/workers/AddressIndexWorker.js similarity index 100% rename from web/lib/workers/AddressIndexWorker.js rename to app/lib/workers/AddressIndexWorker.js diff --git a/web/lib/workers/AesWorker.js b/app/lib/workers/AesWorker.js similarity index 100% rename from web/lib/workers/AesWorker.js rename to app/lib/workers/AesWorker.js diff --git a/web/lib/workers/GenesisFilterWorker.js b/app/lib/workers/GenesisFilterWorker.js similarity index 100% rename from web/lib/workers/GenesisFilterWorker.js rename to app/lib/workers/GenesisFilterWorker.js diff --git a/web/app/routerTransition.js b/app/routerTransition.js similarity index 100% rename from web/app/routerTransition.js rename to app/routerTransition.js diff --git a/web/app/stores/AccountRefsStore.js b/app/stores/AccountRefsStore.js similarity index 100% rename from web/app/stores/AccountRefsStore.js rename to app/stores/AccountRefsStore.js diff --git a/web/app/stores/AccountStore.js b/app/stores/AccountStore.js similarity index 100% rename from web/app/stores/AccountStore.js rename to app/stores/AccountStore.js diff --git a/web/app/stores/AddressIndex.js b/app/stores/AddressIndex.js similarity index 100% rename from web/app/stores/AddressIndex.js rename to app/stores/AddressIndex.js diff --git a/web/app/stores/AssetStore.js b/app/stores/AssetStore.js similarity index 100% rename from web/app/stores/AssetStore.js rename to app/stores/AssetStore.js diff --git a/web/app/stores/BackupStore.js b/app/stores/BackupStore.js similarity index 100% rename from web/app/stores/BackupStore.js rename to app/stores/BackupStore.js diff --git a/web/app/stores/BalanceClaimActiveStore.js b/app/stores/BalanceClaimActiveStore.js similarity index 100% rename from web/app/stores/BalanceClaimActiveStore.js rename to app/stores/BalanceClaimActiveStore.js diff --git a/web/app/stores/BaseStore.js b/app/stores/BaseStore.js similarity index 100% rename from web/app/stores/BaseStore.js rename to app/stores/BaseStore.js diff --git a/web/app/stores/BlockchainStore.js b/app/stores/BlockchainStore.js similarity index 100% rename from web/app/stores/BlockchainStore.js rename to app/stores/BlockchainStore.js diff --git a/web/app/stores/BrainkeyStore.js b/app/stores/BrainkeyStore.js similarity index 100% rename from web/app/stores/BrainkeyStore.js rename to app/stores/BrainkeyStore.js diff --git a/web/app/stores/CachedPropertyStore.js b/app/stores/CachedPropertyStore.js similarity index 100% rename from web/app/stores/CachedPropertyStore.js rename to app/stores/CachedPropertyStore.js diff --git a/web/app/stores/GatewayStore.js b/app/stores/GatewayStore.js similarity index 100% rename from web/app/stores/GatewayStore.js rename to app/stores/GatewayStore.js diff --git a/web/app/stores/ImportKeysStore.js b/app/stores/ImportKeysStore.js similarity index 100% rename from web/app/stores/ImportKeysStore.js rename to app/stores/ImportKeysStore.js diff --git a/web/app/stores/IntlStore.js b/app/stores/IntlStore.js similarity index 100% rename from web/app/stores/IntlStore.js rename to app/stores/IntlStore.js diff --git a/web/app/stores/MarketsStore.js b/app/stores/MarketsStore.js similarity index 100% rename from web/app/stores/MarketsStore.js rename to app/stores/MarketsStore.js diff --git a/web/app/stores/NotificationStore.js b/app/stores/NotificationStore.js similarity index 100% rename from web/app/stores/NotificationStore.js rename to app/stores/NotificationStore.js diff --git a/web/app/stores/PrivateKeyStore.js b/app/stores/PrivateKeyStore.js similarity index 100% rename from web/app/stores/PrivateKeyStore.js rename to app/stores/PrivateKeyStore.js diff --git a/web/app/stores/SettingsStore.js b/app/stores/SettingsStore.js similarity index 100% rename from web/app/stores/SettingsStore.js rename to app/stores/SettingsStore.js diff --git a/web/app/stores/TransactionConfirmStore.js b/app/stores/TransactionConfirmStore.js similarity index 100% rename from web/app/stores/TransactionConfirmStore.js rename to app/stores/TransactionConfirmStore.js diff --git a/web/app/stores/VoteStore.js b/app/stores/VoteStore.js similarity index 100% rename from web/app/stores/VoteStore.js rename to app/stores/VoteStore.js diff --git a/web/app/stores/WalletDb.js b/app/stores/WalletDb.js similarity index 100% rename from web/app/stores/WalletDb.js rename to app/stores/WalletDb.js diff --git a/web/app/stores/WalletManagerStore.js b/app/stores/WalletManagerStore.js similarity index 100% rename from web/app/stores/WalletManagerStore.js rename to app/stores/WalletManagerStore.js diff --git a/web/app/stores/WalletUnlockStore.js b/app/stores/WalletUnlockStore.js similarity index 100% rename from web/app/stores/WalletUnlockStore.js rename to app/stores/WalletUnlockStore.js diff --git a/web/app/stores/tcomb_structs.js b/app/stores/tcomb_structs.js similarity index 100% rename from web/app/stores/tcomb_structs.js rename to app/stores/tcomb_structs.js diff --git a/web/test/README.txt b/app/test/README.txt similarity index 100% rename from web/test/README.txt rename to app/test/README.txt diff --git a/web/test/marketBenchmark.js b/app/test/marketBenchmark.js similarity index 100% rename from web/test/marketBenchmark.js rename to app/test/marketBenchmark.js diff --git a/web/test/marketTests.js b/app/test/marketTests.js similarity index 100% rename from web/test/marketTests.js rename to app/test/marketTests.js diff --git a/web/test/test_helper.coffee b/app/test/test_helper.coffee similarity index 100% rename from web/test/test_helper.coffee rename to app/test/test_helper.coffee diff --git a/web/test/wallet_action_test.js b/app/test/wallet_action_test.js similarity index 100% rename from web/test/wallet_action_test.js rename to app/test/wallet_action_test.js diff --git a/appveyor.yml b/appveyor.yml new file mode 100644 index 0000000000..8b887abd6a --- /dev/null +++ b/appveyor.yml @@ -0,0 +1,41 @@ +version: 1.0.{build} +environment: + nodejs_version: "7" +install: + # Get the latest stable version of Node.js or io.js + - ps: Install-Product node $env:nodejs_version + # install modules + - npm install +build: off +platform: + - x64 +cache: + - node_modules +before_package: + echo Before package +after_test: + - 7z a build\html5_history_dist_%APPVEYOR_REPO_TAG_NAME%.zip %APPVEYOR_BUILD_FOLDER%\build\dist -r + - 7z a build\hash_history_dist_%APPVEYOR_REPO_TAG_NAME%.zip %APPVEYOR_BUILD_FOLDER%\build\hash-history -r +test_script: + - npm run package + - npm run build + - npm run build-hash +artifacts: + - path: build\binaries\*.exe + name: WindowsApp + - path: build\html5_history_dist_*.zip + name: html5_history_dist + - path: build\hash_history_dist_*.zip + name: hash_history_dist +deploy: + provider: GitHub + release: $(APPVEYOR_REPO_TAG_NAME) + description: "Automated GUI release" + auth_token: + secure: F/9ssjiE7swLmbl4JXtgpgv40kr3u6q+nbcNCs+Rw2S0VEMYBAXDwmKHQuAH8uDB + artifact: WindowsApp, html5_history_dist, hash_history_dist + draft: true + force_update: true + on: + branch: 224-build-automation + appveyor_repo_tag: true diff --git a/web/bower.json b/bower.json similarity index 100% rename from web/bower.json rename to bower.json diff --git a/build.sh b/build.sh new file mode 100755 index 0000000000..a59d486ee1 --- /dev/null +++ b/build.sh @@ -0,0 +1,2 @@ +cd $TRAVIS_BUILD_DIR +npm run-script package diff --git a/deploy.sh b/deploy.sh new file mode 100755 index 0000000000..137cc8d3ee --- /dev/null +++ b/deploy.sh @@ -0,0 +1,29 @@ +# This script clones an existing gh-pages repository and pushes updates +# from the newly compiled version into github. +# The GITHUB_TOKEN for authentication is stored in the encrypted +# variable in .travis.yml + +# Clone Repo +############ +#echo "Cloning wallet repo" +#git clone -b gh-pages https://github.com:${GITHUB_TOKEN}@github.com/${GITHUB_REPO} /gh-pages + +# Copy new compile files +######################## +#echo "Copying compiled files over to repo" +#ls -al $TRAVIS_BUILD_DIR/web/dist/ +#ls -al /gh-pages/ +#cp -Rv $TRAVIS_BUILD_DIR/web/dist/* /gh-pages/ + +# Commit Changes +################ +#echo "Pushing new wallet repo" +#cd /gh-pages +#git config user.email "travis@bitshares.org" +#git config user.name "BitShares Wallet Build Automation" +#git add . +#git commit -a -m "Travis #$TRAVIS_BUILD_NUMBER" + +# Push Changes +############## +#git push origin gh-pages diff --git a/electron/build/package.json b/electron/build/package.json deleted file mode 100644 index e45a75259b..0000000000 --- a/electron/build/package.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "name": "BitShares-light", - "productName": "BitShares2-light", - "identifier": "org.bitshares.graphene", - "description": "BitShares - cryptocurrency and decentralized exchange", - "version": "2.0.170830", - "author": "community@bitshares.org", - "main": "electron.js", - "config": { - "target": "development" - }, - "dependencies": { - } -} diff --git a/electron/.eslintrc b/electron_old/.eslintrc similarity index 100% rename from electron/.eslintrc rename to electron_old/.eslintrc diff --git a/electron/.gitignore b/electron_old/.gitignore similarity index 100% rename from electron/.gitignore rename to electron_old/.gitignore diff --git a/electron/config/env_development.json b/electron_old/config/env_development.json similarity index 100% rename from electron/config/env_development.json rename to electron_old/config/env_development.json diff --git a/electron/config/env_production.json b/electron_old/config/env_production.json similarity index 100% rename from electron/config/env_production.json rename to electron_old/config/env_production.json diff --git a/electron/config/env_test.json b/electron_old/config/env_test.json similarity index 100% rename from electron/config/env_test.json rename to electron_old/config/env_test.json diff --git a/electron/gulpfile.js b/electron_old/gulpfile.js similarity index 100% rename from electron/gulpfile.js rename to electron_old/gulpfile.js diff --git a/electron/package.json b/electron_old/package.json similarity index 100% rename from electron/package.json rename to electron_old/package.json diff --git a/electron/tasks/release.js b/electron_old/tasks/release.js similarity index 100% rename from electron/tasks/release.js rename to electron_old/tasks/release.js diff --git a/electron/tasks/release_linux.js b/electron_old/tasks/release_linux.js similarity index 100% rename from electron/tasks/release_linux.js rename to electron_old/tasks/release_linux.js diff --git a/electron/tasks/release_osx.js b/electron_old/tasks/release_osx.js similarity index 100% rename from electron/tasks/release_osx.js rename to electron_old/tasks/release_osx.js diff --git a/electron/tasks/release_windows.js b/electron_old/tasks/release_windows.js similarity index 100% rename from electron/tasks/release_windows.js rename to electron_old/tasks/release_windows.js diff --git a/electron/tasks/start.js b/electron_old/tasks/start.js similarity index 100% rename from electron/tasks/start.js rename to electron_old/tasks/start.js diff --git a/electron/tasks/utils.js b/electron_old/tasks/utils.js similarity index 100% rename from electron/tasks/utils.js rename to electron_old/tasks/utils.js diff --git a/electron/tasks/write_digest.js b/electron_old/tasks/write_digest.js similarity index 100% rename from electron/tasks/write_digest.js rename to electron_old/tasks/write_digest.js diff --git a/install.sh b/install.sh new file mode 100755 index 0000000000..dcd73c8215 --- /dev/null +++ b/install.sh @@ -0,0 +1,6 @@ +# npm install coffee-script +# npm install webpack + +# Also install from packages.json +cd $TRAVIS_BUILD_DIR +npm install diff --git a/web/nginx.local.conf b/nginx.local.conf similarity index 100% rename from web/nginx.local.conf rename to nginx.local.conf diff --git a/web/package.json b/package.json similarity index 51% rename from web/package.json rename to package.json index df8d66a966..c0cabc197c 100644 --- a/web/package.json +++ b/package.json @@ -1,38 +1,124 @@ { - "name": "BitShares-UI", - "version": "1.1.0", + "name": "BitShares2-light", + "version": "2.0.170907", "description": "Advanced wallet interface for the BitShares financial blockchain.", "homepage": "https://github.com/bitshares/bitshares-ui", - "author": [ - "Cryptonomex, Inc.", - "Sigve Kvalsvik, Kvalsvik Crypto" + "author": "Sigve Kvalsvik ", + "contributors": [ + "James Calfee", + "Dan Larimer", + "Valentine Zavgorodnev " ], - "license": "LicenseRef-LICENSE", + "license": "MIT", "engines": { - "node": ">=6.0.0", - "npm": ">=3.0.0" + "node": ">=7.x", + "npm": ">=4.x", + "yarn": ">=0.21.3" }, "repository": { "type": "git", "url": "git://github.com/bitshares/bitshares-ui" }, + "main": "build/electron/index.js", "scripts": { - "test": "NODE_ENV=test jest", - "test:wallet": "NODE_ENV=test NODE_PATH=../app mocha --compilers coffee:coffee-script,js:babel/register --require coffee-script/register", - "test:market": "NODE_ENV=test mocha --compilers js:babel-core/register ./test/marketTests --watch", - "bench:market": "NODE_ENV=test babel ./lib/common/MarketClasses.js -o ./test/MarketClasses.js && NODE_ENV=test node --harmony ./test/marketBenchmark", + "test": "cross-env NODE_ENV=test jest", + "test:wallet": "cross-env NODE_ENV=test NODE_PATH=../app mocha --compilers coffee:coffee-script,js:babel/register --require coffee-script/register", + "test:market": "cross-env NODE_ENV=test mocha --compilers js:babel-core/register ./test/marketTests --watch", + "bench:market": "cross-env NODE_ENV=test babel ./lib/common/MarketClasses.js -o ./test/MarketClasses.js && cross-env NODE_ENV=test node --harmony ./test/marketBenchmark", "profile-dev": "webpack --env.dev --env.profile --profile --json > stats-dev.json", - "profile-build": "NODE_ENV=production webpack --env.prod --env.profile --profile --json > stats-prod.json", - "profile-nougly": "NODE_ENV=production webpack --env.prod --env.profile --env.noUgly --profile --json > stats-prod-nougly.json", - "start": "NODE_ENV=development node server.js", - "build": "NODE_ENV=production webpack --env.prod --progress --display-error-details --colors --display-optimization-bailout", - "build-hash": "NODE_ENV=production webpack --env.prod --env.hash --env.baseUrl='' --progress --display-error-details --colors --display-optimization-bailout", - "build-github": "NODE_ENV=production webpack --env.prod --env.hash --env.baseUrl='/wallet/' --progress --display-error-details --colors --display-optimization-bailout", - "electron": "NODE_ENV=production webpack --env.prod --env.electron --env.hash --progress --display-error-details --colors --display-optimization-bailout ", - "electron-nougly": "NODE_ENV=production webpack --env.prod --env.electron --env.noUgly --env.hash --progress --display-error-details --colors", - "postelectron": " echo 'copying to electron/build..'; cp -r electron/* ../electron/build/; echo 'done.'", - "postelectron-nougly": " echo 'copying to electron/build..'; cp -r electron/* ../electron/build/; echo 'done.'", - "build-win32": "set NODE_ENV=production && webpack --env.prod --progress --colors && echo 'copying to electron/build..' && xcopy dist ..\\electron\\build /s /e /y && echo 'done.'" + "profile-build": "cross-env NODE_ENV=production webpack --env.prod --env.profile --profile --json > stats-prod.json", + "profile-nougly": "cross-env NODE_ENV=production webpack --env.prod --env.profile --env.noUgly --profile --json > stats-prod-nougly.json", + "start": "cross-env NODE_ENV=development node server.js", + "start-electron": "electron build/electron/index.js", + "build": "cross-env NODE_ENV=production webpack --env.prod", + "build-hash": "cross-env NODE_ENV=production webpack --env.prod --env.hash --env.baseUrl=''", + "build-github": "cross-env NODE_ENV=production webpack --env.prod --env.hash --env.baseUrl='/wallet/'", + "build-electron": "cross-env NODE_ENV=production webpack --env.prod --env.electron --env.hash", + "build-electron-nougly": "cross-env NODE_ENV=production webpack --env.prod --env.electron --env.noUgly --env.hash --progress --display-error-details --colors", + "prepare-electron": "copyfiles -f resources/*.js build/electron/", + "postbuild-electron": "npm run prepare-electron", + "postbuild-electron-nougly": "npm run prepare-electron", + "build-win32": "cross-env NODE_ENV=production && webpack --env.prod --progress --colors && echo 'copying to electron/build..' && xcopy dist ..\\electron\\build /s /e /y && echo 'done.'", + "prepackage": "npm run build-electron", + "package": "build -p never", + "package-deb": "npm run prepackage && build -p never --linux deb", + "package-win": "npm run prepackage && build -p never --windows", + "package-mac": "npm run prepackage && build -p never --mac dmg" + }, + "jest": { + "scriptPreprocessor": "/__tests__/jest-preprocessor.js", + "testPathDirs": [ + "/__tests__" + ], + "unmockedModulePathPatterns": [ + "/node_modules/react", + "/node_modules/tcomb", + "/node_modules/immutable" + ], + "moduleFileExtensions": [ + "js", + "jsx", + "json", + "coffee" + ], + "testFileExtensions": [ + "js", + "jsx" + ], + "testPathIgnorePatterns": [ + "/jest-preprocessor.js", + "/node_modules/", + "/utils/" + ] + }, + "browsersList": "electron 1.7", + "build": { + "productName": "BitShares Light Wallet", + "appId": "org.bitshares.graphene", + "files": [ + "build/electron", + "!node_modules" + ], + "mac": { + "category": "public.app-category.finance" + }, + "dmg": { + "contents": [ + { + "x": 130, + "y": 220 + }, + { + "x": 410, + "y": 220, + "type": "link", + "path": "/Applications" + } + ] + }, + "win": { + "target": [ + { + "target": "nsis", + "arch": [ + "x64", + "ia32" + ] + } + ] + }, + "linux": { + "category": "Finance", + "target": [ + "deb", + "AppImage" + ], + "synopsis": "BitShares: Cryptocurrency and Decentralized Exchange" + }, + "directories": { + "buildResources": "resources", + "output": "build/binaries" + } }, "dependencies": { "alt": "^0.18.6", @@ -93,7 +179,11 @@ "clean-webpack-plugin": "^0.1.3", "coffee-loader": "^0.7.2", "coffee-script": "^1.12.2", + "copyfiles": "^1.2.0", + "cross-env": "^5.0.5", "css-loader": "^0.22.0", + "electron": "^1.7.6", + "electron-builder": "^19.27.7", "es6-promise": "^3.0.2", "eslint": "^2.11.1", "eslint-plugin-json": "^1.2.0", @@ -102,7 +192,7 @@ "express-history-api-fallback": "^2.1.0", "extract-text-webpack-plugin": "^3.0.0", "file-loader": "^0.8.4", - "git-rev-sync": "^1.8.0", + "git-rev-sync": "^1.9.1", "html-loader": "^0.4.4", "jest-cli": "^18.1.0", "json-loader": "^0.5.4", @@ -117,35 +207,9 @@ "svg-inline-loader": "^0.7.1", "svgo-loader": "1.1.2", "url-loader": "^0.5.7", - "webpack": "^3.5.4", + "webpack": "^3.5.6", "webpack-dev-middleware": "^1.12.0", "webpack-hot-middleware": "^2.14.0", "worker-loader": "^0.8.1" - }, - "jest": { - "scriptPreprocessor": "/__tests__/jest-preprocessor.js", - "testPathDirs": [ - "/__tests__" - ], - "unmockedModulePathPatterns": [ - "/node_modules/react", - "/node_modules/tcomb", - "/node_modules/immutable" - ], - "moduleFileExtensions": [ - "js", - "jsx", - "json", - "coffee" - ], - "testFileExtensions": [ - "js", - "jsx" - ], - "testPathIgnorePatterns": [ - "/jest-preprocessor.js", - "/node_modules/", - "/utils/" - ] } } diff --git a/electron/build/vendor/electron_boilerplate/context_menu.js b/resources/context_menu.js similarity index 100% rename from electron/build/vendor/electron_boilerplate/context_menu.js rename to resources/context_menu.js diff --git a/electron/build/vendor/electron_boilerplate/dev_helper.js b/resources/dev_helper.js similarity index 100% rename from electron/build/vendor/electron_boilerplate/dev_helper.js rename to resources/dev_helper.js diff --git a/electron/resources/osx/dmg-background.png b/resources/dmg-background.png similarity index 100% rename from electron/resources/osx/dmg-background.png rename to resources/dmg-background.png diff --git a/electron/resources/osx/dmg-background@2x.png b/resources/dmg-background@2x.png similarity index 100% rename from electron/resources/osx/dmg-background@2x.png rename to resources/dmg-background@2x.png diff --git a/electron/build/vendor/electron_boilerplate/env_config.js b/resources/env_config.js similarity index 100% rename from electron/build/vendor/electron_boilerplate/env_config.js rename to resources/env_config.js diff --git a/electron/build/vendor/electron_boilerplate/external_links.js b/resources/external_links.js similarity index 100% rename from electron/build/vendor/electron_boilerplate/external_links.js rename to resources/external_links.js diff --git a/electron/resources/osx/icon.icns b/resources/icon.icns similarity index 100% rename from electron/resources/osx/icon.icns rename to resources/icon.icns diff --git a/electron/resources/windows/icon.ico b/resources/icon.ico similarity index 100% rename from electron/resources/windows/icon.ico rename to resources/icon.ico diff --git a/electron/resources/icon.png b/resources/icon.png similarity index 100% rename from electron/resources/icon.png rename to resources/icon.png diff --git a/electron/build/electron.js b/resources/index.js similarity index 91% rename from electron/build/electron.js rename to resources/index.js index ff6cf79c15..cf3b70df4a 100644 --- a/electron/build/electron.js +++ b/resources/index.js @@ -4,10 +4,11 @@ var app = require('electron').app; var BrowserWindow = require('electron').BrowserWindow; var Menu = require("electron").Menu; - var env = require('./vendor/electron_boilerplate/env_config'); - var devHelper = require('./vendor/electron_boilerplate/dev_helper'); - var windowStateKeeper = require('./vendor/electron_boilerplate/window_state'); + var env = require('./env_config'); + var devHelper = require('./dev_helper'); + var windowStateKeeper = require('./window_state'); var fs = require('fs'); + // var git = require("git-rev-sync"); var mainWindow; @@ -17,7 +18,7 @@ height: 800 }); global.guid = mainWindowState.guid; - global.version = JSON.parse(fs.readFileSync(__dirname + "/package.json")).version; + // global.version = JSON.stringify(git.tag()); app.on('ready', function () { diff --git a/electron/resources/linux/DEBIAN/control b/resources/linux/DEBIAN/control similarity index 100% rename from electron/resources/linux/DEBIAN/control rename to resources/linux/DEBIAN/control diff --git a/electron/resources/linux/app.desktop b/resources/linux/app.desktop similarity index 100% rename from electron/resources/linux/app.desktop rename to resources/linux/app.desktop diff --git a/electron/resources/osx/Info.plist b/resources/osx/Info.plist similarity index 100% rename from electron/resources/osx/Info.plist rename to resources/osx/Info.plist diff --git a/electron/resources/osx/appdmg.json b/resources/osx/appdmg.json similarity index 100% rename from electron/resources/osx/appdmg.json rename to resources/osx/appdmg.json diff --git a/electron/resources/osx/dmg-icon.icns b/resources/osx/dmg-icon.icns similarity index 100% rename from electron/resources/osx/dmg-icon.icns rename to resources/osx/dmg-icon.icns diff --git a/electron/resources/osx/helper_apps/Info EH.plist b/resources/osx/helper_apps/Info EH.plist similarity index 100% rename from electron/resources/osx/helper_apps/Info EH.plist rename to resources/osx/helper_apps/Info EH.plist diff --git a/electron/resources/osx/helper_apps/Info NP.plist b/resources/osx/helper_apps/Info NP.plist similarity index 100% rename from electron/resources/osx/helper_apps/Info NP.plist rename to resources/osx/helper_apps/Info NP.plist diff --git a/electron/resources/osx/helper_apps/Info.plist b/resources/osx/helper_apps/Info.plist similarity index 100% rename from electron/resources/osx/helper_apps/Info.plist rename to resources/osx/helper_apps/Info.plist diff --git a/electron/resources/windows/setup-icon.ico b/resources/setup-icon.ico similarity index 100% rename from electron/resources/windows/setup-icon.ico rename to resources/setup-icon.ico diff --git a/electron/build/vendor/electron_boilerplate/window_state.js b/resources/window_state.js similarity index 100% rename from electron/build/vendor/electron_boilerplate/window_state.js rename to resources/window_state.js diff --git a/electron/resources/windows/installer.nsi b/resources/windows/installer.nsi similarity index 100% rename from electron/resources/windows/installer.nsi rename to resources/windows/installer.nsi diff --git a/electron/resources/windows/setup-banner.bmp b/resources/windows/setup-banner.bmp similarity index 100% rename from electron/resources/windows/setup-banner.bmp rename to resources/windows/setup-banner.bmp diff --git a/web/server.js b/server.js similarity index 100% rename from web/server.js rename to server.js diff --git a/web/.gitignore b/web/.gitignore deleted file mode 100644 index 885c184b26..0000000000 --- a/web/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -.sass-cache -node_modules -bower_components -bundle -stats-dev.json -stats-prod.json -test/MarketClasses.js diff --git a/web/karma.conf.js b/web/karma.conf.js deleted file mode 100644 index 9e15ce9dfc..0000000000 --- a/web/karma.conf.js +++ /dev/null @@ -1,5 +0,0 @@ -var karmaConfig = require('./gulpfile.js/config').karma; - -module.exports = function(config) { - config.set(karmaConfig); -}; diff --git a/web/webpack.config.js b/webpack.config.js similarity index 85% rename from web/webpack.config.js rename to webpack.config.js index 26c7069566..752ab95666 100644 --- a/web/webpack.config.js +++ b/webpack.config.js @@ -9,9 +9,9 @@ require("es6-promise").polyfill(); var root_dir = path.resolve(__dirname); module.exports = function(env) { - if (!env.profile) { - console.log("env:", env); - } + // if (!env.profile) { + // console.log("env:", env); + // } // console.log(env.prod ? "Using PRODUCTION options\n" : "Using DEV options\n"); // STYLE LOADERS var cssLoaders = [ @@ -66,10 +66,10 @@ module.exports = function(env) { if (env.prod) { // PROD OUTPUT PATH let outputDir = env.electron ? "electron" : env.hash ? "hash-history" : "dist"; - outputPath = path.join(root_dir, outputDir); + outputPath = path.join(root_dir, "build", outputDir); // DIRECTORY CLEANER - var cleanDirectories = [outputDir]; + var cleanDirectories = [outputPath]; // WRAP INTO CSS FILE const extractCSS = new ExtractTextPlugin("app.css"); @@ -142,7 +142,7 @@ module.exports = function(env) { rules: [ { test: /\.jsx$/, - include: [path.join(root_dir, "app"), path.join(root_dir, "node_modules/react-foundation-apps"), "/home/sigve/Dev/graphene/react-foundation-apps"], + include: [path.join(root_dir, "app"), path.join(root_dir, "node_modules/react-foundation-apps")], use: [ { loader: "babel-loader", @@ -161,7 +161,7 @@ module.exports = function(env) { { test: /\.json/, loader: "json-loader", exclude: [ - path.resolve(root_dir, "lib/common"), + path.resolve(root_dir, "app/lib/common"), path.resolve(root_dir, "app/assets/locales") ] }, @@ -171,10 +171,6 @@ module.exports = function(env) { test: /\.css$/, use: cssLoaders }, - - // var cssLoaders = "style-loader!css-loader!postcss-loader", - // scssLoaders = "style-loader!css-loader!postcss-loader!sass-loader?outputStyle=expanded"; - { test: /\.scss$/, use: scssLoaders @@ -228,25 +224,13 @@ module.exports = function(env) { resolve: { modules: [ path.resolve(root_dir, "app"), - path.resolve(root_dir, "lib"), + path.resolve(root_dir, "app/lib"), "node_modules" ], - extensions: [".js", ".jsx", ".coffee", ".json"], - // fallback: [path.resolve(root_dir, "./node_modules")] - }, - resolveLoader: { - modules: [path.join(root_dir, "node_modules")], - // fallback: [path.resolve(root_dir, "./node_modules")] + extensions: [".js", ".jsx", ".coffee", ".json"] }, plugins: plugins }; - // if(env.prod) config.entry.vendors = [ - // "classnames", "react-router", "highcharts/highstock", "counterpart", "react-translate-component", - // "perfect-scrollbar", "jdenticon", "react-notification-system", "react-tooltip", - // "whatwg-fetch", "alt", "react-json-inspector", - // "immutable", "bitsharesjs" - // ]; - return config; };