From 04d49a5ca5bf2a6f5e445296215eb6ca2ca9b286 Mon Sep 17 00:00:00 2001 From: Vasek Mlejnsky Date: Tue, 4 Sep 2018 11:33:24 +0200 Subject: [PATCH] Delete "buttons" folder and move "Button" at the root of "components/" --- src/components/{buttons => }/Button/index.js | 0 src/components/modals/confirm/UnverifiedAddress/index.js | 2 +- src/components/modals/device/Duplicate/index.js | 2 +- src/components/modals/device/Forget/index.js | 2 +- src/components/modals/device/Remember/index.js | 2 +- src/components/modals/passphrase/Passphrase/index.js | 2 +- src/components/modals/pin/Pin/index.js | 2 +- src/views/Landing/components/BrowserNotSupported/index.js | 2 +- src/views/Landing/components/ConnectDevice/index.js | 2 +- src/views/Landing/components/InstallBridge/index.js | 2 +- .../components/LeftNavigation/components/DeviceMenu/index.js | 2 +- .../Wallet/views/AccountSummary/components/AddedToken/index.js | 2 +- src/views/Wallet/views/DeviceSettings/index.js | 2 +- src/views/Wallet/views/Initialize/index.js | 2 +- 14 files changed, 13 insertions(+), 13 deletions(-) rename src/components/{buttons => }/Button/index.js (100%) diff --git a/src/components/buttons/Button/index.js b/src/components/Button/index.js similarity index 100% rename from src/components/buttons/Button/index.js rename to src/components/Button/index.js diff --git a/src/components/modals/confirm/UnverifiedAddress/index.js b/src/components/modals/confirm/UnverifiedAddress/index.js index b84a4ce3..dee29f9e 100644 --- a/src/components/modals/confirm/UnverifiedAddress/index.js +++ b/src/components/modals/confirm/UnverifiedAddress/index.js @@ -6,7 +6,7 @@ import styled from 'styled-components'; import Icon from 'components/Icon'; import colors from 'config/colors'; import icons from 'config/icons'; -import Button from 'components/buttons/Button'; +import Button from 'components/Button'; import Link from 'components/Link'; import { findAccount } from 'reducers/AccountsReducer'; diff --git a/src/components/modals/device/Duplicate/index.js b/src/components/modals/device/Duplicate/index.js index 8c8562c7..a5339bf4 100644 --- a/src/components/modals/device/Duplicate/index.js +++ b/src/components/modals/device/Duplicate/index.js @@ -3,7 +3,7 @@ import React, { Component } from 'react'; import styled from 'styled-components'; import { H3 } from 'components/Heading'; import P from 'components/Paragraph'; -import Button from 'components/buttons/Button'; +import Button from 'components/Button'; import Input from 'components/inputs/Input'; import { getDuplicateInstanceNumber } from 'reducers/utils'; import { FONT_SIZE } from 'config/variables'; diff --git a/src/components/modals/device/Forget/index.js b/src/components/modals/device/Forget/index.js index 75ab4a70..7388d047 100644 --- a/src/components/modals/device/Forget/index.js +++ b/src/components/modals/device/Forget/index.js @@ -2,7 +2,7 @@ import React, { Component } from 'react'; import styled from 'styled-components'; import { H3 } from 'components/Heading'; import P from 'components/Paragraph'; -import Button from 'components/buttons/Button'; +import Button from 'components/Button'; const Wrapper = styled.div` width: 360px; diff --git a/src/components/modals/device/Remember/index.js b/src/components/modals/device/Remember/index.js index efb10db6..a7f698b7 100644 --- a/src/components/modals/device/Remember/index.js +++ b/src/components/modals/device/Remember/index.js @@ -4,7 +4,7 @@ import styled from 'styled-components'; import { H3 } from 'components/Heading'; import P from 'components/Paragraph'; import Loader from 'components/Loader'; -import Button from 'components/buttons/Button'; +import Button from 'components/Button'; import type { Props } from './index'; diff --git a/src/components/modals/passphrase/Passphrase/index.js b/src/components/modals/passphrase/Passphrase/index.js index 18e7d77e..8e01c85a 100644 --- a/src/components/modals/passphrase/Passphrase/index.js +++ b/src/components/modals/passphrase/Passphrase/index.js @@ -7,7 +7,7 @@ import { FONT_SIZE } from 'config/variables'; import { H2 } from 'components/Heading'; import Link from 'components/Link'; import Checkbox from 'components/Checkbox'; -import Button from 'components/buttons/Button'; +import Button from 'components/Button'; import Input from 'components/inputs/Input'; import styled from 'styled-components'; diff --git a/src/components/modals/pin/Pin/index.js b/src/components/modals/pin/Pin/index.js index 9c0588bf..62a71f99 100644 --- a/src/components/modals/pin/Pin/index.js +++ b/src/components/modals/pin/Pin/index.js @@ -6,7 +6,7 @@ import Link from 'components/Link'; import colors from 'config/colors'; import styled from 'styled-components'; import PinInput from 'components/inputs/PinInput'; -import Button from 'components/buttons/Button'; +import Button from 'components/Button'; import PinButton from './components/PinButton'; import type { Props } from './index'; diff --git a/src/views/Landing/components/BrowserNotSupported/index.js b/src/views/Landing/components/BrowserNotSupported/index.js index 34b5920e..e5f0f51e 100644 --- a/src/views/Landing/components/BrowserNotSupported/index.js +++ b/src/views/Landing/components/BrowserNotSupported/index.js @@ -1,7 +1,7 @@ import React from 'react'; import styled, { css } from 'styled-components'; import Link from 'components/Link'; -import Button from 'components/buttons/Button'; +import Button from 'components/Button'; import P from 'components/Paragraph'; import { H2 } from 'components/Heading'; diff --git a/src/views/Landing/components/ConnectDevice/index.js b/src/views/Landing/components/ConnectDevice/index.js index f7600bee..3290e149 100644 --- a/src/views/Landing/components/ConnectDevice/index.js +++ b/src/views/Landing/components/ConnectDevice/index.js @@ -4,7 +4,7 @@ import React, { Component } from 'react'; import styled, { keyframes } from 'styled-components'; import TrezorConnect from 'trezor-connect'; import P from 'components/Paragraph'; -import Button from 'components/buttons/Button'; +import Button from 'components/Button'; import { PULSATE } from 'config/animations'; import colors from 'config/colors'; import { FONT_SIZE, FONT_WEIGHT } from 'config/variables'; diff --git a/src/views/Landing/components/InstallBridge/index.js b/src/views/Landing/components/InstallBridge/index.js index bcd642de..d3cb0775 100644 --- a/src/views/Landing/components/InstallBridge/index.js +++ b/src/views/Landing/components/InstallBridge/index.js @@ -7,7 +7,7 @@ import { FONT_SIZE, FONT_WEIGHT } from 'config/variables'; import installers from 'constants/bridge'; import { Select } from 'components/Select'; import Link from 'components/Link'; -import Button from 'components/buttons/Button'; +import Button from 'components/Button'; import Loader from 'components/Loader'; import P from 'components/Paragraph'; import ICONS from 'config/icons'; diff --git a/src/views/Wallet/components/LeftNavigation/components/DeviceMenu/index.js b/src/views/Wallet/components/LeftNavigation/components/DeviceMenu/index.js index 7012d101..14a88007 100644 --- a/src/views/Wallet/components/LeftNavigation/components/DeviceMenu/index.js +++ b/src/views/Wallet/components/LeftNavigation/components/DeviceMenu/index.js @@ -4,7 +4,7 @@ import styled from 'styled-components'; import TrezorConnect from 'trezor-connect'; import type { TrezorDevice } from 'flowtype'; import DeviceHeader from 'components/DeviceHeader'; -import Button from 'components/buttons/Button'; +import Button from 'components/Button'; import { isWebUSB } from 'utils/device'; import MenuItems from './components/MenuItems'; import DeviceList from './components/DeviceList'; diff --git a/src/views/Wallet/views/AccountSummary/components/AddedToken/index.js b/src/views/Wallet/views/AccountSummary/components/AddedToken/index.js index 676974d1..29051dbc 100644 --- a/src/views/Wallet/views/AccountSummary/components/AddedToken/index.js +++ b/src/views/Wallet/views/AccountSummary/components/AddedToken/index.js @@ -3,7 +3,7 @@ import styled from 'styled-components'; import ColorHash from 'color-hash'; import ScaleText from 'react-scale-text'; import colors from 'config/colors'; -import Button from 'components/buttons/Button'; +import Button from 'components/Button'; import ICONS from 'config/icons'; import * as stateUtils from 'reducers/utils'; import BigNumber from 'bignumber.js'; diff --git a/src/views/Wallet/views/DeviceSettings/index.js b/src/views/Wallet/views/DeviceSettings/index.js index c1cb2a05..83eb1d47 100644 --- a/src/views/Wallet/views/DeviceSettings/index.js +++ b/src/views/Wallet/views/DeviceSettings/index.js @@ -3,7 +3,7 @@ import styled from 'styled-components'; import { H2 } from 'components/Heading'; import Icon from 'components/Icon'; import colors from 'config/colors'; -import Button from 'components/buttons/Button'; +import Button from 'components/Button'; import ICONS from 'config/icons'; import { connect } from 'react-redux'; diff --git a/src/views/Wallet/views/Initialize/index.js b/src/views/Wallet/views/Initialize/index.js index a9ee478d..9627d4ee 100644 --- a/src/views/Wallet/views/Initialize/index.js +++ b/src/views/Wallet/views/Initialize/index.js @@ -1,6 +1,6 @@ import styled from 'styled-components'; import { H2 } from 'components/Heading'; -import Button from 'components/buttons/Button'; +import Button from 'components/Button'; import Paragraph from 'components/Paragraph'; import React from 'react'; import { connect } from 'react-redux';