arno/trezor-wallet
1
0
Fork 0
mirror of https://github.com/trezor/trezor-wallet synced 2024-11-24 17:28:10 +00:00
Code Issues Releases Wiki Activity

Merge branch 'styled-components-refactor' of https://github.com/satoshilabs/trezor-wallet into styled-components-refactor

Browse Source
This commit is contained in:
Vasek Mlejnsky 2018-08-16 16:31:49 +02:00
commit 38ae8e52f7
9 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
src/js/components/wallet/pages/Acquire.js → src/js/views/Wallet/views/Acquire/index.js
View File

0
src/js/components/wallet/pages/Bootloader.js → src/js/views/Wallet/views/Bootloader/index.js
View File

0
src/js/components/wallet/pages/Dashboard.js → src/js/views/Wallet/views/Dashboard/index.js
View File

2
src/js/components/wallet/pages/DeviceSettings.js → src/js/views/Wallet/views/DeviceSettings/index.js
View File

@ -29,7 +29,7 @@ const Row = styled.div`
padding-bottom: 98px; padding-bottom: 98px;
`; `;
export const DeviceSettings = () => ( const DeviceSettings = () => (
<Section> <Section>
<Row> <Row>
<Icon <Icon

0
src/js/components/wallet/pages/DeviceSettingsTabs.js → src/js/views/Wallet/views/DeviceSettingsTabs/index.js
View File

0
src/js/components/wallet/pages/Initialize.js → src/js/views/Wallet/views/Initialize/index.js
View File

0
src/js/components/wallet/pages/UnreadableDevice.js → src/js/views/Wallet/views/UnreadableDevice/index.js
View File

2
src/js/components/wallet/pages/WalletSettings.js → src/js/views/Wallet/views/WalletSettings/index.js
View File

@ -5,7 +5,7 @@ import React from 'react';
import { bindActionCreators } from 'redux'; import { bindActionCreators } from 'redux';
import { connect } from 'react-redux'; import { connect } from 'react-redux';
export const WalletSettings = () => ( const WalletSettings = () => (
<section className="settings"> <section className="settings">
Wallet settings Wallet settings
</section> </section>

37
src/js/views/index.js
View File

@ -5,19 +5,18 @@ import { Provider } from 'react-redux';
import { ConnectedRouter } from 'react-router-redux'; import { ConnectedRouter } from 'react-router-redux';
import ErrorBoundary from 'support/ErrorBoundary'; import ErrorBoundary from 'support/ErrorBoundary';
import WalletContainer from 'views/Wallet';
import BootloaderContainer from 'components/wallet/pages/Bootloader';
import InitializeContainer from 'components/wallet/pages/Initialize';
import AcquireContainer from 'components/wallet/pages/Acquire';
import UnreadableDeviceContainer from 'components/wallet/pages/UnreadableDevice';
import DashboardContainer from 'components/wallet/pages/Dashboard';
import DeviceSettingsContainer from 'components/wallet/pages/DeviceSettings';
import WalletSettingsContainer from 'components/wallet/pages/WalletSettings';
import LandingContainer from 'views/Landing/Container'; import LandingContainer from 'views/Landing/Container';
// wallet views
import WalletContainer from 'views/Wallet';
import WalletDashboard from 'views/Wallet/views/Dashboard';
import WalletDeviceSettings from 'views/Wallet/views/DeviceSettings';
import WalletSettings from 'views/Wallet/views/WalletSettings';
import WalletBootloader from 'views/Wallet/views/Bootloader';
import WalletInitialize from 'views/Wallet/views/Initialize';
import WalletAcquire from 'views/Wallet/views/Acquire';
import WalletUnreadableDevice from 'views/Wallet/views/UnreadableDevice';
import SignVerifyContainer from './Wallet/components/Sign'; import SignVerifyContainer from './Wallet/components/Sign';
import ReceiveContainer from './Wallet/components/Receive/Container'; import ReceiveContainer from './Wallet/components/Receive/Container';
import SendFormContainer from './Wallet/components/Send/Container'; import SendFormContainer from './Wallet/components/Send/Container';
@ -35,14 +34,14 @@ const App = () => (
<Route> <Route>
<ErrorBoundary> <ErrorBoundary>
<WalletContainer> <WalletContainer>
<Route exact path="/settings" component={WalletSettingsContainer} /> <Route exact path="/settings" component={WalletSettings} />
<Route exact path="/device/:device/" component={DashboardContainer} /> <Route exact path="/device/:device/" component={WalletDashboard} />
<Route exact path="/device/:device/network/:network" component={DashboardContainer} /> <Route exact path="/device/:device/network/:network" component={WalletDashboard} />
<Route exact path="/device/:device/acquire" component={AcquireContainer} /> <Route exact path="/device/:device/acquire" component={WalletAcquire} />
<Route exact path="/device/:device/unreadable" component={UnreadableDeviceContainer} /> <Route exact path="/device/:device/unreadable" component={WalletUnreadableDevice} />
<Route exact path="/device/:device/bootloader" component={BootloaderContainer} /> <Route exact path="/device/:device/bootloader" component={WalletBootloader} />
<Route exact path="/device/:device/initialize" component={InitializeContainer} /> <Route exact path="/device/:device/initialize" component={WalletInitialize} />
<Route exact path="/device/:device/settings" component={DeviceSettingsContainer} /> <Route exact path="/device/:device/settings" component={WalletDeviceSettings} />
<Route exact path="/device/:device/network/:network/account/:account" component={SummaryContainer} /> <Route exact path="/device/:device/network/:network/account/:account" component={SummaryContainer} />
<Route path="/device/:device/network/:network/account/:account/send" component={SendFormContainer} /> <Route path="/device/:device/network/:network/account/:account/send" component={SendFormContainer} />
<Route path="/device/:device/network/:network/account/:account/send/override" component={SendFormContainer} /> <Route path="/device/:device/network/:network/account/:account/send/override" component={SendFormContainer} />