(Shields extension) Move brave-ui paths to brave-core paths

Manually move theme to brave-core which was left out of the imported commits from brave-ui
brave · Sep 10, 2019 · e76aa02 · e76aa02
1 parent 0148175
commit e76aa02
Show file tree

Hide file tree

Showing 71 changed files with 194 additions and 61 deletions.
diff --git a/components/brave_extension/extension/brave_extension/braveShieldsPanel.tsx b/components/brave_extension/extension/brave_extension/braveShieldsPanel.tsx
@@ -4,8 +4,8 @@
 
 import * as React from 'react'
 import * as ReactDOM from 'react-dom'
-import shieldsDarkTheme from 'brave-ui/theme/shields-dark'
-import shieldsLightTheme from 'brave-ui/theme/shields-light'
+import shieldsDarkTheme from './theme/shields-dark'
+import shieldsLightTheme from './theme/shields-light'
 import { Provider } from 'react-redux'
 import { Store } from 'react-chrome-redux'
 import BraveCoreThemeProvider from '../../../common/BraveCoreThemeProvider'

diff --git a/src/features/shields/data/index.ts → .../brave_extension/components/data/index.ts b/src/features/shields/data/index.ts → .../brave_extension/components/data/index.ts
diff --git a/src/features/shields/display.ts → ...ion/brave_extension/components/display.ts b/src/features/shields/display.ts → ...ion/brave_extension/components/display.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 from '../../theme'
-import Button, { Props as ButtonProps } from '../../components/buttonsIndicators/button'
+import styled from 'brave-ui/theme'
+import Button, { Props as ButtonProps } from 'brave-ui/components/buttonsIndicators/button'
 import { ComponentType } from 'react'
 
 /**

diff --git a/src/features/shields/index.ts → ...nsion/brave_extension/components/index.ts b/src/features/shields/index.ts → ...nsion/brave_extension/components/index.ts
diff --git a/src/features/shields/media/index.ts → ...brave_extension/components/media/index.ts b/src/features/shields/media/index.ts → ...brave_extension/components/media/index.ts
@@ -2,9 +2,9 @@
  * 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 from '../../../theme'
+import styled from 'brave-ui/theme'
 import { StyledComponentClass } from 'styled-components'
-import { CaratStrongDownIcon, ShieldAlertIcon, AlertMessageIcon } from '../../../components/icons'
+import { CaratStrongDownIcon, ShieldAlertIcon, AlertMessageIcon } from 'brave-ui/components/icons'
 
 import { ComponentType } from 'react'
 

diff --git a/src/features/shields/select/carat.svg → ...ave_extension/components/select/carat.svg b/src/features/shields/select/carat.svg → ...ave_extension/components/select/carat.svg
diff --git a/src/features/shields/select/index.ts → ...rave_extension/components/select/index.ts b/src/features/shields/select/index.ts → ...rave_extension/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/shields/structure/dash.svg → ...e_extension/components/structure/dash.svg b/src/features/shields/structure/dash.svg → ...e_extension/components/structure/dash.svg
diff --git a/src/features/shields/structure/index.ts → ...e_extension/components/structure/index.ts b/src/features/shields/structure/index.ts → ...e_extension/components/structure/index.ts
@@ -2,7 +2,7 @@
  * 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 from '../../../theme'
+import styled from 'brave-ui/theme'
 import { BlockedInfoRowStats, BlockedInfoRowText } from '../display'
 import { StyledWrapper as Toggle } from '../toggle/style'
 import dash from './dash.svg'

diff --git a/src/features/shields/toggle/index.tsx → ...ave_extension/components/toggle/index.tsx b/src/features/shields/toggle/index.tsx → ...ave_extension/components/toggle/index.tsx
diff --git a/src/features/shields/toggle/style.ts → ...rave_extension/components/toggle/style.ts b/src/features/shields/toggle/style.ts → ...rave_extension/components/toggle/style.ts
@@ -2,9 +2,9 @@
  * 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 styled, { css } from 'brave-ui/theme'
 import { Props } from './index'
-import palette from '../../../theme/colors'
+import palette from 'brave-ui/theme/colors'
 
 export const StyledCheckbox = styled<{}, 'input'>('input')`
   -webkit-appearance: none;

diff --git a/...tension/extension/brave_extension/containers/advancedView/controls/adsTrackersControl.tsx b/...tension/extension/brave_extension/containers/advancedView/controls/adsTrackersControl.tsx
@@ -12,7 +12,7 @@ import {
   BlockedInfoRowStats,
   BlockedInfoRowText,
   Toggle
-} from 'brave-ui/features/shields'
+} from '../../../components'
 
 // Group Components
 import StaticList from '../overlays/staticOverlay'

diff --git a/...e_extension/extension/brave_extension/containers/advancedView/controls/cookiesControl.tsx b/...e_extension/extension/brave_extension/containers/advancedView/controls/cookiesControl.tsx
@@ -5,7 +5,7 @@
 import * as React from 'react'
 
 // Feature-specific components
-import { BlockedInfoRowSingle, SelectBox } from 'brave-ui/features/shields'
+import { BlockedInfoRowSingle, SelectBox } from '../../../components'
 
 // Locale
 import { getLocale } from '../../../background/api/localeAPI'

diff --git a/...n/extension/brave_extension/containers/advancedView/controls/deviceRecognitionControl.tsx b/...n/extension/brave_extension/containers/advancedView/controls/deviceRecognitionControl.tsx
@@ -11,7 +11,7 @@ import {
   ArrowDownIcon,
   BlockedInfoRowStats,
   SelectBox
-} from 'brave-ui/features/shields'
+} from '../../../components'
 
 // Group Components
 import StaticList from '../overlays/staticOverlay'

diff --git a/...nsion/extension/brave_extension/containers/advancedView/controls/httpsUpgradesControl.tsx b/...nsion/extension/brave_extension/containers/advancedView/controls/httpsUpgradesControl.tsx
@@ -12,7 +12,7 @@ import {
   BlockedInfoRowStats,
   BlockedInfoRowText,
   Toggle
-} from 'brave-ui/features/shields'
+} from '../../../components'
 
 // Group Components
 import HTTPSUpgrades from '../overlays/httpsUpgradesOverlay'

diff --git a/...e_extension/extension/brave_extension/containers/advancedView/controls/scriptsControl.tsx b/...e_extension/extension/brave_extension/containers/advancedView/controls/scriptsControl.tsx
@@ -13,7 +13,7 @@ import {
   BlockedInfoRowText,
   LinkAction,
   Toggle
-} from 'brave-ui/features/shields'
+} from '../../../components'
 
 // Group Components
 import NoScript from '../overlays/noScriptOverlay'

diff --git a/components/brave_extension/extension/brave_extension/containers/advancedView/footer.tsx b/components/brave_extension/extension/brave_extension/containers/advancedView/footer.tsx
@@ -5,7 +5,7 @@
 import * as React from 'react'
 
 // Feature-specific components
-import { MainFooter, Link } from 'brave-ui/features/shields'
+import { MainFooter, Link } from '../../components'
 
 // API
 import * as tabsAPI from '../../background/api/tabsAPI'

diff --git a/components/brave_extension/extension/brave_extension/containers/advancedView/header.tsx b/components/brave_extension/extension/brave_extension/containers/advancedView/header.tsx
@@ -22,7 +22,7 @@ import {
   ShieldIcon,
   DisabledContentText,
   Toggle
-} from 'brave-ui/features/shields'
+} from '../../components'
 
 // Helpers
 import { getLocale } from '../../background/api/localeAPI'

diff --git a/components/brave_extension/extension/brave_extension/containers/advancedView/index.tsx b/components/brave_extension/extension/brave_extension/containers/advancedView/index.tsx
@@ -8,7 +8,7 @@ import * as React from 'react'
 import 'emptykit.css'
 
 // Feature-specific components
-import { ShieldsPanel } from 'brave-ui/features/shields'
+import { ShieldsPanel } from '../../components'
 
 // Components group
 import Header from './header'

diff --git a/...nsion/extension/brave_extension/containers/advancedView/overlays/httpsUpgradesOverlay.tsx b/...nsion/extension/brave_extension/containers/advancedView/overlays/httpsUpgradesOverlay.tsx
@@ -17,7 +17,7 @@ import {
   BlockedInfoRowStats,
   BlockedListSummaryText,
   ShieldsButton
-} from 'brave-ui/features/shields'
+} from '../../../components'
 
 // Helpers
 import { blockedResourcesSize } from '../../../helpers/shieldsUtils'

diff --git a/..._extension/extension/brave_extension/containers/advancedView/overlays/noScriptOverlay.tsx b/..._extension/extension/brave_extension/containers/advancedView/overlays/noScriptOverlay.tsx
@@ -42,7 +42,7 @@ import {
   BlockedListItemHeaderStats,
   BlockedListItemHeaderText,
   ShieldsButton
-} from 'brave-ui/features/shields'
+} from '../../../components'
 
 // Helpers
 import { getLocale } from '../../../background/api/localeAPI'

diff --git a/...ve_extension/extension/brave_extension/containers/advancedView/overlays/staticOverlay.tsx b/...ve_extension/extension/brave_extension/containers/advancedView/overlays/staticOverlay.tsx
@@ -17,7 +17,7 @@ import {
   BlockedInfoRowStats,
   BlockedListSummaryText,
   ShieldsButton
-} from 'brave-ui/features/shields'
+} from '../../../components'
 
 // Helpers
 import { blockedResourcesSize } from '../../../helpers/shieldsUtils'

diff --git a/...on/extension/brave_extension/containers/advancedView/overlays/webCompatWarningOverlay.tsx b/...on/extension/brave_extension/containers/advancedView/overlays/webCompatWarningOverlay.tsx
@@ -14,7 +14,7 @@ import {
   WarningIcon,
   WarningText,
   ShieldsButton
-} from 'brave-ui/features/shields'
+} from '../../../components'
 
 // Shared components
 import { Card } from 'brave-ui'

diff --git a/components/brave_extension/extension/brave_extension/containers/app.tsx b/components/brave_extension/extension/brave_extension/containers/app.tsx
@@ -6,7 +6,7 @@ import { bindActionCreators } from 'redux'
 import { connect } from 'react-redux'
 import * as shieldsPanelActions from '../actions/shieldsPanelActions'
 import * as shieldsPanelState from '../state/shieldsPanelState'
-import BraveShields from '../components/braveShields'
+import BraveShields from '../containers/braveShields'
 import { State } from '../types/state/mainState'
 
 const mapStateToProps = (

diff --git a/...tension/extension/brave_extension/containers/readOnlyView/controls/adsTrackersControl.tsx b/...tension/extension/brave_extension/containers/readOnlyView/controls/adsTrackersControl.tsx
@@ -14,7 +14,7 @@ import {
   ArrowDownIcon,
   BlockedInfoRowStats,
   BlockedListStatic
-} from 'brave-ui/features/shields'
+} from '../../../components'
 
 // Group components
 import StaticResourcesList from '../../shared/resourcesBlockedList/staticResourcesList'

diff --git a/...e_extension/extension/brave_extension/containers/readOnlyView/controls/cookiesControl.tsx b/...e_extension/extension/brave_extension/containers/readOnlyView/controls/cookiesControl.tsx
@@ -8,7 +8,7 @@ import * as React from 'react'
 import {
   BlockedInfoRowSingleText,
   BlockedInfoRowText
-} from 'brave-ui/features/shields'
+} from '../../../components'
 
 // Helpers
 import { getLocale } from '../../../background/api/localeAPI'

diff --git a/...n/extension/brave_extension/containers/readOnlyView/controls/deviceRecognitionControl.tsx b/...n/extension/brave_extension/containers/readOnlyView/controls/deviceRecognitionControl.tsx
@@ -14,7 +14,7 @@ import {
   BlockedInfoRowDataForSelect,
   BlockedListStatic,
   BlockedInfoRowText
-} from 'brave-ui/features/shields'
+} from '../../../components'
 
 // Group components
 import StaticResourcesList from '../../shared/resourcesBlockedList/staticResourcesList'

diff --git a/...nsion/extension/brave_extension/containers/readOnlyView/controls/httpsUpgradesControl.tsx b/...nsion/extension/brave_extension/containers/readOnlyView/controls/httpsUpgradesControl.tsx
@@ -14,7 +14,7 @@ import {
   ArrowDownIcon,
   BlockedInfoRowStats,
   BlockedListStatic
-} from 'brave-ui/features/shields'
+} from '../../../components'
 
 // Group components
 import StaticResourcesList from '../../shared/resourcesBlockedList/staticResourcesList'

diff --git a/...e_extension/extension/brave_extension/containers/readOnlyView/controls/scriptsControl.tsx b/...e_extension/extension/brave_extension/containers/readOnlyView/controls/scriptsControl.tsx
@@ -14,7 +14,7 @@ import {
   ArrowDownIcon,
   BlockedInfoRowStats,
   BlockedListStatic
-} from 'brave-ui/features/shields'
+} from '../../../components'
 
 // Group components
 import StaticResourcesList from '../../shared/resourcesBlockedList/staticResourcesList'

diff --git a/components/brave_extension/extension/brave_extension/containers/readOnlyView/index.tsx b/components/brave_extension/extension/brave_extension/containers/readOnlyView/index.tsx
@@ -19,7 +19,7 @@ import {
   BlockedInfoRowText,
   BlockedListFooter,
   ShieldsButton
-} from 'brave-ui/features/shields'
+} from '../../components'
 
 // Group components
 import InterfaceControls from './interfaceControls'

diff --git a/...xtension/brave_extension/containers/shared/resourcesBlockedList/noScriptResourcesList.tsx b/...xtension/brave_extension/containers/shared/resourcesBlockedList/noScriptResourcesList.tsx
@@ -21,7 +21,7 @@ import {
   LinkAction,
   BlockedListItemDetails,
   BlockedListItemSummary
-} from 'brave-ui/features/shields'
+} from '../../../components'
 
 // Helpers
 import { getHostname, stripProtocolFromUrl } from '../../../helpers/urlUtils'

diff --git a/.../extension/brave_extension/containers/shared/resourcesBlockedList/staticResourcesList.tsx b/.../extension/brave_extension/containers/shared/resourcesBlockedList/staticResourcesList.tsx
@@ -5,7 +5,7 @@
 import * as React from 'react'
 
 // Feature-specific components
-import { BlockedListItem } from 'brave-ui/features/shields'
+import { BlockedListItem } from '../../../components'
 
 // Helpers
 import { stripProtocolFromUrl } from '../../../helpers/urlUtils'

diff --git a/components/brave_extension/extension/brave_extension/containers/simpleView/footer.tsx b/components/brave_extension/extension/brave_extension/containers/simpleView/footer.tsx
@@ -5,7 +5,7 @@
 import * as React from 'react'
 
 // Feature-specific components
-import { MainFooter, Link } from 'brave-ui/features/shields'
+import { MainFooter, Link } from '../../components'
 
 // API
 import * as tabsAPI from '../../background/api/tabsAPI'

diff --git a/components/brave_extension/extension/brave_extension/containers/simpleView/header.tsx b/components/brave_extension/extension/brave_extension/containers/simpleView/header.tsx
@@ -23,7 +23,7 @@ import {
   ShieldIcon,
   DisabledContentText,
   Toggle
- } from 'brave-ui/features/shields'
+ } from '../../components'
 
 // Helpers
 import { getLocale } from '../../background/api/localeAPI'

diff --git a/components/brave_extension/extension/brave_extension/containers/simpleView/index.tsx b/components/brave_extension/extension/brave_extension/containers/simpleView/index.tsx
@@ -5,7 +5,7 @@
 import * as React from 'react'
 
 // Feature-specific components
-import { ShieldsPanel } from 'brave-ui/features/shields'
+import { ShieldsPanel } from '../../components'
 
 // Components group
 import Header from './header'

diff --git a/...ancedView/controls/adsTrackersControl.tsx → ...ancedView/controls/adsTrackersControl.tsx b/...ancedView/controls/adsTrackersControl.tsx → ...ancedView/controls/adsTrackersControl.tsx
@@ -12,7 +12,7 @@ import {
   BlockedInfoRowStats,
   BlockedInfoRowText,
   Toggle
-} from '../../../../../../src/features/shields'
+} from '../../../../components'
 
 // Group Components
 import StaticList from '../overlays/staticOverlay'

diff --git a/.../advancedView/controls/cookiesControl.tsx → .../advancedView/controls/cookiesControl.tsx b/.../advancedView/controls/cookiesControl.tsx → .../advancedView/controls/cookiesControl.tsx
@@ -5,7 +5,7 @@
 import * as React from 'react'
 
 // Feature-specific components
-import { BlockedInfoRowSingle, SelectBox } from '../../../../../../src/features/shields'
+import { BlockedInfoRowSingle, SelectBox } from '../../../../components'
 
 // Fake data
 import { getLocale } from '../../../fakeLocale'

diff --git a/...iew/controls/deviceRecognitionControl.tsx → ...iew/controls/deviceRecognitionControl.tsx b/...iew/controls/deviceRecognitionControl.tsx → ...iew/controls/deviceRecognitionControl.tsx
@@ -11,7 +11,7 @@ import {
   ArrowDownIcon,
   BlockedInfoRowStats,
   SelectBox
-} from '../../../../../../src/features/shields'
+} from '../../../../components'
 
 // Group Components
 import StaticList from '../overlays/staticOverlay'

diff --git a/...cedView/controls/httpsUpgradesControl.tsx → ...cedView/controls/httpsUpgradesControl.tsx b/...cedView/controls/httpsUpgradesControl.tsx → ...cedView/controls/httpsUpgradesControl.tsx
@@ -12,7 +12,7 @@ import {
   BlockedInfoRowStats,
   BlockedInfoRowText,
   Toggle
-} from '../../../../../../src/features/shields'
+} from '../../../../components'
 
 // Group Components
 import StaticList from '../overlays/staticOverlay'

diff --git a/.../advancedView/controls/scriptsControl.tsx → .../advancedView/controls/scriptsControl.tsx b/.../advancedView/controls/scriptsControl.tsx → .../advancedView/controls/scriptsControl.tsx
@@ -13,7 +13,7 @@ import {
   BlockedInfoRowText,
   Toggle,
   LinkAction
-} from '../../../../../../src/features/shields'
+} from '../../../../components'
 
 // Group Components
 import NoScriptOverlay from '../overlays/noScriptOverlay'

diff --git a/...hields/components/advancedView/header.tsx → ...tories/components/advancedView/header.tsx b/...hields/components/advancedView/header.tsx → ...tories/components/advancedView/header.tsx
@@ -22,7 +22,7 @@ import {
   ShieldIcon,
   DisabledContentText,
   Toggle
- } from '../../../../../src/features/shields'
+ } from '../../../components'
 
 // Fake data
 import { getLocale } from '../../fakeLocale'

diff --git a/...shields/components/advancedView/index.tsx → ...stories/components/advancedView/index.tsx b/...shields/components/advancedView/index.tsx → ...stories/components/advancedView/index.tsx
@@ -5,7 +5,7 @@
 import * as React from 'react'
 
 // Feature-specific components
-import { ShieldsPanel } from '../../../../../src/features/shields'
+import { ShieldsPanel } from '../../../components'
 
 // Components group
 import Header from './header'

diff --git a/...onents/advancedView/interfaceControls.tsx → ...onents/advancedView/interfaceControls.tsx b/...onents/advancedView/interfaceControls.tsx → ...onents/advancedView/interfaceControls.tsx
diff --git a/...advancedView/overlays/noScriptOverlay.tsx → ...advancedView/overlays/noScriptOverlay.tsx b/...advancedView/overlays/noScriptOverlay.tsx → ...advancedView/overlays/noScriptOverlay.tsx
@@ -33,7 +33,7 @@ import {
   BlockedListItemHeaderStats,
   BlockedListItemHeaderText,
   ShieldsButton
-} from '../../../../../../src/features/shields'
+} from '../../../../components'
 
 // Helpers
 import { getLocale } from '../../../fakeLocale'

diff --git a/...s/advancedView/overlays/staticOverlay.tsx → ...s/advancedView/overlays/staticOverlay.tsx b/...s/advancedView/overlays/staticOverlay.tsx → ...s/advancedView/overlays/staticOverlay.tsx
@@ -16,7 +16,7 @@ import {
   BlockedInfoRowStats,
   BlockedListSummaryText,
   ShieldsButton
-} from '../../../../../../src/features/shields'
+} from '../../../../components'
 
 // Group components
 import StaticResourcesList from '../../shared/resourcesBlockedList/staticResourcesList'

diff --git a/...View/overlays/webCompatWarningOverlay.tsx → ...View/overlays/webCompatWarningOverlay.tsx b/...View/overlays/webCompatWarningOverlay.tsx → ...View/overlays/webCompatWarningOverlay.tsx
@@ -11,10 +11,10 @@ import {
   WarningIcon,
   WarningText,
   ShieldsButton
-} from '../../../../../../src/features/shields'
+} from '../../../../components'
 
 // Shared components
-import { Card } from '../../../../../../src/components'
+import { Card } from 'brave-ui'
 
 // Helpers
 import { getLocale } from '../../../fakeLocale'

diff --git a/...mponents/advancedView/privacyControls.tsx → ...mponents/advancedView/privacyControls.tsx b/...mponents/advancedView/privacyControls.tsx → ...mponents/advancedView/privacyControls.tsx
diff --git a/...dOnlyView/controls/adsTrackersControl.tsx → ...dOnlyView/controls/adsTrackersControl.tsx b/...dOnlyView/controls/adsTrackersControl.tsx → ...dOnlyView/controls/adsTrackersControl.tsx
@@ -15,7 +15,7 @@ import {
   BlockedInfoRowStats,
   BlockedListStatic,
   dummyData
-} from '../../../../../../src/features/shields'
+} from '../../../../components'
 
 // Group components
 import StaticResourcesList from '../../shared/resourcesBlockedList/staticResourcesList'

diff --git a/.../readOnlyView/controls/cookiesControl.tsx → .../readOnlyView/controls/cookiesControl.tsx b/.../readOnlyView/controls/cookiesControl.tsx → .../readOnlyView/controls/cookiesControl.tsx
@@ -8,7 +8,7 @@ import * as React from 'react'
 import {
   BlockedInfoRowSingleText,
   BlockedInfoRowText
-} from '../../../../../../src/features/shields'
+} from '../../../../components'
 
 // Helpers
 import { getLocale } from '../../../fakeLocale'