From 37dd4885796de4332a4a726f4a83f3029b4e388d Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Fri, 28 Apr 2017 11:21:05 +0200 Subject: [PATCH] UI 2 component & modal splits (#5525) * Remove mui from Actionbar * Add semantic-ui to vendor.js * Stateless components * Multi-item spacing * Stateless components * Stateless components * Default font * Context passing * Move Vault modals into Vault dapp * Move modals to their respective views --- js/src/modals/index.js | 43 ---- js/src/redux/providers/status.js | 2 +- .../shell/Application/Container/container.js | 4 +- .../shell/Application/Extension/extension.js | 6 +- js/src/shell/Application/application.js | 5 +- js/src/shell/Connection/connection.css | 1 + .../DappPermissions/dappPermissions.js | 0 .../DappPermissions/dappPermissions.spec.js | 2 +- .../DappPermissions/index.js | 0 .../DappPermissions/store.js | 0 .../DappPermissions/store.spec.js | 2 +- js/src/shell/Dapps/dapps.js | 6 +- .../DappsVisible/dappsVisible.css} | 0 .../DappsVisible/dappsVisible.js} | 4 +- .../DappsVisible/dappsVisible.spec.js} | 6 +- js/src/shell/DappsVisible/index.js | 17 ++ .../FirstRun/Completed/completed.js | 0 .../FirstRun/Completed/index.js | 0 .../{modals => shell}/FirstRun/TnC/index.js | 0 js/src/{modals => shell}/FirstRun/TnC/tnc.js | 0 .../FirstRun/Welcome/index.js | 0 .../FirstRun/Welcome/welcome.js | 0 .../{modals => shell}/FirstRun/firstRun.css | 0 js/src/{modals => shell}/FirstRun/firstRun.js | 9 +- .../FirstRun/firstRun.spec.js | 0 js/src/{modals => shell}/FirstRun/index.js | 0 .../{modals => shell}/UpgradeParity/index.js | 0 .../{modals => shell}/UpgradeParity/store.js | 0 .../UpgradeParity/store.spec.js | 0 .../UpgradeParity/upgradeParity.css | 0 .../UpgradeParity/upgradeParity.js | 0 js/src/shell/index.ejs | 4 +- js/src/shell/index.js | 3 - js/src/ui/Actionbar/Search/search.css | 3 +- js/src/ui/Actionbar/actionbar.css | 28 ++- js/src/ui/Actionbar/actionbar.js | 64 ++---- js/src/ui/Badge/badge.js | 31 ++- js/src/ui/Balance/balance.js | 195 +++++++++--------- js/src/ui/BlockStatus/blockStatus.js | 156 +++++++------- js/src/ui/Button/button.js | 93 ++++----- js/src/ui/ConfirmDialog/confirmDialog.js | 108 +++++----- .../Form/VaultSelect}/VaultSelector/index.js | 0 .../VaultSelector/vaultSelector.js | 0 .../VaultSelector/vaultSelector.spec.js | 0 js/src/ui/Form/VaultSelect/vaultSelect.js | 2 +- js/src/ui/Modal/Busy/busy.js | 34 ++- js/src/ui/Modal/Completed/completed.js | 26 +-- js/src/ui/Page/page.js | 72 +++---- js/src/ui/ShortenedHash/shortenedHash.js | 36 ++-- js/src/ui/SignerIcon/signerIcon.js | 42 ++-- js/src/ui/TokenImage/tokenImage.js | 62 +++--- js/src/ui/VaultCard/Accounts/accounts.js | 66 ++++++ .../VaultCard/Accounts}/index.js | 2 +- js/src/ui/VaultCard/Buttons/buttons.js | 52 +++++ js/src/ui/VaultCard/Buttons/index.js | 17 ++ js/src/ui/VaultCard/vaultCard.js | 143 ++++--------- js/src/ui/VaultTag/vaultTag.js | 38 ++-- js/src/ui/Warning/warning.js | 32 ++- .../Account}/DeleteAccount/deleteAccount.css | 0 .../Account}/DeleteAccount/deleteAccount.js | 0 .../DeleteAccount/deleteAccount.spec.js | 0 .../Account}/DeleteAccount/index.js | 0 .../Account}/EditMeta/editMeta.js | 0 .../Account}/EditMeta/editMeta.spec.js | 0 .../Account}/EditMeta/editMeta.test.js | 0 .../Account}/EditMeta/index.js | 0 .../Account}/EditMeta/store.js | 0 .../Account}/EditMeta/store.spec.js | 0 .../Account}/Faucet/faucet.js | 0 .../{modals => views/Account}/Faucet/index.js | 0 .../{modals => views/Account}/Faucet/store.js | 0 .../Account}/PasswordManager/index.js | 0 .../PasswordManager/passwordManager.css | 0 .../PasswordManager/passwordManager.js | 0 .../PasswordManager/passwordManager.spec.js | 0 .../PasswordManager/passwordManager.test.js | 0 .../Account}/PasswordManager/store.js | 0 .../Account}/PasswordManager/store.spec.js | 0 .../awaitingDepositStep.js | 0 .../awaitingDepositStep.spec.js | 0 .../Shapeshift/AwaitingDepositStep/index.js | 0 .../awaitingExchangeStep.js | 0 .../awaitingExchangeStep.spec.js | 0 .../Shapeshift/AwaitingExchangeStep/index.js | 0 .../Shapeshift/CompletedStep/completedStep.js | 0 .../CompletedStep/completedStep.spec.js | 0 .../Shapeshift/CompletedStep/index.js | 0 .../Shapeshift/ErrorStep/errorStep.js | 0 .../Shapeshift/ErrorStep/errorStep.spec.js | 0 .../Account}/Shapeshift/ErrorStep/index.js | 0 .../Account}/Shapeshift/OptionsStep/index.js | 0 .../Shapeshift/OptionsStep/optionsStep.css | 0 .../Shapeshift/OptionsStep/optionsStep.js | 0 .../OptionsStep/optionsSteps.spec.js | 0 .../Account}/Shapeshift/Price/index.js | 0 .../Account}/Shapeshift/Price/price.js | 0 .../Account}/Shapeshift/Price/price.spec.js | 0 .../Account}/Shapeshift/Value/index.js | 0 .../Account}/Shapeshift/Value/value.css | 0 .../Account}/Shapeshift/Value/value.js | 0 .../Account}/Shapeshift/Value/value.spec.js | 0 .../Account}/Shapeshift/index.js | 0 .../Account}/Shapeshift/shapeshift.css | 0 .../Account}/Shapeshift/shapeshift.js | 0 .../Account}/Shapeshift/shapeshift.spec.js | 0 .../Account}/Shapeshift/store.js | 0 .../Account}/Shapeshift/store.spec.js | 0 .../Account}/Transfer/Details/details.js | 0 .../Account}/Transfer/Details/index.js | 0 .../Account}/Transfer/Details/tokenSelect.js | 0 .../Account}/Transfer/Extras/extras.js | 0 .../Account}/Transfer/Extras/index.js | 0 .../Account}/Transfer/errors.js | 0 .../Account}/Transfer/index.js | 0 .../Account}/Transfer/store.js | 0 .../Account}/Transfer/transfer.css | 0 .../Account}/Transfer/transfer.js | 0 .../Account}/Verification/Done/done.css | 0 .../Account}/Verification/Done/done.js | 0 .../Account}/Verification/Done/index.js | 0 .../Verification/GatherData/gatherData.css | 0 .../Verification/GatherData/gatherData.js | 0 .../Account}/Verification/GatherData/index.js | 0 .../Account}/Verification/QueryCode/index.js | 0 .../Verification/QueryCode/queryCode.js | 0 .../Verification/SendConfirmation/index.js | 0 .../SendConfirmation/sendConfirmation.css | 0 .../SendConfirmation/sendConfirmation.js | 0 .../Verification/SendRequest/index.js | 0 .../Verification/SendRequest/sendRequest.css | 0 .../Verification/SendRequest/sendRequest.js | 0 .../Account}/Verification/email-store.js | 0 .../Account}/Verification/how-it-works.js | 0 .../Account}/Verification/index.js | 0 .../Account}/Verification/sms-store.js | 0 .../Account}/Verification/store.js | 0 .../Account}/Verification/verification.css | 0 .../Account}/Verification/verification.js | 0 js/src/views/Account/account.js | 13 +- js/src/views/Account/index.js | 3 - .../AccountDetails/accountDetails.js | 0 .../AccountDetails/accountDetails.spec.js | 0 .../CreateAccount/AccountDetails/index.js | 0 .../AccountDetailsGeth/accountDetailsGeth.js | 0 .../accountDetailsGeth.spec.js | 0 .../CreateAccount/AccountDetailsGeth/index.js | 0 .../CreateAccount/ChangeVault/changeVault.js | 0 .../ChangeVault/changeVault.spec.js | 0 .../CreateAccount/ChangeVault/index.js | 0 .../CreationType/creationType.js | 0 .../CreationType/creationType.spec.js | 0 .../CreateAccount/CreationType/index.js | 0 .../CreateAccount/GethCard/gethCard.js | 0 .../Accounts}/CreateAccount/GethCard/index.js | 0 .../CreateAccount/NewAccount/index.js | 0 .../CreateAccount/NewAccount/newAccount.js | 0 .../NewAccount/newAccount.spec.js | 0 .../Accounts}/CreateAccount/NewGeth/index.js | 0 .../CreateAccount/NewGeth/newGeth.js | 0 .../CreateAccount/NewGeth/newGeth.spec.js | 0 .../CreateAccount/NewImport/index.js | 0 .../CreateAccount/NewImport/newImport.js | 0 .../CreateAccount/NewImport/newImport.spec.js | 0 .../Accounts}/CreateAccount/NewQr/index.js | 0 .../Accounts}/CreateAccount/NewQr/newQr.js | 0 .../CreateAccount/NewQr/newQr.spec.js | 0 .../Accounts}/CreateAccount/RawKey/index.js | 0 .../Accounts}/CreateAccount/RawKey/rawKey.js | 0 .../CreateAccount/RawKey/rawKey.spec.js | 0 .../CreateAccount/RecoveryPhrase/index.js | 0 .../RecoveryPhrase/recoveryPhrase.js | 0 .../RecoveryPhrase/recoveryPhrase.spec.js | 0 .../Accounts}/CreateAccount/TypeIcon/index.js | 0 .../CreateAccount/TypeIcon/typeIcon.js | 0 .../Accounts}/CreateAccount/createAccount.css | 0 .../Accounts}/CreateAccount/createAccount.js | 0 .../CreateAccount/createAccount.spec.js | 0 .../CreateAccount/createAccount.test.js | 0 .../Accounts}/CreateAccount/errors.js | 0 .../Accounts}/CreateAccount/index.js | 0 .../Accounts}/CreateAccount/print.js | 0 .../Accounts}/CreateAccount/recoveryPage.ejs | 0 .../Accounts}/CreateAccount/store.js | 0 .../Accounts}/CreateAccount/store.spec.js | 0 .../CreateWallet/WalletDetails/index.js | 0 .../WalletDetails/walletDetails.js | 0 .../WalletDetails/walletDetails.spec.js | 0 .../CreateWallet/WalletInfo/index.js | 0 .../CreateWallet/WalletInfo/walletInfo.js | 0 .../WalletInfo/walletInfo.spec.js | 0 .../CreateWallet/WalletType/index.js | 0 .../CreateWallet/WalletType/walletType.js | 0 .../WalletType/walletType.spec.js | 0 .../Accounts}/CreateWallet/createWallet.css | 0 .../Accounts}/CreateWallet/createWallet.js | 0 .../CreateWallet/createWallet.spec.js | 0 .../CreateWallet/createWallet.test.js | 0 .../CreateWallet/createWalletStore.js | 0 .../Accounts}/CreateWallet/index.js | 0 .../Accounts}/ExportAccount/exportAccount.js | 0 .../ExportAccount/exportAccount.spec.js | 0 .../ExportAccount/exportInput/exportInput.js | 0 .../ExportAccount/exportInput/index.js | 0 .../Accounts}/ExportAccount/exportStore.js | 0 .../ExportAccount/exportStore.spec.js | 0 .../Accounts}/ExportAccount/index.js | 0 js/src/views/Accounts/accounts.js | 4 +- js/src/views/Accounts/index.js | 3 - js/src/views/Address/address.js | 3 +- js/src/views/Address/index.js | 3 - .../Addresses}/AddAddress/addAddress.js | 0 .../Addresses}/AddAddress/addAddress.spec.js | 0 .../Addresses}/AddAddress/index.js | 0 .../Addresses}/AddAddress/store.js | 0 .../Addresses}/AddAddress/store.spec.js | 0 .../Addresses}/AddAddress/store.test.js | 0 js/src/views/Addresses/addresses.js | 7 +- js/src/views/Addresses/index.js | 5 - .../AdvancedStep/advancedStep.js | 0 .../ExecuteContract/AdvancedStep/index.js | 0 .../DetailsStep/detailsStep.js | 0 .../DetailsStep/detailsStep.spec.js | 0 .../ExecuteContract}/DetailsStep/index.js | 0 .../ExecuteContract/executeContract.css | 0 .../ExecuteContract/executeContract.js | 0 .../ExecuteContract/executeContract.spec.js | 0 .../ExecuteContract/executeContract.test.js | 0 .../Contract}/ExecuteContract/index.js | 0 js/src/views/Contract/contract.js | 3 +- js/src/views/Contract/index.js | 3 - .../ContractDevelop}/LoadContract/index.js | 0 .../LoadContract/loadContract.css | 0 .../LoadContract/loadContract.js | 0 .../LoadContract/loadContract.spec.js | 0 .../ContractDevelop}/SaveContract/index.js | 0 .../SaveContract/saveContract.css | 0 .../SaveContract/saveContract.js | 0 .../views/ContractDevelop/contractDevelop.js | 5 +- js/src/views/ContractDevelop/index.js | 5 - .../Contracts}/AddContract/addContract.css | 0 .../Contracts}/AddContract/addContract.js | 0 .../AddContract/addContract.spec.js | 0 .../AddContract/addContract.test.js | 0 .../Contracts}/AddContract/index.js | 0 .../Contracts}/AddContract/store.js | 0 .../Contracts}/AddContract/store.spec.js | 0 .../Contracts}/AddContract/types.js | 0 .../DeployContract/DetailsStep/detailsStep.js | 0 .../DeployContract}/DetailsStep/index.js | 0 .../DeployContract/ParametersStep/index.js | 0 .../ParametersStep/parametersStep.js | 0 .../DeployContract/deployContract.css | 0 .../DeployContract/deployContract.js | 2 +- .../DeployContract/deployContract.spec.js | 0 .../Contracts}/DeployContract/index.js | 0 js/src/views/Contracts/contracts.js | 4 +- js/src/views/Contracts/index.js | 3 - js/src/views/Home/index.js | 5 - js/src/views/Playground/index.js | 5 - js/src/views/Settings/index.js | 5 - js/src/views/Signer/index.js | 3 - js/src/views/Status/index.js | 5 - .../Vaults}/VaultAccounts/index.js | 0 .../Vaults}/VaultAccounts/vaultAccounts.js | 0 .../VaultAccounts/vaultAccounts.spec.js | 0 .../Vaults}/VaultCreate/index.js | 0 .../Vaults}/VaultCreate/vaultCreate.css | 0 .../Vaults}/VaultCreate/vaultCreate.js | 0 .../Vaults}/VaultCreate/vaultCreate.spec.js | 0 .../Vaults}/VaultLock/index.js | 0 .../Vaults}/VaultLock/vaultLock.js | 0 .../Vaults}/VaultLock/vaultLock.spec.js | 0 .../Vaults}/VaultMeta/index.js | 0 .../Vaults}/VaultMeta/vaultMeta.js | 0 .../Vaults}/VaultMeta/vaultMeta.spec.js | 0 .../Vaults}/VaultUnlock/index.js | 0 .../Vaults}/VaultUnlock/vaultUnlock.css | 0 .../Vaults}/VaultUnlock/vaultUnlock.js | 0 .../Vaults}/VaultUnlock/vaultUnlock.spec.js | 0 js/src/views/Vaults/index.js | 5 - js/src/views/Vaults/store.js | 2 +- js/src/views/Vaults/store.spec.js | 2 +- js/src/views/Vaults/vaults.js | 7 +- .../Wallet}/WalletSettings/index.js | 0 .../Wallet}/WalletSettings/walletSettings.css | 0 .../Wallet}/WalletSettings/walletSettings.js | 0 .../WalletSettings/walletSettingsStore.js | 0 js/src/views/Wallet/index.js | 3 - js/src/views/Wallet/wallet.js | 4 +- js/src/views/Web/index.js | 5 - js/src/views/index.ejs | 4 +- js/webpack/vendor.js | 2 + 292 files changed, 734 insertions(+), 805 deletions(-) delete mode 100644 js/src/modals/index.js rename js/src/{modals => shell}/DappPermissions/dappPermissions.js (100%) rename js/src/{modals => shell}/DappPermissions/dappPermissions.spec.js (97%) rename js/src/{modals => shell}/DappPermissions/index.js (100%) rename js/src/{modals => shell}/DappPermissions/store.js (100%) rename js/src/{modals => shell}/DappPermissions/store.spec.js (98%) rename js/src/{modals/AddDapps/addDapps.css => shell/DappsVisible/dappsVisible.css} (100%) rename js/src/{modals/AddDapps/addDapps.js => shell/DappsVisible/dappsVisible.js} (97%) rename js/src/{modals/AddDapps/addDapps.spec.js => shell/DappsVisible/dappsVisible.spec.js} (92%) create mode 100644 js/src/shell/DappsVisible/index.js rename js/src/{modals => shell}/FirstRun/Completed/completed.js (100%) rename js/src/{modals => shell}/FirstRun/Completed/index.js (100%) rename js/src/{modals => shell}/FirstRun/TnC/index.js (100%) rename js/src/{modals => shell}/FirstRun/TnC/tnc.js (100%) rename js/src/{modals => shell}/FirstRun/Welcome/index.js (100%) rename js/src/{modals => shell}/FirstRun/Welcome/welcome.js (100%) rename js/src/{modals => shell}/FirstRun/firstRun.css (100%) rename js/src/{modals => shell}/FirstRun/firstRun.js (95%) rename js/src/{modals => shell}/FirstRun/firstRun.spec.js (100%) rename js/src/{modals => shell}/FirstRun/index.js (100%) rename js/src/{modals => shell}/UpgradeParity/index.js (100%) rename js/src/{modals => shell}/UpgradeParity/store.js (100%) rename js/src/{modals => shell}/UpgradeParity/store.spec.js (100%) rename js/src/{modals => shell}/UpgradeParity/upgradeParity.css (100%) rename js/src/{modals => shell}/UpgradeParity/upgradeParity.js (100%) rename js/src/{modals => ui/Form/VaultSelect}/VaultSelector/index.js (100%) rename js/src/{modals => ui/Form/VaultSelect}/VaultSelector/vaultSelector.js (100%) rename js/src/{modals => ui/Form/VaultSelect}/VaultSelector/vaultSelector.spec.js (100%) create mode 100644 js/src/ui/VaultCard/Accounts/accounts.js rename js/src/{modals/AddDapps => ui/VaultCard/Accounts}/index.js (95%) create mode 100644 js/src/ui/VaultCard/Buttons/buttons.js create mode 100644 js/src/ui/VaultCard/Buttons/index.js rename js/src/{modals => views/Account}/DeleteAccount/deleteAccount.css (100%) rename js/src/{modals => views/Account}/DeleteAccount/deleteAccount.js (100%) rename js/src/{modals => views/Account}/DeleteAccount/deleteAccount.spec.js (100%) rename js/src/{modals => views/Account}/DeleteAccount/index.js (100%) rename js/src/{modals => views/Account}/EditMeta/editMeta.js (100%) rename js/src/{modals => views/Account}/EditMeta/editMeta.spec.js (100%) rename js/src/{modals => views/Account}/EditMeta/editMeta.test.js (100%) rename js/src/{modals => views/Account}/EditMeta/index.js (100%) rename js/src/{modals => views/Account}/EditMeta/store.js (100%) rename js/src/{modals => views/Account}/EditMeta/store.spec.js (100%) rename js/src/{modals => views/Account}/Faucet/faucet.js (100%) rename js/src/{modals => views/Account}/Faucet/index.js (100%) rename js/src/{modals => views/Account}/Faucet/store.js (100%) rename js/src/{modals => views/Account}/PasswordManager/index.js (100%) rename js/src/{modals => views/Account}/PasswordManager/passwordManager.css (100%) rename js/src/{modals => views/Account}/PasswordManager/passwordManager.js (100%) rename js/src/{modals => views/Account}/PasswordManager/passwordManager.spec.js (100%) rename js/src/{modals => views/Account}/PasswordManager/passwordManager.test.js (100%) rename js/src/{modals => views/Account}/PasswordManager/store.js (100%) rename js/src/{modals => views/Account}/PasswordManager/store.spec.js (100%) rename js/src/{modals => views/Account}/Shapeshift/AwaitingDepositStep/awaitingDepositStep.js (100%) rename js/src/{modals => views/Account}/Shapeshift/AwaitingDepositStep/awaitingDepositStep.spec.js (100%) rename js/src/{modals => views/Account}/Shapeshift/AwaitingDepositStep/index.js (100%) rename js/src/{modals => views/Account}/Shapeshift/AwaitingExchangeStep/awaitingExchangeStep.js (100%) rename js/src/{modals => views/Account}/Shapeshift/AwaitingExchangeStep/awaitingExchangeStep.spec.js (100%) rename js/src/{modals => views/Account}/Shapeshift/AwaitingExchangeStep/index.js (100%) rename js/src/{modals => views/Account}/Shapeshift/CompletedStep/completedStep.js (100%) rename js/src/{modals => views/Account}/Shapeshift/CompletedStep/completedStep.spec.js (100%) rename js/src/{modals => views/Account}/Shapeshift/CompletedStep/index.js (100%) rename js/src/{modals => views/Account}/Shapeshift/ErrorStep/errorStep.js (100%) rename js/src/{modals => views/Account}/Shapeshift/ErrorStep/errorStep.spec.js (100%) rename js/src/{modals => views/Account}/Shapeshift/ErrorStep/index.js (100%) rename js/src/{modals => views/Account}/Shapeshift/OptionsStep/index.js (100%) rename js/src/{modals => views/Account}/Shapeshift/OptionsStep/optionsStep.css (100%) rename js/src/{modals => views/Account}/Shapeshift/OptionsStep/optionsStep.js (100%) rename js/src/{modals => views/Account}/Shapeshift/OptionsStep/optionsSteps.spec.js (100%) rename js/src/{modals => views/Account}/Shapeshift/Price/index.js (100%) rename js/src/{modals => views/Account}/Shapeshift/Price/price.js (100%) rename js/src/{modals => views/Account}/Shapeshift/Price/price.spec.js (100%) rename js/src/{modals => views/Account}/Shapeshift/Value/index.js (100%) rename js/src/{modals => views/Account}/Shapeshift/Value/value.css (100%) rename js/src/{modals => views/Account}/Shapeshift/Value/value.js (100%) rename js/src/{modals => views/Account}/Shapeshift/Value/value.spec.js (100%) rename js/src/{modals => views/Account}/Shapeshift/index.js (100%) rename js/src/{modals => views/Account}/Shapeshift/shapeshift.css (100%) rename js/src/{modals => views/Account}/Shapeshift/shapeshift.js (100%) rename js/src/{modals => views/Account}/Shapeshift/shapeshift.spec.js (100%) rename js/src/{modals => views/Account}/Shapeshift/store.js (100%) rename js/src/{modals => views/Account}/Shapeshift/store.spec.js (100%) rename js/src/{modals => views/Account}/Transfer/Details/details.js (100%) rename js/src/{modals => views/Account}/Transfer/Details/index.js (100%) rename js/src/{modals => views/Account}/Transfer/Details/tokenSelect.js (100%) rename js/src/{modals => views/Account}/Transfer/Extras/extras.js (100%) rename js/src/{modals => views/Account}/Transfer/Extras/index.js (100%) rename js/src/{modals => views/Account}/Transfer/errors.js (100%) rename js/src/{modals => views/Account}/Transfer/index.js (100%) rename js/src/{modals => views/Account}/Transfer/store.js (100%) rename js/src/{modals => views/Account}/Transfer/transfer.css (100%) rename js/src/{modals => views/Account}/Transfer/transfer.js (100%) rename js/src/{modals => views/Account}/Verification/Done/done.css (100%) rename js/src/{modals => views/Account}/Verification/Done/done.js (100%) rename js/src/{modals => views/Account}/Verification/Done/index.js (100%) rename js/src/{modals => views/Account}/Verification/GatherData/gatherData.css (100%) rename js/src/{modals => views/Account}/Verification/GatherData/gatherData.js (100%) rename js/src/{modals => views/Account}/Verification/GatherData/index.js (100%) rename js/src/{modals => views/Account}/Verification/QueryCode/index.js (100%) rename js/src/{modals => views/Account}/Verification/QueryCode/queryCode.js (100%) rename js/src/{modals => views/Account}/Verification/SendConfirmation/index.js (100%) rename js/src/{modals => views/Account}/Verification/SendConfirmation/sendConfirmation.css (100%) rename js/src/{modals => views/Account}/Verification/SendConfirmation/sendConfirmation.js (100%) rename js/src/{modals => views/Account}/Verification/SendRequest/index.js (100%) rename js/src/{modals => views/Account}/Verification/SendRequest/sendRequest.css (100%) rename js/src/{modals => views/Account}/Verification/SendRequest/sendRequest.js (100%) rename js/src/{modals => views/Account}/Verification/email-store.js (100%) rename js/src/{modals => views/Account}/Verification/how-it-works.js (100%) rename js/src/{modals => views/Account}/Verification/index.js (100%) rename js/src/{modals => views/Account}/Verification/sms-store.js (100%) rename js/src/{modals => views/Account}/Verification/store.js (100%) rename js/src/{modals => views/Account}/Verification/verification.css (100%) rename js/src/{modals => views/Account}/Verification/verification.js (100%) rename js/src/{modals => views/Accounts}/CreateAccount/AccountDetails/accountDetails.js (100%) rename js/src/{modals => views/Accounts}/CreateAccount/AccountDetails/accountDetails.spec.js (100%) rename js/src/{modals => views/Accounts}/CreateAccount/AccountDetails/index.js (100%) rename js/src/{modals => views/Accounts}/CreateAccount/AccountDetailsGeth/accountDetailsGeth.js (100%) rename js/src/{modals => views/Accounts}/CreateAccount/AccountDetailsGeth/accountDetailsGeth.spec.js (100%) rename js/src/{modals => views/Accounts}/CreateAccount/AccountDetailsGeth/index.js (100%) rename js/src/{modals => views/Accounts}/CreateAccount/ChangeVault/changeVault.js (100%) rename js/src/{modals => views/Accounts}/CreateAccount/ChangeVault/changeVault.spec.js (100%) rename js/src/{modals => views/Accounts}/CreateAccount/ChangeVault/index.js (100%) rename js/src/{modals => views/Accounts}/CreateAccount/CreationType/creationType.js (100%) rename js/src/{modals => views/Accounts}/CreateAccount/CreationType/creationType.spec.js (100%) rename js/src/{modals => views/Accounts}/CreateAccount/CreationType/index.js (100%) rename js/src/{modals => views/Accounts}/CreateAccount/GethCard/gethCard.js (100%) rename js/src/{modals => views/Accounts}/CreateAccount/GethCard/index.js (100%) rename js/src/{modals => views/Accounts}/CreateAccount/NewAccount/index.js (100%) rename js/src/{modals => views/Accounts}/CreateAccount/NewAccount/newAccount.js (100%) rename js/src/{modals => views/Accounts}/CreateAccount/NewAccount/newAccount.spec.js (100%) rename js/src/{modals => views/Accounts}/CreateAccount/NewGeth/index.js (100%) rename js/src/{modals => views/Accounts}/CreateAccount/NewGeth/newGeth.js (100%) rename js/src/{modals => views/Accounts}/CreateAccount/NewGeth/newGeth.spec.js (100%) rename js/src/{modals => views/Accounts}/CreateAccount/NewImport/index.js (100%) rename js/src/{modals => views/Accounts}/CreateAccount/NewImport/newImport.js (100%) rename js/src/{modals => views/Accounts}/CreateAccount/NewImport/newImport.spec.js (100%) rename js/src/{modals => views/Accounts}/CreateAccount/NewQr/index.js (100%) rename js/src/{modals => views/Accounts}/CreateAccount/NewQr/newQr.js (100%) rename js/src/{modals => views/Accounts}/CreateAccount/NewQr/newQr.spec.js (100%) rename js/src/{modals => views/Accounts}/CreateAccount/RawKey/index.js (100%) rename js/src/{modals => views/Accounts}/CreateAccount/RawKey/rawKey.js (100%) rename js/src/{modals => views/Accounts}/CreateAccount/RawKey/rawKey.spec.js (100%) rename js/src/{modals => views/Accounts}/CreateAccount/RecoveryPhrase/index.js (100%) rename js/src/{modals => views/Accounts}/CreateAccount/RecoveryPhrase/recoveryPhrase.js (100%) rename js/src/{modals => views/Accounts}/CreateAccount/RecoveryPhrase/recoveryPhrase.spec.js (100%) rename js/src/{modals => views/Accounts}/CreateAccount/TypeIcon/index.js (100%) rename js/src/{modals => views/Accounts}/CreateAccount/TypeIcon/typeIcon.js (100%) rename js/src/{modals => views/Accounts}/CreateAccount/createAccount.css (100%) rename js/src/{modals => views/Accounts}/CreateAccount/createAccount.js (100%) rename js/src/{modals => views/Accounts}/CreateAccount/createAccount.spec.js (100%) rename js/src/{modals => views/Accounts}/CreateAccount/createAccount.test.js (100%) rename js/src/{modals => views/Accounts}/CreateAccount/errors.js (100%) rename js/src/{modals => views/Accounts}/CreateAccount/index.js (100%) rename js/src/{modals => views/Accounts}/CreateAccount/print.js (100%) rename js/src/{modals => views/Accounts}/CreateAccount/recoveryPage.ejs (100%) rename js/src/{modals => views/Accounts}/CreateAccount/store.js (100%) rename js/src/{modals => views/Accounts}/CreateAccount/store.spec.js (100%) rename js/src/{modals => views/Accounts}/CreateWallet/WalletDetails/index.js (100%) rename js/src/{modals => views/Accounts}/CreateWallet/WalletDetails/walletDetails.js (100%) rename js/src/{modals => views/Accounts}/CreateWallet/WalletDetails/walletDetails.spec.js (100%) rename js/src/{modals => views/Accounts}/CreateWallet/WalletInfo/index.js (100%) rename js/src/{modals => views/Accounts}/CreateWallet/WalletInfo/walletInfo.js (100%) rename js/src/{modals => views/Accounts}/CreateWallet/WalletInfo/walletInfo.spec.js (100%) rename js/src/{modals => views/Accounts}/CreateWallet/WalletType/index.js (100%) rename js/src/{modals => views/Accounts}/CreateWallet/WalletType/walletType.js (100%) rename js/src/{modals => views/Accounts}/CreateWallet/WalletType/walletType.spec.js (100%) rename js/src/{modals => views/Accounts}/CreateWallet/createWallet.css (100%) rename js/src/{modals => views/Accounts}/CreateWallet/createWallet.js (100%) rename js/src/{modals => views/Accounts}/CreateWallet/createWallet.spec.js (100%) rename js/src/{modals => views/Accounts}/CreateWallet/createWallet.test.js (100%) rename js/src/{modals => views/Accounts}/CreateWallet/createWalletStore.js (100%) rename js/src/{modals => views/Accounts}/CreateWallet/index.js (100%) rename js/src/{modals => views/Accounts}/ExportAccount/exportAccount.js (100%) rename js/src/{modals => views/Accounts}/ExportAccount/exportAccount.spec.js (100%) rename js/src/{modals => views/Accounts}/ExportAccount/exportInput/exportInput.js (100%) rename js/src/{modals => views/Accounts}/ExportAccount/exportInput/index.js (100%) rename js/src/{modals => views/Accounts}/ExportAccount/exportStore.js (100%) rename js/src/{modals => views/Accounts}/ExportAccount/exportStore.spec.js (100%) rename js/src/{modals => views/Accounts}/ExportAccount/index.js (100%) rename js/src/{modals => views/Addresses}/AddAddress/addAddress.js (100%) rename js/src/{modals => views/Addresses}/AddAddress/addAddress.spec.js (100%) rename js/src/{modals => views/Addresses}/AddAddress/index.js (100%) rename js/src/{modals => views/Addresses}/AddAddress/store.js (100%) rename js/src/{modals => views/Addresses}/AddAddress/store.spec.js (100%) rename js/src/{modals => views/Addresses}/AddAddress/store.test.js (100%) rename js/src/{modals => views/Contract}/ExecuteContract/AdvancedStep/advancedStep.js (100%) rename js/src/{modals => views/Contract}/ExecuteContract/AdvancedStep/index.js (100%) rename js/src/{modals => views/Contract}/ExecuteContract/DetailsStep/detailsStep.js (100%) rename js/src/{modals => views/Contract}/ExecuteContract/DetailsStep/detailsStep.spec.js (100%) rename js/src/{modals/DeployContract => views/Contract/ExecuteContract}/DetailsStep/index.js (100%) rename js/src/{modals => views/Contract}/ExecuteContract/executeContract.css (100%) rename js/src/{modals => views/Contract}/ExecuteContract/executeContract.js (100%) rename js/src/{modals => views/Contract}/ExecuteContract/executeContract.spec.js (100%) rename js/src/{modals => views/Contract}/ExecuteContract/executeContract.test.js (100%) rename js/src/{modals => views/Contract}/ExecuteContract/index.js (100%) rename js/src/{modals => views/ContractDevelop}/LoadContract/index.js (100%) rename js/src/{modals => views/ContractDevelop}/LoadContract/loadContract.css (100%) rename js/src/{modals => views/ContractDevelop}/LoadContract/loadContract.js (100%) rename js/src/{modals => views/ContractDevelop}/LoadContract/loadContract.spec.js (100%) rename js/src/{modals => views/ContractDevelop}/SaveContract/index.js (100%) rename js/src/{modals => views/ContractDevelop}/SaveContract/saveContract.css (100%) rename js/src/{modals => views/ContractDevelop}/SaveContract/saveContract.js (100%) rename js/src/{modals => views/Contracts}/AddContract/addContract.css (100%) rename js/src/{modals => views/Contracts}/AddContract/addContract.js (100%) rename js/src/{modals => views/Contracts}/AddContract/addContract.spec.js (100%) rename js/src/{modals => views/Contracts}/AddContract/addContract.test.js (100%) rename js/src/{modals => views/Contracts}/AddContract/index.js (100%) rename js/src/{modals => views/Contracts}/AddContract/store.js (100%) rename js/src/{modals => views/Contracts}/AddContract/store.spec.js (100%) rename js/src/{modals => views/Contracts}/AddContract/types.js (100%) rename js/src/{modals => views/Contracts}/DeployContract/DetailsStep/detailsStep.js (100%) rename js/src/{modals/ExecuteContract => views/Contracts/DeployContract}/DetailsStep/index.js (100%) rename js/src/{modals => views/Contracts}/DeployContract/ParametersStep/index.js (100%) rename js/src/{modals => views/Contracts}/DeployContract/ParametersStep/parametersStep.js (100%) rename js/src/{modals => views/Contracts}/DeployContract/deployContract.css (100%) rename js/src/{modals => views/Contracts}/DeployContract/deployContract.js (99%) rename js/src/{modals => views/Contracts}/DeployContract/deployContract.spec.js (100%) rename js/src/{modals => views/Contracts}/DeployContract/index.js (100%) rename js/src/{modals => views/Vaults}/VaultAccounts/index.js (100%) rename js/src/{modals => views/Vaults}/VaultAccounts/vaultAccounts.js (100%) rename js/src/{modals => views/Vaults}/VaultAccounts/vaultAccounts.spec.js (100%) rename js/src/{modals => views/Vaults}/VaultCreate/index.js (100%) rename js/src/{modals => views/Vaults}/VaultCreate/vaultCreate.css (100%) rename js/src/{modals => views/Vaults}/VaultCreate/vaultCreate.js (100%) rename js/src/{modals => views/Vaults}/VaultCreate/vaultCreate.spec.js (100%) rename js/src/{modals => views/Vaults}/VaultLock/index.js (100%) rename js/src/{modals => views/Vaults}/VaultLock/vaultLock.js (100%) rename js/src/{modals => views/Vaults}/VaultLock/vaultLock.spec.js (100%) rename js/src/{modals => views/Vaults}/VaultMeta/index.js (100%) rename js/src/{modals => views/Vaults}/VaultMeta/vaultMeta.js (100%) rename js/src/{modals => views/Vaults}/VaultMeta/vaultMeta.spec.js (100%) rename js/src/{modals => views/Vaults}/VaultUnlock/index.js (100%) rename js/src/{modals => views/Vaults}/VaultUnlock/vaultUnlock.css (100%) rename js/src/{modals => views/Vaults}/VaultUnlock/vaultUnlock.js (100%) rename js/src/{modals => views/Vaults}/VaultUnlock/vaultUnlock.spec.js (100%) rename js/src/{modals => views/Wallet}/WalletSettings/index.js (100%) rename js/src/{modals => views/Wallet}/WalletSettings/walletSettings.css (100%) rename js/src/{modals => views/Wallet}/WalletSettings/walletSettings.js (100%) rename js/src/{modals => views/Wallet}/WalletSettings/walletSettingsStore.js (100%) diff --git a/js/src/modals/index.js b/js/src/modals/index.js deleted file mode 100644 index 7c313a2ef..000000000 --- a/js/src/modals/index.js +++ /dev/null @@ -1,43 +0,0 @@ -// Copyright 2015-2017 Parity Technologies (UK) Ltd. -// This file is part of Parity. - -// Parity is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. - -// Parity is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. - -// You should have received a copy of the GNU General Public License -// along with Parity. If not, see . - -export AddAddress from './AddAddress'; -export AddContract from './AddContract'; -export CreateAccount from './CreateAccount'; -export CreateWallet from './CreateWallet'; -export DappPermissions from './DappPermissions'; -export DappsVisible from './AddDapps'; -export DeleteAccount from './DeleteAccount'; -export DeployContract from './DeployContract'; -export EditMeta from './EditMeta'; -export ExecuteContract from './ExecuteContract'; -export ExportAccount from './ExportAccount'; -export Faucet from './Faucet'; -export FirstRun from './FirstRun'; -export LoadContract from './LoadContract'; -export PasswordManager from './PasswordManager'; -export SaveContract from './SaveContract'; -export Shapeshift from './Shapeshift'; -export Transfer from './Transfer'; -export UpgradeParity from './UpgradeParity'; -export VaultAccounts from './VaultAccounts'; -export VaultCreate from './VaultCreate'; -export VaultLock from './VaultLock'; -export VaultMeta from './VaultMeta'; -export VaultSelector from './VaultSelector'; -export VaultUnlock from './VaultUnlock'; -export Verification from './Verification'; -export WalletSettings from './WalletSettings'; diff --git a/js/src/redux/providers/status.js b/js/src/redux/providers/status.js index ba953b898..6bac91d85 100644 --- a/js/src/redux/providers/status.js +++ b/js/src/redux/providers/status.js @@ -17,7 +17,7 @@ import { isEqual } from 'lodash'; import { LOG_KEYS, getLogger } from '~/config'; -import UpgradeStore from '~/modals/UpgradeParity/store'; +import UpgradeStore from '~/shell/UpgradeParity/store'; import BalancesProvider from './balances'; import { statusBlockNumber, statusCollection } from './statusActions'; diff --git a/js/src/shell/Application/Container/container.js b/js/src/shell/Application/Container/container.js index b869a32e3..43a76ad40 100644 --- a/js/src/shell/Application/Container/container.js +++ b/js/src/shell/Application/Container/container.js @@ -16,9 +16,11 @@ import React, { PropTypes } from 'react'; -import { FirstRun, UpgradeParity } from '~/modals'; import { Errors, Tooltips } from '~/ui'; +import FirstRun from '../../FirstRun'; +import UpgradeParity from '../../UpgradeParity'; + import styles from '../application.css'; export default function Container ({ children, onCloseFirstRun, showFirstRun, upgradeStore }) { diff --git a/js/src/shell/Application/Extension/extension.js b/js/src/shell/Application/Extension/extension.js index 0c033225b..8aba74b72 100644 --- a/js/src/shell/Application/Extension/extension.js +++ b/js/src/shell/Application/Extension/extension.js @@ -37,10 +37,12 @@ export default class Extension extends Component { return (
- + > + +

{ +describe('shell/DappPermissions', () => { describe('rendering', () => { it('renders defaults', () => { expect(renderShallow()).to.be.ok; diff --git a/js/src/modals/DappPermissions/index.js b/js/src/shell/DappPermissions/index.js similarity index 100% rename from js/src/modals/DappPermissions/index.js rename to js/src/shell/DappPermissions/index.js diff --git a/js/src/modals/DappPermissions/store.js b/js/src/shell/DappPermissions/store.js similarity index 100% rename from js/src/modals/DappPermissions/store.js rename to js/src/shell/DappPermissions/store.js diff --git a/js/src/modals/DappPermissions/store.spec.js b/js/src/shell/DappPermissions/store.spec.js similarity index 98% rename from js/src/modals/DappPermissions/store.spec.js rename to js/src/shell/DappPermissions/store.spec.js index ed6d766b2..ae0bf64fd 100644 --- a/js/src/modals/DappPermissions/store.spec.js +++ b/js/src/shell/DappPermissions/store.spec.js @@ -41,7 +41,7 @@ function create () { store = new Store(api); } -describe('modals/DappPermissions/store', () => { +describe('shell/DappPermissions/store', () => { beforeEach(() => { create(); }); diff --git a/js/src/shell/Dapps/dapps.js b/js/src/shell/Dapps/dapps.js index 41730b1ca..cd9f3be84 100644 --- a/js/src/shell/Dapps/dapps.js +++ b/js/src/shell/Dapps/dapps.js @@ -21,11 +21,13 @@ import React, { Component, PropTypes } from 'react'; import { FormattedMessage } from 'react-intl'; import { connect } from 'react-redux'; -import { DappPermissions, DappsVisible } from '~/modals'; -import PermissionStore from '~/modals/DappPermissions/store'; import { Actionbar, Button, DappCard, Page, SectionList } from '~/ui'; import { LockedIcon, VisibleIcon } from '~/ui/Icons'; +import DappsVisible from '../DappsVisible'; +import DappPermissions from '../DappPermissions'; +import PermissionStore from '../DappPermissions/store'; + import DappsStore from './dappsStore'; import styles from './dapps.css'; diff --git a/js/src/modals/AddDapps/addDapps.css b/js/src/shell/DappsVisible/dappsVisible.css similarity index 100% rename from js/src/modals/AddDapps/addDapps.css rename to js/src/shell/DappsVisible/dappsVisible.css diff --git a/js/src/modals/AddDapps/addDapps.js b/js/src/shell/DappsVisible/dappsVisible.js similarity index 97% rename from js/src/modals/AddDapps/addDapps.js rename to js/src/shell/DappsVisible/dappsVisible.js index 871b4f505..0f43c8876 100644 --- a/js/src/modals/AddDapps/addDapps.js +++ b/js/src/shell/DappsVisible/dappsVisible.js @@ -20,10 +20,10 @@ import { FormattedMessage } from 'react-intl'; import { DappCard, Portal, SelectionList } from '~/ui'; -import styles from './addDapps.css'; +import styles from './dappsVisible.css'; @observer -export default class AddDapps extends Component { +export default class DappsVisible extends Component { static propTypes = { store: PropTypes.object.isRequired }; diff --git a/js/src/modals/AddDapps/addDapps.spec.js b/js/src/shell/DappsVisible/dappsVisible.spec.js similarity index 92% rename from js/src/modals/AddDapps/addDapps.spec.js rename to js/src/shell/DappsVisible/dappsVisible.spec.js index e629a5375..27893434b 100644 --- a/js/src/modals/AddDapps/addDapps.spec.js +++ b/js/src/shell/DappsVisible/dappsVisible.spec.js @@ -17,15 +17,15 @@ import { shallow } from 'enzyme'; import React from 'react'; -import AddDapps from './'; +import DappsVisible from './'; function renderShallow (store = {}) { return shallow( - + ); } -describe('modals/AddDapps', () => { +describe('shell/DappsVisible', () => { describe('rendering', () => { it('renders defaults', () => { expect(renderShallow()).to.be.ok; diff --git a/js/src/shell/DappsVisible/index.js b/js/src/shell/DappsVisible/index.js new file mode 100644 index 000000000..89b0c0fed --- /dev/null +++ b/js/src/shell/DappsVisible/index.js @@ -0,0 +1,17 @@ +// Copyright 2015-2017 Parity Technologies (UK) Ltd. +// This file is part of Parity. + +// Parity is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. + +// Parity is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License +// along with Parity. If not, see . + +export default from './dappsVisible'; diff --git a/js/src/modals/FirstRun/Completed/completed.js b/js/src/shell/FirstRun/Completed/completed.js similarity index 100% rename from js/src/modals/FirstRun/Completed/completed.js rename to js/src/shell/FirstRun/Completed/completed.js diff --git a/js/src/modals/FirstRun/Completed/index.js b/js/src/shell/FirstRun/Completed/index.js similarity index 100% rename from js/src/modals/FirstRun/Completed/index.js rename to js/src/shell/FirstRun/Completed/index.js diff --git a/js/src/modals/FirstRun/TnC/index.js b/js/src/shell/FirstRun/TnC/index.js similarity index 100% rename from js/src/modals/FirstRun/TnC/index.js rename to js/src/shell/FirstRun/TnC/index.js diff --git a/js/src/modals/FirstRun/TnC/tnc.js b/js/src/shell/FirstRun/TnC/tnc.js similarity index 100% rename from js/src/modals/FirstRun/TnC/tnc.js rename to js/src/shell/FirstRun/TnC/tnc.js diff --git a/js/src/modals/FirstRun/Welcome/index.js b/js/src/shell/FirstRun/Welcome/index.js similarity index 100% rename from js/src/modals/FirstRun/Welcome/index.js rename to js/src/shell/FirstRun/Welcome/index.js diff --git a/js/src/modals/FirstRun/Welcome/welcome.js b/js/src/shell/FirstRun/Welcome/welcome.js similarity index 100% rename from js/src/modals/FirstRun/Welcome/welcome.js rename to js/src/shell/FirstRun/Welcome/welcome.js diff --git a/js/src/modals/FirstRun/firstRun.css b/js/src/shell/FirstRun/firstRun.css similarity index 100% rename from js/src/modals/FirstRun/firstRun.css rename to js/src/shell/FirstRun/firstRun.css diff --git a/js/src/modals/FirstRun/firstRun.js b/js/src/shell/FirstRun/firstRun.js similarity index 95% rename from js/src/modals/FirstRun/firstRun.js rename to js/src/shell/FirstRun/firstRun.js index 826a02d99..6ca65978e 100644 --- a/js/src/modals/FirstRun/firstRun.js +++ b/js/src/shell/FirstRun/firstRun.js @@ -27,10 +27,11 @@ import { newError } from '~/redux/actions'; import { Button, Portal } from '~/ui'; import { CheckIcon, DoneIcon, NextIcon, PrintIcon } from '~/ui/Icons'; -import { NewAccount, AccountDetails } from '../CreateAccount'; -import print from '../CreateAccount/print'; -import recoveryPage from '../CreateAccount/recoveryPage.ejs'; -import CreateStore from '../CreateAccount/store'; +// FIXME: These imports, while nice for re-using, breaks since the shell import +import { NewAccount, AccountDetails } from '~/views/Accounts/CreateAccount'; +import print from '~/views/Accounts/CreateAccount/print'; +import recoveryPage from '~/views/Accounts/CreateAccount/recoveryPage.ejs'; +import CreateStore from '~/views/Accounts/CreateAccount/store'; import Completed from './Completed'; import TnC from './TnC'; diff --git a/js/src/modals/FirstRun/firstRun.spec.js b/js/src/shell/FirstRun/firstRun.spec.js similarity index 100% rename from js/src/modals/FirstRun/firstRun.spec.js rename to js/src/shell/FirstRun/firstRun.spec.js diff --git a/js/src/modals/FirstRun/index.js b/js/src/shell/FirstRun/index.js similarity index 100% rename from js/src/modals/FirstRun/index.js rename to js/src/shell/FirstRun/index.js diff --git a/js/src/modals/UpgradeParity/index.js b/js/src/shell/UpgradeParity/index.js similarity index 100% rename from js/src/modals/UpgradeParity/index.js rename to js/src/shell/UpgradeParity/index.js diff --git a/js/src/modals/UpgradeParity/store.js b/js/src/shell/UpgradeParity/store.js similarity index 100% rename from js/src/modals/UpgradeParity/store.js rename to js/src/shell/UpgradeParity/store.js diff --git a/js/src/modals/UpgradeParity/store.spec.js b/js/src/shell/UpgradeParity/store.spec.js similarity index 100% rename from js/src/modals/UpgradeParity/store.spec.js rename to js/src/shell/UpgradeParity/store.spec.js diff --git a/js/src/modals/UpgradeParity/upgradeParity.css b/js/src/shell/UpgradeParity/upgradeParity.css similarity index 100% rename from js/src/modals/UpgradeParity/upgradeParity.css rename to js/src/shell/UpgradeParity/upgradeParity.css diff --git a/js/src/modals/UpgradeParity/upgradeParity.js b/js/src/shell/UpgradeParity/upgradeParity.js similarity index 100% rename from js/src/modals/UpgradeParity/upgradeParity.js rename to js/src/shell/UpgradeParity/upgradeParity.js diff --git a/js/src/shell/index.ejs b/js/src/shell/index.ejs index 305568f5b..1bf9ab726 100644 --- a/js/src/shell/index.ejs +++ b/js/src/shell/index.ejs @@ -16,9 +16,7 @@ height: 100%; margin: 0; padding: 0; - font-family: 'Roboto', sans-serif; - font-size: 16px; - font-weight: 300; + font-family: Sans-Serif; } .loading { diff --git a/js/src/shell/index.js b/js/src/shell/index.js index 715968dda..49e0f68d9 100644 --- a/js/src/shell/index.js +++ b/js/src/shell/index.js @@ -41,9 +41,6 @@ import Dapps from './Dapps'; import '~/environment'; -import '~/../assets/fonts/Roboto/font.css'; -import '~/../assets/fonts/RobotoMono/font.css'; - injectTapEventPlugin(); if (process.env.NODE_ENV === 'development') { diff --git a/js/src/ui/Actionbar/Search/search.css b/js/src/ui/Actionbar/Search/search.css index 820dc23bf..69ec3d3f0 100644 --- a/js/src/ui/Actionbar/Search/search.css +++ b/js/src/ui/Actionbar/Search/search.css @@ -14,9 +14,8 @@ /* You should have received a copy of the GNU General Public License /* along with Parity. If not, see . */ + .searchcontainer { - display: flex; - overflow: hidden; } .searchButton { diff --git a/js/src/ui/Actionbar/actionbar.css b/js/src/ui/Actionbar/actionbar.css index 9b6e5fc39..56f69a829 100644 --- a/js/src/ui/Actionbar/actionbar.css +++ b/js/src/ui/Actionbar/actionbar.css @@ -16,17 +16,23 @@ */ .actionbar { - padding: 0 24px !important; - margin-bottom: 0; - height: auto !important; - background: transparent !important; -} + background: transparent; + display: flex; + flex-direction: row; + justify-content: space-between; + padding: 0.5em 1.5em; + margin: 0; -.tooltitle { - text-transform: uppercase; -} + .title { + text-transform: uppercase; + } -.toolbuttons { - padding: 0.5em 0; - overflow: hidden; + .children { + } + + .buttons { + div { + display: inline-block; + } + } } diff --git a/js/src/ui/Actionbar/actionbar.js b/js/src/ui/Actionbar/actionbar.js index 69bb0bb14..2564d7c10 100644 --- a/js/src/ui/Actionbar/actionbar.js +++ b/js/src/ui/Actionbar/actionbar.js @@ -14,55 +14,31 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; -import { Toolbar, ToolbarGroup } from 'material-ui/Toolbar'; +import React, { PropTypes } from 'react'; import { nodeOrStringProptype } from '~/util/proptypes'; import styles from './actionbar.css'; -export default class Actionbar extends Component { - static propTypes = { - title: nodeOrStringProptype(), - buttons: PropTypes.array, - children: PropTypes.node, - className: PropTypes.string - }; - - render () { - const { children, className } = this.props; - const classes = `${styles.actionbar} ${className}`; - - return ( - - { this.renderTitle() } - { this.renderButtons() } - { children } - - ); - } - - renderButtons () { - const { buttons } = this.props; - - if (!buttons || !buttons.length) { - return null; - } - - return ( - - { buttons } - - ); - } - - renderTitle () { - const { title } = this.props; - - return ( -

+export default function Actionbar ({ buttons, children, className, title }) { + return ( +
+

{ title }

- ); - } +
+ { children } +
+
+ { buttons } +
+
+ ); } + +Actionbar.propTypes = { + title: nodeOrStringProptype(), + buttons: PropTypes.array, + children: PropTypes.node, + className: PropTypes.string +}; diff --git a/js/src/ui/Badge/badge.js b/js/src/ui/Badge/badge.js index 69a309098..c3746272a 100644 --- a/js/src/ui/Badge/badge.js +++ b/js/src/ui/Badge/badge.js @@ -14,25 +14,20 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { PropTypes } from 'react'; import styles from './badge.css'; -export default class Badge extends Component { - static propTypes = { - className: PropTypes.string, - color: PropTypes.string, - value: PropTypes.any - }; - - render () { - const { className, color, value } = this.props; - const classes = `${styles.bubble} ${styles[color || 'default']} ${className}`; - - return ( -
- { value } -
- ); - } +export default function Badge ({ className, color, value }) { + return ( +
+ { value } +
+ ); } + +Badge.propTypes = { + className: PropTypes.string, + color: PropTypes.string, + value: PropTypes.any +}; diff --git a/js/src/ui/Balance/balance.js b/js/src/ui/Balance/balance.js index 8bb552daa..8af5e2852 100644 --- a/js/src/ui/Balance/balance.js +++ b/js/src/ui/Balance/balance.js @@ -15,7 +15,7 @@ // along with Parity. If not, see . import BigNumber from 'bignumber.js'; -import React, { Component, PropTypes } from 'react'; +import React, { PropTypes } from 'react'; import { FormattedMessage } from 'react-intl'; import { connect } from 'react-redux'; @@ -23,122 +23,118 @@ import TokenImage from '~/ui/TokenImage'; import styles from './balance.css'; -export class Balance extends Component { - static contextTypes = { - api: PropTypes.object - }; +function Balance ({ balance, className, showOnlyEth, tokens }) { + if (Object.keys(balance).length === 0) { + return null; + } - static propTypes = { - balance: PropTypes.object.isRequired, - tokens: PropTypes.object.isRequired, - address: PropTypes.string, - className: PropTypes.string, - showOnlyEth: PropTypes.bool, - showZeroValues: PropTypes.bool - }; + let body = Object.keys(balance) + .map((tokenId) => { + const token = tokens[tokenId]; + const balanceValue = balance[tokenId]; - static defaultProps = { - showOnlyEth: false, - showZeroValues: false - }; + const isEthToken = token.native; + const isFullToken = !showOnlyEth || isEthToken; + const hasBalance = balanceValue.gt(0); - render () { - const { balance, className, showOnlyEth, tokens } = this.props; + if (!hasBalance && !isEthToken) { + return null; + } - if (Object.keys(balance).length === 0) { - return null; - } + const bnf = new BigNumber(token.format || 1); + let decimals = 0; - let body = Object.keys(balance) - .map((tokenId) => { - const token = tokens[tokenId]; - const balanceValue = balance[tokenId]; + if (bnf.gte(1000)) { + decimals = 3; + } else if (bnf.gte(100)) { + decimals = 2; + } else if (bnf.gte(10)) { + decimals = 1; + } - const isEthToken = token.native; - const isFullToken = !showOnlyEth || isEthToken; - const hasBalance = balanceValue.gt(0); + const value = new BigNumber(balanceValue).div(bnf).toFormat(decimals); - if (!hasBalance && !isEthToken) { - return null; - } + const classNames = [styles.balance]; + let details = null; - const bnf = new BigNumber(token.format || 1); - let decimals = 0; - - if (bnf.gte(1000)) { - decimals = 3; - } else if (bnf.gte(100)) { - decimals = 2; - } else if (bnf.gte(10)) { - decimals = 1; - } - - const value = new BigNumber(balanceValue).div(bnf).toFormat(decimals); - - const classNames = [styles.balance]; - let details = null; - - if (isFullToken) { - classNames.push(styles.full); - details = [ -
- - { value } - -
, -
- { token.tag } -
- ]; - } - - return ( + if (isFullToken) { + classNames.push(styles.full); + details = [
- - { details } + + { value } + +
, +
+ { token.tag }
- ); - }) - .filter((node) => node); + ]; + } - if (!body.length) { - body = ( -
- + return ( +
+ + { details }
); - } + }) + .filter((node) => node); - return ( -
- { body } + if (!body.length) { + body = ( +
+
); } + + return ( +
+ { body } +
+ ); } +Balance.contextTypes = { + api: PropTypes.object.isRequired +}; + +Balance.propTypes = { + balance: PropTypes.object.isRequired, + tokens: PropTypes.object.isRequired, + address: PropTypes.string, + className: PropTypes.string, + showOnlyEth: PropTypes.bool, + showZeroValues: PropTypes.bool +}; + +Balance.defaultProps = { + showOnlyEth: false, + showZeroValues: false +}; + function mapStateToProps (state, props) { const { balances, tokens } = state; const { address } = props; @@ -149,4 +145,7 @@ function mapStateToProps (state, props) { }; } -export default connect(mapStateToProps)(Balance); +export default connect( + mapStateToProps, + null +)(Balance); diff --git a/js/src/ui/BlockStatus/blockStatus.js b/js/src/ui/BlockStatus/blockStatus.js index 0c11fec19..15e70f247 100644 --- a/js/src/ui/BlockStatus/blockStatus.js +++ b/js/src/ui/BlockStatus/blockStatus.js @@ -14,99 +14,95 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { PropTypes } from 'react'; import { FormattedMessage } from 'react-intl'; import { connect } from 'react-redux'; import styles from './blockStatus.css'; -class BlockStatus extends Component { - static propTypes = { - blockNumber: PropTypes.object, - syncing: PropTypes.oneOfType([ - PropTypes.bool, - PropTypes.object - ]) +function BlockStatus ({ blockNumber, syncing }) { + if (!blockNumber) { + return null; } - render () { - const { blockNumber, syncing } = this.props; - - if (!blockNumber) { - return null; - } - - if (!syncing) { - return ( -
- -
- ); - } - - if (syncing.warpChunksAmount && syncing.warpChunksProcessed && !syncing.warpChunksAmount.eq(syncing.warpChunksProcessed)) { - return ( -
- -
- ); - } - - let syncStatus = null; - let warpStatus = null; - - if (syncing.currentBlock && syncing.highestBlock) { - syncStatus = ( - - - - ); - } - - if (syncing.blockGap) { - const [first, last] = syncing.blockGap; - - warpStatus = ( - - - - ); - } - + if (!syncing) { return ( -
- { syncStatus } - { warpStatus } +
+
); } + + if (syncing.warpChunksAmount && syncing.warpChunksProcessed && !syncing.warpChunksAmount.eq(syncing.warpChunksProcessed)) { + return ( +
+ +
+ ); + } + + let syncStatus = null; + let warpStatus = null; + + if (syncing.currentBlock && syncing.highestBlock) { + syncStatus = ( + + + + ); + } + + if (syncing.blockGap) { + const [first, last] = syncing.blockGap; + + warpStatus = ( + + + + ); + } + + return ( +
+ { syncStatus } + { warpStatus } +
+ ); } +BlockStatus.propTypes = { + blockNumber: PropTypes.object, + syncing: PropTypes.oneOfType([ + PropTypes.bool, + PropTypes.object + ]) +}; + function mapStateToProps (state) { const { blockNumber, syncing } = state.nodeStatus; diff --git a/js/src/ui/Button/button.js b/js/src/ui/Button/button.js index 7702ba14e..a4b1412c3 100644 --- a/js/src/ui/Button/button.js +++ b/js/src/ui/Button/button.js @@ -14,63 +14,46 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { PropTypes } from 'react'; import { Button as SemButton } from 'semantic-ui-react'; import { nodeOrStringProptype } from '~/util/proptypes'; -export default class Button extends Component { - static propTypes = { - active: PropTypes.bool, - animated: PropTypes.bool, - basic: PropTypes.bool, - backgroundColor: PropTypes.string, - className: PropTypes.string, - color: PropTypes.string, - disabled: PropTypes.bool, - icon: PropTypes.node, - label: nodeOrStringProptype(), - onClick: PropTypes.func, - primary: PropTypes.bool, - size: PropTypes.string, - toggle: PropTypes.bool - } - - static defaultProps = { - primary: true - } - - render () { - const { - active, - animated, - basic, - className, - color, - disabled, - icon, - label, - onClick, - primary, - size, - toggle - } = this.props; - - return ( - - ); - } +export default function Button ({ active, animated, basic, className, color, disabled, icon, label, onClick, primary, size, toggle }) { + return ( + + ); } + +Button.propTypes = { + active: PropTypes.bool, + animated: PropTypes.bool, + basic: PropTypes.bool, + backgroundColor: PropTypes.string, + className: PropTypes.string, + color: PropTypes.string, + disabled: PropTypes.bool, + icon: PropTypes.node, + label: nodeOrStringProptype(), + onClick: PropTypes.func, + primary: PropTypes.bool, + size: PropTypes.string, + toggle: PropTypes.bool +}; + +Button.defaultProps = { + primary: true +}; diff --git a/js/src/ui/ConfirmDialog/confirmDialog.js b/js/src/ui/ConfirmDialog/confirmDialog.js index 02f400e93..f6514d63d 100644 --- a/js/src/ui/ConfirmDialog/confirmDialog.js +++ b/js/src/ui/ConfirmDialog/confirmDialog.js @@ -14,7 +14,7 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { PropTypes } from 'react'; import { FormattedMessage } from 'react-intl'; import { nodeOrStringProptype } from '~/util/proptypes'; @@ -38,62 +38,56 @@ const DEFAULT_YES = ( /> ); -export default class ConfirmDialog extends Component { - static propTypes = { - children: PropTypes.node.isRequired, - className: PropTypes.string, - disabledConfirm: PropTypes.bool, - disabledDeny: PropTypes.bool, - busy: PropTypes.bool, - iconConfirm: PropTypes.node, - iconDeny: PropTypes.node, - labelConfirm: PropTypes.string, - labelDeny: PropTypes.string, - onConfirm: PropTypes.func.isRequired, - onDeny: PropTypes.func.isRequired, - open: PropTypes.bool, - title: nodeOrStringProptype().isRequired, - visible: PropTypes.bool +export default function ConfirmDialog ({ busy, children, className, disabledConfirm, disabledDeny, iconConfirm, iconDeny, labelConfirm, labelDeny, onConfirm, onDeny, open, title, visible }) { + if (!visible && !open) { + return null; } - render () { - const { busy, children, className, disabledConfirm, disabledDeny, iconConfirm, iconDeny, labelConfirm, labelDeny, onConfirm, onDeny, open, title, visible } = this.props; - - // TODO: visible is for compatibility with existing, open aligns with Portal. - // (Cleanup once all uses of ConfirmDialog has been migrated) - if (!visible && !open) { - return null; - } - - return ( - } - key='deny' - label={ labelDeny || DEFAULT_NO } - onClick={ onDeny } - />, -
+ ); +} + +Buttons.propTypes = { + buttons: PropTypes.array, + hideButtons: PropTypes.bool, + vault: PropTypes.object.isRequired +}; diff --git a/js/src/ui/VaultCard/Buttons/index.js b/js/src/ui/VaultCard/Buttons/index.js new file mode 100644 index 000000000..2d0945ae0 --- /dev/null +++ b/js/src/ui/VaultCard/Buttons/index.js @@ -0,0 +1,17 @@ +// Copyright 2015-2017 Parity Technologies (UK) Ltd. +// This file is part of Parity. + +// Parity is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. + +// Parity is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License +// along with Parity. If not, see . + +export default from './buttons'; diff --git a/js/src/ui/VaultCard/vaultCard.js b/js/src/ui/VaultCard/vaultCard.js index 62dae2049..5d34b2a12 100644 --- a/js/src/ui/VaultCard/vaultCard.js +++ b/js/src/ui/VaultCard/vaultCard.js @@ -14,113 +14,52 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; -import { FormattedMessage } from 'react-intl'; -import { Link } from 'react-router'; +import React, { PropTypes } from 'react'; -import Button from '~/ui/Button'; import Container from '~/ui/Container'; -import IdentityIcon from '~/ui/IdentityIcon'; -import { LockedIcon, UnlockedIcon } from '~/ui/Icons'; +import Accounts from './Accounts'; +import Buttons from './Buttons'; import Layout from './Layout'; + import styles from './vaultCard.css'; -export default class VaultCard extends Component { - static propTypes = { - accounts: PropTypes.array, - buttons: PropTypes.array, - children: PropTypes.node, - hideAccounts: PropTypes.bool, - hideButtons: PropTypes.bool, - vault: PropTypes.object.isRequired - }; +export default function VaultCard ({ accounts, buttons, children, hideAccounts, hideButtons, vault }) { + const { isOpen } = vault; - static Layout = Layout; - - render () { - const { children, vault } = this.props; - const { isOpen } = vault; - - return ( - - { this.renderButtons() } - - { children } - - - ); - } - - renderAccounts () { - const { accounts, hideAccounts } = this.props; - - if (hideAccounts) { - return null; - } - - if (!accounts || !accounts.length) { - return ( -
- -
- ); - } - - return ( -
- { - accounts.map((address) => { - return ( - - - - ); - }) - } -
- ); - } - - renderButtons () { - const { buttons, hideButtons, vault } = this.props; - const { isOpen } = vault; - - if (hideButtons) { - return null; - } - - return ( -
-
- ); - } + return ( + + ) + : null + } + > + + + { children } + + + ); } + +VaultCard.propTypes = { + accounts: PropTypes.array, + buttons: PropTypes.array, + children: PropTypes.node, + hideAccounts: PropTypes.bool, + hideButtons: PropTypes.bool, + vault: PropTypes.object.isRequired +}; + +VaultCard.Layout = Layout; diff --git a/js/src/ui/VaultTag/vaultTag.js b/js/src/ui/VaultTag/vaultTag.js index 303aaca61..196c5b8e4 100644 --- a/js/src/ui/VaultTag/vaultTag.js +++ b/js/src/ui/VaultTag/vaultTag.js @@ -14,32 +14,28 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { PropTypes } from 'react'; import IdentityIcon from '~/ui/IdentityIcon'; import styles from './vaultTag.css'; -export default class VaultTag extends Component { - static propTypes = { - vault: PropTypes.string.isRequired - }; - - render () { - const { vault } = this.props; - - return ( -
-
- -
- { vault } -
+export default function VaultTag ({ vault }) { + return ( +
+
+ +
+ { vault }
- ); - } +
+ ); } + +VaultTag.propTypes = { + vault: PropTypes.string.isRequired +}; diff --git a/js/src/ui/Warning/warning.js b/js/src/ui/Warning/warning.js index 1bde5a5d0..f849489d8 100644 --- a/js/src/ui/Warning/warning.js +++ b/js/src/ui/Warning/warning.js @@ -14,28 +14,24 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component } from 'react'; +import React from 'react'; import { nodeOrStringProptype } from '~/util/proptypes'; import styles from './warning.css'; -export default class Warning extends Component { - static propTypes = { - warning: nodeOrStringProptype() - }; - - render () { - const { warning } = this.props; - - if (!warning) { - return null; - } - - return ( -
- { warning } -
- ); +export default function Warning ({ warning }) { + if (!warning) { + return null; } + + return ( +
+ { warning } +
+ ); } + +Warning.propTypes = { + warning: nodeOrStringProptype() +}; diff --git a/js/src/modals/DeleteAccount/deleteAccount.css b/js/src/views/Account/DeleteAccount/deleteAccount.css similarity index 100% rename from js/src/modals/DeleteAccount/deleteAccount.css rename to js/src/views/Account/DeleteAccount/deleteAccount.css diff --git a/js/src/modals/DeleteAccount/deleteAccount.js b/js/src/views/Account/DeleteAccount/deleteAccount.js similarity index 100% rename from js/src/modals/DeleteAccount/deleteAccount.js rename to js/src/views/Account/DeleteAccount/deleteAccount.js diff --git a/js/src/modals/DeleteAccount/deleteAccount.spec.js b/js/src/views/Account/DeleteAccount/deleteAccount.spec.js similarity index 100% rename from js/src/modals/DeleteAccount/deleteAccount.spec.js rename to js/src/views/Account/DeleteAccount/deleteAccount.spec.js diff --git a/js/src/modals/DeleteAccount/index.js b/js/src/views/Account/DeleteAccount/index.js similarity index 100% rename from js/src/modals/DeleteAccount/index.js rename to js/src/views/Account/DeleteAccount/index.js diff --git a/js/src/modals/EditMeta/editMeta.js b/js/src/views/Account/EditMeta/editMeta.js similarity index 100% rename from js/src/modals/EditMeta/editMeta.js rename to js/src/views/Account/EditMeta/editMeta.js diff --git a/js/src/modals/EditMeta/editMeta.spec.js b/js/src/views/Account/EditMeta/editMeta.spec.js similarity index 100% rename from js/src/modals/EditMeta/editMeta.spec.js rename to js/src/views/Account/EditMeta/editMeta.spec.js diff --git a/js/src/modals/EditMeta/editMeta.test.js b/js/src/views/Account/EditMeta/editMeta.test.js similarity index 100% rename from js/src/modals/EditMeta/editMeta.test.js rename to js/src/views/Account/EditMeta/editMeta.test.js diff --git a/js/src/modals/EditMeta/index.js b/js/src/views/Account/EditMeta/index.js similarity index 100% rename from js/src/modals/EditMeta/index.js rename to js/src/views/Account/EditMeta/index.js diff --git a/js/src/modals/EditMeta/store.js b/js/src/views/Account/EditMeta/store.js similarity index 100% rename from js/src/modals/EditMeta/store.js rename to js/src/views/Account/EditMeta/store.js diff --git a/js/src/modals/EditMeta/store.spec.js b/js/src/views/Account/EditMeta/store.spec.js similarity index 100% rename from js/src/modals/EditMeta/store.spec.js rename to js/src/views/Account/EditMeta/store.spec.js diff --git a/js/src/modals/Faucet/faucet.js b/js/src/views/Account/Faucet/faucet.js similarity index 100% rename from js/src/modals/Faucet/faucet.js rename to js/src/views/Account/Faucet/faucet.js diff --git a/js/src/modals/Faucet/index.js b/js/src/views/Account/Faucet/index.js similarity index 100% rename from js/src/modals/Faucet/index.js rename to js/src/views/Account/Faucet/index.js diff --git a/js/src/modals/Faucet/store.js b/js/src/views/Account/Faucet/store.js similarity index 100% rename from js/src/modals/Faucet/store.js rename to js/src/views/Account/Faucet/store.js diff --git a/js/src/modals/PasswordManager/index.js b/js/src/views/Account/PasswordManager/index.js similarity index 100% rename from js/src/modals/PasswordManager/index.js rename to js/src/views/Account/PasswordManager/index.js diff --git a/js/src/modals/PasswordManager/passwordManager.css b/js/src/views/Account/PasswordManager/passwordManager.css similarity index 100% rename from js/src/modals/PasswordManager/passwordManager.css rename to js/src/views/Account/PasswordManager/passwordManager.css diff --git a/js/src/modals/PasswordManager/passwordManager.js b/js/src/views/Account/PasswordManager/passwordManager.js similarity index 100% rename from js/src/modals/PasswordManager/passwordManager.js rename to js/src/views/Account/PasswordManager/passwordManager.js diff --git a/js/src/modals/PasswordManager/passwordManager.spec.js b/js/src/views/Account/PasswordManager/passwordManager.spec.js similarity index 100% rename from js/src/modals/PasswordManager/passwordManager.spec.js rename to js/src/views/Account/PasswordManager/passwordManager.spec.js diff --git a/js/src/modals/PasswordManager/passwordManager.test.js b/js/src/views/Account/PasswordManager/passwordManager.test.js similarity index 100% rename from js/src/modals/PasswordManager/passwordManager.test.js rename to js/src/views/Account/PasswordManager/passwordManager.test.js diff --git a/js/src/modals/PasswordManager/store.js b/js/src/views/Account/PasswordManager/store.js similarity index 100% rename from js/src/modals/PasswordManager/store.js rename to js/src/views/Account/PasswordManager/store.js diff --git a/js/src/modals/PasswordManager/store.spec.js b/js/src/views/Account/PasswordManager/store.spec.js similarity index 100% rename from js/src/modals/PasswordManager/store.spec.js rename to js/src/views/Account/PasswordManager/store.spec.js diff --git a/js/src/modals/Shapeshift/AwaitingDepositStep/awaitingDepositStep.js b/js/src/views/Account/Shapeshift/AwaitingDepositStep/awaitingDepositStep.js similarity index 100% rename from js/src/modals/Shapeshift/AwaitingDepositStep/awaitingDepositStep.js rename to js/src/views/Account/Shapeshift/AwaitingDepositStep/awaitingDepositStep.js diff --git a/js/src/modals/Shapeshift/AwaitingDepositStep/awaitingDepositStep.spec.js b/js/src/views/Account/Shapeshift/AwaitingDepositStep/awaitingDepositStep.spec.js similarity index 100% rename from js/src/modals/Shapeshift/AwaitingDepositStep/awaitingDepositStep.spec.js rename to js/src/views/Account/Shapeshift/AwaitingDepositStep/awaitingDepositStep.spec.js diff --git a/js/src/modals/Shapeshift/AwaitingDepositStep/index.js b/js/src/views/Account/Shapeshift/AwaitingDepositStep/index.js similarity index 100% rename from js/src/modals/Shapeshift/AwaitingDepositStep/index.js rename to js/src/views/Account/Shapeshift/AwaitingDepositStep/index.js diff --git a/js/src/modals/Shapeshift/AwaitingExchangeStep/awaitingExchangeStep.js b/js/src/views/Account/Shapeshift/AwaitingExchangeStep/awaitingExchangeStep.js similarity index 100% rename from js/src/modals/Shapeshift/AwaitingExchangeStep/awaitingExchangeStep.js rename to js/src/views/Account/Shapeshift/AwaitingExchangeStep/awaitingExchangeStep.js diff --git a/js/src/modals/Shapeshift/AwaitingExchangeStep/awaitingExchangeStep.spec.js b/js/src/views/Account/Shapeshift/AwaitingExchangeStep/awaitingExchangeStep.spec.js similarity index 100% rename from js/src/modals/Shapeshift/AwaitingExchangeStep/awaitingExchangeStep.spec.js rename to js/src/views/Account/Shapeshift/AwaitingExchangeStep/awaitingExchangeStep.spec.js diff --git a/js/src/modals/Shapeshift/AwaitingExchangeStep/index.js b/js/src/views/Account/Shapeshift/AwaitingExchangeStep/index.js similarity index 100% rename from js/src/modals/Shapeshift/AwaitingExchangeStep/index.js rename to js/src/views/Account/Shapeshift/AwaitingExchangeStep/index.js diff --git a/js/src/modals/Shapeshift/CompletedStep/completedStep.js b/js/src/views/Account/Shapeshift/CompletedStep/completedStep.js similarity index 100% rename from js/src/modals/Shapeshift/CompletedStep/completedStep.js rename to js/src/views/Account/Shapeshift/CompletedStep/completedStep.js diff --git a/js/src/modals/Shapeshift/CompletedStep/completedStep.spec.js b/js/src/views/Account/Shapeshift/CompletedStep/completedStep.spec.js similarity index 100% rename from js/src/modals/Shapeshift/CompletedStep/completedStep.spec.js rename to js/src/views/Account/Shapeshift/CompletedStep/completedStep.spec.js diff --git a/js/src/modals/Shapeshift/CompletedStep/index.js b/js/src/views/Account/Shapeshift/CompletedStep/index.js similarity index 100% rename from js/src/modals/Shapeshift/CompletedStep/index.js rename to js/src/views/Account/Shapeshift/CompletedStep/index.js diff --git a/js/src/modals/Shapeshift/ErrorStep/errorStep.js b/js/src/views/Account/Shapeshift/ErrorStep/errorStep.js similarity index 100% rename from js/src/modals/Shapeshift/ErrorStep/errorStep.js rename to js/src/views/Account/Shapeshift/ErrorStep/errorStep.js diff --git a/js/src/modals/Shapeshift/ErrorStep/errorStep.spec.js b/js/src/views/Account/Shapeshift/ErrorStep/errorStep.spec.js similarity index 100% rename from js/src/modals/Shapeshift/ErrorStep/errorStep.spec.js rename to js/src/views/Account/Shapeshift/ErrorStep/errorStep.spec.js diff --git a/js/src/modals/Shapeshift/ErrorStep/index.js b/js/src/views/Account/Shapeshift/ErrorStep/index.js similarity index 100% rename from js/src/modals/Shapeshift/ErrorStep/index.js rename to js/src/views/Account/Shapeshift/ErrorStep/index.js diff --git a/js/src/modals/Shapeshift/OptionsStep/index.js b/js/src/views/Account/Shapeshift/OptionsStep/index.js similarity index 100% rename from js/src/modals/Shapeshift/OptionsStep/index.js rename to js/src/views/Account/Shapeshift/OptionsStep/index.js diff --git a/js/src/modals/Shapeshift/OptionsStep/optionsStep.css b/js/src/views/Account/Shapeshift/OptionsStep/optionsStep.css similarity index 100% rename from js/src/modals/Shapeshift/OptionsStep/optionsStep.css rename to js/src/views/Account/Shapeshift/OptionsStep/optionsStep.css diff --git a/js/src/modals/Shapeshift/OptionsStep/optionsStep.js b/js/src/views/Account/Shapeshift/OptionsStep/optionsStep.js similarity index 100% rename from js/src/modals/Shapeshift/OptionsStep/optionsStep.js rename to js/src/views/Account/Shapeshift/OptionsStep/optionsStep.js diff --git a/js/src/modals/Shapeshift/OptionsStep/optionsSteps.spec.js b/js/src/views/Account/Shapeshift/OptionsStep/optionsSteps.spec.js similarity index 100% rename from js/src/modals/Shapeshift/OptionsStep/optionsSteps.spec.js rename to js/src/views/Account/Shapeshift/OptionsStep/optionsSteps.spec.js diff --git a/js/src/modals/Shapeshift/Price/index.js b/js/src/views/Account/Shapeshift/Price/index.js similarity index 100% rename from js/src/modals/Shapeshift/Price/index.js rename to js/src/views/Account/Shapeshift/Price/index.js diff --git a/js/src/modals/Shapeshift/Price/price.js b/js/src/views/Account/Shapeshift/Price/price.js similarity index 100% rename from js/src/modals/Shapeshift/Price/price.js rename to js/src/views/Account/Shapeshift/Price/price.js diff --git a/js/src/modals/Shapeshift/Price/price.spec.js b/js/src/views/Account/Shapeshift/Price/price.spec.js similarity index 100% rename from js/src/modals/Shapeshift/Price/price.spec.js rename to js/src/views/Account/Shapeshift/Price/price.spec.js diff --git a/js/src/modals/Shapeshift/Value/index.js b/js/src/views/Account/Shapeshift/Value/index.js similarity index 100% rename from js/src/modals/Shapeshift/Value/index.js rename to js/src/views/Account/Shapeshift/Value/index.js diff --git a/js/src/modals/Shapeshift/Value/value.css b/js/src/views/Account/Shapeshift/Value/value.css similarity index 100% rename from js/src/modals/Shapeshift/Value/value.css rename to js/src/views/Account/Shapeshift/Value/value.css diff --git a/js/src/modals/Shapeshift/Value/value.js b/js/src/views/Account/Shapeshift/Value/value.js similarity index 100% rename from js/src/modals/Shapeshift/Value/value.js rename to js/src/views/Account/Shapeshift/Value/value.js diff --git a/js/src/modals/Shapeshift/Value/value.spec.js b/js/src/views/Account/Shapeshift/Value/value.spec.js similarity index 100% rename from js/src/modals/Shapeshift/Value/value.spec.js rename to js/src/views/Account/Shapeshift/Value/value.spec.js diff --git a/js/src/modals/Shapeshift/index.js b/js/src/views/Account/Shapeshift/index.js similarity index 100% rename from js/src/modals/Shapeshift/index.js rename to js/src/views/Account/Shapeshift/index.js diff --git a/js/src/modals/Shapeshift/shapeshift.css b/js/src/views/Account/Shapeshift/shapeshift.css similarity index 100% rename from js/src/modals/Shapeshift/shapeshift.css rename to js/src/views/Account/Shapeshift/shapeshift.css diff --git a/js/src/modals/Shapeshift/shapeshift.js b/js/src/views/Account/Shapeshift/shapeshift.js similarity index 100% rename from js/src/modals/Shapeshift/shapeshift.js rename to js/src/views/Account/Shapeshift/shapeshift.js diff --git a/js/src/modals/Shapeshift/shapeshift.spec.js b/js/src/views/Account/Shapeshift/shapeshift.spec.js similarity index 100% rename from js/src/modals/Shapeshift/shapeshift.spec.js rename to js/src/views/Account/Shapeshift/shapeshift.spec.js diff --git a/js/src/modals/Shapeshift/store.js b/js/src/views/Account/Shapeshift/store.js similarity index 100% rename from js/src/modals/Shapeshift/store.js rename to js/src/views/Account/Shapeshift/store.js diff --git a/js/src/modals/Shapeshift/store.spec.js b/js/src/views/Account/Shapeshift/store.spec.js similarity index 100% rename from js/src/modals/Shapeshift/store.spec.js rename to js/src/views/Account/Shapeshift/store.spec.js diff --git a/js/src/modals/Transfer/Details/details.js b/js/src/views/Account/Transfer/Details/details.js similarity index 100% rename from js/src/modals/Transfer/Details/details.js rename to js/src/views/Account/Transfer/Details/details.js diff --git a/js/src/modals/Transfer/Details/index.js b/js/src/views/Account/Transfer/Details/index.js similarity index 100% rename from js/src/modals/Transfer/Details/index.js rename to js/src/views/Account/Transfer/Details/index.js diff --git a/js/src/modals/Transfer/Details/tokenSelect.js b/js/src/views/Account/Transfer/Details/tokenSelect.js similarity index 100% rename from js/src/modals/Transfer/Details/tokenSelect.js rename to js/src/views/Account/Transfer/Details/tokenSelect.js diff --git a/js/src/modals/Transfer/Extras/extras.js b/js/src/views/Account/Transfer/Extras/extras.js similarity index 100% rename from js/src/modals/Transfer/Extras/extras.js rename to js/src/views/Account/Transfer/Extras/extras.js diff --git a/js/src/modals/Transfer/Extras/index.js b/js/src/views/Account/Transfer/Extras/index.js similarity index 100% rename from js/src/modals/Transfer/Extras/index.js rename to js/src/views/Account/Transfer/Extras/index.js diff --git a/js/src/modals/Transfer/errors.js b/js/src/views/Account/Transfer/errors.js similarity index 100% rename from js/src/modals/Transfer/errors.js rename to js/src/views/Account/Transfer/errors.js diff --git a/js/src/modals/Transfer/index.js b/js/src/views/Account/Transfer/index.js similarity index 100% rename from js/src/modals/Transfer/index.js rename to js/src/views/Account/Transfer/index.js diff --git a/js/src/modals/Transfer/store.js b/js/src/views/Account/Transfer/store.js similarity index 100% rename from js/src/modals/Transfer/store.js rename to js/src/views/Account/Transfer/store.js diff --git a/js/src/modals/Transfer/transfer.css b/js/src/views/Account/Transfer/transfer.css similarity index 100% rename from js/src/modals/Transfer/transfer.css rename to js/src/views/Account/Transfer/transfer.css diff --git a/js/src/modals/Transfer/transfer.js b/js/src/views/Account/Transfer/transfer.js similarity index 100% rename from js/src/modals/Transfer/transfer.js rename to js/src/views/Account/Transfer/transfer.js diff --git a/js/src/modals/Verification/Done/done.css b/js/src/views/Account/Verification/Done/done.css similarity index 100% rename from js/src/modals/Verification/Done/done.css rename to js/src/views/Account/Verification/Done/done.css diff --git a/js/src/modals/Verification/Done/done.js b/js/src/views/Account/Verification/Done/done.js similarity index 100% rename from js/src/modals/Verification/Done/done.js rename to js/src/views/Account/Verification/Done/done.js diff --git a/js/src/modals/Verification/Done/index.js b/js/src/views/Account/Verification/Done/index.js similarity index 100% rename from js/src/modals/Verification/Done/index.js rename to js/src/views/Account/Verification/Done/index.js diff --git a/js/src/modals/Verification/GatherData/gatherData.css b/js/src/views/Account/Verification/GatherData/gatherData.css similarity index 100% rename from js/src/modals/Verification/GatherData/gatherData.css rename to js/src/views/Account/Verification/GatherData/gatherData.css diff --git a/js/src/modals/Verification/GatherData/gatherData.js b/js/src/views/Account/Verification/GatherData/gatherData.js similarity index 100% rename from js/src/modals/Verification/GatherData/gatherData.js rename to js/src/views/Account/Verification/GatherData/gatherData.js diff --git a/js/src/modals/Verification/GatherData/index.js b/js/src/views/Account/Verification/GatherData/index.js similarity index 100% rename from js/src/modals/Verification/GatherData/index.js rename to js/src/views/Account/Verification/GatherData/index.js diff --git a/js/src/modals/Verification/QueryCode/index.js b/js/src/views/Account/Verification/QueryCode/index.js similarity index 100% rename from js/src/modals/Verification/QueryCode/index.js rename to js/src/views/Account/Verification/QueryCode/index.js diff --git a/js/src/modals/Verification/QueryCode/queryCode.js b/js/src/views/Account/Verification/QueryCode/queryCode.js similarity index 100% rename from js/src/modals/Verification/QueryCode/queryCode.js rename to js/src/views/Account/Verification/QueryCode/queryCode.js diff --git a/js/src/modals/Verification/SendConfirmation/index.js b/js/src/views/Account/Verification/SendConfirmation/index.js similarity index 100% rename from js/src/modals/Verification/SendConfirmation/index.js rename to js/src/views/Account/Verification/SendConfirmation/index.js diff --git a/js/src/modals/Verification/SendConfirmation/sendConfirmation.css b/js/src/views/Account/Verification/SendConfirmation/sendConfirmation.css similarity index 100% rename from js/src/modals/Verification/SendConfirmation/sendConfirmation.css rename to js/src/views/Account/Verification/SendConfirmation/sendConfirmation.css diff --git a/js/src/modals/Verification/SendConfirmation/sendConfirmation.js b/js/src/views/Account/Verification/SendConfirmation/sendConfirmation.js similarity index 100% rename from js/src/modals/Verification/SendConfirmation/sendConfirmation.js rename to js/src/views/Account/Verification/SendConfirmation/sendConfirmation.js diff --git a/js/src/modals/Verification/SendRequest/index.js b/js/src/views/Account/Verification/SendRequest/index.js similarity index 100% rename from js/src/modals/Verification/SendRequest/index.js rename to js/src/views/Account/Verification/SendRequest/index.js diff --git a/js/src/modals/Verification/SendRequest/sendRequest.css b/js/src/views/Account/Verification/SendRequest/sendRequest.css similarity index 100% rename from js/src/modals/Verification/SendRequest/sendRequest.css rename to js/src/views/Account/Verification/SendRequest/sendRequest.css diff --git a/js/src/modals/Verification/SendRequest/sendRequest.js b/js/src/views/Account/Verification/SendRequest/sendRequest.js similarity index 100% rename from js/src/modals/Verification/SendRequest/sendRequest.js rename to js/src/views/Account/Verification/SendRequest/sendRequest.js diff --git a/js/src/modals/Verification/email-store.js b/js/src/views/Account/Verification/email-store.js similarity index 100% rename from js/src/modals/Verification/email-store.js rename to js/src/views/Account/Verification/email-store.js diff --git a/js/src/modals/Verification/how-it-works.js b/js/src/views/Account/Verification/how-it-works.js similarity index 100% rename from js/src/modals/Verification/how-it-works.js rename to js/src/views/Account/Verification/how-it-works.js diff --git a/js/src/modals/Verification/index.js b/js/src/views/Account/Verification/index.js similarity index 100% rename from js/src/modals/Verification/index.js rename to js/src/views/Account/Verification/index.js diff --git a/js/src/modals/Verification/sms-store.js b/js/src/views/Account/Verification/sms-store.js similarity index 100% rename from js/src/modals/Verification/sms-store.js rename to js/src/views/Account/Verification/sms-store.js diff --git a/js/src/modals/Verification/store.js b/js/src/views/Account/Verification/store.js similarity index 100% rename from js/src/modals/Verification/store.js rename to js/src/views/Account/Verification/store.js diff --git a/js/src/modals/Verification/verification.css b/js/src/views/Account/Verification/verification.css similarity index 100% rename from js/src/modals/Verification/verification.css rename to js/src/views/Account/Verification/verification.css diff --git a/js/src/modals/Verification/verification.js b/js/src/views/Account/Verification/verification.js similarity index 100% rename from js/src/modals/Verification/verification.js rename to js/src/views/Account/Verification/verification.js diff --git a/js/src/views/Account/account.js b/js/src/views/Account/account.js index 90c69b1a8..18139928f 100644 --- a/js/src/views/Account/account.js +++ b/js/src/views/Account/account.js @@ -20,18 +20,25 @@ import { FormattedMessage } from 'react-intl'; import { connect } from 'react-redux'; import { bindActionCreators } from 'redux'; -import { newError } from '~/redux/actions'; import shapeshiftBtn from '~/../assets/images/shapeshift-btn.png'; + +import { newError } from '~/redux/actions'; import HardwareStore from '~/mobx/hardwareStore'; -import ExportStore from '~/modals/ExportAccount/exportStore'; import HistoryStore from '~/mobx/historyStore'; -import { DeleteAccount, EditMeta, Faucet, PasswordManager, Shapeshift, Transfer, Verification } from '~/modals'; import { setVisibleAccounts } from '~/redux/providers/personalActions'; import { fetchCertifiers, fetchCertifications } from '~/redux/providers/certifications/actions'; import { Actionbar, Button, ConfirmDialog, Input, Page, Portal } from '~/ui'; import { DeleteIcon, DialIcon, EditIcon, LockedIcon, SendIcon, VerifyIcon, FileDownloadIcon } from '~/ui/Icons'; +import DeleteAccount from './DeleteAccount'; +import EditMeta from './EditMeta'; import DeleteAddress from '../Address/Delete'; +import ExportStore from '../Accounts/ExportAccount/exportStore'; +import Faucet from './Faucet'; +import PasswordManager from './PasswordManager'; +import Shapeshift from './Shapeshift'; +import Transfer from './Transfer'; +import Verification from './Verification'; import Header from './Header'; import Store from './store'; diff --git a/js/src/views/Account/index.js b/js/src/views/Account/index.js index 207168954..868cd429f 100644 --- a/js/src/views/Account/index.js +++ b/js/src/views/Account/index.js @@ -30,9 +30,6 @@ import muiTheme from '~/ui/Theme'; import Account from './account'; -import '~/../assets/fonts/Roboto/font.css'; -import '~/../assets/fonts/RobotoMono/font.css'; - ContractInstances.get(api); const store = initStore(api, hashHistory); diff --git a/js/src/modals/CreateAccount/AccountDetails/accountDetails.js b/js/src/views/Accounts/CreateAccount/AccountDetails/accountDetails.js similarity index 100% rename from js/src/modals/CreateAccount/AccountDetails/accountDetails.js rename to js/src/views/Accounts/CreateAccount/AccountDetails/accountDetails.js diff --git a/js/src/modals/CreateAccount/AccountDetails/accountDetails.spec.js b/js/src/views/Accounts/CreateAccount/AccountDetails/accountDetails.spec.js similarity index 100% rename from js/src/modals/CreateAccount/AccountDetails/accountDetails.spec.js rename to js/src/views/Accounts/CreateAccount/AccountDetails/accountDetails.spec.js diff --git a/js/src/modals/CreateAccount/AccountDetails/index.js b/js/src/views/Accounts/CreateAccount/AccountDetails/index.js similarity index 100% rename from js/src/modals/CreateAccount/AccountDetails/index.js rename to js/src/views/Accounts/CreateAccount/AccountDetails/index.js diff --git a/js/src/modals/CreateAccount/AccountDetailsGeth/accountDetailsGeth.js b/js/src/views/Accounts/CreateAccount/AccountDetailsGeth/accountDetailsGeth.js similarity index 100% rename from js/src/modals/CreateAccount/AccountDetailsGeth/accountDetailsGeth.js rename to js/src/views/Accounts/CreateAccount/AccountDetailsGeth/accountDetailsGeth.js diff --git a/js/src/modals/CreateAccount/AccountDetailsGeth/accountDetailsGeth.spec.js b/js/src/views/Accounts/CreateAccount/AccountDetailsGeth/accountDetailsGeth.spec.js similarity index 100% rename from js/src/modals/CreateAccount/AccountDetailsGeth/accountDetailsGeth.spec.js rename to js/src/views/Accounts/CreateAccount/AccountDetailsGeth/accountDetailsGeth.spec.js diff --git a/js/src/modals/CreateAccount/AccountDetailsGeth/index.js b/js/src/views/Accounts/CreateAccount/AccountDetailsGeth/index.js similarity index 100% rename from js/src/modals/CreateAccount/AccountDetailsGeth/index.js rename to js/src/views/Accounts/CreateAccount/AccountDetailsGeth/index.js diff --git a/js/src/modals/CreateAccount/ChangeVault/changeVault.js b/js/src/views/Accounts/CreateAccount/ChangeVault/changeVault.js similarity index 100% rename from js/src/modals/CreateAccount/ChangeVault/changeVault.js rename to js/src/views/Accounts/CreateAccount/ChangeVault/changeVault.js diff --git a/js/src/modals/CreateAccount/ChangeVault/changeVault.spec.js b/js/src/views/Accounts/CreateAccount/ChangeVault/changeVault.spec.js similarity index 100% rename from js/src/modals/CreateAccount/ChangeVault/changeVault.spec.js rename to js/src/views/Accounts/CreateAccount/ChangeVault/changeVault.spec.js diff --git a/js/src/modals/CreateAccount/ChangeVault/index.js b/js/src/views/Accounts/CreateAccount/ChangeVault/index.js similarity index 100% rename from js/src/modals/CreateAccount/ChangeVault/index.js rename to js/src/views/Accounts/CreateAccount/ChangeVault/index.js diff --git a/js/src/modals/CreateAccount/CreationType/creationType.js b/js/src/views/Accounts/CreateAccount/CreationType/creationType.js similarity index 100% rename from js/src/modals/CreateAccount/CreationType/creationType.js rename to js/src/views/Accounts/CreateAccount/CreationType/creationType.js diff --git a/js/src/modals/CreateAccount/CreationType/creationType.spec.js b/js/src/views/Accounts/CreateAccount/CreationType/creationType.spec.js similarity index 100% rename from js/src/modals/CreateAccount/CreationType/creationType.spec.js rename to js/src/views/Accounts/CreateAccount/CreationType/creationType.spec.js diff --git a/js/src/modals/CreateAccount/CreationType/index.js b/js/src/views/Accounts/CreateAccount/CreationType/index.js similarity index 100% rename from js/src/modals/CreateAccount/CreationType/index.js rename to js/src/views/Accounts/CreateAccount/CreationType/index.js diff --git a/js/src/modals/CreateAccount/GethCard/gethCard.js b/js/src/views/Accounts/CreateAccount/GethCard/gethCard.js similarity index 100% rename from js/src/modals/CreateAccount/GethCard/gethCard.js rename to js/src/views/Accounts/CreateAccount/GethCard/gethCard.js diff --git a/js/src/modals/CreateAccount/GethCard/index.js b/js/src/views/Accounts/CreateAccount/GethCard/index.js similarity index 100% rename from js/src/modals/CreateAccount/GethCard/index.js rename to js/src/views/Accounts/CreateAccount/GethCard/index.js diff --git a/js/src/modals/CreateAccount/NewAccount/index.js b/js/src/views/Accounts/CreateAccount/NewAccount/index.js similarity index 100% rename from js/src/modals/CreateAccount/NewAccount/index.js rename to js/src/views/Accounts/CreateAccount/NewAccount/index.js diff --git a/js/src/modals/CreateAccount/NewAccount/newAccount.js b/js/src/views/Accounts/CreateAccount/NewAccount/newAccount.js similarity index 100% rename from js/src/modals/CreateAccount/NewAccount/newAccount.js rename to js/src/views/Accounts/CreateAccount/NewAccount/newAccount.js diff --git a/js/src/modals/CreateAccount/NewAccount/newAccount.spec.js b/js/src/views/Accounts/CreateAccount/NewAccount/newAccount.spec.js similarity index 100% rename from js/src/modals/CreateAccount/NewAccount/newAccount.spec.js rename to js/src/views/Accounts/CreateAccount/NewAccount/newAccount.spec.js diff --git a/js/src/modals/CreateAccount/NewGeth/index.js b/js/src/views/Accounts/CreateAccount/NewGeth/index.js similarity index 100% rename from js/src/modals/CreateAccount/NewGeth/index.js rename to js/src/views/Accounts/CreateAccount/NewGeth/index.js diff --git a/js/src/modals/CreateAccount/NewGeth/newGeth.js b/js/src/views/Accounts/CreateAccount/NewGeth/newGeth.js similarity index 100% rename from js/src/modals/CreateAccount/NewGeth/newGeth.js rename to js/src/views/Accounts/CreateAccount/NewGeth/newGeth.js diff --git a/js/src/modals/CreateAccount/NewGeth/newGeth.spec.js b/js/src/views/Accounts/CreateAccount/NewGeth/newGeth.spec.js similarity index 100% rename from js/src/modals/CreateAccount/NewGeth/newGeth.spec.js rename to js/src/views/Accounts/CreateAccount/NewGeth/newGeth.spec.js diff --git a/js/src/modals/CreateAccount/NewImport/index.js b/js/src/views/Accounts/CreateAccount/NewImport/index.js similarity index 100% rename from js/src/modals/CreateAccount/NewImport/index.js rename to js/src/views/Accounts/CreateAccount/NewImport/index.js diff --git a/js/src/modals/CreateAccount/NewImport/newImport.js b/js/src/views/Accounts/CreateAccount/NewImport/newImport.js similarity index 100% rename from js/src/modals/CreateAccount/NewImport/newImport.js rename to js/src/views/Accounts/CreateAccount/NewImport/newImport.js diff --git a/js/src/modals/CreateAccount/NewImport/newImport.spec.js b/js/src/views/Accounts/CreateAccount/NewImport/newImport.spec.js similarity index 100% rename from js/src/modals/CreateAccount/NewImport/newImport.spec.js rename to js/src/views/Accounts/CreateAccount/NewImport/newImport.spec.js diff --git a/js/src/modals/CreateAccount/NewQr/index.js b/js/src/views/Accounts/CreateAccount/NewQr/index.js similarity index 100% rename from js/src/modals/CreateAccount/NewQr/index.js rename to js/src/views/Accounts/CreateAccount/NewQr/index.js diff --git a/js/src/modals/CreateAccount/NewQr/newQr.js b/js/src/views/Accounts/CreateAccount/NewQr/newQr.js similarity index 100% rename from js/src/modals/CreateAccount/NewQr/newQr.js rename to js/src/views/Accounts/CreateAccount/NewQr/newQr.js diff --git a/js/src/modals/CreateAccount/NewQr/newQr.spec.js b/js/src/views/Accounts/CreateAccount/NewQr/newQr.spec.js similarity index 100% rename from js/src/modals/CreateAccount/NewQr/newQr.spec.js rename to js/src/views/Accounts/CreateAccount/NewQr/newQr.spec.js diff --git a/js/src/modals/CreateAccount/RawKey/index.js b/js/src/views/Accounts/CreateAccount/RawKey/index.js similarity index 100% rename from js/src/modals/CreateAccount/RawKey/index.js rename to js/src/views/Accounts/CreateAccount/RawKey/index.js diff --git a/js/src/modals/CreateAccount/RawKey/rawKey.js b/js/src/views/Accounts/CreateAccount/RawKey/rawKey.js similarity index 100% rename from js/src/modals/CreateAccount/RawKey/rawKey.js rename to js/src/views/Accounts/CreateAccount/RawKey/rawKey.js diff --git a/js/src/modals/CreateAccount/RawKey/rawKey.spec.js b/js/src/views/Accounts/CreateAccount/RawKey/rawKey.spec.js similarity index 100% rename from js/src/modals/CreateAccount/RawKey/rawKey.spec.js rename to js/src/views/Accounts/CreateAccount/RawKey/rawKey.spec.js diff --git a/js/src/modals/CreateAccount/RecoveryPhrase/index.js b/js/src/views/Accounts/CreateAccount/RecoveryPhrase/index.js similarity index 100% rename from js/src/modals/CreateAccount/RecoveryPhrase/index.js rename to js/src/views/Accounts/CreateAccount/RecoveryPhrase/index.js diff --git a/js/src/modals/CreateAccount/RecoveryPhrase/recoveryPhrase.js b/js/src/views/Accounts/CreateAccount/RecoveryPhrase/recoveryPhrase.js similarity index 100% rename from js/src/modals/CreateAccount/RecoveryPhrase/recoveryPhrase.js rename to js/src/views/Accounts/CreateAccount/RecoveryPhrase/recoveryPhrase.js diff --git a/js/src/modals/CreateAccount/RecoveryPhrase/recoveryPhrase.spec.js b/js/src/views/Accounts/CreateAccount/RecoveryPhrase/recoveryPhrase.spec.js similarity index 100% rename from js/src/modals/CreateAccount/RecoveryPhrase/recoveryPhrase.spec.js rename to js/src/views/Accounts/CreateAccount/RecoveryPhrase/recoveryPhrase.spec.js diff --git a/js/src/modals/CreateAccount/TypeIcon/index.js b/js/src/views/Accounts/CreateAccount/TypeIcon/index.js similarity index 100% rename from js/src/modals/CreateAccount/TypeIcon/index.js rename to js/src/views/Accounts/CreateAccount/TypeIcon/index.js diff --git a/js/src/modals/CreateAccount/TypeIcon/typeIcon.js b/js/src/views/Accounts/CreateAccount/TypeIcon/typeIcon.js similarity index 100% rename from js/src/modals/CreateAccount/TypeIcon/typeIcon.js rename to js/src/views/Accounts/CreateAccount/TypeIcon/typeIcon.js diff --git a/js/src/modals/CreateAccount/createAccount.css b/js/src/views/Accounts/CreateAccount/createAccount.css similarity index 100% rename from js/src/modals/CreateAccount/createAccount.css rename to js/src/views/Accounts/CreateAccount/createAccount.css diff --git a/js/src/modals/CreateAccount/createAccount.js b/js/src/views/Accounts/CreateAccount/createAccount.js similarity index 100% rename from js/src/modals/CreateAccount/createAccount.js rename to js/src/views/Accounts/CreateAccount/createAccount.js diff --git a/js/src/modals/CreateAccount/createAccount.spec.js b/js/src/views/Accounts/CreateAccount/createAccount.spec.js similarity index 100% rename from js/src/modals/CreateAccount/createAccount.spec.js rename to js/src/views/Accounts/CreateAccount/createAccount.spec.js diff --git a/js/src/modals/CreateAccount/createAccount.test.js b/js/src/views/Accounts/CreateAccount/createAccount.test.js similarity index 100% rename from js/src/modals/CreateAccount/createAccount.test.js rename to js/src/views/Accounts/CreateAccount/createAccount.test.js diff --git a/js/src/modals/CreateAccount/errors.js b/js/src/views/Accounts/CreateAccount/errors.js similarity index 100% rename from js/src/modals/CreateAccount/errors.js rename to js/src/views/Accounts/CreateAccount/errors.js diff --git a/js/src/modals/CreateAccount/index.js b/js/src/views/Accounts/CreateAccount/index.js similarity index 100% rename from js/src/modals/CreateAccount/index.js rename to js/src/views/Accounts/CreateAccount/index.js diff --git a/js/src/modals/CreateAccount/print.js b/js/src/views/Accounts/CreateAccount/print.js similarity index 100% rename from js/src/modals/CreateAccount/print.js rename to js/src/views/Accounts/CreateAccount/print.js diff --git a/js/src/modals/CreateAccount/recoveryPage.ejs b/js/src/views/Accounts/CreateAccount/recoveryPage.ejs similarity index 100% rename from js/src/modals/CreateAccount/recoveryPage.ejs rename to js/src/views/Accounts/CreateAccount/recoveryPage.ejs diff --git a/js/src/modals/CreateAccount/store.js b/js/src/views/Accounts/CreateAccount/store.js similarity index 100% rename from js/src/modals/CreateAccount/store.js rename to js/src/views/Accounts/CreateAccount/store.js diff --git a/js/src/modals/CreateAccount/store.spec.js b/js/src/views/Accounts/CreateAccount/store.spec.js similarity index 100% rename from js/src/modals/CreateAccount/store.spec.js rename to js/src/views/Accounts/CreateAccount/store.spec.js diff --git a/js/src/modals/CreateWallet/WalletDetails/index.js b/js/src/views/Accounts/CreateWallet/WalletDetails/index.js similarity index 100% rename from js/src/modals/CreateWallet/WalletDetails/index.js rename to js/src/views/Accounts/CreateWallet/WalletDetails/index.js diff --git a/js/src/modals/CreateWallet/WalletDetails/walletDetails.js b/js/src/views/Accounts/CreateWallet/WalletDetails/walletDetails.js similarity index 100% rename from js/src/modals/CreateWallet/WalletDetails/walletDetails.js rename to js/src/views/Accounts/CreateWallet/WalletDetails/walletDetails.js diff --git a/js/src/modals/CreateWallet/WalletDetails/walletDetails.spec.js b/js/src/views/Accounts/CreateWallet/WalletDetails/walletDetails.spec.js similarity index 100% rename from js/src/modals/CreateWallet/WalletDetails/walletDetails.spec.js rename to js/src/views/Accounts/CreateWallet/WalletDetails/walletDetails.spec.js diff --git a/js/src/modals/CreateWallet/WalletInfo/index.js b/js/src/views/Accounts/CreateWallet/WalletInfo/index.js similarity index 100% rename from js/src/modals/CreateWallet/WalletInfo/index.js rename to js/src/views/Accounts/CreateWallet/WalletInfo/index.js diff --git a/js/src/modals/CreateWallet/WalletInfo/walletInfo.js b/js/src/views/Accounts/CreateWallet/WalletInfo/walletInfo.js similarity index 100% rename from js/src/modals/CreateWallet/WalletInfo/walletInfo.js rename to js/src/views/Accounts/CreateWallet/WalletInfo/walletInfo.js diff --git a/js/src/modals/CreateWallet/WalletInfo/walletInfo.spec.js b/js/src/views/Accounts/CreateWallet/WalletInfo/walletInfo.spec.js similarity index 100% rename from js/src/modals/CreateWallet/WalletInfo/walletInfo.spec.js rename to js/src/views/Accounts/CreateWallet/WalletInfo/walletInfo.spec.js diff --git a/js/src/modals/CreateWallet/WalletType/index.js b/js/src/views/Accounts/CreateWallet/WalletType/index.js similarity index 100% rename from js/src/modals/CreateWallet/WalletType/index.js rename to js/src/views/Accounts/CreateWallet/WalletType/index.js diff --git a/js/src/modals/CreateWallet/WalletType/walletType.js b/js/src/views/Accounts/CreateWallet/WalletType/walletType.js similarity index 100% rename from js/src/modals/CreateWallet/WalletType/walletType.js rename to js/src/views/Accounts/CreateWallet/WalletType/walletType.js diff --git a/js/src/modals/CreateWallet/WalletType/walletType.spec.js b/js/src/views/Accounts/CreateWallet/WalletType/walletType.spec.js similarity index 100% rename from js/src/modals/CreateWallet/WalletType/walletType.spec.js rename to js/src/views/Accounts/CreateWallet/WalletType/walletType.spec.js diff --git a/js/src/modals/CreateWallet/createWallet.css b/js/src/views/Accounts/CreateWallet/createWallet.css similarity index 100% rename from js/src/modals/CreateWallet/createWallet.css rename to js/src/views/Accounts/CreateWallet/createWallet.css diff --git a/js/src/modals/CreateWallet/createWallet.js b/js/src/views/Accounts/CreateWallet/createWallet.js similarity index 100% rename from js/src/modals/CreateWallet/createWallet.js rename to js/src/views/Accounts/CreateWallet/createWallet.js diff --git a/js/src/modals/CreateWallet/createWallet.spec.js b/js/src/views/Accounts/CreateWallet/createWallet.spec.js similarity index 100% rename from js/src/modals/CreateWallet/createWallet.spec.js rename to js/src/views/Accounts/CreateWallet/createWallet.spec.js diff --git a/js/src/modals/CreateWallet/createWallet.test.js b/js/src/views/Accounts/CreateWallet/createWallet.test.js similarity index 100% rename from js/src/modals/CreateWallet/createWallet.test.js rename to js/src/views/Accounts/CreateWallet/createWallet.test.js diff --git a/js/src/modals/CreateWallet/createWalletStore.js b/js/src/views/Accounts/CreateWallet/createWalletStore.js similarity index 100% rename from js/src/modals/CreateWallet/createWalletStore.js rename to js/src/views/Accounts/CreateWallet/createWalletStore.js diff --git a/js/src/modals/CreateWallet/index.js b/js/src/views/Accounts/CreateWallet/index.js similarity index 100% rename from js/src/modals/CreateWallet/index.js rename to js/src/views/Accounts/CreateWallet/index.js diff --git a/js/src/modals/ExportAccount/exportAccount.js b/js/src/views/Accounts/ExportAccount/exportAccount.js similarity index 100% rename from js/src/modals/ExportAccount/exportAccount.js rename to js/src/views/Accounts/ExportAccount/exportAccount.js diff --git a/js/src/modals/ExportAccount/exportAccount.spec.js b/js/src/views/Accounts/ExportAccount/exportAccount.spec.js similarity index 100% rename from js/src/modals/ExportAccount/exportAccount.spec.js rename to js/src/views/Accounts/ExportAccount/exportAccount.spec.js diff --git a/js/src/modals/ExportAccount/exportInput/exportInput.js b/js/src/views/Accounts/ExportAccount/exportInput/exportInput.js similarity index 100% rename from js/src/modals/ExportAccount/exportInput/exportInput.js rename to js/src/views/Accounts/ExportAccount/exportInput/exportInput.js diff --git a/js/src/modals/ExportAccount/exportInput/index.js b/js/src/views/Accounts/ExportAccount/exportInput/index.js similarity index 100% rename from js/src/modals/ExportAccount/exportInput/index.js rename to js/src/views/Accounts/ExportAccount/exportInput/index.js diff --git a/js/src/modals/ExportAccount/exportStore.js b/js/src/views/Accounts/ExportAccount/exportStore.js similarity index 100% rename from js/src/modals/ExportAccount/exportStore.js rename to js/src/views/Accounts/ExportAccount/exportStore.js diff --git a/js/src/modals/ExportAccount/exportStore.spec.js b/js/src/views/Accounts/ExportAccount/exportStore.spec.js similarity index 100% rename from js/src/modals/ExportAccount/exportStore.spec.js rename to js/src/views/Accounts/ExportAccount/exportStore.spec.js diff --git a/js/src/modals/ExportAccount/index.js b/js/src/views/Accounts/ExportAccount/index.js similarity index 100% rename from js/src/modals/ExportAccount/index.js rename to js/src/views/Accounts/ExportAccount/index.js diff --git a/js/src/views/Accounts/accounts.js b/js/src/views/Accounts/accounts.js index 71c441bfc..ee3340d3a 100644 --- a/js/src/views/Accounts/accounts.js +++ b/js/src/views/Accounts/accounts.js @@ -23,11 +23,13 @@ import { connect } from 'react-redux'; import { bindActionCreators } from 'redux'; import HardwareStore from '~/mobx/hardwareStore'; -import { CreateAccount, CreateWallet, ExportAccount } from '~/modals'; import { Actionbar, ActionbarSearch, ActionbarSort, Button, Page, Tooltip } from '~/ui'; import { AddIcon, FileDownloadIcon } from '~/ui/Icons'; import { setVisibleAccounts } from '~/redux/providers/personalActions'; +import CreateWallet from './CreateWallet'; +import CreateAccount from './CreateAccount'; +import ExportAccount from './ExportAccount'; import List from './List'; import styles from './accounts.css'; diff --git a/js/src/views/Accounts/index.js b/js/src/views/Accounts/index.js index 8586680f3..7265ff545 100644 --- a/js/src/views/Accounts/index.js +++ b/js/src/views/Accounts/index.js @@ -30,9 +30,6 @@ import muiTheme from '~/ui/Theme'; import Accounts from './accounts'; -import '~/../assets/fonts/Roboto/font.css'; -import '~/../assets/fonts/RobotoMono/font.css'; - ContractInstances.get(api); const store = initStore(api, hashHistory); diff --git a/js/src/views/Address/address.js b/js/src/views/Address/address.js index a8c1dc2d4..340232c50 100644 --- a/js/src/views/Address/address.js +++ b/js/src/views/Address/address.js @@ -19,12 +19,13 @@ import { FormattedMessage } from 'react-intl'; import { connect } from 'react-redux'; import { bindActionCreators } from 'redux'; -import { EditMeta, AddAddress } from '~/modals'; import { Actionbar, Button, Page } from '~/ui'; import { AddIcon, DeleteIcon, EditIcon } from '~/ui/Icons'; +import EditMeta from '../Account/EditMeta'; import Header from '../Account/Header'; import Transactions from '../Account/Transactions'; +import AddAddress from '../Addresses/AddAddress'; import Delete from './Delete'; import { setVisibleAccounts } from '~/redux/providers/personalActions'; diff --git a/js/src/views/Address/index.js b/js/src/views/Address/index.js index 94252425a..e39616f69 100644 --- a/js/src/views/Address/index.js +++ b/js/src/views/Address/index.js @@ -30,9 +30,6 @@ import muiTheme from '~/ui/Theme'; import Address from './address'; -import '~/../assets/fonts/Roboto/font.css'; -import '~/../assets/fonts/RobotoMono/font.css'; - ContractInstances.get(api); const store = initStore(api, hashHistory); diff --git a/js/src/modals/AddAddress/addAddress.js b/js/src/views/Addresses/AddAddress/addAddress.js similarity index 100% rename from js/src/modals/AddAddress/addAddress.js rename to js/src/views/Addresses/AddAddress/addAddress.js diff --git a/js/src/modals/AddAddress/addAddress.spec.js b/js/src/views/Addresses/AddAddress/addAddress.spec.js similarity index 100% rename from js/src/modals/AddAddress/addAddress.spec.js rename to js/src/views/Addresses/AddAddress/addAddress.spec.js diff --git a/js/src/modals/AddAddress/index.js b/js/src/views/Addresses/AddAddress/index.js similarity index 100% rename from js/src/modals/AddAddress/index.js rename to js/src/views/Addresses/AddAddress/index.js diff --git a/js/src/modals/AddAddress/store.js b/js/src/views/Addresses/AddAddress/store.js similarity index 100% rename from js/src/modals/AddAddress/store.js rename to js/src/views/Addresses/AddAddress/store.js diff --git a/js/src/modals/AddAddress/store.spec.js b/js/src/views/Addresses/AddAddress/store.spec.js similarity index 100% rename from js/src/modals/AddAddress/store.spec.js rename to js/src/views/Addresses/AddAddress/store.spec.js diff --git a/js/src/modals/AddAddress/store.test.js b/js/src/views/Addresses/AddAddress/store.test.js similarity index 100% rename from js/src/modals/AddAddress/store.test.js rename to js/src/views/Addresses/AddAddress/store.test.js diff --git a/js/src/views/Addresses/addresses.js b/js/src/views/Addresses/addresses.js index f4324703d..2f163eeb9 100644 --- a/js/src/views/Addresses/addresses.js +++ b/js/src/views/Addresses/addresses.js @@ -20,13 +20,14 @@ import { connect } from 'react-redux'; import { bindActionCreators } from 'redux'; import { uniq, isEqual } from 'lodash'; -import List from '../Accounts/List'; -import Summary from '../Accounts/Summary'; -import { AddAddress } from '~/modals'; import { Actionbar, ActionbarExport, ActionbarImport, ActionbarSearch, ActionbarSort, Button, Page } from '~/ui'; import { AddIcon } from '~/ui/Icons'; import { setVisibleAccounts } from '~/redux/providers/personalActions'; +import List from '../Accounts/List'; +import Summary from '../Accounts/Summary'; +import AddAddress from './AddAddress'; + import styles from './addresses.css'; class Addresses extends Component { diff --git a/js/src/views/Addresses/index.js b/js/src/views/Addresses/index.js index 1188498d1..4a6f04010 100644 --- a/js/src/views/Addresses/index.js +++ b/js/src/views/Addresses/index.js @@ -30,11 +30,6 @@ import muiTheme from '~/ui/Theme'; import Addresses from './addresses'; -import '~/../assets/fonts/Roboto/font.css'; -import '~/../assets/fonts/RobotoMono/font.css'; - -import './addresses.css'; - ContractInstances.get(api); const store = initStore(api, hashHistory); diff --git a/js/src/modals/ExecuteContract/AdvancedStep/advancedStep.js b/js/src/views/Contract/ExecuteContract/AdvancedStep/advancedStep.js similarity index 100% rename from js/src/modals/ExecuteContract/AdvancedStep/advancedStep.js rename to js/src/views/Contract/ExecuteContract/AdvancedStep/advancedStep.js diff --git a/js/src/modals/ExecuteContract/AdvancedStep/index.js b/js/src/views/Contract/ExecuteContract/AdvancedStep/index.js similarity index 100% rename from js/src/modals/ExecuteContract/AdvancedStep/index.js rename to js/src/views/Contract/ExecuteContract/AdvancedStep/index.js diff --git a/js/src/modals/ExecuteContract/DetailsStep/detailsStep.js b/js/src/views/Contract/ExecuteContract/DetailsStep/detailsStep.js similarity index 100% rename from js/src/modals/ExecuteContract/DetailsStep/detailsStep.js rename to js/src/views/Contract/ExecuteContract/DetailsStep/detailsStep.js diff --git a/js/src/modals/ExecuteContract/DetailsStep/detailsStep.spec.js b/js/src/views/Contract/ExecuteContract/DetailsStep/detailsStep.spec.js similarity index 100% rename from js/src/modals/ExecuteContract/DetailsStep/detailsStep.spec.js rename to js/src/views/Contract/ExecuteContract/DetailsStep/detailsStep.spec.js diff --git a/js/src/modals/DeployContract/DetailsStep/index.js b/js/src/views/Contract/ExecuteContract/DetailsStep/index.js similarity index 100% rename from js/src/modals/DeployContract/DetailsStep/index.js rename to js/src/views/Contract/ExecuteContract/DetailsStep/index.js diff --git a/js/src/modals/ExecuteContract/executeContract.css b/js/src/views/Contract/ExecuteContract/executeContract.css similarity index 100% rename from js/src/modals/ExecuteContract/executeContract.css rename to js/src/views/Contract/ExecuteContract/executeContract.css diff --git a/js/src/modals/ExecuteContract/executeContract.js b/js/src/views/Contract/ExecuteContract/executeContract.js similarity index 100% rename from js/src/modals/ExecuteContract/executeContract.js rename to js/src/views/Contract/ExecuteContract/executeContract.js diff --git a/js/src/modals/ExecuteContract/executeContract.spec.js b/js/src/views/Contract/ExecuteContract/executeContract.spec.js similarity index 100% rename from js/src/modals/ExecuteContract/executeContract.spec.js rename to js/src/views/Contract/ExecuteContract/executeContract.spec.js diff --git a/js/src/modals/ExecuteContract/executeContract.test.js b/js/src/views/Contract/ExecuteContract/executeContract.test.js similarity index 100% rename from js/src/modals/ExecuteContract/executeContract.test.js rename to js/src/views/Contract/ExecuteContract/executeContract.test.js diff --git a/js/src/modals/ExecuteContract/index.js b/js/src/views/Contract/ExecuteContract/index.js similarity index 100% rename from js/src/modals/ExecuteContract/index.js rename to js/src/views/Contract/ExecuteContract/index.js diff --git a/js/src/views/Contract/contract.js b/js/src/views/Contract/contract.js index 4af775cef..5ceca3139 100644 --- a/js/src/views/Contract/contract.js +++ b/js/src/views/Contract/contract.js @@ -20,16 +20,17 @@ import { connect } from 'react-redux'; import { bindActionCreators } from 'redux'; import BigNumber from 'bignumber.js'; -import { EditMeta, ExecuteContract } from '~/modals'; import { newError } from '~/redux/actions'; import { setVisibleAccounts } from '~/redux/providers/personalActions'; import { Actionbar, Button, Page, Portal } from '~/ui'; import { CancelIcon, DeleteIcon, EditIcon, PlayIcon, VisibleIcon } from '~/ui/Icons'; import Editor from '~/ui/Editor'; +import EditMeta from '../Account/EditMeta'; import Header from '../Account/Header'; import Delete from '../Address/Delete'; +import ExecuteContract from './ExecuteContract'; import Events from './Events'; import Queries from './Queries'; diff --git a/js/src/views/Contract/index.js b/js/src/views/Contract/index.js index abf23d0e7..58284171c 100644 --- a/js/src/views/Contract/index.js +++ b/js/src/views/Contract/index.js @@ -30,9 +30,6 @@ import muiTheme from '~/ui/Theme'; import Contract from './contract'; -import '~/../assets/fonts/Roboto/font.css'; -import '~/../assets/fonts/RobotoMono/font.css'; - ContractInstances.get(api); const store = initStore(api, hashHistory); diff --git a/js/src/modals/LoadContract/index.js b/js/src/views/ContractDevelop/LoadContract/index.js similarity index 100% rename from js/src/modals/LoadContract/index.js rename to js/src/views/ContractDevelop/LoadContract/index.js diff --git a/js/src/modals/LoadContract/loadContract.css b/js/src/views/ContractDevelop/LoadContract/loadContract.css similarity index 100% rename from js/src/modals/LoadContract/loadContract.css rename to js/src/views/ContractDevelop/LoadContract/loadContract.css diff --git a/js/src/modals/LoadContract/loadContract.js b/js/src/views/ContractDevelop/LoadContract/loadContract.js similarity index 100% rename from js/src/modals/LoadContract/loadContract.js rename to js/src/views/ContractDevelop/LoadContract/loadContract.js diff --git a/js/src/modals/LoadContract/loadContract.spec.js b/js/src/views/ContractDevelop/LoadContract/loadContract.spec.js similarity index 100% rename from js/src/modals/LoadContract/loadContract.spec.js rename to js/src/views/ContractDevelop/LoadContract/loadContract.spec.js diff --git a/js/src/modals/SaveContract/index.js b/js/src/views/ContractDevelop/SaveContract/index.js similarity index 100% rename from js/src/modals/SaveContract/index.js rename to js/src/views/ContractDevelop/SaveContract/index.js diff --git a/js/src/modals/SaveContract/saveContract.css b/js/src/views/ContractDevelop/SaveContract/saveContract.css similarity index 100% rename from js/src/modals/SaveContract/saveContract.css rename to js/src/views/ContractDevelop/SaveContract/saveContract.css diff --git a/js/src/modals/SaveContract/saveContract.js b/js/src/views/ContractDevelop/SaveContract/saveContract.js similarity index 100% rename from js/src/modals/SaveContract/saveContract.js rename to js/src/views/ContractDevelop/SaveContract/saveContract.js diff --git a/js/src/views/ContractDevelop/contractDevelop.js b/js/src/views/ContractDevelop/contractDevelop.js index d681ff17d..c5410b39b 100644 --- a/js/src/views/ContractDevelop/contractDevelop.js +++ b/js/src/views/ContractDevelop/contractDevelop.js @@ -25,7 +25,10 @@ import { throttle } from 'lodash'; import { Actionbar, ActionbarExport, ActionbarImport, Button, Input, Loading, Page, Select } from '~/ui'; import { CancelIcon, ListIcon, SaveIcon, SendIcon, SettingsIcon } from '~/ui/Icons'; import Editor from '~/ui/Editor'; -import { DeployContract, SaveContract, LoadContract } from '~/modals'; + +import DeployContract from '../Contracts/DeployContract'; +import LoadContract from './LoadContract'; +import SaveContract from './SaveContract'; import ContractDevelopStore from './store'; import styles from './contractDevelop.css'; diff --git a/js/src/views/ContractDevelop/index.js b/js/src/views/ContractDevelop/index.js index c1ffc17d2..d0fb67a9f 100644 --- a/js/src/views/ContractDevelop/index.js +++ b/js/src/views/ContractDevelop/index.js @@ -29,11 +29,6 @@ import muiTheme from '~/ui/Theme'; import ContractDevelop from './contractDevelop'; -import '~/../assets/fonts/Roboto/font.css'; -import '~/../assets/fonts/RobotoMono/font.css'; - -import './contractDevelop.css'; - const store = initStore(api, hashHistory); ReactDOM.render( diff --git a/js/src/modals/AddContract/addContract.css b/js/src/views/Contracts/AddContract/addContract.css similarity index 100% rename from js/src/modals/AddContract/addContract.css rename to js/src/views/Contracts/AddContract/addContract.css diff --git a/js/src/modals/AddContract/addContract.js b/js/src/views/Contracts/AddContract/addContract.js similarity index 100% rename from js/src/modals/AddContract/addContract.js rename to js/src/views/Contracts/AddContract/addContract.js diff --git a/js/src/modals/AddContract/addContract.spec.js b/js/src/views/Contracts/AddContract/addContract.spec.js similarity index 100% rename from js/src/modals/AddContract/addContract.spec.js rename to js/src/views/Contracts/AddContract/addContract.spec.js diff --git a/js/src/modals/AddContract/addContract.test.js b/js/src/views/Contracts/AddContract/addContract.test.js similarity index 100% rename from js/src/modals/AddContract/addContract.test.js rename to js/src/views/Contracts/AddContract/addContract.test.js diff --git a/js/src/modals/AddContract/index.js b/js/src/views/Contracts/AddContract/index.js similarity index 100% rename from js/src/modals/AddContract/index.js rename to js/src/views/Contracts/AddContract/index.js diff --git a/js/src/modals/AddContract/store.js b/js/src/views/Contracts/AddContract/store.js similarity index 100% rename from js/src/modals/AddContract/store.js rename to js/src/views/Contracts/AddContract/store.js diff --git a/js/src/modals/AddContract/store.spec.js b/js/src/views/Contracts/AddContract/store.spec.js similarity index 100% rename from js/src/modals/AddContract/store.spec.js rename to js/src/views/Contracts/AddContract/store.spec.js diff --git a/js/src/modals/AddContract/types.js b/js/src/views/Contracts/AddContract/types.js similarity index 100% rename from js/src/modals/AddContract/types.js rename to js/src/views/Contracts/AddContract/types.js diff --git a/js/src/modals/DeployContract/DetailsStep/detailsStep.js b/js/src/views/Contracts/DeployContract/DetailsStep/detailsStep.js similarity index 100% rename from js/src/modals/DeployContract/DetailsStep/detailsStep.js rename to js/src/views/Contracts/DeployContract/DetailsStep/detailsStep.js diff --git a/js/src/modals/ExecuteContract/DetailsStep/index.js b/js/src/views/Contracts/DeployContract/DetailsStep/index.js similarity index 100% rename from js/src/modals/ExecuteContract/DetailsStep/index.js rename to js/src/views/Contracts/DeployContract/DetailsStep/index.js diff --git a/js/src/modals/DeployContract/ParametersStep/index.js b/js/src/views/Contracts/DeployContract/ParametersStep/index.js similarity index 100% rename from js/src/modals/DeployContract/ParametersStep/index.js rename to js/src/views/Contracts/DeployContract/ParametersStep/index.js diff --git a/js/src/modals/DeployContract/ParametersStep/parametersStep.js b/js/src/views/Contracts/DeployContract/ParametersStep/parametersStep.js similarity index 100% rename from js/src/modals/DeployContract/ParametersStep/parametersStep.js rename to js/src/views/Contracts/DeployContract/ParametersStep/parametersStep.js diff --git a/js/src/modals/DeployContract/deployContract.css b/js/src/views/Contracts/DeployContract/deployContract.css similarity index 100% rename from js/src/modals/DeployContract/deployContract.css rename to js/src/views/Contracts/DeployContract/deployContract.css diff --git a/js/src/modals/DeployContract/deployContract.js b/js/src/views/Contracts/DeployContract/deployContract.js similarity index 99% rename from js/src/modals/DeployContract/deployContract.js rename to js/src/views/Contracts/DeployContract/deployContract.js index 0f5b4e1d8..55bbf2efa 100644 --- a/js/src/modals/DeployContract/deployContract.js +++ b/js/src/views/Contracts/DeployContract/deployContract.js @@ -29,7 +29,7 @@ import { setRequest } from '~/redux/providers/requestsActions'; import DetailsStep from './DetailsStep'; import ParametersStep from './ParametersStep'; -import Extras from '../Transfer/Extras'; +import Extras from '../../Account/Transfer/Extras'; const STEPS = { CONTRACT_DETAILS: { diff --git a/js/src/modals/DeployContract/deployContract.spec.js b/js/src/views/Contracts/DeployContract/deployContract.spec.js similarity index 100% rename from js/src/modals/DeployContract/deployContract.spec.js rename to js/src/views/Contracts/DeployContract/deployContract.spec.js diff --git a/js/src/modals/DeployContract/index.js b/js/src/views/Contracts/DeployContract/index.js similarity index 100% rename from js/src/modals/DeployContract/index.js rename to js/src/views/Contracts/DeployContract/index.js diff --git a/js/src/views/Contracts/contracts.js b/js/src/views/Contracts/contracts.js index 6bbc8e5aa..5185b0a2c 100644 --- a/js/src/views/Contracts/contracts.js +++ b/js/src/views/Contracts/contracts.js @@ -20,13 +20,15 @@ import { connect } from 'react-redux'; import { bindActionCreators } from 'redux'; import { uniq, isEqual } from 'lodash'; -import { AddContract, DeployContract } from '~/modals'; import { setVisibleAccounts } from '~/redux/providers/personalActions'; import { Actionbar, ActionbarSearch, ActionbarSort, Button, Page } from '~/ui'; import { AddIcon } from '~/ui/Icons'; import List from '../Accounts/List'; +import AddContract from './AddContract'; +import DeployContract from './DeployContract'; + const META_SORT = [ { key: 'timestamp', diff --git a/js/src/views/Contracts/index.js b/js/src/views/Contracts/index.js index e6cd95c90..d59d3d1b0 100644 --- a/js/src/views/Contracts/index.js +++ b/js/src/views/Contracts/index.js @@ -30,9 +30,6 @@ import muiTheme from '~/ui/Theme'; import Contracts from './contracts'; -import '~/../assets/fonts/Roboto/font.css'; -import '~/../assets/fonts/RobotoMono/font.css'; - ContractInstances.get(api); const store = initStore(api, hashHistory); diff --git a/js/src/views/Home/index.js b/js/src/views/Home/index.js index 6f6a064dd..92e46e29c 100644 --- a/js/src/views/Home/index.js +++ b/js/src/views/Home/index.js @@ -29,11 +29,6 @@ import muiTheme from '~/ui/Theme'; import Home from './home'; -import '~/../assets/fonts/Roboto/font.css'; -import '~/../assets/fonts/RobotoMono/font.css'; - -import './home.css'; - const store = initStore(api, hashHistory); ReactDOM.render( diff --git a/js/src/views/Playground/index.js b/js/src/views/Playground/index.js index cfcd3c513..8ffef2ae6 100644 --- a/js/src/views/Playground/index.js +++ b/js/src/views/Playground/index.js @@ -29,11 +29,6 @@ import muiTheme from '~/ui/Theme'; import Playground from './playground'; -import '~/../assets/fonts/Roboto/font.css'; -import '~/../assets/fonts/RobotoMono/font.css'; - -import './playground.css'; - const store = initStore(api, hashHistory); ReactDOM.render( diff --git a/js/src/views/Settings/index.js b/js/src/views/Settings/index.js index 0f4289786..f3ddb6857 100644 --- a/js/src/views/Settings/index.js +++ b/js/src/views/Settings/index.js @@ -33,11 +33,6 @@ import SettingsProxy from './Proxy'; import SettingsViews from './Views'; import Settings from './settings'; -import '~/../assets/fonts/Roboto/font.css'; -import '~/../assets/fonts/RobotoMono/font.css'; - -import './settings.css'; - const store = initStore(api, hashHistory); ReactDOM.render( diff --git a/js/src/views/Signer/index.js b/js/src/views/Signer/index.js index ad6a49503..bf6bb67a2 100644 --- a/js/src/views/Signer/index.js +++ b/js/src/views/Signer/index.js @@ -30,9 +30,6 @@ import muiTheme from '~/ui/Theme'; import Signer from './signer'; -import '~/../assets/fonts/Roboto/font.css'; -import '~/../assets/fonts/RobotoMono/font.css'; - ContractInstances.get(api); const store = initStore(api, hashHistory); diff --git a/js/src/views/Status/index.js b/js/src/views/Status/index.js index cf362c6aa..17432a774 100644 --- a/js/src/views/Status/index.js +++ b/js/src/views/Status/index.js @@ -30,11 +30,6 @@ import muiTheme from '~/ui/Theme'; import Status from './status'; -import '~/../assets/fonts/Roboto/font.css'; -import '~/../assets/fonts/RobotoMono/font.css'; - -import './status.css'; - ContractInstances.get(api); const store = initStore(api, hashHistory); diff --git a/js/src/modals/VaultAccounts/index.js b/js/src/views/Vaults/VaultAccounts/index.js similarity index 100% rename from js/src/modals/VaultAccounts/index.js rename to js/src/views/Vaults/VaultAccounts/index.js diff --git a/js/src/modals/VaultAccounts/vaultAccounts.js b/js/src/views/Vaults/VaultAccounts/vaultAccounts.js similarity index 100% rename from js/src/modals/VaultAccounts/vaultAccounts.js rename to js/src/views/Vaults/VaultAccounts/vaultAccounts.js diff --git a/js/src/modals/VaultAccounts/vaultAccounts.spec.js b/js/src/views/Vaults/VaultAccounts/vaultAccounts.spec.js similarity index 100% rename from js/src/modals/VaultAccounts/vaultAccounts.spec.js rename to js/src/views/Vaults/VaultAccounts/vaultAccounts.spec.js diff --git a/js/src/modals/VaultCreate/index.js b/js/src/views/Vaults/VaultCreate/index.js similarity index 100% rename from js/src/modals/VaultCreate/index.js rename to js/src/views/Vaults/VaultCreate/index.js diff --git a/js/src/modals/VaultCreate/vaultCreate.css b/js/src/views/Vaults/VaultCreate/vaultCreate.css similarity index 100% rename from js/src/modals/VaultCreate/vaultCreate.css rename to js/src/views/Vaults/VaultCreate/vaultCreate.css diff --git a/js/src/modals/VaultCreate/vaultCreate.js b/js/src/views/Vaults/VaultCreate/vaultCreate.js similarity index 100% rename from js/src/modals/VaultCreate/vaultCreate.js rename to js/src/views/Vaults/VaultCreate/vaultCreate.js diff --git a/js/src/modals/VaultCreate/vaultCreate.spec.js b/js/src/views/Vaults/VaultCreate/vaultCreate.spec.js similarity index 100% rename from js/src/modals/VaultCreate/vaultCreate.spec.js rename to js/src/views/Vaults/VaultCreate/vaultCreate.spec.js diff --git a/js/src/modals/VaultLock/index.js b/js/src/views/Vaults/VaultLock/index.js similarity index 100% rename from js/src/modals/VaultLock/index.js rename to js/src/views/Vaults/VaultLock/index.js diff --git a/js/src/modals/VaultLock/vaultLock.js b/js/src/views/Vaults/VaultLock/vaultLock.js similarity index 100% rename from js/src/modals/VaultLock/vaultLock.js rename to js/src/views/Vaults/VaultLock/vaultLock.js diff --git a/js/src/modals/VaultLock/vaultLock.spec.js b/js/src/views/Vaults/VaultLock/vaultLock.spec.js similarity index 100% rename from js/src/modals/VaultLock/vaultLock.spec.js rename to js/src/views/Vaults/VaultLock/vaultLock.spec.js diff --git a/js/src/modals/VaultMeta/index.js b/js/src/views/Vaults/VaultMeta/index.js similarity index 100% rename from js/src/modals/VaultMeta/index.js rename to js/src/views/Vaults/VaultMeta/index.js diff --git a/js/src/modals/VaultMeta/vaultMeta.js b/js/src/views/Vaults/VaultMeta/vaultMeta.js similarity index 100% rename from js/src/modals/VaultMeta/vaultMeta.js rename to js/src/views/Vaults/VaultMeta/vaultMeta.js diff --git a/js/src/modals/VaultMeta/vaultMeta.spec.js b/js/src/views/Vaults/VaultMeta/vaultMeta.spec.js similarity index 100% rename from js/src/modals/VaultMeta/vaultMeta.spec.js rename to js/src/views/Vaults/VaultMeta/vaultMeta.spec.js diff --git a/js/src/modals/VaultUnlock/index.js b/js/src/views/Vaults/VaultUnlock/index.js similarity index 100% rename from js/src/modals/VaultUnlock/index.js rename to js/src/views/Vaults/VaultUnlock/index.js diff --git a/js/src/modals/VaultUnlock/vaultUnlock.css b/js/src/views/Vaults/VaultUnlock/vaultUnlock.css similarity index 100% rename from js/src/modals/VaultUnlock/vaultUnlock.css rename to js/src/views/Vaults/VaultUnlock/vaultUnlock.css diff --git a/js/src/modals/VaultUnlock/vaultUnlock.js b/js/src/views/Vaults/VaultUnlock/vaultUnlock.js similarity index 100% rename from js/src/modals/VaultUnlock/vaultUnlock.js rename to js/src/views/Vaults/VaultUnlock/vaultUnlock.js diff --git a/js/src/modals/VaultUnlock/vaultUnlock.spec.js b/js/src/views/Vaults/VaultUnlock/vaultUnlock.spec.js similarity index 100% rename from js/src/modals/VaultUnlock/vaultUnlock.spec.js rename to js/src/views/Vaults/VaultUnlock/vaultUnlock.spec.js diff --git a/js/src/views/Vaults/index.js b/js/src/views/Vaults/index.js index 614323185..e92e39a5c 100644 --- a/js/src/views/Vaults/index.js +++ b/js/src/views/Vaults/index.js @@ -30,11 +30,6 @@ import muiTheme from '~/ui/Theme'; import Vaults from './vaults'; -import '~/../assets/fonts/Roboto/font.css'; -import '~/../assets/fonts/RobotoMono/font.css'; - -import './vaults.css'; - ContractInstances.get(api); const store = initStore(api, hashHistory); diff --git a/js/src/views/Vaults/store.js b/js/src/views/Vaults/store.js index 2d4f4c2df..e350575ef 100644 --- a/js/src/views/Vaults/store.js +++ b/js/src/views/Vaults/store.js @@ -18,7 +18,7 @@ import { action, computed, observable, transaction } from 'mobx'; // TODO: We need to move this to a generic location, it should most probably be // merged with the other valitation errors. Import here better than duplication. -import ERRORS from '~/modals/CreateAccount/errors'; +import ERRORS from '~/views/Accounts/CreateAccount/errors'; let instance; diff --git a/js/src/views/Vaults/store.spec.js b/js/src/views/Vaults/store.spec.js index 863b853da..caac26eae 100644 --- a/js/src/views/Vaults/store.spec.js +++ b/js/src/views/Vaults/store.spec.js @@ -18,7 +18,7 @@ import sinon from 'sinon'; import Vaults from './'; -import ERRORS from '~/modals/CreateAccount/errors'; +import ERRORS from '~/views/Accounts/CreateAccount/errors'; import { createApi, TEST_VAULTS_ALL, TEST_VAULTS_META, TEST_VAULTS_OPEN } from './vaults.test.js'; let api; diff --git a/js/src/views/Vaults/vaults.js b/js/src/views/Vaults/vaults.js index 79870e566..a66db09ff 100644 --- a/js/src/views/Vaults/vaults.js +++ b/js/src/views/Vaults/vaults.js @@ -19,10 +19,15 @@ import React, { Component, PropTypes } from 'react'; import { FormattedMessage } from 'react-intl'; import { connect } from 'react-redux'; -import { VaultAccounts, VaultCreate, VaultLock, VaultMeta, VaultUnlock } from '~/modals'; import { Button, Container, Page, SectionList, VaultCard } from '~/ui'; import { AccountsIcon, AddIcon, EditIcon, LockedIcon, UnlockedIcon } from '~/ui/Icons'; +import VaultAccounts from './VaultAccounts'; +import VaultCreate from './VaultCreate'; +import VaultLock from './VaultLock'; +import VaultMeta from './VaultMeta'; +import VaultUnlock from './VaultUnlock'; + import Store from './store'; import styles from './vaults.css'; diff --git a/js/src/modals/WalletSettings/index.js b/js/src/views/Wallet/WalletSettings/index.js similarity index 100% rename from js/src/modals/WalletSettings/index.js rename to js/src/views/Wallet/WalletSettings/index.js diff --git a/js/src/modals/WalletSettings/walletSettings.css b/js/src/views/Wallet/WalletSettings/walletSettings.css similarity index 100% rename from js/src/modals/WalletSettings/walletSettings.css rename to js/src/views/Wallet/WalletSettings/walletSettings.css diff --git a/js/src/modals/WalletSettings/walletSettings.js b/js/src/views/Wallet/WalletSettings/walletSettings.js similarity index 100% rename from js/src/modals/WalletSettings/walletSettings.js rename to js/src/views/Wallet/WalletSettings/walletSettings.js diff --git a/js/src/modals/WalletSettings/walletSettingsStore.js b/js/src/views/Wallet/WalletSettings/walletSettingsStore.js similarity index 100% rename from js/src/modals/WalletSettings/walletSettingsStore.js rename to js/src/views/Wallet/WalletSettings/walletSettingsStore.js diff --git a/js/src/views/Wallet/index.js b/js/src/views/Wallet/index.js index 7a22f3637..c68b0ca68 100644 --- a/js/src/views/Wallet/index.js +++ b/js/src/views/Wallet/index.js @@ -30,9 +30,6 @@ import muiTheme from '~/ui/Theme'; import Wallet from './wallet'; -import '~/../assets/fonts/Roboto/font.css'; -import '~/../assets/fonts/RobotoMono/font.css'; - ContractInstances.get(api); const store = initStore(api, hashHistory); diff --git a/js/src/views/Wallet/wallet.js b/js/src/views/Wallet/wallet.js index 7db60ec59..f4b265a8b 100644 --- a/js/src/views/Wallet/wallet.js +++ b/js/src/views/Wallet/wallet.js @@ -21,16 +21,18 @@ import { bindActionCreators } from 'redux'; import moment from 'moment'; import HistoryStore from '~/mobx/historyStore'; -import { EditMeta, Transfer, WalletSettings } from '~/modals'; import { Actionbar, Button, Page, Loading } from '~/ui'; import { DeleteIcon, EditIcon, SendIcon, SettingsIcon } from '~/ui/Icons'; import { nullableProptype } from '~/util/proptypes'; +import EditMeta from '../Account/EditMeta'; +import Transfer from '../Account/Transfer'; import Delete from '../Address/Delete'; import Header from '../Account/Header'; import WalletDetails from './Details'; import WalletConfirmations from './Confirmations'; import WalletTransactions from './Transactions'; +import WalletSettings from './WalletSettings'; import { setVisibleAccounts } from '~/redux/providers/personalActions'; diff --git a/js/src/views/Web/index.js b/js/src/views/Web/index.js index 41d554b43..d7db0069c 100644 --- a/js/src/views/Web/index.js +++ b/js/src/views/Web/index.js @@ -29,11 +29,6 @@ import muiTheme from '~/ui/Theme'; import Web from './web'; -import '~/../assets/fonts/Roboto/font.css'; -import '~/../assets/fonts/RobotoMono/font.css'; - -import './web.css'; - const store = initStore(api, hashHistory); ReactDOM.render( diff --git a/js/src/views/index.ejs b/js/src/views/index.ejs index aab652fa6..a3f6df8f2 100644 --- a/js/src/views/index.ejs +++ b/js/src/views/index.ejs @@ -12,9 +12,7 @@ margin: 0; padding: 0; background: white; - font-family: 'Roboto', sans-serif; - font-size: 16px; - font-weight: 300; + font-family: sans-serif; } .loading { diff --git a/js/webpack/vendor.js b/js/webpack/vendor.js index 5081a894f..4bee5cacd 100644 --- a/js/webpack/vendor.js +++ b/js/webpack/vendor.js @@ -44,6 +44,8 @@ let modules = [ 'recharts', 'redux', 'redux-thunk', + 'semantic-ui-css', + 'semantic-ui-react', 'scryptsy', 'zxcvbn' ];