From 04be3d81eea7e011e5c7fc93c48ea8fd3427d961 Mon Sep 17 00:00:00 2001 From: HichamELBSI Date: Tue, 5 Jan 2021 17:40:26 +0100 Subject: [PATCH] Remove duplicate components from Upload plugin Signed-off-by: HichamELBSI --- .../src/components/BrowseAssets/index.js | 4 +- .../admin/src/components/Card/index.js | 18 ++------- .../src/components/CardErrorMessage/index.js | 2 +- .../admin/src/components/CardTitle/index.js | 2 +- .../src/components/CheckControl/Button.js | 2 +- .../src/components/CheckControl/index.js | 3 +- .../src/components/DropdownButton/index.js | 3 +- .../admin/src/components/Duration/index.js | 2 +- .../src/components/EditForm/FileDetailsBox.js | 28 ++++++++------ .../EditForm/FileDetailsBoxWrapper.js | 2 +- .../src/components/EditForm/FormWrapper.js | 2 +- .../admin/src/components/EditForm/SizeBox.js | 2 +- .../admin/src/components/FileInfos/index.js | 2 +- .../admin/src/components/Filters/index.js | 2 +- .../FiltersPicker/FiltersCard/SizeInput.js | 5 +-- .../admin/src/components/Flex/index.js | 25 ------------ .../components/InputMedia/InputFilePreview.js | 2 +- .../admin/src/components/IntlText/index.js | 2 +- .../src/components/ModalNavWrapper/index.js | 4 +- .../src/components/ModalTab/Count/Wrapper.js | 2 +- .../src/components/ModalTab/Count/index.js | 2 +- .../admin/src/components/ModalTab/index.js | 3 +- .../admin/src/components/Padded/index.js | 28 -------------- .../SelectedAssets/DraggableCard.js | 2 +- .../src/components/SelectedAssets/index.js | 4 +- .../admin/src/components/SortList/Wrapper.js | 2 +- .../admin/src/components/Tag/index.js | 2 +- .../admin/src/components/Text/index.js | 38 ------------------- .../HomePage/HomePageContent/HomePageList.js | 2 +- .../HomePageContent/HomePageSettings.js | 4 +- .../admin/src/containers/HomePage/index.js | 3 +- .../src/containers/SettingsPage/index.js | 3 +- yarn.lock | 35 +---------------- 33 files changed, 52 insertions(+), 190 deletions(-) delete mode 100644 packages/strapi-plugin-upload/admin/src/components/Flex/index.js delete mode 100644 packages/strapi-plugin-upload/admin/src/components/Padded/index.js delete mode 100644 packages/strapi-plugin-upload/admin/src/components/Text/index.js diff --git a/packages/strapi-plugin-upload/admin/src/components/BrowseAssets/index.js b/packages/strapi-plugin-upload/admin/src/components/BrowseAssets/index.js index 29cd48ec41..e323e25c5c 100644 --- a/packages/strapi-plugin-upload/admin/src/components/BrowseAssets/index.js +++ b/packages/strapi-plugin-upload/admin/src/components/BrowseAssets/index.js @@ -1,12 +1,12 @@ import React from 'react'; import { isEmpty } from 'lodash'; import { PageFooter } from 'strapi-helper-plugin'; +import { Flex, Padded } from '@buffetjs/core'; + import { generatePageFromStart, generateStartFromPage } from '../../utils'; import Filters from '../Filters'; -import Flex from '../Flex'; import List from '../List'; import ListEmpty from '../ListEmpty'; -import Padded from '../Padded'; import SelectAll from '../SelectAll'; import SortPicker from '../SortPicker'; import useModalContext from '../../hooks/useModalContext'; diff --git a/packages/strapi-plugin-upload/admin/src/components/Card/index.js b/packages/strapi-plugin-upload/admin/src/components/Card/index.js index 3b048cea4a..248c245e5f 100644 --- a/packages/strapi-plugin-upload/admin/src/components/Card/index.js +++ b/packages/strapi-plugin-upload/admin/src/components/Card/index.js @@ -1,10 +1,9 @@ import React, { memo } from 'react'; import PropTypes from 'prop-types'; +import { Flex } from '@buffetjs/core'; import { getFileExtension, useGlobalContext } from 'strapi-helper-plugin'; import { formatBytes, getType, getTrad } from '../../utils'; -import Flex from '../Flex'; -import Text from '../Text'; import Border from '../CardBorder'; import CardImgWrapper from '../CardImgWrapper'; import CardPreview from '../CardPreview'; @@ -66,26 +65,15 @@ const Card = ({ {children} - - {!withoutFileInfo ? ( + {!withoutFileInfo && ( <> {name} - {!withoutFileInfo && ( - - )} + - ) : ( - )} - {hasError && {errorMessage}} ); diff --git a/packages/strapi-plugin-upload/admin/src/components/CardErrorMessage/index.js b/packages/strapi-plugin-upload/admin/src/components/CardErrorMessage/index.js index 0f530367b2..579ebbe146 100644 --- a/packages/strapi-plugin-upload/admin/src/components/CardErrorMessage/index.js +++ b/packages/strapi-plugin-upload/admin/src/components/CardErrorMessage/index.js @@ -1,6 +1,6 @@ import React from 'react'; import styled from 'styled-components'; -import Text from '../Text'; +import { Text } from '@buffetjs/core'; const ErrorMessage = styled(props => )` margin-top: 3px; diff --git a/packages/strapi-plugin-upload/admin/src/components/CardTitle/index.js b/packages/strapi-plugin-upload/admin/src/components/CardTitle/index.js index 0491531105..574fbf5843 100644 --- a/packages/strapi-plugin-upload/admin/src/components/CardTitle/index.js +++ b/packages/strapi-plugin-upload/admin/src/components/CardTitle/index.js @@ -1,6 +1,6 @@ import React from 'react'; import styled from 'styled-components'; -import Text from '../Text'; +import { Text } from '@buffetjs/core'; const Title = styled(props => ( diff --git a/packages/strapi-plugin-upload/admin/src/components/CheckControl/Button.js b/packages/strapi-plugin-upload/admin/src/components/CheckControl/Button.js index 60fb39cfd0..4aa296d0db 100644 --- a/packages/strapi-plugin-upload/admin/src/components/CheckControl/Button.js +++ b/packages/strapi-plugin-upload/admin/src/components/CheckControl/Button.js @@ -1,5 +1,5 @@ import styled from 'styled-components'; -import Text from '../Text'; +import { Text } from '@buffetjs/core'; const Button = styled(Text)` display: flex; diff --git a/packages/strapi-plugin-upload/admin/src/components/CheckControl/index.js b/packages/strapi-plugin-upload/admin/src/components/CheckControl/index.js index 5b9cc8ef12..8a213e7e2b 100644 --- a/packages/strapi-plugin-upload/admin/src/components/CheckControl/index.js +++ b/packages/strapi-plugin-upload/admin/src/components/CheckControl/index.js @@ -2,9 +2,10 @@ import React, { useState, useRef } from 'react'; import PropTypes from 'prop-types'; import { useClickAwayListener } from '@buffetjs/hooks'; import { useGlobalContext } from 'strapi-helper-plugin'; +import { Padded } from '@buffetjs/core'; + import DoubleFile from '../../icons/DoubleFile'; import File from '../../icons/File'; -import Padded from '../Padded'; import Button from './Button'; import Spacer from './Spacer'; import CardControl from '../CardControl'; diff --git a/packages/strapi-plugin-upload/admin/src/components/DropdownButton/index.js b/packages/strapi-plugin-upload/admin/src/components/DropdownButton/index.js index 6164ea82f6..bd956ec5cb 100644 --- a/packages/strapi-plugin-upload/admin/src/components/DropdownButton/index.js +++ b/packages/strapi-plugin-upload/admin/src/components/DropdownButton/index.js @@ -2,8 +2,7 @@ import React from 'react'; import styled from 'styled-components'; import PropTypes from 'prop-types'; import { themePropTypes } from 'strapi-helper-plugin'; - -import Text from '../Text'; +import { Text } from '@buffetjs/core'; const DropdownButton = styled(props => ( ( diff --git a/packages/strapi-plugin-upload/admin/src/components/EditForm/FileDetailsBox.js b/packages/strapi-plugin-upload/admin/src/components/EditForm/FileDetailsBox.js index 817195152d..e827530ae1 100644 --- a/packages/strapi-plugin-upload/admin/src/components/EditForm/FileDetailsBox.js +++ b/packages/strapi-plugin-upload/admin/src/components/EditForm/FileDetailsBox.js @@ -2,22 +2,23 @@ import React from 'react'; import PropTypes from 'prop-types'; import { dateFormats, dateToUtcTime } from 'strapi-helper-plugin'; import { get } from 'lodash'; +import { useIntl } from 'react-intl'; +import { Text, Flex } from '@buffetjs/core'; -import { formatBytes } from '../../utils'; +import { formatBytes, getTrad } from '../../utils'; -import Flex from '../Flex'; -import Text from '../Text'; import FileDetailsBoxWrapper from './FileDetailsBoxWrapper'; const FileDetailsBox = ({ file }) => { + const { formatMessage } = useIntl(); const fileSize = file.mime ? get(file, 'size', 0) : get(file, 'size', 0) / 1000; const sections = [ { key: 0, rows: [ - { label: 'size', value: formatBytes(fileSize, 0) }, + { label: 'modal.file-details.size', value: formatBytes(fileSize, 0) }, { - label: 'date', + label: 'modal.file-details.date', value: file.created_at ? dateToUtcTime(file.created_at).format(dateFormats.date) : '-', }, ], @@ -29,9 +30,12 @@ const FileDetailsBox = ({ file }) => { { key: 2, rows: [ - { label: 'dimensions', value: file.width ? `${file.width}×${file.height}` : '-' }, { - label: 'extension', + label: 'modal.file-details.dimensions', + value: file.width ? `${file.width}×${file.height}` : '-', + }, + { + label: 'modal.file-details.extension', value: file.ext ? file.ext.replace('.', '') : '-', textTransform: 'uppercase', }, @@ -44,9 +48,9 @@ const FileDetailsBox = ({ file }) => { {sections.map(({ key, rows, type }) => { if (type === 'spacer') { return ( - +
  - +
); } @@ -54,14 +58,14 @@ const FileDetailsBox = ({ file }) => { {rows.map(rowItem => { return ( - +
- {rowItem.label} + {formatMessage({ id: getTrad(rowItem.label) })} {rowItem.value} - +
); })} diff --git a/packages/strapi-plugin-upload/admin/src/components/EditForm/FileDetailsBoxWrapper.js b/packages/strapi-plugin-upload/admin/src/components/EditForm/FileDetailsBoxWrapper.js index 709b5d199e..df417d0af7 100644 --- a/packages/strapi-plugin-upload/admin/src/components/EditForm/FileDetailsBoxWrapper.js +++ b/packages/strapi-plugin-upload/admin/src/components/EditForm/FileDetailsBoxWrapper.js @@ -3,7 +3,7 @@ import { themePropTypes } from 'strapi-helper-plugin'; const FileDetailsBoxWrapper = styled.div` width: 100%; - height: 119px; + min-height: 119px; padding: 16px; background-color: ${({ theme }) => theme.main.colors.lightGrey}; border-radius: ${({ theme }) => theme.main.sizes.borderRadius}; diff --git a/packages/strapi-plugin-upload/admin/src/components/EditForm/FormWrapper.js b/packages/strapi-plugin-upload/admin/src/components/EditForm/FormWrapper.js index 977b0e941c..ddd2014572 100644 --- a/packages/strapi-plugin-upload/admin/src/components/EditForm/FormWrapper.js +++ b/packages/strapi-plugin-upload/admin/src/components/EditForm/FormWrapper.js @@ -1,7 +1,7 @@ import styled from 'styled-components'; const FormWrapper = styled.div` - margin-top: 22px; + margin-top: 19px; `; export default FormWrapper; diff --git a/packages/strapi-plugin-upload/admin/src/components/EditForm/SizeBox.js b/packages/strapi-plugin-upload/admin/src/components/EditForm/SizeBox.js index 9c17bff77f..81707987a1 100644 --- a/packages/strapi-plugin-upload/admin/src/components/EditForm/SizeBox.js +++ b/packages/strapi-plugin-upload/admin/src/components/EditForm/SizeBox.js @@ -1,6 +1,6 @@ import React from 'react'; import styled from 'styled-components'; -import Text from '../Text'; +import { Text } from '@buffetjs/core'; const SizeBox = styled(props => )` position: absolute; diff --git a/packages/strapi-plugin-upload/admin/src/components/FileInfos/index.js b/packages/strapi-plugin-upload/admin/src/components/FileInfos/index.js index 661f27d543..9dc33a2946 100644 --- a/packages/strapi-plugin-upload/admin/src/components/FileInfos/index.js +++ b/packages/strapi-plugin-upload/admin/src/components/FileInfos/index.js @@ -2,7 +2,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import { upperCase } from 'lodash'; -import Text from '../Text'; +import { Text } from '@buffetjs/core'; const FileInfos = ({ extension, height, size, width }) => { return ( diff --git a/packages/strapi-plugin-upload/admin/src/components/Filters/index.js b/packages/strapi-plugin-upload/admin/src/components/Filters/index.js index f0503c2e7a..58a6d94a01 100644 --- a/packages/strapi-plugin-upload/admin/src/components/Filters/index.js +++ b/packages/strapi-plugin-upload/admin/src/components/Filters/index.js @@ -1,9 +1,9 @@ import React from 'react'; import PropTypes from 'prop-types'; +import { Padded } from '@buffetjs/core'; import FiltersList from '../FiltersList'; import FiltersPicker from '../FiltersPicker'; -import Padded from '../Padded'; const Filters = ({ onChange, onClick, filters }) => { return ( diff --git a/packages/strapi-plugin-upload/admin/src/components/FiltersPicker/FiltersCard/SizeInput.js b/packages/strapi-plugin-upload/admin/src/components/FiltersPicker/FiltersCard/SizeInput.js index 3ab279f194..979d891ba5 100644 --- a/packages/strapi-plugin-upload/admin/src/components/FiltersPicker/FiltersCard/SizeInput.js +++ b/packages/strapi-plugin-upload/admin/src/components/FiltersPicker/FiltersCard/SizeInput.js @@ -6,10 +6,7 @@ import React, { useState } from 'react'; import PropTypes from 'prop-types'; -import { InputNumber, Select } from '@buffetjs/core'; - -import Flex from '../../Flex'; -import Padded from '../../Padded'; +import { InputNumber, Select, Padded, Flex } from '@buffetjs/core'; function SizeInput({ onChange, value, ...rest }) { const options = ['KB', 'MB', 'GB']; diff --git a/packages/strapi-plugin-upload/admin/src/components/Flex/index.js b/packages/strapi-plugin-upload/admin/src/components/Flex/index.js deleted file mode 100644 index 09b4b4f55a..0000000000 --- a/packages/strapi-plugin-upload/admin/src/components/Flex/index.js +++ /dev/null @@ -1,25 +0,0 @@ -import styled from 'styled-components'; -import PropTypes from 'prop-types'; - -const Flex = styled.div` - display: flex; - justify-content: ${({ justifyContent }) => justifyContent}; - flex-direction: ${({ flexDirection }) => flexDirection}; - align-items: ${({ alignItems }) => alignItems}; - flex-wrap: ${({ flexWrap }) => flexWrap}; -`; - -Flex.defaultProps = { - justifyContent: 'normal', - flexDirection: 'row', - flexWrap: 'nowrap', - alignItems: 'normal', -}; - -Flex.propTypes = { - justifyContent: PropTypes.string, - flexDirection: PropTypes.string, - flexWrap: PropTypes.string, -}; - -export default Flex; diff --git a/packages/strapi-plugin-upload/admin/src/components/InputMedia/InputFilePreview.js b/packages/strapi-plugin-upload/admin/src/components/InputMedia/InputFilePreview.js index feb8ee8a55..ef5f4fde4a 100644 --- a/packages/strapi-plugin-upload/admin/src/components/InputMedia/InputFilePreview.js +++ b/packages/strapi-plugin-upload/admin/src/components/InputMedia/InputFilePreview.js @@ -2,9 +2,9 @@ import React from 'react'; import PropTypes from 'prop-types'; import { get } from 'lodash'; import { prefixFileUrlWithBackendUrl } from 'strapi-helper-plugin'; +import { Flex } from '@buffetjs/core'; import CardPreview from '../CardPreview'; -import Flex from '../Flex'; import Chevron from './Chevron'; const InputFilePreview = ({ file, onClick, isSlider }) => { diff --git a/packages/strapi-plugin-upload/admin/src/components/IntlText/index.js b/packages/strapi-plugin-upload/admin/src/components/IntlText/index.js index b08300f7ef..1e991f80c5 100644 --- a/packages/strapi-plugin-upload/admin/src/components/IntlText/index.js +++ b/packages/strapi-plugin-upload/admin/src/components/IntlText/index.js @@ -2,7 +2,7 @@ import React from 'react'; import { FormattedMessage } from 'react-intl'; import PropTypes from 'prop-types'; -import Text from '../Text'; +import { Text } from '@buffetjs/core'; const IntlText = ({ id, defaultMessage, values, ...textProps }) => ( diff --git a/packages/strapi-plugin-upload/admin/src/components/ModalNavWrapper/index.js b/packages/strapi-plugin-upload/admin/src/components/ModalNavWrapper/index.js index ac7aa49355..c3e137db5d 100644 --- a/packages/strapi-plugin-upload/admin/src/components/ModalNavWrapper/index.js +++ b/packages/strapi-plugin-upload/admin/src/components/ModalNavWrapper/index.js @@ -1,7 +1,7 @@ import React, { useState } from 'react'; import PropTypes from 'prop-types'; -import Flex from '../Flex'; -import Padded from '../Padded'; +import { Flex, Padded } from '@buffetjs/core'; + import ModalSection from '../ModalSection'; import ModalTab from '../ModalTab'; import Hr from './Hr'; diff --git a/packages/strapi-plugin-upload/admin/src/components/ModalTab/Count/Wrapper.js b/packages/strapi-plugin-upload/admin/src/components/ModalTab/Count/Wrapper.js index 5a49e7c10d..ee3046629c 100644 --- a/packages/strapi-plugin-upload/admin/src/components/ModalTab/Count/Wrapper.js +++ b/packages/strapi-plugin-upload/admin/src/components/ModalTab/Count/Wrapper.js @@ -1,6 +1,6 @@ import styled from 'styled-components'; -import Flex from '../../Flex'; +import { Flex } from '@buffetjs/core'; const Wrapper = styled(Flex)` width: 1.4rem; diff --git a/packages/strapi-plugin-upload/admin/src/components/ModalTab/Count/index.js b/packages/strapi-plugin-upload/admin/src/components/ModalTab/Count/index.js index 682dca2764..18533198c7 100644 --- a/packages/strapi-plugin-upload/admin/src/components/ModalTab/Count/index.js +++ b/packages/strapi-plugin-upload/admin/src/components/ModalTab/Count/index.js @@ -1,7 +1,7 @@ import React from 'react'; import PropTypes from 'prop-types'; +import { Text } from '@buffetjs/core'; -import Text from '../../Text'; import Wrapper from './Wrapper'; const Count = ({ count, isActive }) => ( diff --git a/packages/strapi-plugin-upload/admin/src/components/ModalTab/index.js b/packages/strapi-plugin-upload/admin/src/components/ModalTab/index.js index 3ca2af8ad7..f5066dbe70 100644 --- a/packages/strapi-plugin-upload/admin/src/components/ModalTab/index.js +++ b/packages/strapi-plugin-upload/admin/src/components/ModalTab/index.js @@ -6,12 +6,11 @@ import React from 'react'; import PropTypes from 'prop-types'; +import { Flex, Padded } from '@buffetjs/core'; import { getTrad } from '../../utils'; import Wrapper from './Wrapper'; -import Padded from '../Padded'; import IntlText from '../IntlText'; -import Flex from '../Flex'; import Count from './Count'; const ModalTab = ({ isDisabled, label, to, isActive, onClick, count }) => { diff --git a/packages/strapi-plugin-upload/admin/src/components/Padded/index.js b/packages/strapi-plugin-upload/admin/src/components/Padded/index.js deleted file mode 100644 index dbba2cbc66..0000000000 --- a/packages/strapi-plugin-upload/admin/src/components/Padded/index.js +++ /dev/null @@ -1,28 +0,0 @@ -import PropTypes from 'prop-types'; -import styled from 'styled-components'; - -const Padded = styled.div` - padding-top: ${({ theme, size, top }) => top && (theme.main.sizes.paddings[size] || size)}; - padding-right: ${({ theme, size, right }) => right && (theme.main.sizes.paddings[size] || size)}; - padding-bottom: ${({ theme, size, bottom }) => - bottom && (theme.main.sizes.paddings[size] || size)}; - padding-left: ${({ theme, size, left }) => left && (theme.main.sizes.paddings[size] || size)}; -`; - -Padded.defaultProps = { - bottom: false, - left: false, - right: false, - top: false, - size: 'sm', -}; - -Padded.propTypes = { - bottom: PropTypes.bool, - left: PropTypes.bool, - right: PropTypes.bool, - top: PropTypes.bool, - size: PropTypes.string, -}; - -export default Padded; diff --git a/packages/strapi-plugin-upload/admin/src/components/SelectedAssets/DraggableCard.js b/packages/strapi-plugin-upload/admin/src/components/SelectedAssets/DraggableCard.js index 24323828f8..a3b350327e 100644 --- a/packages/strapi-plugin-upload/admin/src/components/SelectedAssets/DraggableCard.js +++ b/packages/strapi-plugin-upload/admin/src/components/SelectedAssets/DraggableCard.js @@ -2,10 +2,10 @@ import React, { useRef, useEffect } from 'react'; import { useDrag, useDrop } from 'react-dnd'; import PropTypes from 'prop-types'; import { getEmptyImage } from 'react-dnd-html5-backend'; +import { Flex } from '@buffetjs/core'; import { getFileExtension } from 'strapi-helper-plugin'; import { formatBytes, getType, ItemTypes } from '../../utils'; -import Flex from '../Flex'; import Border from '../CardBorder'; import CardImgWrapper from '../CardImgWrapper'; import CardPreview from '../CardPreview'; diff --git a/packages/strapi-plugin-upload/admin/src/components/SelectedAssets/index.js b/packages/strapi-plugin-upload/admin/src/components/SelectedAssets/index.js index 4db73b7075..7082dcd01a 100644 --- a/packages/strapi-plugin-upload/admin/src/components/SelectedAssets/index.js +++ b/packages/strapi-plugin-upload/admin/src/components/SelectedAssets/index.js @@ -1,8 +1,8 @@ import React from 'react'; -import { getTrad } from '../../utils'; +import { Flex } from '@buffetjs/core'; -import Flex from '../Flex'; +import { getTrad } from '../../utils'; import IntlText from '../IntlText'; import ListTitle from '../UploadList/ListTitle'; import useModalContext from '../../hooks/useModalContext'; diff --git a/packages/strapi-plugin-upload/admin/src/components/SortList/Wrapper.js b/packages/strapi-plugin-upload/admin/src/components/SortList/Wrapper.js index a482cfaa30..8cf1b2cee6 100644 --- a/packages/strapi-plugin-upload/admin/src/components/SortList/Wrapper.js +++ b/packages/strapi-plugin-upload/admin/src/components/SortList/Wrapper.js @@ -2,7 +2,7 @@ import React from 'react'; import styled from 'styled-components'; import { themePropTypes } from 'strapi-helper-plugin'; -import Text from '../Text'; +import { Text } from '@buffetjs/core'; const Wrapper = styled(props => )` margin-bottom: 0; diff --git a/packages/strapi-plugin-upload/admin/src/components/Tag/index.js b/packages/strapi-plugin-upload/admin/src/components/Tag/index.js index 11be8c446d..c8f36fd29d 100644 --- a/packages/strapi-plugin-upload/admin/src/components/Tag/index.js +++ b/packages/strapi-plugin-upload/admin/src/components/Tag/index.js @@ -1,7 +1,7 @@ import React from 'react'; import PropTypes from 'prop-types'; +import { Text } from '@buffetjs/core'; -import Text from '../Text'; import Wrapper from './Wrapper'; const Tag = ({ label }) => { diff --git a/packages/strapi-plugin-upload/admin/src/components/Text/index.js b/packages/strapi-plugin-upload/admin/src/components/Text/index.js deleted file mode 100644 index 5fa484aede..0000000000 --- a/packages/strapi-plugin-upload/admin/src/components/Text/index.js +++ /dev/null @@ -1,38 +0,0 @@ -import styled from 'styled-components'; -import PropTypes from 'prop-types'; - -const Text = styled.p` - margin: 0; - line-height: ${({ lineHeight }) => lineHeight}; - color: ${({ theme, color }) => theme.main.colors[color] || color}; - font-size: ${({ theme, fontSize }) => theme.main.sizes.fonts[fontSize]}; - font-weight: ${({ theme, fontWeight }) => theme.main.fontWeights[fontWeight]}; - text-transform: ${({ textTransform }) => textTransform}; - ${({ ellipsis }) => - ellipsis && - ` - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; - `} -`; - -Text.defaultProps = { - color: 'greyDark', - ellipsis: false, - fontSize: 'md', - fontWeight: 'regular', - lineHeight: 'normal', - textTransform: 'none', -}; - -Text.propTypes = { - color: PropTypes.string, - ellipsis: PropTypes.bool, - fontSize: PropTypes.string, - fontWeight: PropTypes.string, - lineHeight: PropTypes.string, - textTransform: PropTypes.string, -}; - -export default Text; diff --git a/packages/strapi-plugin-upload/admin/src/containers/HomePage/HomePageContent/HomePageList.js b/packages/strapi-plugin-upload/admin/src/containers/HomePage/HomePageContent/HomePageList.js index d9f590e587..b9ad5be99a 100644 --- a/packages/strapi-plugin-upload/admin/src/containers/HomePage/HomePageContent/HomePageList.js +++ b/packages/strapi-plugin-upload/admin/src/containers/HomePage/HomePageContent/HomePageList.js @@ -1,11 +1,11 @@ import React from 'react'; import PropTypes from 'prop-types'; +import { Padded } from '@buffetjs/core'; import { PageFooter, useQuery } from 'strapi-helper-plugin'; import { generatePageFromStart, generateStartFromPage } from '../../../utils'; import { useAppContext } from '../../../hooks'; import List from '../../../components/List'; import ListEmpty from '../../../components/ListEmpty'; -import Padded from '../../../components/Padded'; const HomePageList = ({ areResultsEmptyWithSettings, diff --git a/packages/strapi-plugin-upload/admin/src/containers/HomePage/HomePageContent/HomePageSettings.js b/packages/strapi-plugin-upload/admin/src/containers/HomePage/HomePageContent/HomePageSettings.js index c42e1f5073..bb51a2d400 100644 --- a/packages/strapi-plugin-upload/admin/src/containers/HomePage/HomePageContent/HomePageSettings.js +++ b/packages/strapi-plugin-upload/admin/src/containers/HomePage/HomePageContent/HomePageSettings.js @@ -1,13 +1,13 @@ import React, { useEffect, useState } from 'react'; import PropTypes from 'prop-types'; import { useDebounce } from '@buffetjs/hooks'; +import { Padded } from '@buffetjs/core'; import { HeaderSearch, useGlobalContext, useQuery, LoadingIndicator } from 'strapi-helper-plugin'; + import { useAppContext } from '../../../hooks'; import { getTrad, getFileModelTimestamps } from '../../../utils'; - import ControlsWrapper from '../../../components/ControlsWrapper'; import Filters from '../../../components/Filters'; -import Padded from '../../../components/Padded'; import SelectAll from '../../../components/SelectAll'; import SortPicker from '../../../components/SortPicker'; diff --git a/packages/strapi-plugin-upload/admin/src/containers/HomePage/index.js b/packages/strapi-plugin-upload/admin/src/containers/HomePage/index.js index ec2878f543..fe2eda3378 100644 --- a/packages/strapi-plugin-upload/admin/src/containers/HomePage/index.js +++ b/packages/strapi-plugin-upload/admin/src/containers/HomePage/index.js @@ -2,7 +2,7 @@ import React, { useCallback, useReducer, useRef, useState, useEffect } from 'rea import { get, includes, toString, isEqual, intersectionWith } from 'lodash'; import { useHistory, useLocation } from 'react-router-dom'; import { Header } from '@buffetjs/custom'; -import { Button } from '@buffetjs/core'; +import { Button, Padded } from '@buffetjs/core'; import { PopUpWarning, useGlobalContext, @@ -14,7 +14,6 @@ import { import { formatFileForEditing, getRequestUrl, getTrad, getFileModelTimestamps } from '../../utils'; import Container from '../../components/Container'; import HomePageContent from './HomePageContent'; -import Padded from '../../components/Padded'; import { useAppContext } from '../../hooks'; import ModalStepper from '../ModalStepper'; import { generateStringFromParams, getHeaderLabel } from './utils'; diff --git a/packages/strapi-plugin-upload/admin/src/containers/SettingsPage/index.js b/packages/strapi-plugin-upload/admin/src/containers/SettingsPage/index.js index 17dc122a22..502e42ecec 100644 --- a/packages/strapi-plugin-upload/admin/src/containers/SettingsPage/index.js +++ b/packages/strapi-plugin-upload/admin/src/containers/SettingsPage/index.js @@ -1,11 +1,10 @@ import React, { useEffect, useReducer, useRef } from 'react'; import { Header, Inputs } from '@buffetjs/custom'; +import { Text } from '@buffetjs/core'; import { isEqual } from 'lodash'; import { LoadingIndicatorPage, useGlobalContext, request } from 'strapi-helper-plugin'; import { getRequestUrl, getTrad } from '../../utils'; -import Text from '../../components/Text'; -// import Divider from './Divider'; import SectionTitleWrapper from './SectionTitleWrapper'; import Wrapper from './Wrapper'; import init from './init'; diff --git a/yarn.lock b/yarn.lock index ecf6272639..e886f7af7b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4554,11 +4554,6 @@ base64-js@^1.0.2, base64-js@^1.3.0: resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.1.tgz#58ece8cb75dd07e71ed08c736abc5fac4dbf8df1" integrity sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g== -base64url@3.x.x: - version "3.0.1" - resolved "https://registry.yarnpkg.com/base64url/-/base64url-3.0.1.tgz#6399d572e2bc3f90a9a8b22d5dbb0a32d33f788d" - integrity sha512-ir1UPr3dkwexU7FdV8qBBbNDRUhMmIekYMFZfi+C/sLNnRESKPl23nB9b2pltqfOQNnGzsDdId90AEtG5tCx4A== - base@^0.11.1: version "0.11.2" resolved "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz#7bde5ced145b6d551a90db87f83c558b4eb48a8f" @@ -13467,11 +13462,6 @@ oauth-sign@^0.9.0, oauth-sign@~0.9.0: resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455" integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ== -oauth@0.9.x: - version "0.9.15" - resolved "https://registry.yarnpkg.com/oauth/-/oauth-0.9.15.tgz#bd1fefaf686c96b75475aed5196412ff60cfb9c1" - integrity sha1-vR/vr2hslrdUda7VGWQS/2DPucE= - object-assign@4.x, object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" @@ -14050,13 +14040,6 @@ pascalcase@^0.1.1: resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14" integrity sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ= -passport-google-oauth2@0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/passport-google-oauth2/-/passport-google-oauth2-0.2.0.tgz#fc9ea59e7091f02e24fd16d6be9257ea982ebbc3" - integrity sha512-62EdPtbfVdc55nIXi0p1WOa/fFMM8v/M8uQGnbcXA4OexZWCnfsEi3wo2buag+Is5oqpuHzOtI64JpHk0Xi5RQ== - dependencies: - passport-oauth2 "^1.1.2" - passport-local@1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/passport-local/-/passport-local-1.0.0.tgz#1fe63268c92e75606626437e3b906662c15ba6ee" @@ -14064,17 +14047,6 @@ passport-local@1.0.0: dependencies: passport-strategy "1.x.x" -passport-oauth2@^1.1.2: - version "1.5.0" - resolved "https://registry.yarnpkg.com/passport-oauth2/-/passport-oauth2-1.5.0.tgz#64babbb54ac46a4dcab35e7f266ed5294e3c4108" - integrity sha512-kqBt6vR/5VlCK8iCx1/KpY42kQ+NEHZwsSyt4Y6STiNjU+wWICG1i8ucc1FapXDGO15C5O5VZz7+7vRzrDPXXQ== - dependencies: - base64url "3.x.x" - oauth "0.9.x" - passport-strategy "1.x.x" - uid2 "0.0.x" - utils-merge "1.x.x" - passport-strategy@1.x.x: version "1.0.0" resolved "https://registry.yarnpkg.com/passport-strategy/-/passport-strategy-1.0.0.tgz#b5539aa8fc225a3d1ad179476ddf236b440f52e4" @@ -18955,11 +18927,6 @@ uid-number@0.0.6: resolved "https://registry.yarnpkg.com/uid-number/-/uid-number-0.0.6.tgz#0ea10e8035e8eb5b8e4449f06da1c730663baa81" integrity sha1-DqEOgDXo61uOREnwbaHHMGY7qoE= -uid2@0.0.x: - version "0.0.3" - resolved "https://registry.yarnpkg.com/uid2/-/uid2-0.0.3.tgz#483126e11774df2f71b8b639dcd799c376162b82" - integrity sha1-SDEm4Rd03y9xuLY53NeZw3YWK4I= - umask@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/umask/-/umask-1.1.0.tgz#f29cebf01df517912bb58ff9c4e50fde8e33320d" @@ -19293,7 +19260,7 @@ utila@^0.4.0, utila@~0.4: resolved "https://registry.yarnpkg.com/utila/-/utila-0.4.0.tgz#8a16a05d445657a3aea5eecc5b12a4fa5379772c" integrity sha1-ihagXURWV6Oupe7MWxKk+lN5dyw= -utils-merge@1.0.1, utils-merge@1.x.x: +utils-merge@1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713" integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=