diff --git a/.eslintignore b/.eslintignore index 44531bc51..bc463a0d6 100644 --- a/.eslintignore +++ b/.eslintignore @@ -16,4 +16,4 @@ yarn-error.log* # compiled by tsc /public/electron.js # generated by open api -/src/types/generated +/src/renderer/types/generated diff --git a/.prettierignore b/.prettierignore index 89cd40e8f..510e4af26 100644 --- a/.prettierignore +++ b/.prettierignore @@ -2,5 +2,5 @@ /node_modules .editorconfig README.md -src/serviceWorker.ts +src/renderer/serviceWorker.ts /public/ diff --git a/.storybook/main.js b/.storybook/main.js index 00dc9b973..90563c82a 100644 --- a/.storybook/main.js +++ b/.storybook/main.js @@ -1,5 +1,5 @@ module.exports = { - stories: ['../src/**/*.stories.(ts|tsx)'], + stories: ['../src/renderer/**/*.stories.(ts|tsx)'], addons: [ '@storybook/preset-create-react-app', '@storybook/addon-actions', diff --git a/.storybook/preview.tsx b/.storybook/preview.tsx index 994d6fba4..76a5f3307 100644 --- a/.storybook/preview.tsx +++ b/.storybook/preview.tsx @@ -5,10 +5,10 @@ import { configure } from '@storybook/react' import { withThemes } from '@react-theming/storybook-addon' import { BrowserRouter as Router, Route } from 'react-router-dom' -import { AppProvider } from '../src/contexts/AppContext' -import { ThemeProvider } from '../src/contexts/ThemeContext' -import { I18nProvider } from '../src/contexts/I18nContext' -import { AppWrapper } from '../src/App.style' +import { AppProvider } from '../src/renderer/contexts/AppContext' +import { ThemeProvider } from '../src/renderer/contexts/ThemeContext' +import { I18nProvider } from '../src/renderer/contexts/I18nContext' +import { AppWrapper } from '../src/renderer/App.style' const lightTheme = { name: 'Light', ...themes.light } const darkTheme = { name: 'Dark', ...themes.dark } diff --git a/craco.config.js b/craco.config.js index 96248c823..8b72badf9 100644 --- a/craco.config.js +++ b/craco.config.js @@ -1,3 +1,5 @@ +// const path = require('path') + const GitRevisionPlugin = require('git-revision-webpack-plugin') const webpack = require('webpack') @@ -8,6 +10,7 @@ module.exports = { webpackConfig.target = 'electron-renderer' // support hot reload of hooks webpackConfig.resolve.alias['react-dom'] = '@hot-loader/react-dom' + console.log('webpackConfig 22', webpackConfig) return webpackConfig }, plugins: [ diff --git a/package.json b/package.json index 5c6f068ab..e0a449b0a 100644 --- a/package.json +++ b/package.json @@ -8,21 +8,21 @@ "start:web": "craco start", "dev": "concurrently --kill-others --success first \"yarn:dev:*\"", "dev:app": "cross-env BROWSER=none yarn start:web", - "dev:electron": "wait-on http://localhost:3000 && nodemon -I --watch ./electron/ --exec electron ./public/dev.js", + "dev:electron": "wait-on http://localhost:3000 && nodemon -I --watch ./src/main/ --exec electron ./public/dev.js", "build": "cross-env CI=false PUBLIC_URL=./ craco build", - "prebuild": "webpack --config webpack.electron.js --mode production", + "prebuild": "webpack --config webpack.main.js --mode production", "test": "craco test", "package": "yarn build && yarn package:electron", "package:electron": "electron-builder build -c.extraMetadata.main=build/electron.js --config .electronbuildrc", "package:ci": "yarn postinstall && yarn build && yarn package:electron --publish always", "postinstall": "electron-builder install-app-deps", - "lint": "eslint \"{src,electron,e2e,}/**/*.{ts,tsx}\" --fix", + "lint": "eslint \"{src,e2e,}/**/*.{ts,tsx}\" --fix", "eject": "craco eject", "test:e2e": "yarn build && yarn test:cafe", "test:cafe": "cross-env NODE_ENV=production testcafe electron:./ ./e2e/**/*.e2e.ts", "generate:types": "yarn clean:types:midgard && yarn generate:types:midgard", - "generate:types:midgard": "openapi-generator generate -i https://midgard.bepswap.com/v1/swagger.json -g typescript-rxjs -o ./src/types/generated/midgard --reserved-words-mappings in=in", - "clean:types:midgard": "rm -rf ./src/types/generated/midgard", + "generate:types:midgard": "openapi-generator generate -i https://midgard.bepswap.com/v1/swagger.json -g typescript-rxjs -o ./src/renderer/types/generated/midgard --reserved-words-mappings in=in", + "clean:types:midgard": "rm -rf ./src/renderer/types/generated/midgard", "storybook": "start-storybook -p 9009 -s public", "build-storybook": "build-storybook -s public" }, diff --git a/public/dev.js b/public/dev.js index 17c978b5b..f0316136d 100644 --- a/public/dev.js +++ b/public/dev.js @@ -9,8 +9,8 @@ */ // import tsconfig -const config = require("../electron/tsconfig.json"); +const config = require("../tsconfig.main.json"); // register the typescript compiler require("ts-node").register(config); // import the main process typescript code -require("../electron/electron"); +require("../src/main/electron"); diff --git a/src/index.ts b/src/index.ts new file mode 100644 index 000000000..f6692581c --- /dev/null +++ b/src/index.ts @@ -0,0 +1,3 @@ +// needed by CRA (can't be overridden by craco) +// see https://github.com/gsoft-inc/craco/issues/66#issuecomment-455202361 +import './renderer/index' diff --git a/electron/electron.ts b/src/main/electron.ts similarity index 96% rename from electron/electron.ts rename to src/main/electron.ts index eb2f2bf54..edd7ff8a5 100644 --- a/electron/electron.ts +++ b/src/main/electron.ts @@ -7,8 +7,8 @@ import log from 'electron-log' import { warn } from 'electron-log' import { fromEvent } from 'rxjs' -import { Locale } from '../src/shared/i18n/types' -import IPCMessages from '../src/shared/ipc/messages' +import { Locale } from '../shared/i18n/types' +import IPCMessages from '../shared/ipc/messages' import { setMenu } from './menu' export const IS_DEV = isDev && process.env.NODE_ENV !== 'production' diff --git a/electron/i18n/de/index.ts b/src/main/i18n/de/index.ts similarity index 100% rename from electron/i18n/de/index.ts rename to src/main/i18n/de/index.ts diff --git a/electron/i18n/en/index.ts b/src/main/i18n/en/index.ts similarity index 100% rename from electron/i18n/en/index.ts rename to src/main/i18n/en/index.ts diff --git a/electron/i18n/fr/index.ts b/src/main/i18n/fr/index.ts similarity index 100% rename from electron/i18n/fr/index.ts rename to src/main/i18n/fr/index.ts diff --git a/electron/i18n/index.ts b/src/main/i18n/index.ts similarity index 88% rename from electron/i18n/index.ts rename to src/main/i18n/index.ts index c7fa36e5f..94a311791 100644 --- a/electron/i18n/index.ts +++ b/src/main/i18n/index.ts @@ -1,6 +1,6 @@ import { createIntlCache } from 'react-intl' -import { Locale } from '../../src/shared/i18n/types' +import { Locale } from '../../shared/i18n/types' import de from './de' import en from './en' import fr from './fr' diff --git a/electron/i18n/types.ts b/src/main/i18n/types.ts similarity index 100% rename from electron/i18n/types.ts rename to src/main/i18n/types.ts diff --git a/electron/menu/app.ts b/src/main/menu/app.ts similarity index 100% rename from electron/menu/app.ts rename to src/main/menu/app.ts diff --git a/electron/menu/edit.ts b/src/main/menu/edit.ts similarity index 100% rename from electron/menu/edit.ts rename to src/main/menu/edit.ts diff --git a/electron/menu/help.ts b/src/main/menu/help.ts similarity index 94% rename from electron/menu/help.ts rename to src/main/menu/help.ts index a9ba477db..2815bc6a3 100644 --- a/electron/menu/help.ts +++ b/src/main/menu/help.ts @@ -1,7 +1,7 @@ import { MenuItemConstructorOptions, shell } from 'electron' import { IntlShape } from 'react-intl' -import { ExternalUrl } from '../../src/shared/const' +import { ExternalUrl } from '../../shared/const' const menu = (intl: IntlShape): MenuItemConstructorOptions => ({ label: intl.formatMessage({ id: 'menu.help.title' }), diff --git a/electron/menu/index.ts b/src/main/menu/index.ts similarity index 92% rename from electron/menu/index.ts rename to src/main/menu/index.ts index 1b90c53e0..98c322e3d 100644 --- a/electron/menu/index.ts +++ b/src/main/menu/index.ts @@ -1,7 +1,7 @@ import { Menu } from 'electron' import { createIntl } from 'react-intl' -import { Locale } from '../../src/shared/i18n/types' +import { Locale } from '../../shared/i18n/types' import { getMessagesByLocale, cache } from '../i18n' import appMenu from './app' import editMenu from './edit' diff --git a/electron/menu/view.ts b/src/main/menu/view.ts similarity index 100% rename from electron/menu/view.ts rename to src/main/menu/view.ts diff --git a/src/App.style.tsx b/src/renderer/App.style.tsx similarity index 100% rename from src/App.style.tsx rename to src/renderer/App.style.tsx diff --git a/src/App.tsx b/src/renderer/App.tsx similarity index 100% rename from src/App.tsx rename to src/renderer/App.tsx diff --git a/src/assets/fonts/Exo2-Bold.otf b/src/renderer/assets/fonts/Exo2-Bold.otf similarity index 100% rename from src/assets/fonts/Exo2-Bold.otf rename to src/renderer/assets/fonts/Exo2-Bold.otf diff --git a/src/assets/fonts/Exo2-Regular.otf b/src/renderer/assets/fonts/Exo2-Regular.otf similarity index 100% rename from src/assets/fonts/Exo2-Regular.otf rename to src/renderer/assets/fonts/Exo2-Regular.otf diff --git a/src/assets/fonts/Exo2-SemiBold.otf b/src/renderer/assets/fonts/Exo2-SemiBold.otf similarity index 100% rename from src/assets/fonts/Exo2-SemiBold.otf rename to src/renderer/assets/fonts/Exo2-SemiBold.otf diff --git a/src/assets/svg/asset-arrow-blacksmall.svg b/src/renderer/assets/svg/asset-arrow-blacksmall.svg similarity index 100% rename from src/assets/svg/asset-arrow-blacksmall.svg rename to src/renderer/assets/svg/asset-arrow-blacksmall.svg diff --git a/src/assets/svg/asset-arrow-green-dash.svg b/src/renderer/assets/svg/asset-arrow-green-dash.svg similarity index 100% rename from src/assets/svg/asset-arrow-green-dash.svg rename to src/renderer/assets/svg/asset-arrow-green-dash.svg diff --git a/src/assets/svg/asset-arrow-green.svg b/src/renderer/assets/svg/asset-arrow-green.svg similarity index 100% rename from src/assets/svg/asset-arrow-green.svg rename to src/renderer/assets/svg/asset-arrow-green.svg diff --git a/src/assets/svg/asset-arrow-grey.svg b/src/renderer/assets/svg/asset-arrow-grey.svg similarity index 100% rename from src/assets/svg/asset-arrow-grey.svg rename to src/renderer/assets/svg/asset-arrow-grey.svg diff --git a/src/assets/svg/asset-arrow-twoway.svg b/src/renderer/assets/svg/asset-arrow-twoway.svg similarity index 100% rename from src/assets/svg/asset-arrow-twoway.svg rename to src/renderer/assets/svg/asset-arrow-twoway.svg diff --git a/src/assets/svg/asset-arrow-yello.svg b/src/renderer/assets/svg/asset-arrow-yello.svg similarity index 100% rename from src/assets/svg/asset-arrow-yello.svg rename to src/renderer/assets/svg/asset-arrow-yello.svg diff --git a/src/assets/svg/asset-dropdown.svg b/src/renderer/assets/svg/asset-dropdown.svg similarity index 100% rename from src/assets/svg/asset-dropdown.svg rename to src/renderer/assets/svg/asset-dropdown.svg diff --git a/src/assets/svg/asset-market.svg b/src/renderer/assets/svg/asset-market.svg similarity index 100% rename from src/assets/svg/asset-market.svg rename to src/renderer/assets/svg/asset-market.svg diff --git a/src/assets/svg/asset-refresh.svg b/src/renderer/assets/svg/asset-refresh.svg similarity index 100% rename from src/assets/svg/asset-refresh.svg rename to src/renderer/assets/svg/asset-refresh.svg diff --git a/src/assets/svg/asset-user.svg b/src/renderer/assets/svg/asset-user.svg similarity index 100% rename from src/assets/svg/asset-user.svg rename to src/renderer/assets/svg/asset-user.svg diff --git a/src/assets/svg/binancedex_logo.svg b/src/renderer/assets/svg/binancedex_logo.svg similarity index 100% rename from src/assets/svg/binancedex_logo.svg rename to src/renderer/assets/svg/binancedex_logo.svg diff --git a/src/assets/svg/bitcoin-icon.svg b/src/renderer/assets/svg/bitcoin-icon.svg similarity index 100% rename from src/assets/svg/bitcoin-icon.svg rename to src/renderer/assets/svg/bitcoin-icon.svg diff --git a/src/assets/svg/coin-bnb.svg b/src/renderer/assets/svg/coin-bnb.svg similarity index 100% rename from src/assets/svg/coin-bnb.svg rename to src/renderer/assets/svg/coin-bnb.svg diff --git a/src/assets/svg/coin-btc.svg b/src/renderer/assets/svg/coin-btc.svg similarity index 100% rename from src/assets/svg/coin-btc.svg rename to src/renderer/assets/svg/coin-btc.svg diff --git a/src/assets/svg/coin-rune.svg b/src/renderer/assets/svg/coin-rune.svg similarity index 100% rename from src/assets/svg/coin-rune.svg rename to src/renderer/assets/svg/coin-rune.svg diff --git a/src/assets/svg/currency-icon.svg b/src/renderer/assets/svg/currency-icon.svg similarity index 100% rename from src/assets/svg/currency-icon.svg rename to src/renderer/assets/svg/currency-icon.svg diff --git a/src/assets/svg/icon-arrow-button.svg b/src/renderer/assets/svg/icon-arrow-button.svg similarity index 100% rename from src/assets/svg/icon-arrow-button.svg rename to src/renderer/assets/svg/icon-arrow-button.svg diff --git a/src/assets/svg/icon-close.svg b/src/renderer/assets/svg/icon-close.svg similarity index 100% rename from src/assets/svg/icon-close.svg rename to src/renderer/assets/svg/icon-close.svg diff --git a/src/assets/svg/icon-down.svg b/src/renderer/assets/svg/icon-down.svg similarity index 100% rename from src/assets/svg/icon-down.svg rename to src/renderer/assets/svg/icon-down.svg diff --git a/src/assets/svg/icon-lock.svg b/src/renderer/assets/svg/icon-lock.svg similarity index 100% rename from src/assets/svg/icon-lock.svg rename to src/renderer/assets/svg/icon-lock.svg diff --git a/src/assets/svg/icon-menu.svg b/src/renderer/assets/svg/icon-menu.svg similarity index 100% rename from src/assets/svg/icon-menu.svg rename to src/renderer/assets/svg/icon-menu.svg diff --git a/src/assets/svg/icon-settings.svg b/src/renderer/assets/svg/icon-settings.svg similarity index 100% rename from src/assets/svg/icon-settings.svg rename to src/renderer/assets/svg/icon-settings.svg diff --git a/src/assets/svg/icon-stake.svg b/src/renderer/assets/svg/icon-stake.svg similarity index 100% rename from src/assets/svg/icon-stake.svg rename to src/renderer/assets/svg/icon-stake.svg diff --git a/src/assets/svg/icon-swap.svg b/src/renderer/assets/svg/icon-swap.svg similarity index 100% rename from src/assets/svg/icon-swap.svg rename to src/renderer/assets/svg/icon-swap.svg diff --git a/src/assets/svg/icon-telegram.svg b/src/renderer/assets/svg/icon-telegram.svg similarity index 100% rename from src/assets/svg/icon-telegram.svg rename to src/renderer/assets/svg/icon-telegram.svg diff --git a/src/assets/svg/icon-theme-switch.svg b/src/renderer/assets/svg/icon-theme-switch.svg similarity index 100% rename from src/assets/svg/icon-theme-switch.svg rename to src/renderer/assets/svg/icon-theme-switch.svg diff --git a/src/assets/svg/icon-unlock-warning.svg b/src/renderer/assets/svg/icon-unlock-warning.svg similarity index 100% rename from src/assets/svg/icon-unlock-warning.svg rename to src/renderer/assets/svg/icon-unlock-warning.svg diff --git a/src/assets/svg/icon-unlock.svg b/src/renderer/assets/svg/icon-unlock.svg similarity index 100% rename from src/assets/svg/icon-unlock.svg rename to src/renderer/assets/svg/icon-unlock.svg diff --git a/src/assets/svg/icon-wallet.svg b/src/renderer/assets/svg/icon-wallet.svg similarity index 100% rename from src/assets/svg/icon-wallet.svg rename to src/renderer/assets/svg/icon-wallet.svg diff --git a/src/assets/svg/logo-asgardex.svg b/src/renderer/assets/svg/logo-asgardex.svg similarity index 100% rename from src/assets/svg/logo-asgardex.svg rename to src/renderer/assets/svg/logo-asgardex.svg diff --git a/src/assets/svg/logo-bepswap-large.svg b/src/renderer/assets/svg/logo-bepswap-large.svg similarity index 100% rename from src/assets/svg/logo-bepswap-large.svg rename to src/renderer/assets/svg/logo-bepswap-large.svg diff --git a/src/assets/svg/logo-bepswap-long.svg b/src/renderer/assets/svg/logo-bepswap-long.svg similarity index 100% rename from src/assets/svg/logo-bepswap-long.svg rename to src/renderer/assets/svg/logo-bepswap-long.svg diff --git a/src/assets/svg/logo-bepswap-normal.svg b/src/renderer/assets/svg/logo-bepswap-normal.svg similarity index 100% rename from src/assets/svg/logo-bepswap-normal.svg rename to src/renderer/assets/svg/logo-bepswap-normal.svg diff --git a/src/assets/svg/logo-thorchain-black.svg b/src/renderer/assets/svg/logo-thorchain-black.svg similarity index 100% rename from src/assets/svg/logo-thorchain-black.svg rename to src/renderer/assets/svg/logo-thorchain-black.svg diff --git a/src/assets/svg/logo-thorchain.svg b/src/renderer/assets/svg/logo-thorchain.svg similarity index 100% rename from src/assets/svg/logo-thorchain.svg rename to src/renderer/assets/svg/logo-thorchain.svg diff --git a/src/assets/svg/orb-blue.svg b/src/renderer/assets/svg/orb-blue.svg similarity index 100% rename from src/assets/svg/orb-blue.svg rename to src/renderer/assets/svg/orb-blue.svg diff --git a/src/assets/svg/orb-green.svg b/src/renderer/assets/svg/orb-green.svg similarity index 100% rename from src/assets/svg/orb-green.svg rename to src/renderer/assets/svg/orb-green.svg diff --git a/src/assets/svg/rune-flash-icon.svg b/src/renderer/assets/svg/rune-flash-icon.svg similarity index 100% rename from src/assets/svg/rune-flash-icon.svg rename to src/renderer/assets/svg/rune-flash-icon.svg diff --git a/src/assets/svg/tx-detail.svg b/src/renderer/assets/svg/tx-detail.svg similarity index 100% rename from src/assets/svg/tx-detail.svg rename to src/renderer/assets/svg/tx-detail.svg diff --git a/src/assets/svg/tx-stake.svg b/src/renderer/assets/svg/tx-stake.svg similarity index 100% rename from src/assets/svg/tx-stake.svg rename to src/renderer/assets/svg/tx-stake.svg diff --git a/src/assets/svg/tx-swap.svg b/src/renderer/assets/svg/tx-swap.svg similarity index 100% rename from src/assets/svg/tx-swap.svg rename to src/renderer/assets/svg/tx-swap.svg diff --git a/src/assets/svg/tx-withdraw.svg b/src/renderer/assets/svg/tx-withdraw.svg similarity index 100% rename from src/assets/svg/tx-withdraw.svg rename to src/renderer/assets/svg/tx-withdraw.svg diff --git a/src/assets/timer/icon-tick-fill.svg b/src/renderer/assets/timer/icon-tick-fill.svg similarity index 100% rename from src/assets/timer/icon-tick-fill.svg rename to src/renderer/assets/timer/icon-tick-fill.svg diff --git a/src/assets/timer/refund.svg b/src/renderer/assets/timer/refund.svg similarity index 100% rename from src/assets/timer/refund.svg rename to src/renderer/assets/timer/refund.svg diff --git a/src/assets/timer/timerchart-1.svg b/src/renderer/assets/timer/timerchart-1.svg similarity index 100% rename from src/assets/timer/timerchart-1.svg rename to src/renderer/assets/timer/timerchart-1.svg diff --git a/src/assets/timer/timerchart-2.svg b/src/renderer/assets/timer/timerchart-2.svg similarity index 100% rename from src/assets/timer/timerchart-2.svg rename to src/renderer/assets/timer/timerchart-2.svg diff --git a/src/assets/timer/timerchart-3.svg b/src/renderer/assets/timer/timerchart-3.svg similarity index 100% rename from src/assets/timer/timerchart-3.svg rename to src/renderer/assets/timer/timerchart-3.svg diff --git a/src/assets/timer/timerchart-4.svg b/src/renderer/assets/timer/timerchart-4.svg similarity index 100% rename from src/assets/timer/timerchart-4.svg rename to src/renderer/assets/timer/timerchart-4.svg diff --git a/src/assets/timer/timerchart-full.svg b/src/renderer/assets/timer/timerchart-full.svg similarity index 100% rename from src/assets/timer/timerchart-full.svg rename to src/renderer/assets/timer/timerchart-full.svg diff --git a/src/components/Footer.style.tsx b/src/renderer/components/Footer.style.tsx similarity index 100% rename from src/components/Footer.style.tsx rename to src/renderer/components/Footer.style.tsx diff --git a/src/components/Footer.tsx b/src/renderer/components/Footer.tsx similarity index 98% rename from src/components/Footer.tsx rename to src/renderer/components/Footer.tsx index 81b17a661..ea3424c82 100644 --- a/src/components/Footer.tsx +++ b/src/renderer/components/Footer.tsx @@ -5,10 +5,10 @@ import { Row, Col, Grid } from 'antd' import { useIntl } from 'react-intl' import { useHistory } from 'react-router-dom' +import { ExternalUrl } from '../../shared/const' import { ReactComponent as TelegramIcon } from '../assets/svg/icon-telegram.svg' import { ReactComponent as ThorChainIcon } from '../assets/svg/logo-thorchain.svg' import * as playgroundRoutes from '../routes/playground' -import { ExternalUrl } from '../shared/const' import { FooterContainer, FooterLink, FooterIconWrapper, FooterLinkWrapper } from './Footer.style' const { shell } = window.require('electron') diff --git a/src/components/header/Header.tsx b/src/renderer/components/header/Header.tsx similarity index 100% rename from src/components/header/Header.tsx rename to src/renderer/components/header/Header.tsx diff --git a/src/components/header/HeaderComponent.stories.tsx b/src/renderer/components/header/HeaderComponent.stories.tsx similarity index 100% rename from src/components/header/HeaderComponent.stories.tsx rename to src/renderer/components/header/HeaderComponent.stories.tsx diff --git a/src/components/header/HeaderComponent.style.tsx b/src/renderer/components/header/HeaderComponent.style.tsx similarity index 100% rename from src/components/header/HeaderComponent.style.tsx rename to src/renderer/components/header/HeaderComponent.style.tsx diff --git a/src/components/header/HeaderComponent.tsx b/src/renderer/components/header/HeaderComponent.tsx similarity index 100% rename from src/components/header/HeaderComponent.tsx rename to src/renderer/components/header/HeaderComponent.tsx diff --git a/src/components/header/HeaderIcon.style.tsx b/src/renderer/components/header/HeaderIcon.style.tsx similarity index 100% rename from src/components/header/HeaderIcon.style.tsx rename to src/renderer/components/header/HeaderIcon.style.tsx diff --git a/src/components/header/HeaderLang.stories.tsx b/src/renderer/components/header/HeaderLang.stories.tsx similarity index 100% rename from src/components/header/HeaderLang.stories.tsx rename to src/renderer/components/header/HeaderLang.stories.tsx diff --git a/src/components/header/HeaderLang.tsx b/src/renderer/components/header/HeaderLang.tsx similarity index 100% rename from src/components/header/HeaderLang.tsx rename to src/renderer/components/header/HeaderLang.tsx diff --git a/src/components/header/HeaderLock.stories.tsx b/src/renderer/components/header/HeaderLock.stories.tsx similarity index 100% rename from src/components/header/HeaderLock.stories.tsx rename to src/renderer/components/header/HeaderLock.stories.tsx diff --git a/src/components/header/HeaderLock.style.tsx b/src/renderer/components/header/HeaderLock.style.tsx similarity index 100% rename from src/components/header/HeaderLock.style.tsx rename to src/renderer/components/header/HeaderLock.style.tsx diff --git a/src/components/header/HeaderLock.tsx b/src/renderer/components/header/HeaderLock.tsx similarity index 100% rename from src/components/header/HeaderLock.tsx rename to src/renderer/components/header/HeaderLock.tsx diff --git a/src/components/header/HeaderMenu.style.tsx b/src/renderer/components/header/HeaderMenu.style.tsx similarity index 100% rename from src/components/header/HeaderMenu.style.tsx rename to src/renderer/components/header/HeaderMenu.style.tsx diff --git a/src/components/header/HeaderNetStatus.stories.tsx b/src/renderer/components/header/HeaderNetStatus.stories.tsx similarity index 100% rename from src/components/header/HeaderNetStatus.stories.tsx rename to src/renderer/components/header/HeaderNetStatus.stories.tsx diff --git a/src/components/header/HeaderNetStatus.style.tsx b/src/renderer/components/header/HeaderNetStatus.style.tsx similarity index 100% rename from src/components/header/HeaderNetStatus.style.tsx rename to src/renderer/components/header/HeaderNetStatus.style.tsx diff --git a/src/components/header/HeaderNetStatus.tsx b/src/renderer/components/header/HeaderNetStatus.tsx similarity index 100% rename from src/components/header/HeaderNetStatus.tsx rename to src/renderer/components/header/HeaderNetStatus.tsx diff --git a/src/components/header/HeaderPriceSelector.stories.tsx b/src/renderer/components/header/HeaderPriceSelector.stories.tsx similarity index 100% rename from src/components/header/HeaderPriceSelector.stories.tsx rename to src/renderer/components/header/HeaderPriceSelector.stories.tsx diff --git a/src/components/header/HeaderPriceSelector.style.tsx b/src/renderer/components/header/HeaderPriceSelector.style.tsx similarity index 100% rename from src/components/header/HeaderPriceSelector.style.tsx rename to src/renderer/components/header/HeaderPriceSelector.style.tsx diff --git a/src/components/header/HeaderPriceSelector.tsx b/src/renderer/components/header/HeaderPriceSelector.tsx similarity index 100% rename from src/components/header/HeaderPriceSelector.tsx rename to src/renderer/components/header/HeaderPriceSelector.tsx diff --git a/src/components/header/HeaderSettings.stories.tsx b/src/renderer/components/header/HeaderSettings.stories.tsx similarity index 100% rename from src/components/header/HeaderSettings.stories.tsx rename to src/renderer/components/header/HeaderSettings.stories.tsx diff --git a/src/components/header/HeaderSettings.style.tsx b/src/renderer/components/header/HeaderSettings.style.tsx similarity index 100% rename from src/components/header/HeaderSettings.style.tsx rename to src/renderer/components/header/HeaderSettings.style.tsx diff --git a/src/components/header/HeaderSettings.tsx b/src/renderer/components/header/HeaderSettings.tsx similarity index 100% rename from src/components/header/HeaderSettings.tsx rename to src/renderer/components/header/HeaderSettings.tsx diff --git a/src/components/header/HeaderTheme.stories.tsx b/src/renderer/components/header/HeaderTheme.stories.tsx similarity index 100% rename from src/components/header/HeaderTheme.stories.tsx rename to src/renderer/components/header/HeaderTheme.stories.tsx diff --git a/src/components/header/HeaderTheme.style.tsx b/src/renderer/components/header/HeaderTheme.style.tsx similarity index 100% rename from src/components/header/HeaderTheme.style.tsx rename to src/renderer/components/header/HeaderTheme.style.tsx diff --git a/src/components/header/HeaderTheme.tsx b/src/renderer/components/header/HeaderTheme.tsx similarity index 100% rename from src/components/header/HeaderTheme.tsx rename to src/renderer/components/header/HeaderTheme.tsx diff --git a/src/components/header/util.test.ts b/src/renderer/components/header/util.test.ts similarity index 100% rename from src/components/header/util.test.ts rename to src/renderer/components/header/util.test.ts diff --git a/src/components/header/util.ts b/src/renderer/components/header/util.ts similarity index 100% rename from src/components/header/util.ts rename to src/renderer/components/header/util.ts diff --git a/src/components/icons/assetIcons.ts b/src/renderer/components/icons/assetIcons.ts similarity index 100% rename from src/components/icons/assetIcons.ts rename to src/renderer/components/icons/assetIcons.ts diff --git a/src/components/icons/coinIcons.ts b/src/renderer/components/icons/coinIcons.ts similarity index 100% rename from src/components/icons/coinIcons.ts rename to src/renderer/components/icons/coinIcons.ts diff --git a/src/components/icons/index.ts b/src/renderer/components/icons/index.ts similarity index 100% rename from src/components/icons/index.ts rename to src/renderer/components/icons/index.ts diff --git a/src/components/icons/timerIcons.ts b/src/renderer/components/icons/timerIcons.ts similarity index 100% rename from src/components/icons/timerIcons.ts rename to src/renderer/components/icons/timerIcons.ts diff --git a/src/components/modal/privateModal/PrivateModal.stories.tsx b/src/renderer/components/modal/privateModal/PrivateModal.stories.tsx similarity index 100% rename from src/components/modal/privateModal/PrivateModal.stories.tsx rename to src/renderer/components/modal/privateModal/PrivateModal.stories.tsx diff --git a/src/components/modal/privateModal/PrivateModal.style.tsx b/src/renderer/components/modal/privateModal/PrivateModal.style.tsx similarity index 100% rename from src/components/modal/privateModal/PrivateModal.style.tsx rename to src/renderer/components/modal/privateModal/PrivateModal.style.tsx diff --git a/src/components/modal/privateModal/PrivateModal.tsx b/src/renderer/components/modal/privateModal/PrivateModal.tsx similarity index 100% rename from src/components/modal/privateModal/PrivateModal.tsx rename to src/renderer/components/modal/privateModal/PrivateModal.tsx diff --git a/src/components/modal/privateModal/index.ts b/src/renderer/components/modal/privateModal/index.ts similarity index 100% rename from src/components/modal/privateModal/index.ts rename to src/renderer/components/modal/privateModal/index.ts diff --git a/src/components/modal/swapModal/SwapModal.stories.tsx b/src/renderer/components/modal/swapModal/SwapModal.stories.tsx similarity index 95% rename from src/components/modal/swapModal/SwapModal.stories.tsx rename to src/renderer/components/modal/swapModal/SwapModal.stories.tsx index 40b771af9..c23ce92a4 100644 --- a/src/components/modal/swapModal/SwapModal.stories.tsx +++ b/src/renderer/components/modal/swapModal/SwapModal.stories.tsx @@ -4,7 +4,7 @@ import { storiesOf } from '@storybook/react' import { assetAmount, assetToBase } from '@thorchain/asgardex-util' import BigNumber from 'bignumber.js' -import { ASSETS_MAINNET } from '../../../mock/assets' +import { ASSETS_MAINNET } from '../../../../shared/mock/assets' import { TxStatus, TxTypes } from '../../../types/asgardex' import SwapModal from './SwapModal' import { CalcResult } from './types' diff --git a/src/components/modal/swapModal/SwapModal.style.tsx b/src/renderer/components/modal/swapModal/SwapModal.style.tsx similarity index 100% rename from src/components/modal/swapModal/SwapModal.style.tsx rename to src/renderer/components/modal/swapModal/SwapModal.style.tsx diff --git a/src/components/modal/swapModal/SwapModal.tsx b/src/renderer/components/modal/swapModal/SwapModal.tsx similarity index 100% rename from src/components/modal/swapModal/SwapModal.tsx rename to src/renderer/components/modal/swapModal/SwapModal.tsx diff --git a/src/components/modal/swapModal/index.tsx b/src/renderer/components/modal/swapModal/index.tsx similarity index 100% rename from src/components/modal/swapModal/index.tsx rename to src/renderer/components/modal/swapModal/index.tsx diff --git a/src/components/modal/swapModal/types.ts b/src/renderer/components/modal/swapModal/types.ts similarity index 100% rename from src/components/modal/swapModal/types.ts rename to src/renderer/components/modal/swapModal/types.ts diff --git a/src/components/shared/.gitkeep b/src/renderer/components/shared/.gitkeep similarity index 100% rename from src/components/shared/.gitkeep rename to src/renderer/components/shared/.gitkeep diff --git a/src/components/shared/Menu.tsx b/src/renderer/components/shared/Menu.tsx similarity index 100% rename from src/components/shared/Menu.tsx rename to src/renderer/components/shared/Menu.tsx diff --git a/src/components/shared/error/ErrorView.stories.tsx b/src/renderer/components/shared/error/ErrorView.stories.tsx similarity index 100% rename from src/components/shared/error/ErrorView.stories.tsx rename to src/renderer/components/shared/error/ErrorView.stories.tsx diff --git a/src/components/shared/error/ErrorView.style.ts b/src/renderer/components/shared/error/ErrorView.style.ts similarity index 100% rename from src/components/shared/error/ErrorView.style.ts rename to src/renderer/components/shared/error/ErrorView.style.ts diff --git a/src/components/shared/error/ErrorView.tsx b/src/renderer/components/shared/error/ErrorView.tsx similarity index 100% rename from src/components/shared/error/ErrorView.tsx rename to src/renderer/components/shared/error/ErrorView.tsx diff --git a/src/components/shared/icons/ConnectionStatus.tsx b/src/renderer/components/shared/icons/ConnectionStatus.tsx similarity index 100% rename from src/components/shared/icons/ConnectionStatus.tsx rename to src/renderer/components/shared/icons/ConnectionStatus.tsx diff --git a/src/components/stake/.gitkeep b/src/renderer/components/stake/.gitkeep similarity index 100% rename from src/components/stake/.gitkeep rename to src/renderer/components/stake/.gitkeep diff --git a/src/components/swap/.gitkeep b/src/renderer/components/swap/.gitkeep similarity index 100% rename from src/components/swap/.gitkeep rename to src/renderer/components/swap/.gitkeep diff --git a/src/components/uielements/adressInput/addressInput.stories.tsx b/src/renderer/components/uielements/adressInput/addressInput.stories.tsx similarity index 100% rename from src/components/uielements/adressInput/addressInput.stories.tsx rename to src/renderer/components/uielements/adressInput/addressInput.stories.tsx diff --git a/src/components/uielements/adressInput/addressInput.style.tsx b/src/renderer/components/uielements/adressInput/addressInput.style.tsx similarity index 100% rename from src/components/uielements/adressInput/addressInput.style.tsx rename to src/renderer/components/uielements/adressInput/addressInput.style.tsx diff --git a/src/components/uielements/adressInput/addressInput.tsx b/src/renderer/components/uielements/adressInput/addressInput.tsx similarity index 100% rename from src/components/uielements/adressInput/addressInput.tsx rename to src/renderer/components/uielements/adressInput/addressInput.tsx diff --git a/src/components/uielements/adressInput/index.tsx b/src/renderer/components/uielements/adressInput/index.tsx similarity index 100% rename from src/components/uielements/adressInput/index.tsx rename to src/renderer/components/uielements/adressInput/index.tsx diff --git a/src/components/uielements/assets/assetCard/AssetCard.stories.tsx b/src/renderer/components/uielements/assets/assetCard/AssetCard.stories.tsx similarity index 94% rename from src/components/uielements/assets/assetCard/AssetCard.stories.tsx rename to src/renderer/components/uielements/assets/assetCard/AssetCard.stories.tsx index 9653f9184..b759d6b4a 100644 --- a/src/components/uielements/assets/assetCard/AssetCard.stories.tsx +++ b/src/renderer/components/uielements/assets/assetCard/AssetCard.stories.tsx @@ -3,8 +3,8 @@ import React from 'react' import { storiesOf } from '@storybook/react' import { bn, assetAmount, assetToBase } from '@thorchain/asgardex-util' +import { ASSETS_MAINNET } from '../../../../../shared/mock/assets' import { ONE_ASSET_BASE_AMOUNT } from '../../../../const' -import { ASSETS_MAINNET } from '../../../../mock/assets' import AssetCard from './AssetCard' storiesOf('Components/Assets/AssetCard', module).add('default', () => { diff --git a/src/components/uielements/assets/assetCard/AssetCard.style.ts b/src/renderer/components/uielements/assets/assetCard/AssetCard.style.ts similarity index 100% rename from src/components/uielements/assets/assetCard/AssetCard.style.ts rename to src/renderer/components/uielements/assets/assetCard/AssetCard.style.ts diff --git a/src/components/uielements/assets/assetCard/AssetCard.tsx b/src/renderer/components/uielements/assets/assetCard/AssetCard.tsx similarity index 100% rename from src/components/uielements/assets/assetCard/AssetCard.tsx rename to src/renderer/components/uielements/assets/assetCard/AssetCard.tsx diff --git a/src/components/uielements/assets/assetCard/index.ts b/src/renderer/components/uielements/assets/assetCard/index.ts similarity index 100% rename from src/components/uielements/assets/assetCard/index.ts rename to src/renderer/components/uielements/assets/assetCard/index.ts diff --git a/src/components/uielements/assets/assetData/AssetData.stories.tsx b/src/renderer/components/uielements/assets/assetData/AssetData.stories.tsx similarity index 95% rename from src/components/uielements/assets/assetData/AssetData.stories.tsx rename to src/renderer/components/uielements/assets/assetData/AssetData.stories.tsx index 8cf6d55e2..b9dbfe4d5 100644 --- a/src/components/uielements/assets/assetData/AssetData.stories.tsx +++ b/src/renderer/components/uielements/assets/assetData/AssetData.stories.tsx @@ -3,7 +3,7 @@ import React from 'react' import { storiesOf } from '@storybook/react' import { assetAmount, assetToBase } from '@thorchain/asgardex-util' -import { ASSETS_MAINNET } from '../../../../mock/assets' +import { ASSETS_MAINNET } from '../../../../../shared/mock/assets' import AssetData from './AssetData' const assetValue = assetToBase(assetAmount(2.49274)) diff --git a/src/components/uielements/assets/assetData/AssetData.style.tsx b/src/renderer/components/uielements/assets/assetData/AssetData.style.tsx similarity index 100% rename from src/components/uielements/assets/assetData/AssetData.style.tsx rename to src/renderer/components/uielements/assets/assetData/AssetData.style.tsx diff --git a/src/components/uielements/assets/assetData/AssetData.tsx b/src/renderer/components/uielements/assets/assetData/AssetData.tsx similarity index 100% rename from src/components/uielements/assets/assetData/AssetData.tsx rename to src/renderer/components/uielements/assets/assetData/AssetData.tsx diff --git a/src/components/uielements/assets/assetData/index.tsx b/src/renderer/components/uielements/assets/assetData/index.tsx similarity index 100% rename from src/components/uielements/assets/assetData/index.tsx rename to src/renderer/components/uielements/assets/assetData/index.tsx diff --git a/src/components/uielements/assets/assetIcon/AssetIcon.stories.tsx b/src/renderer/components/uielements/assets/assetIcon/AssetIcon.stories.tsx similarity index 92% rename from src/components/uielements/assets/assetIcon/AssetIcon.stories.tsx rename to src/renderer/components/uielements/assets/assetIcon/AssetIcon.stories.tsx index c812cd116..c61924487 100644 --- a/src/components/uielements/assets/assetIcon/AssetIcon.stories.tsx +++ b/src/renderer/components/uielements/assets/assetIcon/AssetIcon.stories.tsx @@ -3,7 +3,7 @@ import React from 'react' import { radios } from '@storybook/addon-knobs' import { storiesOf } from '@storybook/react' -import { ASSETS_MAINNET } from '../../../../mock/assets' +import { ASSETS_MAINNET } from '../../../../../shared/mock/assets' import AssetIcon from './AssetIcon' import { Size } from './types' diff --git a/src/components/uielements/assets/assetIcon/AssetIcon.style.ts b/src/renderer/components/uielements/assets/assetIcon/AssetIcon.style.ts similarity index 100% rename from src/components/uielements/assets/assetIcon/AssetIcon.style.ts rename to src/renderer/components/uielements/assets/assetIcon/AssetIcon.style.ts diff --git a/src/components/uielements/assets/assetIcon/AssetIcon.tsx b/src/renderer/components/uielements/assets/assetIcon/AssetIcon.tsx similarity index 100% rename from src/components/uielements/assets/assetIcon/AssetIcon.tsx rename to src/renderer/components/uielements/assets/assetIcon/AssetIcon.tsx diff --git a/src/components/uielements/assets/assetIcon/index.ts b/src/renderer/components/uielements/assets/assetIcon/index.ts similarity index 100% rename from src/components/uielements/assets/assetIcon/index.ts rename to src/renderer/components/uielements/assets/assetIcon/index.ts diff --git a/src/components/uielements/assets/assetIcon/types.ts b/src/renderer/components/uielements/assets/assetIcon/types.ts similarity index 100% rename from src/components/uielements/assets/assetIcon/types.ts rename to src/renderer/components/uielements/assets/assetIcon/types.ts diff --git a/src/components/uielements/assets/assetInput/AssetInput.stories.tsx b/src/renderer/components/uielements/assets/assetInput/AssetInput.stories.tsx similarity index 100% rename from src/components/uielements/assets/assetInput/AssetInput.stories.tsx rename to src/renderer/components/uielements/assets/assetInput/AssetInput.stories.tsx diff --git a/src/components/uielements/assets/assetInput/AssetInput.style.ts b/src/renderer/components/uielements/assets/assetInput/AssetInput.style.ts similarity index 100% rename from src/components/uielements/assets/assetInput/AssetInput.style.ts rename to src/renderer/components/uielements/assets/assetInput/AssetInput.style.ts diff --git a/src/components/uielements/assets/assetInput/AssetInput.tsx b/src/renderer/components/uielements/assets/assetInput/AssetInput.tsx similarity index 100% rename from src/components/uielements/assets/assetInput/AssetInput.tsx rename to src/renderer/components/uielements/assets/assetInput/AssetInput.tsx diff --git a/src/components/uielements/assets/assetInput/index.ts b/src/renderer/components/uielements/assets/assetInput/index.ts similarity index 100% rename from src/components/uielements/assets/assetInput/index.ts rename to src/renderer/components/uielements/assets/assetInput/index.ts diff --git a/src/components/uielements/assets/assetInput/types.ts b/src/renderer/components/uielements/assets/assetInput/types.ts similarity index 100% rename from src/components/uielements/assets/assetInput/types.ts rename to src/renderer/components/uielements/assets/assetInput/types.ts diff --git a/src/components/uielements/assets/assetMenu/AssetMenu.stories.tsx b/src/renderer/components/uielements/assets/assetMenu/AssetMenu.stories.tsx similarity index 92% rename from src/components/uielements/assets/assetMenu/AssetMenu.stories.tsx rename to src/renderer/components/uielements/assets/assetMenu/AssetMenu.stories.tsx index 324d2a071..56369582b 100644 --- a/src/components/uielements/assets/assetMenu/AssetMenu.stories.tsx +++ b/src/renderer/components/uielements/assets/assetMenu/AssetMenu.stories.tsx @@ -3,8 +3,8 @@ import React from 'react' import { storiesOf } from '@storybook/react' import { bn } from '@thorchain/asgardex-util' +import { ASSETS_MAINNET } from '../../../../../shared/mock/assets' import { ONE_ASSET_BASE_AMOUNT } from '../../../../const' -import { ASSETS_MAINNET } from '../../../../mock/assets' import AssetMenu from './AssetMenu' storiesOf('Components/Assets/AssetMenu', module).add('default', () => { diff --git a/src/components/uielements/assets/assetMenu/AssetMenu.tsx b/src/renderer/components/uielements/assets/assetMenu/AssetMenu.tsx similarity index 100% rename from src/components/uielements/assets/assetMenu/AssetMenu.tsx rename to src/renderer/components/uielements/assets/assetMenu/AssetMenu.tsx diff --git a/src/components/uielements/assets/assetMenu/index.ts b/src/renderer/components/uielements/assets/assetMenu/index.ts similarity index 100% rename from src/components/uielements/assets/assetMenu/index.ts rename to src/renderer/components/uielements/assets/assetMenu/index.ts diff --git a/src/components/uielements/assets/assetPair/AssetPair.stories.tsx b/src/renderer/components/uielements/assets/assetPair/AssetPair.stories.tsx similarity index 91% rename from src/components/uielements/assets/assetPair/AssetPair.stories.tsx rename to src/renderer/components/uielements/assets/assetPair/AssetPair.stories.tsx index 863684e54..c03fc3e29 100644 --- a/src/components/uielements/assets/assetPair/AssetPair.stories.tsx +++ b/src/renderer/components/uielements/assets/assetPair/AssetPair.stories.tsx @@ -3,7 +3,7 @@ import React from 'react' import { withKnobs, radios } from '@storybook/addon-knobs' import { storiesOf } from '@storybook/react' -import { ASSETS_MAINNET } from '../../../../mock/assets' +import { ASSETS_MAINNET } from '../../../../../shared/mock/assets' import { Size as CoinSize } from '../assetIcon/types' import AssetPair from './AssetPair' diff --git a/src/components/uielements/assets/assetPair/AssetPair.style.ts b/src/renderer/components/uielements/assets/assetPair/AssetPair.style.ts similarity index 100% rename from src/components/uielements/assets/assetPair/AssetPair.style.ts rename to src/renderer/components/uielements/assets/assetPair/AssetPair.style.ts diff --git a/src/components/uielements/assets/assetPair/AssetPair.tsx b/src/renderer/components/uielements/assets/assetPair/AssetPair.tsx similarity index 100% rename from src/components/uielements/assets/assetPair/AssetPair.tsx rename to src/renderer/components/uielements/assets/assetPair/AssetPair.tsx diff --git a/src/components/uielements/assets/assetPair/AssetPairOverlapped.stories.tsx b/src/renderer/components/uielements/assets/assetPair/AssetPairOverlapped.stories.tsx similarity index 94% rename from src/components/uielements/assets/assetPair/AssetPairOverlapped.stories.tsx rename to src/renderer/components/uielements/assets/assetPair/AssetPairOverlapped.stories.tsx index 13c772d28..e73167ad3 100644 --- a/src/components/uielements/assets/assetPair/AssetPairOverlapped.stories.tsx +++ b/src/renderer/components/uielements/assets/assetPair/AssetPairOverlapped.stories.tsx @@ -3,7 +3,7 @@ import React from 'react' import { radios, withKnobs } from '@storybook/addon-knobs' import { storiesOf } from '@storybook/react' -import { ASSETS_MAINNET } from '../../../../mock/assets' +import { ASSETS_MAINNET } from '../../../../../shared/mock/assets' import { Size } from '../assetIcon/types' import AssetPairOverlapped from './AssetPairOverlapped' diff --git a/src/components/uielements/assets/assetPair/AssetPairOverlapped.style.tsx b/src/renderer/components/uielements/assets/assetPair/AssetPairOverlapped.style.tsx similarity index 100% rename from src/components/uielements/assets/assetPair/AssetPairOverlapped.style.tsx rename to src/renderer/components/uielements/assets/assetPair/AssetPairOverlapped.style.tsx diff --git a/src/components/uielements/assets/assetPair/AssetPairOverlapped.tsx b/src/renderer/components/uielements/assets/assetPair/AssetPairOverlapped.tsx similarity index 100% rename from src/components/uielements/assets/assetPair/AssetPairOverlapped.tsx rename to src/renderer/components/uielements/assets/assetPair/AssetPairOverlapped.tsx diff --git a/src/components/uielements/assets/assetPair/index.ts b/src/renderer/components/uielements/assets/assetPair/index.ts similarity index 100% rename from src/components/uielements/assets/assetPair/index.ts rename to src/renderer/components/uielements/assets/assetPair/index.ts diff --git a/src/components/uielements/assets/assetSelect/AssetSelect.stories.tsx b/src/renderer/components/uielements/assets/assetSelect/AssetSelect.stories.tsx similarity index 92% rename from src/components/uielements/assets/assetSelect/AssetSelect.stories.tsx rename to src/renderer/components/uielements/assets/assetSelect/AssetSelect.stories.tsx index 061d99d4b..44fba64cc 100644 --- a/src/components/uielements/assets/assetSelect/AssetSelect.stories.tsx +++ b/src/renderer/components/uielements/assets/assetSelect/AssetSelect.stories.tsx @@ -3,8 +3,8 @@ import React from 'react' import { storiesOf } from '@storybook/react' import { bn } from '@thorchain/asgardex-util' +import { ASSETS_MAINNET } from '../../../../../shared/mock/assets' import { ONE_ASSET_BASE_AMOUNT } from '../../../../const' -import { ASSETS_MAINNET } from '../../../../mock/assets' import AssetSelect from './AssetSelect' storiesOf('Components/Assets/AssetSelect', module).add('default', () => { diff --git a/src/components/uielements/assets/assetSelect/AssetSelect.style.ts b/src/renderer/components/uielements/assets/assetSelect/AssetSelect.style.ts similarity index 100% rename from src/components/uielements/assets/assetSelect/AssetSelect.style.ts rename to src/renderer/components/uielements/assets/assetSelect/AssetSelect.style.ts diff --git a/src/components/uielements/assets/assetSelect/AssetSelect.tsx b/src/renderer/components/uielements/assets/assetSelect/AssetSelect.tsx similarity index 100% rename from src/components/uielements/assets/assetSelect/AssetSelect.tsx rename to src/renderer/components/uielements/assets/assetSelect/AssetSelect.tsx diff --git a/src/components/uielements/assets/assetSelect/AssetSelectData.style.tsx b/src/renderer/components/uielements/assets/assetSelect/AssetSelectData.style.tsx similarity index 100% rename from src/components/uielements/assets/assetSelect/AssetSelectData.style.tsx rename to src/renderer/components/uielements/assets/assetSelect/AssetSelectData.style.tsx diff --git a/src/components/uielements/assets/assetSelect/AssetSelectData.tsx b/src/renderer/components/uielements/assets/assetSelect/AssetSelectData.tsx similarity index 100% rename from src/components/uielements/assets/assetSelect/AssetSelectData.tsx rename to src/renderer/components/uielements/assets/assetSelect/AssetSelectData.tsx diff --git a/src/components/uielements/assets/assetSelect/index.ts b/src/renderer/components/uielements/assets/assetSelect/index.ts similarity index 100% rename from src/components/uielements/assets/assetSelect/index.ts rename to src/renderer/components/uielements/assets/assetSelect/index.ts diff --git a/src/components/uielements/backLink/BackLink.stories.tsx b/src/renderer/components/uielements/backLink/BackLink.stories.tsx similarity index 100% rename from src/components/uielements/backLink/BackLink.stories.tsx rename to src/renderer/components/uielements/backLink/BackLink.stories.tsx diff --git a/src/components/uielements/backLink/BackLink.style.tsx b/src/renderer/components/uielements/backLink/BackLink.style.tsx similarity index 100% rename from src/components/uielements/backLink/BackLink.style.tsx rename to src/renderer/components/uielements/backLink/BackLink.style.tsx diff --git a/src/components/uielements/backLink/BackLink.tsx b/src/renderer/components/uielements/backLink/BackLink.tsx similarity index 100% rename from src/components/uielements/backLink/BackLink.tsx rename to src/renderer/components/uielements/backLink/BackLink.tsx diff --git a/src/components/uielements/backLink/index.tsx b/src/renderer/components/uielements/backLink/index.tsx similarity index 100% rename from src/components/uielements/backLink/index.tsx rename to src/renderer/components/uielements/backLink/index.tsx diff --git a/src/components/uielements/button/button.stories.tsx b/src/renderer/components/uielements/button/button.stories.tsx similarity index 100% rename from src/components/uielements/button/button.stories.tsx rename to src/renderer/components/uielements/button/button.stories.tsx diff --git a/src/components/uielements/button/button.style.ts b/src/renderer/components/uielements/button/button.style.ts similarity index 100% rename from src/components/uielements/button/button.style.ts rename to src/renderer/components/uielements/button/button.style.ts diff --git a/src/components/uielements/button/button.tsx b/src/renderer/components/uielements/button/button.tsx similarity index 100% rename from src/components/uielements/button/button.tsx rename to src/renderer/components/uielements/button/button.tsx diff --git a/src/components/uielements/button/index.ts b/src/renderer/components/uielements/button/index.ts similarity index 100% rename from src/components/uielements/button/index.ts rename to src/renderer/components/uielements/button/index.ts diff --git a/src/components/uielements/button/types.ts b/src/renderer/components/uielements/button/types.ts similarity index 100% rename from src/components/uielements/button/types.ts rename to src/renderer/components/uielements/button/types.ts diff --git a/src/components/uielements/coins/coinInputAdvanced/CoinInputAdvanced.stories.tsx b/src/renderer/components/uielements/coins/coinInputAdvanced/CoinInputAdvanced.stories.tsx similarity index 100% rename from src/components/uielements/coins/coinInputAdvanced/CoinInputAdvanced.stories.tsx rename to src/renderer/components/uielements/coins/coinInputAdvanced/CoinInputAdvanced.stories.tsx diff --git a/src/components/uielements/coins/coinInputAdvanced/CoinInputAdvanced.style.ts b/src/renderer/components/uielements/coins/coinInputAdvanced/CoinInputAdvanced.style.ts similarity index 100% rename from src/components/uielements/coins/coinInputAdvanced/CoinInputAdvanced.style.ts rename to src/renderer/components/uielements/coins/coinInputAdvanced/CoinInputAdvanced.style.ts diff --git a/src/components/uielements/coins/coinInputAdvanced/CoinInputAdvanced.test.tsx b/src/renderer/components/uielements/coins/coinInputAdvanced/CoinInputAdvanced.test.tsx similarity index 100% rename from src/components/uielements/coins/coinInputAdvanced/CoinInputAdvanced.test.tsx rename to src/renderer/components/uielements/coins/coinInputAdvanced/CoinInputAdvanced.test.tsx diff --git a/src/components/uielements/coins/coinInputAdvanced/CoinInputAdvanced.tsx b/src/renderer/components/uielements/coins/coinInputAdvanced/CoinInputAdvanced.tsx similarity index 100% rename from src/components/uielements/coins/coinInputAdvanced/CoinInputAdvanced.tsx rename to src/renderer/components/uielements/coins/coinInputAdvanced/CoinInputAdvanced.tsx diff --git a/src/components/uielements/coins/coinInputAdvanced/index.ts b/src/renderer/components/uielements/coins/coinInputAdvanced/index.ts similarity index 100% rename from src/components/uielements/coins/coinInputAdvanced/index.ts rename to src/renderer/components/uielements/coins/coinInputAdvanced/index.ts diff --git a/src/components/uielements/contentTitle/ContentTitle.stories.tsx b/src/renderer/components/uielements/contentTitle/ContentTitle.stories.tsx similarity index 100% rename from src/components/uielements/contentTitle/ContentTitle.stories.tsx rename to src/renderer/components/uielements/contentTitle/ContentTitle.stories.tsx diff --git a/src/components/uielements/contentTitle/ContentTitle.style.tsx b/src/renderer/components/uielements/contentTitle/ContentTitle.style.tsx similarity index 100% rename from src/components/uielements/contentTitle/ContentTitle.style.tsx rename to src/renderer/components/uielements/contentTitle/ContentTitle.style.tsx diff --git a/src/components/uielements/contentTitle/ContentTitle.tsx b/src/renderer/components/uielements/contentTitle/ContentTitle.tsx similarity index 100% rename from src/components/uielements/contentTitle/ContentTitle.tsx rename to src/renderer/components/uielements/contentTitle/ContentTitle.tsx diff --git a/src/components/uielements/contentTitle/index.tsx b/src/renderer/components/uielements/contentTitle/index.tsx similarity index 100% rename from src/components/uielements/contentTitle/index.tsx rename to src/renderer/components/uielements/contentTitle/index.tsx diff --git a/src/components/uielements/drag/Drag.stories.tsx b/src/renderer/components/uielements/drag/Drag.stories.tsx similarity index 86% rename from src/components/uielements/drag/Drag.stories.tsx rename to src/renderer/components/uielements/drag/Drag.stories.tsx index 0ed73b4e8..fb4a83922 100644 --- a/src/components/uielements/drag/Drag.stories.tsx +++ b/src/renderer/components/uielements/drag/Drag.stories.tsx @@ -3,7 +3,7 @@ import React from 'react' import { storiesOf } from '@storybook/react' -import { ASSETS_MAINNET } from '../../../mock/assets' +import { ASSETS_MAINNET } from '../../../../shared/mock/assets' import Drag from './Drag' storiesOf('Components/Drag', module).add('default', () => { diff --git a/src/components/uielements/drag/Drag.style.tsx b/src/renderer/components/uielements/drag/Drag.style.tsx similarity index 100% rename from src/components/uielements/drag/Drag.style.tsx rename to src/renderer/components/uielements/drag/Drag.style.tsx diff --git a/src/components/uielements/drag/Drag.tsx b/src/renderer/components/uielements/drag/Drag.tsx similarity index 100% rename from src/components/uielements/drag/Drag.tsx rename to src/renderer/components/uielements/drag/Drag.tsx diff --git a/src/components/uielements/drag/index.tsx b/src/renderer/components/uielements/drag/index.tsx similarity index 100% rename from src/components/uielements/drag/index.tsx rename to src/renderer/components/uielements/drag/index.tsx diff --git a/src/components/uielements/filterMenu/FilterMenu.stories.tsx b/src/renderer/components/uielements/filterMenu/FilterMenu.stories.tsx similarity index 96% rename from src/components/uielements/filterMenu/FilterMenu.stories.tsx rename to src/renderer/components/uielements/filterMenu/FilterMenu.stories.tsx index 5c8493d67..545a1d3ef 100644 --- a/src/components/uielements/filterMenu/FilterMenu.stories.tsx +++ b/src/renderer/components/uielements/filterMenu/FilterMenu.stories.tsx @@ -3,8 +3,8 @@ import React from 'react' import { storiesOf } from '@storybook/react' import { assetAmount, assetToBase } from '@thorchain/asgardex-util' +import { ASSETS_MAINNET } from '../../../../shared/mock/assets' import { ONE_ASSET_BASE_AMOUNT } from '../../../const' -import { ASSETS_MAINNET } from '../../../mock/assets' import { AssetPair } from '../../../types/asgardex' import AssetData from '../assets/assetData' import FilterMenu from './FilterMenu' diff --git a/src/components/uielements/filterMenu/FilterMenu.style.tsx b/src/renderer/components/uielements/filterMenu/FilterMenu.style.tsx similarity index 100% rename from src/components/uielements/filterMenu/FilterMenu.style.tsx rename to src/renderer/components/uielements/filterMenu/FilterMenu.style.tsx diff --git a/src/components/uielements/filterMenu/FilterMenu.tsx b/src/renderer/components/uielements/filterMenu/FilterMenu.tsx similarity index 100% rename from src/components/uielements/filterMenu/FilterMenu.tsx rename to src/renderer/components/uielements/filterMenu/FilterMenu.tsx diff --git a/src/components/uielements/filterMenu/index.tsx b/src/renderer/components/uielements/filterMenu/index.tsx similarity index 100% rename from src/components/uielements/filterMenu/index.tsx rename to src/renderer/components/uielements/filterMenu/index.tsx diff --git a/src/components/uielements/headline/Headline.stories.tsx b/src/renderer/components/uielements/headline/Headline.stories.tsx similarity index 100% rename from src/components/uielements/headline/Headline.stories.tsx rename to src/renderer/components/uielements/headline/Headline.stories.tsx diff --git a/src/components/uielements/headline/Headline.style.ts b/src/renderer/components/uielements/headline/Headline.style.ts similarity index 100% rename from src/components/uielements/headline/Headline.style.ts rename to src/renderer/components/uielements/headline/Headline.style.ts diff --git a/src/components/uielements/headline/index.ts b/src/renderer/components/uielements/headline/index.ts similarity index 100% rename from src/components/uielements/headline/index.ts rename to src/renderer/components/uielements/headline/index.ts diff --git a/src/components/uielements/input/Input.stories.tsx b/src/renderer/components/uielements/input/Input.stories.tsx similarity index 100% rename from src/components/uielements/input/Input.stories.tsx rename to src/renderer/components/uielements/input/Input.stories.tsx diff --git a/src/components/uielements/input/Input.style.tsx b/src/renderer/components/uielements/input/Input.style.tsx similarity index 100% rename from src/components/uielements/input/Input.style.tsx rename to src/renderer/components/uielements/input/Input.style.tsx diff --git a/src/components/uielements/input/index.tsx b/src/renderer/components/uielements/input/index.tsx similarity index 100% rename from src/components/uielements/input/index.tsx rename to src/renderer/components/uielements/input/index.tsx diff --git a/src/components/uielements/input/types.ts b/src/renderer/components/uielements/input/types.ts similarity index 100% rename from src/components/uielements/input/types.ts rename to src/renderer/components/uielements/input/types.ts diff --git a/src/components/uielements/label/index.ts b/src/renderer/components/uielements/label/index.ts similarity index 100% rename from src/components/uielements/label/index.ts rename to src/renderer/components/uielements/label/index.ts diff --git a/src/components/uielements/label/label.stories.tsx b/src/renderer/components/uielements/label/label.stories.tsx similarity index 100% rename from src/components/uielements/label/label.stories.tsx rename to src/renderer/components/uielements/label/label.stories.tsx diff --git a/src/components/uielements/label/label.style.ts b/src/renderer/components/uielements/label/label.style.ts similarity index 100% rename from src/components/uielements/label/label.style.ts rename to src/renderer/components/uielements/label/label.style.ts diff --git a/src/components/uielements/label/label.tsx b/src/renderer/components/uielements/label/label.tsx similarity index 100% rename from src/components/uielements/label/label.tsx rename to src/renderer/components/uielements/label/label.tsx diff --git a/src/components/uielements/label/types.ts b/src/renderer/components/uielements/label/types.ts similarity index 100% rename from src/components/uielements/label/types.ts rename to src/renderer/components/uielements/label/types.ts diff --git a/src/components/uielements/modal/Modal.stories.tsx b/src/renderer/components/uielements/modal/Modal.stories.tsx similarity index 100% rename from src/components/uielements/modal/Modal.stories.tsx rename to src/renderer/components/uielements/modal/Modal.stories.tsx diff --git a/src/components/uielements/modal/Modal.style.tsx b/src/renderer/components/uielements/modal/Modal.style.tsx similarity index 100% rename from src/components/uielements/modal/Modal.style.tsx rename to src/renderer/components/uielements/modal/Modal.style.tsx diff --git a/src/components/uielements/modal/Modal.tsx b/src/renderer/components/uielements/modal/Modal.tsx similarity index 100% rename from src/components/uielements/modal/Modal.tsx rename to src/renderer/components/uielements/modal/Modal.tsx diff --git a/src/components/uielements/modal/index.tsx b/src/renderer/components/uielements/modal/index.tsx similarity index 100% rename from src/components/uielements/modal/index.tsx rename to src/renderer/components/uielements/modal/index.tsx diff --git a/src/components/uielements/poolShare/PoolShare.stories.tsx b/src/renderer/components/uielements/poolShare/PoolShare.stories.tsx similarity index 100% rename from src/components/uielements/poolShare/PoolShare.stories.tsx rename to src/renderer/components/uielements/poolShare/PoolShare.stories.tsx diff --git a/src/components/uielements/poolShare/PoolShare.style.ts b/src/renderer/components/uielements/poolShare/PoolShare.style.ts similarity index 100% rename from src/components/uielements/poolShare/PoolShare.style.ts rename to src/renderer/components/uielements/poolShare/PoolShare.style.ts diff --git a/src/components/uielements/poolShare/PoolShare.tsx b/src/renderer/components/uielements/poolShare/PoolShare.tsx similarity index 100% rename from src/components/uielements/poolShare/PoolShare.tsx rename to src/renderer/components/uielements/poolShare/PoolShare.tsx diff --git a/src/components/uielements/poolShare/index.tsx b/src/renderer/components/uielements/poolShare/index.tsx similarity index 100% rename from src/components/uielements/poolShare/index.tsx rename to src/renderer/components/uielements/poolShare/index.tsx diff --git a/src/components/uielements/poolStatus/PoolStatus.stories.tsx b/src/renderer/components/uielements/poolStatus/PoolStatus.stories.tsx similarity index 100% rename from src/components/uielements/poolStatus/PoolStatus.stories.tsx rename to src/renderer/components/uielements/poolStatus/PoolStatus.stories.tsx diff --git a/src/components/uielements/poolStatus/PoolStatus.style.tsx b/src/renderer/components/uielements/poolStatus/PoolStatus.style.tsx similarity index 100% rename from src/components/uielements/poolStatus/PoolStatus.style.tsx rename to src/renderer/components/uielements/poolStatus/PoolStatus.style.tsx diff --git a/src/components/uielements/poolStatus/PoolStatus.tsx b/src/renderer/components/uielements/poolStatus/PoolStatus.tsx similarity index 100% rename from src/components/uielements/poolStatus/PoolStatus.tsx rename to src/renderer/components/uielements/poolStatus/PoolStatus.tsx diff --git a/src/components/uielements/poolStatus/index.tsx b/src/renderer/components/uielements/poolStatus/index.tsx similarity index 100% rename from src/components/uielements/poolStatus/index.tsx rename to src/renderer/components/uielements/poolStatus/index.tsx diff --git a/src/components/uielements/selection/Selection.stories.tsx b/src/renderer/components/uielements/selection/Selection.stories.tsx similarity index 100% rename from src/components/uielements/selection/Selection.stories.tsx rename to src/renderer/components/uielements/selection/Selection.stories.tsx diff --git a/src/components/uielements/selection/Selection.style.tsx b/src/renderer/components/uielements/selection/Selection.style.tsx similarity index 100% rename from src/components/uielements/selection/Selection.style.tsx rename to src/renderer/components/uielements/selection/Selection.style.tsx diff --git a/src/components/uielements/selection/Selection.tsx b/src/renderer/components/uielements/selection/Selection.tsx similarity index 100% rename from src/components/uielements/selection/Selection.tsx rename to src/renderer/components/uielements/selection/Selection.tsx diff --git a/src/components/uielements/selection/index.tsx b/src/renderer/components/uielements/selection/index.tsx similarity index 100% rename from src/components/uielements/selection/index.tsx rename to src/renderer/components/uielements/selection/index.tsx diff --git a/src/components/uielements/slider/Slider.stories.tsx b/src/renderer/components/uielements/slider/Slider.stories.tsx similarity index 100% rename from src/components/uielements/slider/Slider.stories.tsx rename to src/renderer/components/uielements/slider/Slider.stories.tsx diff --git a/src/components/uielements/slider/Slider.style.tsx b/src/renderer/components/uielements/slider/Slider.style.tsx similarity index 100% rename from src/components/uielements/slider/Slider.style.tsx rename to src/renderer/components/uielements/slider/Slider.style.tsx diff --git a/src/components/uielements/slider/Slider.tsx b/src/renderer/components/uielements/slider/Slider.tsx similarity index 100% rename from src/components/uielements/slider/Slider.tsx rename to src/renderer/components/uielements/slider/Slider.tsx diff --git a/src/components/uielements/slider/index.tsx b/src/renderer/components/uielements/slider/index.tsx similarity index 100% rename from src/components/uielements/slider/index.tsx rename to src/renderer/components/uielements/slider/index.tsx diff --git a/src/components/uielements/status/Status.stories.tsx b/src/renderer/components/uielements/status/Status.stories.tsx similarity index 100% rename from src/components/uielements/status/Status.stories.tsx rename to src/renderer/components/uielements/status/Status.stories.tsx diff --git a/src/components/uielements/status/Status.style.ts b/src/renderer/components/uielements/status/Status.style.ts similarity index 100% rename from src/components/uielements/status/Status.style.ts rename to src/renderer/components/uielements/status/Status.style.ts diff --git a/src/components/uielements/status/Status.tsx b/src/renderer/components/uielements/status/Status.tsx similarity index 100% rename from src/components/uielements/status/Status.tsx rename to src/renderer/components/uielements/status/Status.tsx diff --git a/src/components/uielements/status/index.tsx b/src/renderer/components/uielements/status/index.tsx similarity index 100% rename from src/components/uielements/status/index.tsx rename to src/renderer/components/uielements/status/index.tsx diff --git a/src/components/uielements/stepBar/StepBar.stories.tsx b/src/renderer/components/uielements/stepBar/StepBar.stories.tsx similarity index 100% rename from src/components/uielements/stepBar/StepBar.stories.tsx rename to src/renderer/components/uielements/stepBar/StepBar.stories.tsx diff --git a/src/components/uielements/stepBar/StepBar.style.tsx b/src/renderer/components/uielements/stepBar/StepBar.style.tsx similarity index 100% rename from src/components/uielements/stepBar/StepBar.style.tsx rename to src/renderer/components/uielements/stepBar/StepBar.style.tsx diff --git a/src/components/uielements/stepBar/StepBar.tsx b/src/renderer/components/uielements/stepBar/StepBar.tsx similarity index 100% rename from src/components/uielements/stepBar/StepBar.tsx rename to src/renderer/components/uielements/stepBar/StepBar.tsx diff --git a/src/components/uielements/stepBar/index.tsx b/src/renderer/components/uielements/stepBar/index.tsx similarity index 100% rename from src/components/uielements/stepBar/index.tsx rename to src/renderer/components/uielements/stepBar/index.tsx diff --git a/src/components/uielements/table/data.ts b/src/renderer/components/uielements/table/data.ts similarity index 100% rename from src/components/uielements/table/data.ts rename to src/renderer/components/uielements/table/data.ts diff --git a/src/components/uielements/table/index.ts b/src/renderer/components/uielements/table/index.ts similarity index 100% rename from src/components/uielements/table/index.ts rename to src/renderer/components/uielements/table/index.ts diff --git a/src/components/uielements/table/table.stories.tsx b/src/renderer/components/uielements/table/table.stories.tsx similarity index 100% rename from src/components/uielements/table/table.stories.tsx rename to src/renderer/components/uielements/table/table.stories.tsx diff --git a/src/components/uielements/table/table.style.ts b/src/renderer/components/uielements/table/table.style.ts similarity index 100% rename from src/components/uielements/table/table.style.ts rename to src/renderer/components/uielements/table/table.style.ts diff --git a/src/components/uielements/table/table.tsx b/src/renderer/components/uielements/table/table.tsx similarity index 100% rename from src/components/uielements/table/table.tsx rename to src/renderer/components/uielements/table/table.tsx diff --git a/src/components/uielements/tokenDetailCard/TokenDetailCard.stories.tsx b/src/renderer/components/uielements/tokenDetailCard/TokenDetailCard.stories.tsx similarity index 88% rename from src/components/uielements/tokenDetailCard/TokenDetailCard.stories.tsx rename to src/renderer/components/uielements/tokenDetailCard/TokenDetailCard.stories.tsx index 475c9cd59..e41ea0524 100644 --- a/src/components/uielements/tokenDetailCard/TokenDetailCard.stories.tsx +++ b/src/renderer/components/uielements/tokenDetailCard/TokenDetailCard.stories.tsx @@ -3,7 +3,7 @@ import React from 'react' import { storiesOf } from '@storybook/react' import BigNumber from 'bignumber.js' -import { ASSETS_MAINNET } from '../../../mock/assets' +import { ASSETS_MAINNET } from '../../../../shared/mock/assets' import TokenDetailCard from './TokenDetailCard' storiesOf('Components/TokenDetailCard', module).add('default', () => { diff --git a/src/components/uielements/tokenDetailCard/TokenDetailCard.style.tsx b/src/renderer/components/uielements/tokenDetailCard/TokenDetailCard.style.tsx similarity index 100% rename from src/components/uielements/tokenDetailCard/TokenDetailCard.style.tsx rename to src/renderer/components/uielements/tokenDetailCard/TokenDetailCard.style.tsx diff --git a/src/components/uielements/tokenDetailCard/TokenDetailCard.tsx b/src/renderer/components/uielements/tokenDetailCard/TokenDetailCard.tsx similarity index 100% rename from src/components/uielements/tokenDetailCard/TokenDetailCard.tsx rename to src/renderer/components/uielements/tokenDetailCard/TokenDetailCard.tsx diff --git a/src/components/uielements/tokenDetailCard/index.tsx b/src/renderer/components/uielements/tokenDetailCard/index.tsx similarity index 100% rename from src/components/uielements/tokenDetailCard/index.tsx rename to src/renderer/components/uielements/tokenDetailCard/index.tsx diff --git a/src/components/uielements/trend/index.ts b/src/renderer/components/uielements/trend/index.ts similarity index 100% rename from src/components/uielements/trend/index.ts rename to src/renderer/components/uielements/trend/index.ts diff --git a/src/components/uielements/trend/trend.stories.tsx b/src/renderer/components/uielements/trend/trend.stories.tsx similarity index 100% rename from src/components/uielements/trend/trend.stories.tsx rename to src/renderer/components/uielements/trend/trend.stories.tsx diff --git a/src/components/uielements/trend/trend.style.ts b/src/renderer/components/uielements/trend/trend.style.ts similarity index 100% rename from src/components/uielements/trend/trend.style.ts rename to src/renderer/components/uielements/trend/trend.style.ts diff --git a/src/components/uielements/trend/trend.tsx b/src/renderer/components/uielements/trend/trend.tsx similarity index 100% rename from src/components/uielements/trend/trend.tsx rename to src/renderer/components/uielements/trend/trend.tsx diff --git a/src/components/uielements/txTimer/TxTimer.stories.tsx b/src/renderer/components/uielements/txTimer/TxTimer.stories.tsx similarity index 100% rename from src/components/uielements/txTimer/TxTimer.stories.tsx rename to src/renderer/components/uielements/txTimer/TxTimer.stories.tsx diff --git a/src/components/uielements/txTimer/TxTimer.style.tsx b/src/renderer/components/uielements/txTimer/TxTimer.style.tsx similarity index 100% rename from src/components/uielements/txTimer/TxTimer.style.tsx rename to src/renderer/components/uielements/txTimer/TxTimer.style.tsx diff --git a/src/components/uielements/txTimer/TxTimer.tsx b/src/renderer/components/uielements/txTimer/TxTimer.tsx similarity index 100% rename from src/components/uielements/txTimer/TxTimer.tsx rename to src/renderer/components/uielements/txTimer/TxTimer.tsx diff --git a/src/components/uielements/txTimer/index.ts b/src/renderer/components/uielements/txTimer/index.ts similarity index 100% rename from src/components/uielements/txTimer/index.ts rename to src/renderer/components/uielements/txTimer/index.ts diff --git a/src/components/wallet/AccountSelector.stories.tsx b/src/renderer/components/wallet/AccountSelector.stories.tsx similarity index 83% rename from src/components/wallet/AccountSelector.stories.tsx rename to src/renderer/components/wallet/AccountSelector.stories.tsx index 6a271f111..02460c8dc 100644 --- a/src/components/wallet/AccountSelector.stories.tsx +++ b/src/renderer/components/wallet/AccountSelector.stories.tsx @@ -2,7 +2,7 @@ import React from 'react' import { storiesOf } from '@storybook/react' -import { ASSETS_MAINNET } from '../../mock/assets' +import { ASSETS_MAINNET } from '../../../shared/mock/assets' import AccountSelector from './AccountSelector' storiesOf('Wallet/AccountSelector', module).add('default', () => { diff --git a/src/components/wallet/AccountSelector.style.tsx b/src/renderer/components/wallet/AccountSelector.style.tsx similarity index 100% rename from src/components/wallet/AccountSelector.style.tsx rename to src/renderer/components/wallet/AccountSelector.style.tsx diff --git a/src/components/wallet/AccountSelector.tsx b/src/renderer/components/wallet/AccountSelector.tsx similarity index 91% rename from src/components/wallet/AccountSelector.tsx rename to src/renderer/components/wallet/AccountSelector.tsx index 13c94c1ac..a95b94826 100644 --- a/src/components/wallet/AccountSelector.tsx +++ b/src/renderer/components/wallet/AccountSelector.tsx @@ -3,9 +3,9 @@ import React, { useCallback } from 'react' import { Asset } from '@thorchain/asgardex-util' import { Menu, Dropdown } from 'antd' -import { Size as CoinSize } from '../../components/uielements/assets/assetIcon/types' -import Label from '../../components/uielements/label' import AssetIcon from '../uielements/assets/assetIcon' +import { Size as CoinSize } from '../uielements/assets/assetIcon/types' +import Label from '../uielements/label' import { StyledCard, AssetWrapper, AssetInfoWrapper, AssetTitle } from './AccountSelector.style' type Props = { diff --git a/src/components/wallet/AssetDetails.style.tsx b/src/renderer/components/wallet/AssetDetails.style.tsx similarity index 98% rename from src/components/wallet/AssetDetails.style.tsx rename to src/renderer/components/wallet/AssetDetails.style.tsx index 02418ef53..9cb896dea 100644 --- a/src/components/wallet/AssetDetails.style.tsx +++ b/src/renderer/components/wallet/AssetDetails.style.tsx @@ -2,7 +2,7 @@ import { Card, Divider, Row, Col } from 'antd' import styled from 'styled-components' import { palette } from 'styled-theme' -import Label from '../../components/uielements/label' +import Label from '../uielements/label' export const StyledCard = styled(Card)` .ant-card-body { diff --git a/src/components/wallet/AssetDetails.tsx b/src/renderer/components/wallet/AssetDetails.tsx similarity index 97% rename from src/components/wallet/AssetDetails.tsx rename to src/renderer/components/wallet/AssetDetails.tsx index 4bf60d302..f740749da 100644 --- a/src/components/wallet/AssetDetails.tsx +++ b/src/renderer/components/wallet/AssetDetails.tsx @@ -5,11 +5,11 @@ import { Row, Col, Grid } from 'antd' import { useIntl } from 'react-intl' import { useHistory } from 'react-router-dom' -import Button from '../../components/uielements/button' -import { ASSETS_TESTNET } from '../../mock/assets' +import { ASSETS_TESTNET } from '../../../shared/mock/assets' import * as walletRoutes from '../../routes/wallet' import { UserTransactionType } from '../../types/wallet' import AssetIcon from '../uielements/assets/assetIcon' +import Button from '../uielements/button' import { StyledCard, StyledMobileCard, diff --git a/src/components/wallet/AssetsDetails.stories.tsx b/src/renderer/components/wallet/AssetsDetails.stories.tsx similarity index 100% rename from src/components/wallet/AssetsDetails.stories.tsx rename to src/renderer/components/wallet/AssetsDetails.stories.tsx diff --git a/src/components/wallet/AssetsNav.stories.tsx b/src/renderer/components/wallet/AssetsNav.stories.tsx similarity index 100% rename from src/components/wallet/AssetsNav.stories.tsx rename to src/renderer/components/wallet/AssetsNav.stories.tsx diff --git a/src/components/wallet/AssetsNav.style.tsx b/src/renderer/components/wallet/AssetsNav.style.tsx similarity index 100% rename from src/components/wallet/AssetsNav.style.tsx rename to src/renderer/components/wallet/AssetsNav.style.tsx diff --git a/src/components/wallet/AssetsNav.tsx b/src/renderer/components/wallet/AssetsNav.tsx similarity index 100% rename from src/components/wallet/AssetsNav.tsx rename to src/renderer/components/wallet/AssetsNav.tsx diff --git a/src/components/wallet/AssetsTable.stories.tsx b/src/renderer/components/wallet/AssetsTable.stories.tsx similarity index 100% rename from src/components/wallet/AssetsTable.stories.tsx rename to src/renderer/components/wallet/AssetsTable.stories.tsx diff --git a/src/components/wallet/AssetsTable.style.tsx b/src/renderer/components/wallet/AssetsTable.style.tsx similarity index 100% rename from src/components/wallet/AssetsTable.style.tsx rename to src/renderer/components/wallet/AssetsTable.style.tsx diff --git a/src/components/wallet/AssetsTable.tsx b/src/renderer/components/wallet/AssetsTable.tsx similarity index 97% rename from src/components/wallet/AssetsTable.tsx rename to src/renderer/components/wallet/AssetsTable.tsx index 0eac60dcf..d7f83dd89 100644 --- a/src/components/wallet/AssetsTable.tsx +++ b/src/renderer/components/wallet/AssetsTable.tsx @@ -18,15 +18,15 @@ import * as O from 'fp-ts/lib/Option' import { useIntl } from 'react-intl' import { useHistory } from 'react-router-dom' -import ErrorView from '../../components/shared/error/ErrorView' -import Label from '../../components/uielements/label' import { RUNE_PRICE_POOL } from '../../const' import * as walletRoutes from '../../routes/wallet' import { BalancesRD } from '../../services/binance/types' import { bncSymbolToAsset, bncSymbolToAssetString, getPoolPriceValue } from '../../services/binance/utils' import { PoolDetails } from '../../services/midgard/types' import { PricePool } from '../../views/pools/types' +import ErrorView from '../shared/error/ErrorView' import AssetIcon from '../uielements/assets/assetIcon' +import Label from '../uielements/label' import { TableWrapper } from './AssetsTable.style' type Props = { diff --git a/src/components/wallet/ImportPhrase.tsx b/src/renderer/components/wallet/ImportPhrase.tsx similarity index 99% rename from src/components/wallet/ImportPhrase.tsx rename to src/renderer/components/wallet/ImportPhrase.tsx index 20d8a9cf7..226471dfc 100644 --- a/src/components/wallet/ImportPhrase.tsx +++ b/src/renderer/components/wallet/ImportPhrase.tsx @@ -15,7 +15,7 @@ import { useBinanceContext } from '../../contexts/BinanceContext' import { useWalletContext } from '../../contexts/WalletContext' import * as walletRoutes from '../../routes/wallet' import Button from '../uielements/button' -import { InputPassword, InputTextArea } from '../uielements/input/' +import { InputPassword, InputTextArea } from '../uielements/input' const ImportPhrase: React.FC = (): JSX.Element => { const history = useHistory() diff --git a/src/components/wallet/NewMnemonic.tsx b/src/renderer/components/wallet/NewMnemonic.tsx similarity index 100% rename from src/components/wallet/NewMnemonic.tsx rename to src/renderer/components/wallet/NewMnemonic.tsx diff --git a/src/components/wallet/NewMnemonicConfirm.test.ts b/src/renderer/components/wallet/NewMnemonicConfirm.test.ts similarity index 100% rename from src/components/wallet/NewMnemonicConfirm.test.ts rename to src/renderer/components/wallet/NewMnemonicConfirm.test.ts diff --git a/src/components/wallet/NewMnemonicConfirm.tsx b/src/renderer/components/wallet/NewMnemonicConfirm.tsx similarity index 100% rename from src/components/wallet/NewMnemonicConfirm.tsx rename to src/renderer/components/wallet/NewMnemonicConfirm.tsx diff --git a/src/components/wallet/NewMnemonicGenerate.tsx b/src/renderer/components/wallet/NewMnemonicGenerate.tsx similarity index 96% rename from src/components/wallet/NewMnemonicGenerate.tsx rename to src/renderer/components/wallet/NewMnemonicGenerate.tsx index 17d76b9f1..8a87234ff 100644 --- a/src/components/wallet/NewMnemonicGenerate.tsx +++ b/src/renderer/components/wallet/NewMnemonicGenerate.tsx @@ -5,7 +5,7 @@ import { Form, Button } from 'antd' import { Rule } from 'antd/lib/form' import { Store } from 'antd/lib/form/interface' -import { Input } from '../../components/uielements/input' +import { Input } from '../uielements/input' type Props = {} const NewMnemonicGenerate: React.FC = (_: Props): JSX.Element => { diff --git a/src/components/wallet/Receive.stories.tsx b/src/renderer/components/wallet/Receive.stories.tsx similarity index 100% rename from src/components/wallet/Receive.stories.tsx rename to src/renderer/components/wallet/Receive.stories.tsx diff --git a/src/components/wallet/Receive.style.tsx b/src/renderer/components/wallet/Receive.style.tsx similarity index 100% rename from src/components/wallet/Receive.style.tsx rename to src/renderer/components/wallet/Receive.style.tsx diff --git a/src/components/wallet/Receive.tsx b/src/renderer/components/wallet/Receive.tsx similarity index 98% rename from src/components/wallet/Receive.tsx rename to src/renderer/components/wallet/Receive.tsx index dcbe672be..89c1c0968 100644 --- a/src/components/wallet/Receive.tsx +++ b/src/renderer/components/wallet/Receive.tsx @@ -5,7 +5,7 @@ import { Grid, Row, Col } from 'antd' import QRCode from 'qrcode' import { useHistory } from 'react-router-dom' -import { ASSETS_MAINNET } from '../../mock/assets' +import { ASSETS_MAINNET } from '../../../shared/mock/assets' import AccountSelector from './AccountSelector' import { StyledBackLabel, diff --git a/src/components/wallet/Send.stories.tsx b/src/renderer/components/wallet/Send.stories.tsx similarity index 100% rename from src/components/wallet/Send.stories.tsx rename to src/renderer/components/wallet/Send.stories.tsx diff --git a/src/components/wallet/Send.style.tsx b/src/renderer/components/wallet/Send.style.tsx similarity index 94% rename from src/components/wallet/Send.style.tsx rename to src/renderer/components/wallet/Send.style.tsx index f56373fa6..afe9b6405 100644 --- a/src/components/wallet/Send.style.tsx +++ b/src/renderer/components/wallet/Send.style.tsx @@ -2,7 +2,7 @@ import { Col, Form } from 'antd' import styled from 'styled-components' import { palette } from 'styled-theme' -import Label from '../../components/uielements/label' +import Label from '../uielements/label' export const StyledCol = styled(Col)` padding: 20px 30px; diff --git a/src/components/wallet/Send.tsx b/src/renderer/components/wallet/Send.tsx similarity index 93% rename from src/components/wallet/Send.tsx rename to src/renderer/components/wallet/Send.tsx index 5535e4b63..d1b20abeb 100644 --- a/src/components/wallet/Send.tsx +++ b/src/renderer/components/wallet/Send.tsx @@ -6,9 +6,9 @@ import { Store } from 'antd/lib/form/interface' import { useIntl } from 'react-intl' import { useHistory } from 'react-router-dom' -import Button from '../../components/uielements/button' -import { Input } from '../../components/uielements/input' -import { ASSETS_MAINNET } from '../../mock/assets' +import { ASSETS_MAINNET } from '../../../shared/mock/assets' +import Button from '../uielements/button' +import { Input } from '../uielements/input' import AccountSelector from './AccountSelector' import { StyledCol, diff --git a/src/components/wallet/Settings.stories.tsx b/src/renderer/components/wallet/Settings.stories.tsx similarity index 100% rename from src/components/wallet/Settings.stories.tsx rename to src/renderer/components/wallet/Settings.stories.tsx diff --git a/src/components/wallet/Settings.style.tsx b/src/renderer/components/wallet/Settings.style.tsx similarity index 100% rename from src/components/wallet/Settings.style.tsx rename to src/renderer/components/wallet/Settings.style.tsx diff --git a/src/components/wallet/Settings.tsx b/src/renderer/components/wallet/Settings.tsx similarity index 100% rename from src/components/wallet/Settings.tsx rename to src/renderer/components/wallet/Settings.tsx diff --git a/src/components/wallet/UnlockForm.stories.tsx b/src/renderer/components/wallet/UnlockForm.stories.tsx similarity index 100% rename from src/components/wallet/UnlockForm.stories.tsx rename to src/renderer/components/wallet/UnlockForm.stories.tsx diff --git a/src/components/wallet/UnlockForm.style.tsx b/src/renderer/components/wallet/UnlockForm.style.tsx similarity index 100% rename from src/components/wallet/UnlockForm.style.tsx rename to src/renderer/components/wallet/UnlockForm.style.tsx diff --git a/src/components/wallet/UnlockForm.tsx b/src/renderer/components/wallet/UnlockForm.tsx similarity index 97% rename from src/components/wallet/UnlockForm.tsx rename to src/renderer/components/wallet/UnlockForm.tsx index eadde4822..b1afe1bbd 100644 --- a/src/components/wallet/UnlockForm.tsx +++ b/src/renderer/components/wallet/UnlockForm.tsx @@ -9,15 +9,15 @@ import { none, Option, some } from 'fp-ts/lib/Option' import { useIntl } from 'react-intl' import { useHistory, useLocation } from 'react-router-dom' -import { InputPassword } from '../../components/uielements/input' +import { IS_PRODUCTION } from '../../../shared/const' import { useWalletContext } from '../../contexts/WalletContext' import { envOrDefault } from '../../helpers/envHelper' import { RedirectRouteState } from '../../routes/types' import * as walletRoutes from '../../routes/wallet' import { KeystoreState } from '../../services/wallet/types' import { isLocked, hasImportedKeystore } from '../../services/wallet/util' -import { IS_PRODUCTION } from '../../shared/const' import BackLink from '../uielements/backLink' +import { InputPassword } from '../uielements/input' import * as Styled from './UnlockForm.style' type Props = { diff --git a/src/components/wallet/UserTransactionTable.style.tsx b/src/renderer/components/wallet/UserTransactionTable.style.tsx similarity index 94% rename from src/components/wallet/UserTransactionTable.style.tsx rename to src/renderer/components/wallet/UserTransactionTable.style.tsx index 07deb32c3..410ad8e86 100644 --- a/src/components/wallet/UserTransactionTable.style.tsx +++ b/src/renderer/components/wallet/UserTransactionTable.style.tsx @@ -2,7 +2,7 @@ import { Typography } from 'antd' import styled from 'styled-components' import { palette } from 'styled-theme' -import Table from '../../components/uielements/table' +import Table from '../uielements/table' const { Text } = Typography diff --git a/src/components/wallet/UserTransactionsTable.tsx b/src/renderer/components/wallet/UserTransactionsTable.tsx similarity index 100% rename from src/components/wallet/UserTransactionsTable.tsx rename to src/renderer/components/wallet/UserTransactionsTable.tsx diff --git a/src/const.ts b/src/renderer/const.ts similarity index 100% rename from src/const.ts rename to src/renderer/const.ts diff --git a/src/contexts/AppContext.tsx b/src/renderer/contexts/AppContext.tsx similarity index 100% rename from src/contexts/AppContext.tsx rename to src/renderer/contexts/AppContext.tsx diff --git a/src/contexts/BinanceContext.tsx b/src/renderer/contexts/BinanceContext.tsx similarity index 100% rename from src/contexts/BinanceContext.tsx rename to src/renderer/contexts/BinanceContext.tsx diff --git a/src/contexts/I18nContext.tsx b/src/renderer/contexts/I18nContext.tsx similarity index 100% rename from src/contexts/I18nContext.tsx rename to src/renderer/contexts/I18nContext.tsx diff --git a/src/contexts/MidgardContext.tsx b/src/renderer/contexts/MidgardContext.tsx similarity index 100% rename from src/contexts/MidgardContext.tsx rename to src/renderer/contexts/MidgardContext.tsx diff --git a/src/contexts/ThemeContext.test.tsx b/src/renderer/contexts/ThemeContext.test.tsx similarity index 100% rename from src/contexts/ThemeContext.test.tsx rename to src/renderer/contexts/ThemeContext.test.tsx diff --git a/src/contexts/ThemeContext.tsx b/src/renderer/contexts/ThemeContext.tsx similarity index 100% rename from src/contexts/ThemeContext.tsx rename to src/renderer/contexts/ThemeContext.tsx diff --git a/src/contexts/WalletContext.tsx b/src/renderer/contexts/WalletContext.tsx similarity index 100% rename from src/contexts/WalletContext.tsx rename to src/renderer/contexts/WalletContext.tsx diff --git a/src/helpers/array/index.ts b/src/renderer/helpers/array/index.ts similarity index 100% rename from src/helpers/array/index.ts rename to src/renderer/helpers/array/index.ts diff --git a/src/helpers/array/isSelectedHelper.ts b/src/renderer/helpers/array/isSelectedHelper.ts similarity index 100% rename from src/helpers/array/isSelectedHelper.ts rename to src/renderer/helpers/array/isSelectedHelper.ts diff --git a/src/helpers/array/isSelectedHepler.test.ts b/src/renderer/helpers/array/isSelectedHepler.test.ts similarity index 100% rename from src/helpers/array/isSelectedHepler.test.ts rename to src/renderer/helpers/array/isSelectedHepler.test.ts diff --git a/src/helpers/array/sortSelectedHelper.test.ts b/src/renderer/helpers/array/sortSelectedHelper.test.ts similarity index 100% rename from src/helpers/array/sortSelectedHelper.test.ts rename to src/renderer/helpers/array/sortSelectedHelper.test.ts diff --git a/src/helpers/array/sortSelectedHelper.ts b/src/renderer/helpers/array/sortSelectedHelper.ts similarity index 100% rename from src/helpers/array/sortSelectedHelper.ts rename to src/renderer/helpers/array/sortSelectedHelper.ts diff --git a/src/helpers/colorHelper.test.ts b/src/renderer/helpers/colorHelper.test.ts similarity index 100% rename from src/helpers/colorHelper.test.ts rename to src/renderer/helpers/colorHelper.test.ts diff --git a/src/helpers/colorHelpers.ts b/src/renderer/helpers/colorHelpers.ts similarity index 100% rename from src/helpers/colorHelpers.ts rename to src/renderer/helpers/colorHelpers.ts diff --git a/src/helpers/envHelper.test.ts b/src/renderer/helpers/envHelper.test.ts similarity index 100% rename from src/helpers/envHelper.test.ts rename to src/renderer/helpers/envHelper.test.ts diff --git a/src/helpers/envHelper.ts b/src/renderer/helpers/envHelper.ts similarity index 100% rename from src/helpers/envHelper.ts rename to src/renderer/helpers/envHelper.ts diff --git a/src/helpers/poolHelper.test.ts b/src/renderer/helpers/poolHelper.test.ts similarity index 98% rename from src/helpers/poolHelper.test.ts rename to src/renderer/helpers/poolHelper.test.ts index 2d3136966..4bd864f8c 100644 --- a/src/helpers/poolHelper.test.ts +++ b/src/renderer/helpers/poolHelper.test.ts @@ -1,7 +1,7 @@ import { PoolData, assetAmount, assetToBase } from '@thorchain/asgardex-util' import { some } from 'fp-ts/lib/Option' -import { ASSETS_TESTNET } from '../mock/assets' +import { ASSETS_TESTNET } from '../../shared/mock/assets' import { PoolDetails } from '../services/midgard/types' import { toPoolData } from '../services/midgard/utils' import { PoolDetailStatusEnum, PoolDetail } from '../types/generated/midgard' diff --git a/src/helpers/poolHelper.ts b/src/renderer/helpers/poolHelper.ts similarity index 100% rename from src/helpers/poolHelper.ts rename to src/renderer/helpers/poolHelper.ts diff --git a/src/helpers/stateHelper.ts b/src/renderer/helpers/stateHelper.ts similarity index 100% rename from src/helpers/stateHelper.ts rename to src/renderer/helpers/stateHelper.ts diff --git a/src/helpers/stringHelper.test.ts b/src/renderer/helpers/stringHelper.test.ts similarity index 100% rename from src/helpers/stringHelper.test.ts rename to src/renderer/helpers/stringHelper.test.ts diff --git a/src/helpers/stringHelper.ts b/src/renderer/helpers/stringHelper.ts similarity index 100% rename from src/helpers/stringHelper.ts rename to src/renderer/helpers/stringHelper.ts diff --git a/src/helpers/styleHelper.test.ts b/src/renderer/helpers/styleHelper.test.ts similarity index 100% rename from src/helpers/styleHelper.test.ts rename to src/renderer/helpers/styleHelper.test.ts diff --git a/src/helpers/styleHelper.ts b/src/renderer/helpers/styleHelper.ts similarity index 100% rename from src/helpers/styleHelper.ts rename to src/renderer/helpers/styleHelper.ts diff --git a/src/helpers/tokenHelper.test.ts b/src/renderer/helpers/tokenHelper.test.ts similarity index 100% rename from src/helpers/tokenHelper.test.ts rename to src/renderer/helpers/tokenHelper.test.ts diff --git a/src/helpers/tokenHelpers.ts b/src/renderer/helpers/tokenHelpers.ts similarity index 100% rename from src/helpers/tokenHelpers.ts rename to src/renderer/helpers/tokenHelpers.ts diff --git a/src/helpers/transactionHelpers.ts b/src/renderer/helpers/transactionHelpers.ts similarity index 100% rename from src/helpers/transactionHelpers.ts rename to src/renderer/helpers/transactionHelpers.ts diff --git a/src/hooks/useInterval.ts b/src/renderer/hooks/useInterval.ts similarity index 100% rename from src/hooks/useInterval.ts rename to src/renderer/hooks/useInterval.ts diff --git a/src/hooks/useOutsideClick.ts b/src/renderer/hooks/useOutsideClick.ts similarity index 100% rename from src/hooks/useOutsideClick.ts rename to src/renderer/hooks/useOutsideClick.ts diff --git a/src/hooks/useRemoteImage.test.ts b/src/renderer/hooks/useRemoteImage.test.ts similarity index 100% rename from src/hooks/useRemoteImage.test.ts rename to src/renderer/hooks/useRemoteImage.test.ts diff --git a/src/hooks/useRemoteImage.ts b/src/renderer/hooks/useRemoteImage.ts similarity index 100% rename from src/hooks/useRemoteImage.ts rename to src/renderer/hooks/useRemoteImage.ts diff --git a/src/i18n/de/common.ts b/src/renderer/i18n/de/common.ts similarity index 100% rename from src/i18n/de/common.ts rename to src/renderer/i18n/de/common.ts diff --git a/src/i18n/de/index.ts b/src/renderer/i18n/de/index.ts similarity index 100% rename from src/i18n/de/index.ts rename to src/renderer/i18n/de/index.ts diff --git a/src/i18n/de/pools.ts b/src/renderer/i18n/de/pools.ts similarity index 100% rename from src/i18n/de/pools.ts rename to src/renderer/i18n/de/pools.ts diff --git a/src/i18n/de/settings.ts b/src/renderer/i18n/de/settings.ts similarity index 100% rename from src/i18n/de/settings.ts rename to src/renderer/i18n/de/settings.ts diff --git a/src/i18n/de/wallet.ts b/src/renderer/i18n/de/wallet.ts similarity index 100% rename from src/i18n/de/wallet.ts rename to src/renderer/i18n/de/wallet.ts diff --git a/src/i18n/en/common.ts b/src/renderer/i18n/en/common.ts similarity index 100% rename from src/i18n/en/common.ts rename to src/renderer/i18n/en/common.ts diff --git a/src/i18n/en/index.ts b/src/renderer/i18n/en/index.ts similarity index 100% rename from src/i18n/en/index.ts rename to src/renderer/i18n/en/index.ts diff --git a/src/i18n/en/pools.ts b/src/renderer/i18n/en/pools.ts similarity index 100% rename from src/i18n/en/pools.ts rename to src/renderer/i18n/en/pools.ts diff --git a/src/i18n/en/settings.ts b/src/renderer/i18n/en/settings.ts similarity index 100% rename from src/i18n/en/settings.ts rename to src/renderer/i18n/en/settings.ts diff --git a/src/i18n/en/wallet.ts b/src/renderer/i18n/en/wallet.ts similarity index 100% rename from src/i18n/en/wallet.ts rename to src/renderer/i18n/en/wallet.ts diff --git a/src/i18n/fr/common.ts b/src/renderer/i18n/fr/common.ts similarity index 100% rename from src/i18n/fr/common.ts rename to src/renderer/i18n/fr/common.ts diff --git a/src/i18n/fr/index.ts b/src/renderer/i18n/fr/index.ts similarity index 100% rename from src/i18n/fr/index.ts rename to src/renderer/i18n/fr/index.ts diff --git a/src/i18n/fr/pools.ts b/src/renderer/i18n/fr/pools.ts similarity index 100% rename from src/i18n/fr/pools.ts rename to src/renderer/i18n/fr/pools.ts diff --git a/src/i18n/fr/settings.ts b/src/renderer/i18n/fr/settings.ts similarity index 100% rename from src/i18n/fr/settings.ts rename to src/renderer/i18n/fr/settings.ts diff --git a/src/i18n/fr/wallet.ts b/src/renderer/i18n/fr/wallet.ts similarity index 100% rename from src/i18n/fr/wallet.ts rename to src/renderer/i18n/fr/wallet.ts diff --git a/src/i18n/index.ts b/src/renderer/i18n/index.ts similarity index 100% rename from src/i18n/index.ts rename to src/renderer/i18n/index.ts diff --git a/src/i18n/types.ts b/src/renderer/i18n/types.ts similarity index 100% rename from src/i18n/types.ts rename to src/renderer/i18n/types.ts diff --git a/src/index.css b/src/renderer/index.css similarity index 100% rename from src/index.css rename to src/renderer/index.css diff --git a/src/index.tsx b/src/renderer/index.tsx similarity index 100% rename from src/index.tsx rename to src/renderer/index.tsx diff --git a/src/renderer/react-app-env.d.ts b/src/renderer/react-app-env.d.ts new file mode 100644 index 000000000..6431bc5fc --- /dev/null +++ b/src/renderer/react-app-env.d.ts @@ -0,0 +1 @@ +/// diff --git a/src/routes/app.test.ts b/src/renderer/routes/app.test.ts similarity index 100% rename from src/routes/app.test.ts rename to src/renderer/routes/app.test.ts diff --git a/src/routes/app.ts b/src/renderer/routes/app.ts similarity index 100% rename from src/routes/app.ts rename to src/renderer/routes/app.ts diff --git a/src/routes/playground.ts b/src/renderer/routes/playground.ts similarity index 100% rename from src/routes/playground.ts rename to src/renderer/routes/playground.ts diff --git a/src/routes/pools.test.ts b/src/renderer/routes/pools.test.ts similarity index 100% rename from src/routes/pools.test.ts rename to src/renderer/routes/pools.test.ts diff --git a/src/routes/pools.ts b/src/renderer/routes/pools.ts similarity index 100% rename from src/routes/pools.ts rename to src/renderer/routes/pools.ts diff --git a/src/routes/stake.test.ts b/src/renderer/routes/stake.test.ts similarity index 100% rename from src/routes/stake.test.ts rename to src/renderer/routes/stake.test.ts diff --git a/src/routes/stake.ts b/src/renderer/routes/stake.ts similarity index 100% rename from src/routes/stake.ts rename to src/renderer/routes/stake.ts diff --git a/src/routes/swap.test.ts b/src/renderer/routes/swap.test.ts similarity index 100% rename from src/routes/swap.test.ts rename to src/renderer/routes/swap.test.ts diff --git a/src/routes/swap.ts b/src/renderer/routes/swap.ts similarity index 100% rename from src/routes/swap.ts rename to src/renderer/routes/swap.ts diff --git a/src/routes/types.ts b/src/renderer/routes/types.ts similarity index 100% rename from src/routes/types.ts rename to src/renderer/routes/types.ts diff --git a/src/routes/wallet.test.ts b/src/renderer/routes/wallet.test.ts similarity index 100% rename from src/routes/wallet.test.ts rename to src/renderer/routes/wallet.test.ts diff --git a/src/routes/wallet.ts b/src/renderer/routes/wallet.ts similarity index 100% rename from src/routes/wallet.ts rename to src/renderer/routes/wallet.ts diff --git a/src/serviceWorker.ts b/src/renderer/serviceWorker.ts similarity index 100% rename from src/serviceWorker.ts rename to src/renderer/serviceWorker.ts diff --git a/src/services/app/service.ts b/src/renderer/services/app/service.ts similarity index 100% rename from src/services/app/service.ts rename to src/renderer/services/app/service.ts diff --git a/src/services/app/types.ts b/src/renderer/services/app/types.ts similarity index 100% rename from src/services/app/types.ts rename to src/renderer/services/app/types.ts diff --git a/src/services/binance/service.ts b/src/renderer/services/binance/service.ts similarity index 100% rename from src/services/binance/service.ts rename to src/renderer/services/binance/service.ts diff --git a/src/services/binance/types.ts b/src/renderer/services/binance/types.ts similarity index 100% rename from src/services/binance/types.ts rename to src/renderer/services/binance/types.ts diff --git a/src/services/binance/utils.test.ts b/src/renderer/services/binance/utils.test.ts similarity index 100% rename from src/services/binance/utils.test.ts rename to src/renderer/services/binance/utils.test.ts diff --git a/src/services/binance/utils.ts b/src/renderer/services/binance/utils.ts similarity index 94% rename from src/services/binance/utils.ts rename to src/renderer/services/binance/utils.ts index 4ce07903f..1e7da8e9d 100644 --- a/src/services/binance/utils.ts +++ b/src/renderer/services/binance/utils.ts @@ -15,8 +15,8 @@ import * as E from 'fp-ts/lib/Either' import * as FP from 'fp-ts/lib/function' import * as O from 'fp-ts/lib/Option' -import { PoolDetails } from '../../services/midgard/types' -import { getPoolDetail, toPoolData } from '../../services/midgard/utils' +import { PoolDetails } from '../midgard/types' +import { getPoolDetail, toPoolData } from '../midgard/utils' import { BinanceClientState, BinanceClientStateM, BinanceClientStateForViews } from './types' export const getBinanceClient = (clientState: BinanceClientState): O.Option => diff --git a/src/services/const.ts b/src/renderer/services/const.ts similarity index 100% rename from src/services/const.ts rename to src/renderer/services/const.ts diff --git a/src/services/i18n/service.ts b/src/renderer/services/i18n/service.ts similarity index 94% rename from src/services/i18n/service.ts rename to src/renderer/services/i18n/service.ts index 2ed024943..5c81ebc2c 100644 --- a/src/services/i18n/service.ts +++ b/src/renderer/services/i18n/service.ts @@ -1,9 +1,9 @@ import { ipcRenderer } from 'electron' +import IPCMessages from '../../../shared/ipc/messages' import { observableState } from '../../helpers/stateHelper' import { getLocaleFromString } from '../../i18n' import { Locale } from '../../i18n/types' -import IPCMessages from '../../shared/ipc/messages' const LOCALE_KEY = 'asgdx-locale' diff --git a/src/services/midgard/service.ts b/src/renderer/services/midgard/service.ts similarity index 100% rename from src/services/midgard/service.ts rename to src/renderer/services/midgard/service.ts diff --git a/src/services/midgard/types.ts b/src/renderer/services/midgard/types.ts similarity index 100% rename from src/services/midgard/types.ts rename to src/renderer/services/midgard/types.ts diff --git a/src/services/midgard/utils.test.ts b/src/renderer/services/midgard/utils.test.ts similarity index 100% rename from src/services/midgard/utils.test.ts rename to src/renderer/services/midgard/utils.test.ts diff --git a/src/services/midgard/utils.ts b/src/renderer/services/midgard/utils.ts similarity index 100% rename from src/services/midgard/utils.ts rename to src/renderer/services/midgard/utils.ts diff --git a/src/services/wallet/service.ts b/src/renderer/services/wallet/service.ts similarity index 100% rename from src/services/wallet/service.ts rename to src/renderer/services/wallet/service.ts diff --git a/src/services/wallet/types.ts b/src/renderer/services/wallet/types.ts similarity index 100% rename from src/services/wallet/types.ts rename to src/renderer/services/wallet/types.ts diff --git a/src/services/wallet/util.test.ts b/src/renderer/services/wallet/util.test.ts similarity index 100% rename from src/services/wallet/util.test.ts rename to src/renderer/services/wallet/util.test.ts diff --git a/src/services/wallet/util.ts b/src/renderer/services/wallet/util.ts similarity index 100% rename from src/services/wallet/util.ts rename to src/renderer/services/wallet/util.ts diff --git a/src/settings/style-util.ts b/src/renderer/settings/style-util.ts similarity index 100% rename from src/settings/style-util.ts rename to src/renderer/settings/style-util.ts diff --git a/src/types/asgardex.ts b/src/renderer/types/asgardex.ts similarity index 100% rename from src/types/asgardex.ts rename to src/renderer/types/asgardex.ts diff --git a/src/types/declarations.d.ts b/src/renderer/types/declarations.d.ts similarity index 100% rename from src/types/declarations.d.ts rename to src/renderer/types/declarations.d.ts diff --git a/src/types/generated/midgard/.gitignore b/src/renderer/types/generated/midgard/.gitignore similarity index 100% rename from src/types/generated/midgard/.gitignore rename to src/renderer/types/generated/midgard/.gitignore diff --git a/src/types/generated/midgard/.openapi-generator-ignore b/src/renderer/types/generated/midgard/.openapi-generator-ignore similarity index 100% rename from src/types/generated/midgard/.openapi-generator-ignore rename to src/renderer/types/generated/midgard/.openapi-generator-ignore diff --git a/src/types/generated/midgard/.openapi-generator/VERSION b/src/renderer/types/generated/midgard/.openapi-generator/VERSION similarity index 100% rename from src/types/generated/midgard/.openapi-generator/VERSION rename to src/renderer/types/generated/midgard/.openapi-generator/VERSION diff --git a/src/types/generated/midgard/apis/DefaultApi.ts b/src/renderer/types/generated/midgard/apis/DefaultApi.ts similarity index 100% rename from src/types/generated/midgard/apis/DefaultApi.ts rename to src/renderer/types/generated/midgard/apis/DefaultApi.ts diff --git a/src/types/generated/midgard/apis/DocumentationApi.ts b/src/renderer/types/generated/midgard/apis/DocumentationApi.ts similarity index 100% rename from src/types/generated/midgard/apis/DocumentationApi.ts rename to src/renderer/types/generated/midgard/apis/DocumentationApi.ts diff --git a/src/types/generated/midgard/apis/SpecificationApi.ts b/src/renderer/types/generated/midgard/apis/SpecificationApi.ts similarity index 100% rename from src/types/generated/midgard/apis/SpecificationApi.ts rename to src/renderer/types/generated/midgard/apis/SpecificationApi.ts diff --git a/src/types/generated/midgard/apis/index.ts b/src/renderer/types/generated/midgard/apis/index.ts similarity index 100% rename from src/types/generated/midgard/apis/index.ts rename to src/renderer/types/generated/midgard/apis/index.ts diff --git a/src/types/generated/midgard/index.ts b/src/renderer/types/generated/midgard/index.ts similarity index 100% rename from src/types/generated/midgard/index.ts rename to src/renderer/types/generated/midgard/index.ts diff --git a/src/types/generated/midgard/models/AssetDetail.ts b/src/renderer/types/generated/midgard/models/AssetDetail.ts similarity index 100% rename from src/types/generated/midgard/models/AssetDetail.ts rename to src/renderer/types/generated/midgard/models/AssetDetail.ts diff --git a/src/types/generated/midgard/models/BlockRewards.ts b/src/renderer/types/generated/midgard/models/BlockRewards.ts similarity index 100% rename from src/types/generated/midgard/models/BlockRewards.ts rename to src/renderer/types/generated/midgard/models/BlockRewards.ts diff --git a/src/types/generated/midgard/models/BondMetrics.ts b/src/renderer/types/generated/midgard/models/BondMetrics.ts similarity index 100% rename from src/types/generated/midgard/models/BondMetrics.ts rename to src/renderer/types/generated/midgard/models/BondMetrics.ts diff --git a/src/types/generated/midgard/models/Coin.ts b/src/renderer/types/generated/midgard/models/Coin.ts similarity index 100% rename from src/types/generated/midgard/models/Coin.ts rename to src/renderer/types/generated/midgard/models/Coin.ts diff --git a/src/types/generated/midgard/models/Event.ts b/src/renderer/types/generated/midgard/models/Event.ts similarity index 100% rename from src/types/generated/midgard/models/Event.ts rename to src/renderer/types/generated/midgard/models/Event.ts diff --git a/src/types/generated/midgard/models/Gas.ts b/src/renderer/types/generated/midgard/models/Gas.ts similarity index 100% rename from src/types/generated/midgard/models/Gas.ts rename to src/renderer/types/generated/midgard/models/Gas.ts diff --git a/src/types/generated/midgard/models/InlineResponse200.ts b/src/renderer/types/generated/midgard/models/InlineResponse200.ts similarity index 100% rename from src/types/generated/midgard/models/InlineResponse200.ts rename to src/renderer/types/generated/midgard/models/InlineResponse200.ts diff --git a/src/types/generated/midgard/models/InlineResponse2001.ts b/src/renderer/types/generated/midgard/models/InlineResponse2001.ts similarity index 100% rename from src/types/generated/midgard/models/InlineResponse2001.ts rename to src/renderer/types/generated/midgard/models/InlineResponse2001.ts diff --git a/src/types/generated/midgard/models/ModelError.ts b/src/renderer/types/generated/midgard/models/ModelError.ts similarity index 100% rename from src/types/generated/midgard/models/ModelError.ts rename to src/renderer/types/generated/midgard/models/ModelError.ts diff --git a/src/types/generated/midgard/models/NetworkInfo.ts b/src/renderer/types/generated/midgard/models/NetworkInfo.ts similarity index 100% rename from src/types/generated/midgard/models/NetworkInfo.ts rename to src/renderer/types/generated/midgard/models/NetworkInfo.ts diff --git a/src/types/generated/midgard/models/NodeKey.ts b/src/renderer/types/generated/midgard/models/NodeKey.ts similarity index 100% rename from src/types/generated/midgard/models/NodeKey.ts rename to src/renderer/types/generated/midgard/models/NodeKey.ts diff --git a/src/types/generated/midgard/models/Option.ts b/src/renderer/types/generated/midgard/models/Option.ts similarity index 100% rename from src/types/generated/midgard/models/Option.ts rename to src/renderer/types/generated/midgard/models/Option.ts diff --git a/src/types/generated/midgard/models/PoolDetail.ts b/src/renderer/types/generated/midgard/models/PoolDetail.ts similarity index 100% rename from src/types/generated/midgard/models/PoolDetail.ts rename to src/renderer/types/generated/midgard/models/PoolDetail.ts diff --git a/src/types/generated/midgard/models/StakersAddressData.ts b/src/renderer/types/generated/midgard/models/StakersAddressData.ts similarity index 100% rename from src/types/generated/midgard/models/StakersAddressData.ts rename to src/renderer/types/generated/midgard/models/StakersAddressData.ts diff --git a/src/types/generated/midgard/models/StakersAssetData.ts b/src/renderer/types/generated/midgard/models/StakersAssetData.ts similarity index 100% rename from src/types/generated/midgard/models/StakersAssetData.ts rename to src/renderer/types/generated/midgard/models/StakersAssetData.ts diff --git a/src/types/generated/midgard/models/StatsData.ts b/src/renderer/types/generated/midgard/models/StatsData.ts similarity index 100% rename from src/types/generated/midgard/models/StatsData.ts rename to src/renderer/types/generated/midgard/models/StatsData.ts diff --git a/src/types/generated/midgard/models/ThorchainBooleanConstants.ts b/src/renderer/types/generated/midgard/models/ThorchainBooleanConstants.ts similarity index 100% rename from src/types/generated/midgard/models/ThorchainBooleanConstants.ts rename to src/renderer/types/generated/midgard/models/ThorchainBooleanConstants.ts diff --git a/src/types/generated/midgard/models/ThorchainConstants.ts b/src/renderer/types/generated/midgard/models/ThorchainConstants.ts similarity index 100% rename from src/types/generated/midgard/models/ThorchainConstants.ts rename to src/renderer/types/generated/midgard/models/ThorchainConstants.ts diff --git a/src/types/generated/midgard/models/ThorchainEndpoint.ts b/src/renderer/types/generated/midgard/models/ThorchainEndpoint.ts similarity index 100% rename from src/types/generated/midgard/models/ThorchainEndpoint.ts rename to src/renderer/types/generated/midgard/models/ThorchainEndpoint.ts diff --git a/src/types/generated/midgard/models/ThorchainEndpoints.ts b/src/renderer/types/generated/midgard/models/ThorchainEndpoints.ts similarity index 100% rename from src/types/generated/midgard/models/ThorchainEndpoints.ts rename to src/renderer/types/generated/midgard/models/ThorchainEndpoints.ts diff --git a/src/types/generated/midgard/models/ThorchainInt64Constants.ts b/src/renderer/types/generated/midgard/models/ThorchainInt64Constants.ts similarity index 100% rename from src/types/generated/midgard/models/ThorchainInt64Constants.ts rename to src/renderer/types/generated/midgard/models/ThorchainInt64Constants.ts diff --git a/src/types/generated/midgard/models/ThorchainLastblock.ts b/src/renderer/types/generated/midgard/models/ThorchainLastblock.ts similarity index 100% rename from src/types/generated/midgard/models/ThorchainLastblock.ts rename to src/renderer/types/generated/midgard/models/ThorchainLastblock.ts diff --git a/src/types/generated/midgard/models/ThorchainStringConstants.ts b/src/renderer/types/generated/midgard/models/ThorchainStringConstants.ts similarity index 100% rename from src/types/generated/midgard/models/ThorchainStringConstants.ts rename to src/renderer/types/generated/midgard/models/ThorchainStringConstants.ts diff --git a/src/types/generated/midgard/models/Tx.ts b/src/renderer/types/generated/midgard/models/Tx.ts similarity index 100% rename from src/types/generated/midgard/models/Tx.ts rename to src/renderer/types/generated/midgard/models/Tx.ts diff --git a/src/types/generated/midgard/models/TxDetails.ts b/src/renderer/types/generated/midgard/models/TxDetails.ts similarity index 100% rename from src/types/generated/midgard/models/TxDetails.ts rename to src/renderer/types/generated/midgard/models/TxDetails.ts diff --git a/src/types/generated/midgard/models/index.ts b/src/renderer/types/generated/midgard/models/index.ts similarity index 100% rename from src/types/generated/midgard/models/index.ts rename to src/renderer/types/generated/midgard/models/index.ts diff --git a/src/types/generated/midgard/runtime.ts b/src/renderer/types/generated/midgard/runtime.ts similarity index 100% rename from src/types/generated/midgard/runtime.ts rename to src/renderer/types/generated/midgard/runtime.ts diff --git a/src/types/generated/midgard/tsconfig.json b/src/renderer/types/generated/midgard/tsconfig.json similarity index 100% rename from src/types/generated/midgard/tsconfig.json rename to src/renderer/types/generated/midgard/tsconfig.json diff --git a/src/types/wallet/index.ts b/src/renderer/types/wallet/index.ts similarity index 100% rename from src/types/wallet/index.ts rename to src/renderer/types/wallet/index.ts diff --git a/src/views/NoContentView.tsx b/src/renderer/views/NoContentView.tsx similarity index 100% rename from src/views/NoContentView.tsx rename to src/renderer/views/NoContentView.tsx diff --git a/src/views/View.style.tsx b/src/renderer/views/View.style.tsx similarity index 100% rename from src/views/View.style.tsx rename to src/renderer/views/View.style.tsx diff --git a/src/views/View.tsx b/src/renderer/views/View.tsx similarity index 100% rename from src/views/View.tsx rename to src/renderer/views/View.tsx diff --git a/src/views/ViewRoutes.tsx b/src/renderer/views/ViewRoutes.tsx similarity index 100% rename from src/views/ViewRoutes.tsx rename to src/renderer/views/ViewRoutes.tsx diff --git a/src/views/playground/PlaygroundView.tsx b/src/renderer/views/playground/PlaygroundView.tsx similarity index 100% rename from src/views/playground/PlaygroundView.tsx rename to src/renderer/views/playground/PlaygroundView.tsx diff --git a/src/views/pools/PoolsOverview.style.ts b/src/renderer/views/pools/PoolsOverview.style.ts similarity index 100% rename from src/views/pools/PoolsOverview.style.ts rename to src/renderer/views/pools/PoolsOverview.style.ts diff --git a/src/views/pools/PoolsOverview.tsx b/src/renderer/views/pools/PoolsOverview.tsx similarity index 100% rename from src/views/pools/PoolsOverview.tsx rename to src/renderer/views/pools/PoolsOverview.tsx diff --git a/src/views/pools/PoolsView.tsx b/src/renderer/views/pools/PoolsView.tsx similarity index 100% rename from src/views/pools/PoolsView.tsx rename to src/renderer/views/pools/PoolsView.tsx diff --git a/src/views/pools/types.ts b/src/renderer/views/pools/types.ts similarity index 100% rename from src/views/pools/types.ts rename to src/renderer/views/pools/types.ts diff --git a/src/views/pools/util.test.ts b/src/renderer/views/pools/util.test.ts similarity index 98% rename from src/views/pools/util.test.ts rename to src/renderer/views/pools/util.test.ts index a9e3edab0..9de923eda 100644 --- a/src/views/pools/util.test.ts +++ b/src/renderer/views/pools/util.test.ts @@ -1,7 +1,7 @@ import { bn, assetAmount, PoolData, assetToBase } from '@thorchain/asgardex-util' import * as O from 'fp-ts/lib/Option' -import { ASSETS_TESTNET } from '../../mock/assets' +import { ASSETS_TESTNET } from '../../../shared/mock/assets' import { ThorchainConstants, ThorchainLastblock } from '../../types/generated/midgard' import { PoolDetail, PoolDetailStatusEnum } from '../../types/generated/midgard/models/PoolDetail' import { PoolTableRowData } from './types' diff --git a/src/views/pools/utils.ts b/src/renderer/views/pools/utils.ts similarity index 97% rename from src/views/pools/utils.ts rename to src/renderer/views/pools/utils.ts index b8a3a1b19..c17880dd4 100644 --- a/src/views/pools/utils.ts +++ b/src/renderer/views/pools/utils.ts @@ -13,7 +13,7 @@ import * as FP from 'fp-ts/lib/function' import * as O from 'fp-ts/lib/Option' import { none, Option, some } from 'fp-ts/lib/Option' -import { ASSETS_TESTNET } from '../../mock/assets' +import { ASSETS_TESTNET } from '../../../shared/mock/assets' import { toPoolData } from '../../services/midgard/utils' import { PoolDetail, PoolDetailStatusEnum, ThorchainLastblock, ThorchainConstants } from '../../types/generated/midgard' import { PoolTableRowData, Pool } from './types' diff --git a/src/views/stake/StakeView.tsx b/src/renderer/views/stake/StakeView.tsx similarity index 100% rename from src/views/stake/StakeView.tsx rename to src/renderer/views/stake/StakeView.tsx diff --git a/src/views/swap/SwapView.tsx b/src/renderer/views/swap/SwapView.tsx similarity index 100% rename from src/views/swap/SwapView.tsx rename to src/renderer/views/swap/SwapView.tsx diff --git a/src/views/wallet/AssetDetailsView.tsx b/src/renderer/views/wallet/AssetDetailsView.tsx similarity index 100% rename from src/views/wallet/AssetDetailsView.tsx rename to src/renderer/views/wallet/AssetDetailsView.tsx diff --git a/src/views/wallet/AssetsView.tsx b/src/renderer/views/wallet/AssetsView.tsx similarity index 100% rename from src/views/wallet/AssetsView.tsx rename to src/renderer/views/wallet/AssetsView.tsx diff --git a/src/views/wallet/BondsView.tsx b/src/renderer/views/wallet/BondsView.tsx similarity index 100% rename from src/views/wallet/BondsView.tsx rename to src/renderer/views/wallet/BondsView.tsx diff --git a/src/views/wallet/ReceiveView.tsx b/src/renderer/views/wallet/ReceiveView.tsx similarity index 100% rename from src/views/wallet/ReceiveView.tsx rename to src/renderer/views/wallet/ReceiveView.tsx diff --git a/src/views/wallet/SendView.tsx b/src/renderer/views/wallet/SendView.tsx similarity index 100% rename from src/views/wallet/SendView.tsx rename to src/renderer/views/wallet/SendView.tsx diff --git a/src/views/wallet/SettingsView.tsx b/src/renderer/views/wallet/SettingsView.tsx similarity index 100% rename from src/views/wallet/SettingsView.tsx rename to src/renderer/views/wallet/SettingsView.tsx diff --git a/src/views/wallet/StakesView.tsx b/src/renderer/views/wallet/StakesView.tsx similarity index 100% rename from src/views/wallet/StakesView.tsx rename to src/renderer/views/wallet/StakesView.tsx diff --git a/src/views/wallet/UnlockView.tsx b/src/renderer/views/wallet/UnlockView.tsx similarity index 100% rename from src/views/wallet/UnlockView.tsx rename to src/renderer/views/wallet/UnlockView.tsx diff --git a/src/views/wallet/WalletView.styles.tsx b/src/renderer/views/wallet/WalletView.styles.tsx similarity index 100% rename from src/views/wallet/WalletView.styles.tsx rename to src/renderer/views/wallet/WalletView.styles.tsx diff --git a/src/views/wallet/WalletView.tsx b/src/renderer/views/wallet/WalletView.tsx similarity index 100% rename from src/views/wallet/WalletView.tsx rename to src/renderer/views/wallet/WalletView.tsx diff --git a/src/views/wallet/importsView/ImportsView.style.tsx b/src/renderer/views/wallet/importsView/ImportsView.style.tsx similarity index 100% rename from src/views/wallet/importsView/ImportsView.style.tsx rename to src/renderer/views/wallet/importsView/ImportsView.style.tsx diff --git a/src/views/wallet/importsView/ImportsView.tsx b/src/renderer/views/wallet/importsView/ImportsView.tsx similarity index 100% rename from src/views/wallet/importsView/ImportsView.tsx rename to src/renderer/views/wallet/importsView/ImportsView.tsx diff --git a/src/views/wallet/importsView/index.tsx b/src/renderer/views/wallet/importsView/index.tsx similarity index 100% rename from src/views/wallet/importsView/index.tsx rename to src/renderer/views/wallet/importsView/index.tsx diff --git a/src/shared/const.ts b/src/shared/const.ts index 80fbc28af..51e2cc093 100644 --- a/src/shared/const.ts +++ b/src/shared/const.ts @@ -1,4 +1,4 @@ -import { envOrDefault } from '../helpers/envHelper' +import { envOrDefault } from '../renderer/helpers/envHelper' export const IS_PRODUCTION = envOrDefault(process.env.NODE_ENV, '') === 'production' diff --git a/src/mock/assets.tsx b/src/shared/mock/assets.tsx similarity index 100% rename from src/mock/assets.tsx rename to src/shared/mock/assets.tsx diff --git a/tsconfig.json b/tsconfig.json index 79f7ec00c..055aac3e7 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -15,6 +15,6 @@ "jsx": "react", "isolatedModules": true }, - "include": ["src"], - "exclude": ["electron/electron.ts"] + "include": ["src/shared", "src/renderer"], + "exclude": ["src/main/"] } diff --git a/electron/tsconfig.json b/tsconfig.main.json similarity index 72% rename from electron/tsconfig.json rename to tsconfig.main.json index 3d3b894c8..858580476 100644 --- a/electron/tsconfig.json +++ b/tsconfig.main.json @@ -8,8 +8,9 @@ "strict": true, "module": "CommonJS", "moduleResolution": "node", - "outDir": "../public/", + "outDir": "./public/", "pretty": true }, - "include": ["./", "../src/shared"] + "include": ["./src/main", "./src/shared"], + "exclude": ["src/remderer/"] } diff --git a/webpack.electron.js b/webpack.main.js similarity index 80% rename from webpack.electron.js rename to webpack.main.js index b6878f6ab..e72ac025a 100644 --- a/webpack.electron.js +++ b/webpack.main.js @@ -1,7 +1,7 @@ const path = require('path') module.exports = (env, argv) => ({ - entry: './electron/electron.ts', + entry: './src/main/electron.ts', output: { path: path.resolve(__dirname, 'public'), filename: 'electron.js' @@ -15,7 +15,7 @@ module.exports = (env, argv) => ({ { test: [/\.tsx?$/], loader: 'ts-loader', - options: { configFile: path.resolve(__dirname, 'electron', 'tsconfig.json') }, + options: { configFile: path.resolve(__dirname, 'tsconfig.main.json') }, exclude: /node_modules/ } ]