From 993d8df436b9f518e74c1fff9dd38e0733f19b47 Mon Sep 17 00:00:00 2001 From: soupette Date: Mon, 18 May 2020 13:57:00 +0200 Subject: [PATCH] Created custom button Signed-off-by: soupette --- .../Button => components/FullWidthButton}/index.js | 3 ++- .../src/components/Users/FilterPicker/Button.js | 14 ++++++++++++++ .../src/components/Users/FilterPicker/index.js | 11 +++++++++++ .../containers/AuthPage/components/Login/index.js | 4 ++-- .../AuthPage/components/Register/index.js | 4 ++-- .../admin/src/containers/Users/ListPage/index.js | 5 ++++- 6 files changed, 35 insertions(+), 6 deletions(-) rename packages/strapi-admin/admin/src/{containers/AuthPage/components/Button => components/FullWidthButton}/index.js (72%) create mode 100644 packages/strapi-admin/admin/src/components/Users/FilterPicker/Button.js create mode 100644 packages/strapi-admin/admin/src/components/Users/FilterPicker/index.js diff --git a/packages/strapi-admin/admin/src/containers/AuthPage/components/Button/index.js b/packages/strapi-admin/admin/src/components/FullWidthButton/index.js similarity index 72% rename from packages/strapi-admin/admin/src/containers/AuthPage/components/Button/index.js rename to packages/strapi-admin/admin/src/components/FullWidthButton/index.js index d819f069db..3277120c03 100644 --- a/packages/strapi-admin/admin/src/containers/AuthPage/components/Button/index.js +++ b/packages/strapi-admin/admin/src/components/FullWidthButton/index.js @@ -3,12 +3,13 @@ import { Button as Base } from '@buffetjs/core'; const Button = styled(Base)` width: 100%; - text-transform: uppercase; + text-transform: ${({ textTransform }) => textTransform}; `; Button.defaultProps = { color: 'primary', type: 'button', + textTransform: 'none', }; export default Button; diff --git a/packages/strapi-admin/admin/src/components/Users/FilterPicker/Button.js b/packages/strapi-admin/admin/src/components/Users/FilterPicker/Button.js new file mode 100644 index 0000000000..c84b5959f6 --- /dev/null +++ b/packages/strapi-admin/admin/src/components/Users/FilterPicker/Button.js @@ -0,0 +1,14 @@ +import React from 'react'; +import { FormattedMessage } from 'react-intl'; +import { FilterIcon } from 'strapi-helper-plugin'; + +const Button = () => { + return ( + <> + + + + ); +}; + +export default Button; diff --git a/packages/strapi-admin/admin/src/components/Users/FilterPicker/index.js b/packages/strapi-admin/admin/src/components/Users/FilterPicker/index.js new file mode 100644 index 0000000000..7d920bdd8b --- /dev/null +++ b/packages/strapi-admin/admin/src/components/Users/FilterPicker/index.js @@ -0,0 +1,11 @@ +import React from 'react'; +// import PropTypes from 'prop-types'; +// import { FormattedMessage } from 'react-intl'; +import { Picker } from '@buffetjs/core'; +import Button from './Button'; + +const FilterPicker = () => { + return ; +}; + +export default FilterPicker; diff --git a/packages/strapi-admin/admin/src/containers/AuthPage/components/Login/index.js b/packages/strapi-admin/admin/src/containers/AuthPage/components/Login/index.js index 3721cff293..32d344c3b6 100644 --- a/packages/strapi-admin/admin/src/containers/AuthPage/components/Login/index.js +++ b/packages/strapi-admin/admin/src/containers/AuthPage/components/Login/index.js @@ -4,8 +4,8 @@ import { useIntl } from 'react-intl'; import { get } from 'lodash'; import PropTypes from 'prop-types'; import BaselineAlignment from '../../../../components/BaselineAlignement'; +import Button from '../../../../components/FullWidthButton'; import AuthLink from '../AuthLink'; -import Button from '../Button'; import Input from '../Input'; import Logo from '../Logo'; import Section from '../Section'; @@ -51,7 +51,7 @@ const Login = ({ formErrors, modifiedData, onChange, onSubmit, requestError }) = value={modifiedData.rememberMe} /> - diff --git a/packages/strapi-admin/admin/src/containers/AuthPage/components/Register/index.js b/packages/strapi-admin/admin/src/containers/AuthPage/components/Register/index.js index 9ff62a1661..bce05ff914 100644 --- a/packages/strapi-admin/admin/src/containers/AuthPage/components/Register/index.js +++ b/packages/strapi-admin/admin/src/containers/AuthPage/components/Register/index.js @@ -5,8 +5,8 @@ import { Checkbox, Flex, Padded, Text } from '@buffetjs/core'; import { useIntl, FormattedMessage } from 'react-intl'; import { get } from 'lodash'; import PropTypes from 'prop-types'; +import Button from '../../../../components/FullWidthButton'; import AuthLink from '../AuthLink'; -import Button from '../Button'; import Input from '../Input'; import Logo from '../Logo'; import Section from '../Section'; @@ -113,7 +113,7 @@ const Register = ({ - diff --git a/packages/strapi-admin/admin/src/containers/Users/ListPage/index.js b/packages/strapi-admin/admin/src/containers/Users/ListPage/index.js index 598ae49f01..aaafb824b0 100644 --- a/packages/strapi-admin/admin/src/containers/Users/ListPage/index.js +++ b/packages/strapi-admin/admin/src/containers/Users/ListPage/index.js @@ -1,11 +1,12 @@ import React, { useEffect, useReducer, useState } from 'react'; import { useQuery } from 'strapi-helper-plugin'; import { useHistory, useLocation } from 'react-router-dom'; -import { Flex } from '@buffetjs/core'; +import { Flex, Padded } from '@buffetjs/core'; import BaselineAlignement from '../../../components/BaselineAlignement'; import useSettingsHeaderSearchContext from '../../../hooks/useSettingsHeaderSearchContext'; import Footer from '../../../components/Users/Footer'; import List from '../../../components/Users/List'; +import FilterPicker from '../../../components/Users/FilterPicker'; import SortPicker from '../../../components/Users/SortPicker'; import Header from './Header'; import ModalForm from './ModalForm'; @@ -99,6 +100,8 @@ const ListPage = () => { + +