diff --git a/src/features/welcome/button/index.ts b/components/brave_welcome_ui/components/button/index.ts similarity index 93% rename from src/features/welcome/button/index.ts rename to components/brave_welcome_ui/components/button/index.ts index 7661908cf208..d391c743749f 100644 --- a/src/features/welcome/button/index.ts +++ b/components/brave_welcome_ui/components/button/index.ts @@ -3,8 +3,8 @@ * You can obtain one at http://mozilla.org/MPL/2.0/. */ import { ComponentType } from 'react' -import styled, { css } from '../../../theme' -import Button, { Props as ButtonProps } from '../../../components/buttonsIndicators/button' +import styled, { css } from 'brave-ui/theme' +import Button, { Props as ButtonProps } from 'brave-ui/components/buttonsIndicators/button' interface BaseButtonProps { active?: boolean diff --git a/src/features/welcome/images/index.ts b/components/brave_welcome_ui/components/images/index.ts similarity index 100% rename from src/features/welcome/images/index.ts rename to components/brave_welcome_ui/components/images/index.ts diff --git a/src/features/welcome/images/lion_logo.svg b/components/brave_welcome_ui/components/images/lion_logo.svg similarity index 100% rename from src/features/welcome/images/lion_logo.svg rename to components/brave_welcome_ui/components/images/lion_logo.svg diff --git a/src/features/welcome/images/welcome_bg.svg b/components/brave_welcome_ui/components/images/welcome_bg.svg similarity index 100% rename from src/features/welcome/images/welcome_bg.svg rename to components/brave_welcome_ui/components/images/welcome_bg.svg diff --git a/src/features/welcome/images/welcome_import.svg b/components/brave_welcome_ui/components/images/welcome_import.svg similarity index 100% rename from src/features/welcome/images/welcome_import.svg rename to components/brave_welcome_ui/components/images/welcome_import.svg diff --git a/src/features/welcome/images/welcome_rewards.svg b/components/brave_welcome_ui/components/images/welcome_rewards.svg similarity index 100% rename from src/features/welcome/images/welcome_rewards.svg rename to components/brave_welcome_ui/components/images/welcome_rewards.svg diff --git a/src/features/welcome/images/welcome_search.svg b/components/brave_welcome_ui/components/images/welcome_search.svg similarity index 100% rename from src/features/welcome/images/welcome_search.svg rename to components/brave_welcome_ui/components/images/welcome_search.svg diff --git a/src/features/welcome/images/welcome_shields.svg b/components/brave_welcome_ui/components/images/welcome_shields.svg similarity index 100% rename from src/features/welcome/images/welcome_shields.svg rename to components/brave_welcome_ui/components/images/welcome_shields.svg diff --git a/src/features/welcome/images/welcome_theme.svg b/components/brave_welcome_ui/components/images/welcome_theme.svg similarity index 100% rename from src/features/welcome/images/welcome_theme.svg rename to components/brave_welcome_ui/components/images/welcome_theme.svg diff --git a/src/features/welcome/index.ts b/components/brave_welcome_ui/components/index.ts similarity index 100% rename from src/features/welcome/index.ts rename to components/brave_welcome_ui/components/index.ts diff --git a/src/features/welcome/select/carat.svg b/components/brave_welcome_ui/components/select/carat.svg similarity index 100% rename from src/features/welcome/select/carat.svg rename to components/brave_welcome_ui/components/select/carat.svg diff --git a/src/features/welcome/select/index.ts b/components/brave_welcome_ui/components/select/index.ts similarity index 94% rename from src/features/welcome/select/index.ts rename to components/brave_welcome_ui/components/select/index.ts index 716bf9fc265d..e75aaa4e6774 100644 --- a/src/features/welcome/select/index.ts +++ b/components/brave_welcome_ui/components/select/index.ts @@ -2,8 +2,8 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -import styled, { css } from '../../../theme' -import palette from '../../../theme/colors' +import styled, { css } from 'brave-ui/theme' +import palette from 'brave-ui/theme/colors' import caratUrl from './carat.svg' export interface SelectBoxProps { diff --git a/src/features/welcome/text/index.ts b/components/brave_welcome_ui/components/text/index.ts similarity index 91% rename from src/features/welcome/text/index.ts rename to components/brave_welcome_ui/components/text/index.ts index fb3064b5f37c..92288b374bd5 100644 --- a/src/features/welcome/text/index.ts +++ b/components/brave_welcome_ui/components/text/index.ts @@ -3,7 +3,7 @@ * You can obtain one at http://mozilla.org/MPL/2.0/. */ import styled from 'styled-components' -import { Heading } from '../../../index' +import Heading from 'brave-ui/components/text/heading' export const Title = styled(Heading)` font-size: 28px; diff --git a/src/features/welcome/wrapper/index.ts b/components/brave_welcome_ui/components/wrapper/index.ts similarity index 100% rename from src/features/welcome/wrapper/index.ts rename to components/brave_welcome_ui/components/wrapper/index.ts diff --git a/components/brave_welcome_ui/containers/app.tsx b/components/brave_welcome_ui/containers/app.tsx index 0570ae0afc42..f44acc4bb45f 100644 --- a/components/brave_welcome_ui/containers/app.tsx +++ b/components/brave_welcome_ui/containers/app.tsx @@ -7,7 +7,7 @@ import { bindActionCreators, Dispatch } from 'redux' import { connect } from 'react-redux' // Feature-specific components -import { Page, Panel, SlideContent } from 'brave-ui/features/welcome' +import { Page, Panel, SlideContent } from '../components' // Component groups import WelcomeBox from './screens/welcomeBox' @@ -19,7 +19,7 @@ import ThemeBox from './screens/themeBox' import FooterBox from './screens/footerBox' // Images -import { Background, BackgroundContainer } from 'brave-ui/features/welcome/images' +import { Background, BackgroundContainer } from '../components/images' // Utils import * as welcomeActions from '../actions/welcome_actions' diff --git a/components/brave_welcome_ui/containers/screens/footerBox.tsx b/components/brave_welcome_ui/containers/screens/footerBox.tsx index e4b52c20a07b..e92093f71cb1 100644 --- a/components/brave_welcome_ui/containers/screens/footerBox.tsx +++ b/components/brave_welcome_ui/containers/screens/footerBox.tsx @@ -13,7 +13,7 @@ import { SkipButton, FooterButton, Bullet -} from 'brave-ui/features/welcome' +} from '../../components' // Shared components import { ArrowRightIcon } from 'brave-ui/components/icons' diff --git a/components/brave_welcome_ui/containers/screens/importBox.tsx b/components/brave_welcome_ui/containers/screens/importBox.tsx index 9cfda25a2aaf..7805c6378ec7 100644 --- a/components/brave_welcome_ui/containers/screens/importBox.tsx +++ b/components/brave_welcome_ui/containers/screens/importBox.tsx @@ -5,14 +5,18 @@ import * as React from 'react' // Feature-specific components -import { Content, Title, Paragraph, PrimaryButton, SelectGrid, SelectBox } from 'brave-ui/features/welcome' +import { Content, Title, Paragraph, PrimaryButton, SelectGrid, SelectBox } from '../../components' // Images -import { WelcomeImportImage } from 'brave-ui/features/welcome/images' +import { WelcomeImportImage } from '../../components/images' // Utils import { getLocale } from '../../../common/locale' -import { getSelectedBrowserProfile, getSourceBrowserProfileIndex, isValidBrowserProfiles } from '../../welcomeUtils' +import { + getSelectedBrowserProfile, + getSourceBrowserProfileIndex, + isValidBrowserProfiles +} from '../../welcomeUtils' export interface Props { index: number diff --git a/components/brave_welcome_ui/containers/screens/rewardsBox.tsx b/components/brave_welcome_ui/containers/screens/rewardsBox.tsx index 710755c3a49b..d41ed500ab69 100644 --- a/components/brave_welcome_ui/containers/screens/rewardsBox.tsx +++ b/components/brave_welcome_ui/containers/screens/rewardsBox.tsx @@ -5,10 +5,10 @@ import * as React from 'react' // Feature-specific components -import { Content, Title, Paragraph, PrimaryButton } from 'brave-ui/features/welcome' +import { Content, Title, Paragraph, PrimaryButton } from '../../components' // Images -import { WelcomeRewardsImage } from 'brave-ui/features/welcome/images' +import { WelcomeRewardsImage } from '../../components/images' // Utils import { getLocale } from '../../../common/locale' diff --git a/components/brave_welcome_ui/containers/screens/searchBox.tsx b/components/brave_welcome_ui/containers/screens/searchBox.tsx index b61900f1268d..f007d99950ba 100644 --- a/components/brave_welcome_ui/containers/screens/searchBox.tsx +++ b/components/brave_welcome_ui/containers/screens/searchBox.tsx @@ -6,10 +6,10 @@ import * as React from 'react' // Feature-specific components -import { Content, Title, Paragraph, PrimaryButton, SelectGrid, SelectBox } from 'brave-ui/features/welcome' +import { Content, Title, Paragraph, PrimaryButton, SelectGrid, SelectBox } from '../../components' // Images -import { WelcomeSearchImage } from 'brave-ui/features/welcome/images' +import { WelcomeSearchImage } from '../../components/images' // Utils import { getLocale } from '../../../common/locale' diff --git a/components/brave_welcome_ui/containers/screens/shieldsBox.tsx b/components/brave_welcome_ui/containers/screens/shieldsBox.tsx index c16d20a0307a..63e0a4bfade1 100644 --- a/components/brave_welcome_ui/containers/screens/shieldsBox.tsx +++ b/components/brave_welcome_ui/containers/screens/shieldsBox.tsx @@ -5,13 +5,13 @@ import * as React from 'react' // Feature-specific components -import { Content, Title, Paragraph } from 'brave-ui/features/welcome' +import { Content, Title, Paragraph } from '../../components' // Utils import { getLocale } from '../../../common/locale' // Images -import { WelcomeShieldsImage } from 'brave-ui/features/welcome/images' +import { WelcomeShieldsImage } from '../../components/images' interface Props { index: number diff --git a/components/brave_welcome_ui/containers/screens/themeBox.tsx b/components/brave_welcome_ui/containers/screens/themeBox.tsx index f8719fb40cf1..7a88a923a09b 100644 --- a/components/brave_welcome_ui/containers/screens/themeBox.tsx +++ b/components/brave_welcome_ui/containers/screens/themeBox.tsx @@ -5,10 +5,10 @@ import * as React from 'react' // Feature-specific components -import { Content, Title, Paragraph, PrimaryButton } from 'brave-ui/features/welcome' +import { Content, Title, Paragraph, PrimaryButton } from '../../components' // Images -import { WelcomeThemeImage } from 'brave-ui/features/welcome/images' +import { WelcomeThemeImage } from '../../components/images' // Utils import { getLocale } from '../../../common/locale' diff --git a/components/brave_welcome_ui/containers/screens/welcomeBox.tsx b/components/brave_welcome_ui/containers/screens/welcomeBox.tsx index 03a3ac37b30b..f98b48cd7069 100644 --- a/components/brave_welcome_ui/containers/screens/welcomeBox.tsx +++ b/components/brave_welcome_ui/containers/screens/welcomeBox.tsx @@ -5,13 +5,13 @@ import * as React from 'react' // Feature-specific components -import { Content, Title, Paragraph, PrimaryButton } from 'brave-ui/features/welcome' +import { Content, Title, Paragraph, PrimaryButton } from '../../components' // Shared components import { ArrowRightIcon } from 'brave-ui/components/icons' // Images -import { WelcomeLionImage } from 'brave-ui/features/welcome/images' +import { WelcomeLionImage } from '../../components/images' // Utils import { getLocale } from '../../../common/locale' diff --git a/stories/features/welcome/page/fakeLocale.ts b/components/brave_welcome_ui/stories/page/fakeLocale.ts similarity index 100% rename from stories/features/welcome/page/fakeLocale.ts rename to components/brave_welcome_ui/stories/page/fakeLocale.ts diff --git a/stories/features/welcome/page/index.tsx b/components/brave_welcome_ui/stories/page/index.tsx similarity index 94% rename from stories/features/welcome/page/index.tsx rename to components/brave_welcome_ui/stories/page/index.tsx index b1c81beaed54..7655b082d330 100644 --- a/stories/features/welcome/page/index.tsx +++ b/components/brave_welcome_ui/stories/page/index.tsx @@ -5,11 +5,7 @@ import * as React from 'react' // Feature-specific components -import { - Page, - Panel, - SlideContent -} from '../../../../src/features/welcome/' +import { Page, Panel, SlideContent } from '../../components' // Component groups import WelcomeBox from './screens/welcomeBox' @@ -21,11 +17,7 @@ import ThemeBox from './screens/themeBox' import FooterBox from './screens/footerBox' // Images -import { Background, BackgroundContainer } from '../../../../src/features/welcome/images' - -// Fonts -import '../../../assets/fonts/muli.css' -import '../../../assets/fonts/poppins.css' +import { Background, BackgroundContainer } from '../../components/images' export interface State { currentScreen: number diff --git a/stories/features/welcome/page/screens/footerBox.tsx b/components/brave_welcome_ui/stories/page/screens/footerBox.tsx similarity index 94% rename from stories/features/welcome/page/screens/footerBox.tsx rename to components/brave_welcome_ui/stories/page/screens/footerBox.tsx index 68e444db5515..10b5736ed62c 100644 --- a/stories/features/welcome/page/screens/footerBox.tsx +++ b/components/brave_welcome_ui/stories/page/screens/footerBox.tsx @@ -13,10 +13,10 @@ import { SkipButton, FooterButton, Bullet -} from '../../../../../src/features/welcome/' +} from '../../../components' // Shared components -import { ArrowRightIcon } from '../../../../../src/components/icons' +import { ArrowRightIcon } from 'brave-ui/components/icons' // Utils import locale from '../fakeLocale' diff --git a/stories/features/welcome/page/screens/importBox.tsx b/components/brave_welcome_ui/stories/page/screens/importBox.tsx similarity index 88% rename from stories/features/welcome/page/screens/importBox.tsx rename to components/brave_welcome_ui/stories/page/screens/importBox.tsx index 528911953c7e..cf50ba0ff592 100644 --- a/stories/features/welcome/page/screens/importBox.tsx +++ b/components/brave_welcome_ui/stories/page/screens/importBox.tsx @@ -5,14 +5,20 @@ import * as React from 'react' // Feature-specific components -import { Content, Title, Paragraph, PrimaryButton, SelectGrid } from '../../../../../src/features/welcome/' -import { SelectBox } from '../../../../../src/features/welcome' +import { + Content, + Title, + Paragraph, + PrimaryButton, + SelectGrid, + SelectBox +} from '../../../components' // Utils import locale from '../fakeLocale' // Images -import { WelcomeImportImage } from '../../../../../src/features/welcome/images' +import { WelcomeImportImage } from '../../../components/images' interface Props { index: number diff --git a/stories/features/welcome/page/screens/rewardsBox.tsx b/components/brave_welcome_ui/stories/page/screens/rewardsBox.tsx similarity index 91% rename from stories/features/welcome/page/screens/rewardsBox.tsx rename to components/brave_welcome_ui/stories/page/screens/rewardsBox.tsx index 20bc857fc486..5b25311fe6d4 100644 --- a/stories/features/welcome/page/screens/rewardsBox.tsx +++ b/components/brave_welcome_ui/stories/page/screens/rewardsBox.tsx @@ -5,13 +5,13 @@ import * as React from 'react' // Feature-specific components -import { Content, Title, Paragraph, PrimaryButton } from '../../../../../src/features/welcome/' +import { Content, Title, Paragraph, PrimaryButton } from '../../../components' // Utils import locale from '../fakeLocale' // Images -import { WelcomeRewardsImage } from '../../../../../src/features/welcome/images' +import { WelcomeRewardsImage } from '../../../components/images' interface Props { index: number diff --git a/stories/features/welcome/page/screens/searchBox.tsx b/components/brave_welcome_ui/stories/page/screens/searchBox.tsx similarity index 89% rename from stories/features/welcome/page/screens/searchBox.tsx rename to components/brave_welcome_ui/stories/page/screens/searchBox.tsx index fbcd9220e508..8b3c9f426524 100644 --- a/stories/features/welcome/page/screens/searchBox.tsx +++ b/components/brave_welcome_ui/stories/page/screens/searchBox.tsx @@ -6,14 +6,20 @@ import * as React from 'react' // Feature-specific components -import { Content, Title, Paragraph, SelectGrid, PrimaryButton } from '../../../../../src/features/welcome/' -import { SelectBox } from '../../../../../src/features/welcome' +import { + Content, + Title, + Paragraph, + SelectGrid, + PrimaryButton, + SelectBox +} from '../../../components' // Utils import locale from '../fakeLocale' // Images -import { WelcomeSearchImage } from '../../../../../src/features/welcome/images' +import { WelcomeSearchImage } from '../../../components/images' interface Props { index: number diff --git a/stories/features/welcome/page/screens/shieldsBox.tsx b/components/brave_welcome_ui/stories/page/screens/shieldsBox.tsx similarity index 84% rename from stories/features/welcome/page/screens/shieldsBox.tsx rename to components/brave_welcome_ui/stories/page/screens/shieldsBox.tsx index 26741f9b3c3d..986283d82ea3 100644 --- a/stories/features/welcome/page/screens/shieldsBox.tsx +++ b/components/brave_welcome_ui/stories/page/screens/shieldsBox.tsx @@ -5,13 +5,13 @@ import * as React from 'react' // Feature-specific components -import { Content, Title, Paragraph } from '../../../../../src/features/welcome/' +import { Content, Title, Paragraph } from '../../../components' // Utils import locale from '../fakeLocale' // Images -import { WelcomeShieldsImage } from '../../../../../src/features/welcome/images' +import { WelcomeShieldsImage } from '../../../components/images' interface Props { index: number diff --git a/stories/features/welcome/page/screens/themeBox.tsx b/components/brave_welcome_ui/stories/page/screens/themeBox.tsx similarity index 91% rename from stories/features/welcome/page/screens/themeBox.tsx rename to components/brave_welcome_ui/stories/page/screens/themeBox.tsx index 014cf6306706..6bc7d10ccb53 100644 --- a/stories/features/welcome/page/screens/themeBox.tsx +++ b/components/brave_welcome_ui/stories/page/screens/themeBox.tsx @@ -5,13 +5,13 @@ import * as React from 'react' // Feature-specific components -import { Content, Title, Paragraph, PrimaryButton } from '../../../../../src/features/welcome/' +import { Content, Title, Paragraph, PrimaryButton } from '../../../components' // Utils import locale from '../fakeLocale' // Images -import { WelcomeThemeImage } from '../../../../../src/features/welcome/images' +import { WelcomeThemeImage } from '../../../components/images' interface Props { index: number diff --git a/stories/features/welcome/page/screens/welcomeBox.tsx b/components/brave_welcome_ui/stories/page/screens/welcomeBox.tsx similarity index 87% rename from stories/features/welcome/page/screens/welcomeBox.tsx rename to components/brave_welcome_ui/stories/page/screens/welcomeBox.tsx index 2fb0f111c0c9..82b90a370506 100644 --- a/stories/features/welcome/page/screens/welcomeBox.tsx +++ b/components/brave_welcome_ui/stories/page/screens/welcomeBox.tsx @@ -5,16 +5,16 @@ import * as React from 'react' // Feature-specific components -import { Content, Title, Paragraph, PrimaryButton } from '../../../../../src/features/welcome/' +import { Content, Title, Paragraph, PrimaryButton } from '../../../components' // Shared components -import { ArrowRightIcon } from '../../../../../src/components/icons' +import { ArrowRightIcon } from 'brave-ui/components/icons' // Utils import locale from '../fakeLocale' // Images -import { WelcomeLionImage } from '../../../../../src/features/welcome/images' +import { WelcomeLionImage } from '../../../components/images' interface Props { index: number diff --git a/stories/features/welcome/story.tsx b/components/brave_welcome_ui/stories/story.tsx similarity index 81% rename from stories/features/welcome/story.tsx rename to components/brave_welcome_ui/stories/story.tsx index 69a184a3c99b..06366bfb9f4b 100644 --- a/stories/features/welcome/story.tsx +++ b/components/brave_welcome_ui/stories/story.tsx @@ -5,12 +5,10 @@ import * as React from 'react' import { storiesOf } from '@storybook/react' import { withKnobs, boolean } from '@storybook/addon-knobs' -import { FullPageStory } from '../../storyUtils' // Components import WelcomePage from './page/index' -storiesOf('Feature Components/Welcome', module) - .addDecorator(FullPageStory) +storiesOf('Welcome', module) .addDecorator(withKnobs) .add('Page', () => { return ( diff --git a/components/brave_welcome_ui/welcomeUtils.ts b/components/brave_welcome_ui/welcomeUtils.ts index 7f7134f43f1a..4079ef38404b 100644 --- a/components/brave_welcome_ui/welcomeUtils.ts +++ b/components/brave_welcome_ui/welcomeUtils.ts @@ -4,7 +4,7 @@ import { Dispatch } from 'redux' import { getSearchEngineProvidersSuccess, getBrowserProfilesSuccess } from './actions/welcome_actions' -import { State as ImportBoxState } from '../brave_welcome_ui/components/screens/importBox' +import { State as ImportBoxState } from './containers/screens/importBox' // Search box diff --git a/components/test/brave_welcome_ui/components/app_test.tsx b/components/test/brave_welcome_ui/components/app_test.tsx index f5c309a76d9e..8899cac19bd0 100644 --- a/components/test/brave_welcome_ui/components/app_test.tsx +++ b/components/test/brave_welcome_ui/components/app_test.tsx @@ -4,7 +4,7 @@ import { welcomeInitialState } from '../../testData' import { WelcomePage, mapStateToProps -} from '../../../brave_welcome_ui/components/app' +} from '../../../../components/brave_welcome_ui/containers/app' describe('welcomePage component', () => { describe('mapStateToProps', () => { diff --git a/components/test/brave_welcome_ui/components/importBox_test.tsx b/components/test/brave_welcome_ui/components/importBox_test.tsx index a457eb1cb8c9..784ed3a88ab6 100644 --- a/components/test/brave_welcome_ui/components/importBox_test.tsx +++ b/components/test/brave_welcome_ui/components/importBox_test.tsx @@ -4,9 +4,9 @@ import * as React from 'react' import { shallow } from 'enzyme' -import { Content, PrimaryButton } from 'brave-ui/features/welcome' -import { WelcomeImportImage } from 'brave-ui/features/welcome/images' -import ImportBox, { Props } from '../../../../components/brave_welcome_ui/components/screens/importBox' +import { Content, PrimaryButton } from '../../../../components/brave_welcome_ui/components' +import { WelcomeImportImage } from '../../../../components/brave_welcome_ui/components/images' +import ImportBox, { Props } from '../../../../components/brave_welcome_ui/containers/screens/importBox' import { mockImportSources } from '../../testData' describe('ImportBox component tests', () => { diff --git a/components/test/brave_welcome_ui/components/searchBox_test.tsx b/components/test/brave_welcome_ui/components/searchBox_test.tsx index ccf84799444b..bf21d7beec3e 100644 --- a/components/test/brave_welcome_ui/components/searchBox_test.tsx +++ b/components/test/brave_welcome_ui/components/searchBox_test.tsx @@ -4,9 +4,9 @@ import * as React from 'react' import { shallow } from 'enzyme' -import { Content } from 'brave-ui/features/welcome' -import { WelcomeSearchImage } from 'brave-ui/features/welcome/images' -import SearchBox, { Props } from '../../../../components/brave_welcome_ui/components/screens/searchBox' +import { Content } from '../../../../components/brave_welcome_ui/components' +import { WelcomeSearchImage } from '../../../../components/brave_welcome_ui/components/images' +import SearchBox, { Props } from '../../../../components/brave_welcome_ui/containers/screens/searchBox' import { mockSearchProviders } from '../../testData' describe('searchBox component tests', () => {