Welcome Page WebUI: Move brave-ui paths to brave-core paths

brave · Jul 23, 2019 · bc8819d · bc8819d
1 parent 1f6856c
commit bc8819d
Show file tree

Hide file tree

Showing 36 changed files with 65 additions and 59 deletions.
diff --git a/src/features/welcome/button/index.ts → ...ave_welcome_ui/components/button/index.ts b/src/features/welcome/button/index.ts → ...ave_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 → ...ave_welcome_ui/components/images/index.ts b/src/features/welcome/images/index.ts → ...ave_welcome_ui/components/images/index.ts
diff --git a/src/features/welcome/images/lion_logo.svg → ...elcome_ui/components/images/lion_logo.svg b/src/features/welcome/images/lion_logo.svg → ...elcome_ui/components/images/lion_logo.svg
diff --git a/src/features/welcome/images/welcome_bg.svg → ...lcome_ui/components/images/welcome_bg.svg b/src/features/welcome/images/welcome_bg.svg → ...lcome_ui/components/images/welcome_bg.svg
diff --git a/...eatures/welcome/images/welcome_import.svg → ...e_ui/components/images/welcome_import.svg b/...eatures/welcome/images/welcome_import.svg → ...e_ui/components/images/welcome_import.svg
diff --git a/...atures/welcome/images/welcome_rewards.svg → ..._ui/components/images/welcome_rewards.svg b/...atures/welcome/images/welcome_rewards.svg → ..._ui/components/images/welcome_rewards.svg
diff --git a/...eatures/welcome/images/welcome_search.svg → ...e_ui/components/images/welcome_search.svg b/...eatures/welcome/images/welcome_search.svg → ...e_ui/components/images/welcome_search.svg
diff --git a/...atures/welcome/images/welcome_shields.svg → ..._ui/components/images/welcome_shields.svg b/...atures/welcome/images/welcome_shields.svg → ..._ui/components/images/welcome_shields.svg
diff --git a/...features/welcome/images/welcome_theme.svg → ...me_ui/components/images/welcome_theme.svg b/...features/welcome/images/welcome_theme.svg → ...me_ui/components/images/welcome_theme.svg
diff --git a/src/features/welcome/index.ts → ...ents/brave_welcome_ui/components/index.ts b/src/features/welcome/index.ts → ...ents/brave_welcome_ui/components/index.ts
diff --git a/src/features/welcome/select/carat.svg → ...ve_welcome_ui/components/select/carat.svg b/src/features/welcome/select/carat.svg → ...ve_welcome_ui/components/select/carat.svg
diff --git a/src/features/welcome/select/index.ts → ...ave_welcome_ui/components/select/index.ts b/src/features/welcome/select/index.ts → ...ave_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 → ...brave_welcome_ui/components/text/index.ts b/src/features/welcome/text/index.ts → ...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 → ...ve_welcome_ui/components/wrapper/index.ts b/src/features/welcome/wrapper/index.ts → ...ve_welcome_ui/components/wrapper/index.ts
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 → ...ave_welcome_ui/stories/page/fakeLocale.ts b/stories/features/welcome/page/fakeLocale.ts → ...ave_welcome_ui/stories/page/fakeLocale.ts
diff --git a/stories/features/welcome/page/index.tsx → ...s/brave_welcome_ui/stories/page/index.tsx b/stories/features/welcome/page/index.tsx → ...s/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/...atures/welcome/page/screens/footerBox.tsx → ...ome_ui/stories/page/screens/footerBox.tsx b/...atures/welcome/page/screens/footerBox.tsx → ...ome_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/...atures/welcome/page/screens/importBox.tsx → ...ome_ui/stories/page/screens/importBox.tsx b/...atures/welcome/page/screens/importBox.tsx → ...ome_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/...tures/welcome/page/screens/rewardsBox.tsx → ...me_ui/stories/page/screens/rewardsBox.tsx b/...tures/welcome/page/screens/rewardsBox.tsx → ...me_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/...atures/welcome/page/screens/searchBox.tsx → ...ome_ui/stories/page/screens/searchBox.tsx b/...atures/welcome/page/screens/searchBox.tsx → ...ome_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/...tures/welcome/page/screens/shieldsBox.tsx → ...me_ui/stories/page/screens/shieldsBox.tsx b/...tures/welcome/page/screens/shieldsBox.tsx → ...me_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/...eatures/welcome/page/screens/themeBox.tsx → ...come_ui/stories/page/screens/themeBox.tsx b/...eatures/welcome/page/screens/themeBox.tsx → ...come_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/...tures/welcome/page/screens/welcomeBox.tsx → ...me_ui/stories/page/screens/welcomeBox.tsx b/...tures/welcome/page/screens/welcomeBox.tsx → ...me_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 → ...onents/brave_welcome_ui/stories/story.tsx b/stories/features/welcome/story.tsx → ...onents/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
@@ -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
@@ -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
@@ -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
@@ -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', () => {