yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-12-28 23:57:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update all icons with the new set

Browse Source 
Signed-off-by: soupette <cyril@strapi.io>
This commit is contained in:
soupette 2021-10-27 12:30:54 +02:00
parent 85cf6f979c
commit c7dbfc6f88
149 changed files with 1087 additions and 1091 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packages/core/admin/admin/src/components/AutoReloadOverlayBlockerProvider/Blocker.js
View File

@ -4,8 +4,8 @@ import PropTypes from 'prop-types';
import { useIntl } from 'react-intl';
import styled, { keyframes } from 'styled-components';
import { pxToRem } from '@strapi/helper-plugin';
import Time from '@strapi/icons/Time';
import Reload from '@strapi/icons/Reload';
import Clock from '@strapi/icons/Clock';
import Refresh from '@strapi/icons/Refresh';
import { Link } from '@strapi/design-system/Link';
import { Box } from '@strapi/design-system/Box';
import { Stack } from '@strapi/design-system/Stack';
@ -26,7 +26,7 @@ const rotation = keyframes`
}
`;
const LoaderReload = styled(Reload)`
const LoaderReload = styled(Refresh)`
animation: ${rotation} 1s infinite linear;
`;
@ -64,7 +64,7 @@ const Blocker = ({ displayedIcon, description, title, isOpen }) => {
{displayedIcon === 'time' && (
<IconBox padding={6} background="primary100" borderColor="primary200">
<Time width={pxToRem(40)} height={pxToRem(40)} />
<Clock width={pxToRem(40)} height={pxToRem(40)} />
</IconBox>
)}
</Flex>

8
packages/core/admin/admin/src/components/LeftMenu/index.js
View File

@ -18,8 +18,8 @@ import { FocusTrap } from '@strapi/design-system/FocusTrap';
import { Box } from '@strapi/design-system/Box';
import { Text } from '@strapi/design-system/Text';
import { Stack } from '@strapi/design-system/Stack';
import ContentIcon from '@strapi/icons/ContentIcon';
import Logout from '@strapi/icons/Logout';
import Write from '@strapi/icons/Write';
import Exit from '@strapi/icons/Exit';
import { auth, usePersistentState, useAppInfos } from '@strapi/helper-plugin';
import useConfigurations from '../../hooks/useConfigurations';
@ -92,7 +92,7 @@ const LeftMenu = ({ generalSectionLinks, pluginsSectionLinks }) => {
<Divider />
<NavSections>
<NavLink to="/content-manager" icon={<ContentIcon />}>
<NavLink to="/content-manager" icon={<Write />}>
{formatMessage({ id: 'content-manager.plugin.name', defaultMessage: 'Content manager' })}
</NavLink>
@ -155,7 +155,7 @@ const LeftMenu = ({ generalSectionLinks, pluginsSectionLinks }) => {
defaultMessage: 'Logout',
})}
</Text>
<Logout />
<Exit />
</LinkUser>
</Stack>
</FocusTrap>

4
packages/core/admin/admin/src/components/UpgradePlanModal /index.js
View File

@ -11,7 +11,7 @@ import { Flex } from '@strapi/design-system/Flex';
import { Text, H1 } from '@strapi/design-system/Text';
import { Stack } from '@strapi/design-system/Stack';
import ExternalLink from '@strapi/icons/ExternalLink';
import CloseAlertIcon from '@strapi/icons/CloseAlertIcon';
import Cross from '@strapi/icons/Cross';
import { setHexOpacity, useLockScroll } from '@strapi/helper-plugin';
import AirBalloon from '../../assets/images/hot-air-balloon.png';
import BigArrow from '../../assets/images/upgrade-details.png';
@ -79,7 +79,7 @@ const UpgradePlanModal = ({ onClose, isOpen }) => {
<UpgradeContainer aria-labelledby="upgrade-plan" background="neutral0" hasRadius>
<img src={AirBalloon} alt="air-balloon" />
<CloseButtonContainer>
<IconButton onClick={onClose} aria-label="Close" icon={<CloseAlertIcon />} />
<IconButton onClick={onClose} aria-label="Close" icon={<Cross />} />
</CloseButtonContainer>
<StackFlexStart size={6}>
<TextBold textColor="primary600">

4
packages/core/admin/admin/src/content-manager/components/AttributeFilter/Filters.js
View File

@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
import { useIntl } from 'react-intl';
import { Box } from '@strapi/design-system/Box';
import { Button } from '@strapi/design-system/Button';
import FilterIcon from '@strapi/icons/FilterIcon';
import Filter from '@strapi/icons/Filter';
import { FilterListURLQuery, FilterPopoverURLQuery, useTracking } from '@strapi/helper-plugin';
const Filters = ({ displayedFilters }) => {
@ -25,7 +25,7 @@ const Filters = ({ displayedFilters }) => {
<Button
variant="tertiary"
ref={buttonRef}
startIcon={<FilterIcon />}
startIcon={<Filter />}
onClick={handleToggle}
size="S"
>

4
packages/core/admin/admin/src/content-manager/components/ComponentInitializer/index.js
View File

@ -2,7 +2,7 @@ import React from 'react';
import PropTypes from 'prop-types';
import styled from 'styled-components';
import { useIntl } from 'react-intl';
import AddIcon from '@strapi/icons/AddIconCircle';
import PlusCircle from '@strapi/icons/PlusCircle';
import { Box } from '@strapi/design-system/Box';
import { BaseButton } from '@strapi/design-system/BaseButton';
import { Stack } from '@strapi/design-system/Stack';
@ -42,7 +42,7 @@ const ComponentInitializer = ({ isReadOnly, onClick }) => {
<Stack size={2}>
<Flex justifyContent="center" style={{ cursor: isReadOnly ? 'not-allowed' : 'inherit' }}>
<IconButton disabled={isReadOnly} onClick={onClick}>
<AddIcon />
<PlusCircle />
</IconButton>
</Flex>
<Flex justifyContent="center">

8
packages/core/admin/admin/src/content-manager/components/DynamicTable/ConfirmDialogDelete/index.js
View File

@ -6,8 +6,8 @@ import { Stack } from '@strapi/design-system/Stack';
import { Flex } from '@strapi/design-system/Flex';
import { Text } from '@strapi/design-system/Text';
import { Button } from '@strapi/design-system/Button';
import AlertWarningIcon from '@strapi/icons/AlertWarningIcon';
import DeleteIcon from '@strapi/icons/DeleteIcon';
import ExclamationMarkCircle from '@strapi/icons/ExclamationMarkCircle';
import Trash from '@strapi/icons/Trash';
import InjectionZoneList from '../../InjectionZoneList';
const ConfirmDialogDelete = ({ isConfirmButtonLoading, isOpen, onToggleDialog, onConfirm }) => {
@ -24,7 +24,7 @@ const ConfirmDialogDelete = ({ isConfirmButtonLoading, isOpen, onToggleDialog, o
describedBy="confirm-description"
isOpen={isOpen}
>
<DialogBody icon={<AlertWarningIcon />}>
<DialogBody icon={<ExclamationMarkCircle />}>
<Stack size={2}>
<Flex justifyContent="center">
<Text id="confirm-description">
@ -52,7 +52,7 @@ const ConfirmDialogDelete = ({ isConfirmButtonLoading, isOpen, onToggleDialog, o
<Button
onClick={onConfirm}
variant="danger-light"
startIcon={<DeleteIcon />}
startIcon={<Trash />}
id="confirm-delete"
loading={isConfirmButtonLoading}
>

8
packages/core/admin/admin/src/content-manager/components/DynamicTable/ConfirmDialogDeleteAll/index.js
View File

@ -6,8 +6,8 @@ import { Stack } from '@strapi/design-system/Stack';
import { Flex } from '@strapi/design-system/Flex';
import { Text } from '@strapi/design-system/Text';
import { Button } from '@strapi/design-system/Button';
import AlertWarningIcon from '@strapi/icons/AlertWarningIcon';
import DeleteIcon from '@strapi/icons/DeleteIcon';
import ExclamationMarkCircle from '@strapi/icons/ExclamationMarkCircle';
import Trash from '@strapi/icons/Trash';
import InjectionZoneList from '../../InjectionZoneList';
import { getTrad } from '../../../utils';
@ -25,7 +25,7 @@ const ConfirmDialogDeleteAll = ({ isConfirmButtonLoading, isOpen, onToggleDialog
describedBy="confirm-description"
isOpen={isOpen}
>
<DialogBody icon={<AlertWarningIcon />}>
<DialogBody icon={<ExclamationMarkCircle />}>
<Stack size={2}>
<Flex justifyContent="center">
<Text id="confirm-description">
@ -53,7 +53,7 @@ const ConfirmDialogDeleteAll = ({ isConfirmButtonLoading, isOpen, onToggleDialog
<Button
onClick={onConfirm}
variant="danger-light"
startIcon={<DeleteIcon />}
startIcon={<Trash />}
id="confirm-delete"
loading={isConfirmButtonLoading}
>

8
packages/core/admin/admin/src/content-manager/components/DynamicTable/TableRows/index.js
View File

@ -5,9 +5,9 @@ import { Box } from '@strapi/design-system/Box';
import { IconButton } from '@strapi/design-system/IconButton';
import { Tbody, Td, Tr } from '@strapi/design-system/Table';
import { Flex } from '@strapi/design-system/Flex';
import DeleteIcon from '@strapi/icons/DeleteIcon';
import Trash from '@strapi/icons/Trash';
import Duplicate from '@strapi/icons/Duplicate';
import EditIcon from '@strapi/icons/EditIcon';
import Pencil from '@strapi/icons/Pencil';
import { useTracking, stopPropagation, onRowClick } from '@strapi/helper-plugin';
import { useHistory } from 'react-router-dom';
import { useIntl } from 'react-intl';
@ -107,7 +107,7 @@ const TableRows = ({
{ target: itemLineText }
)}
noBorder
icon={<EditIcon />}
icon={<Pencil />}
/>
{canCreate && (
@ -142,7 +142,7 @@ const TableRows = ({
{ target: itemLineText }
)}
noBorder
icon={<DeleteIcon />}
icon={<Trash />}
/>
</Box>
)}

4
packages/core/admin/admin/src/content-manager/components/DynamicZone/components/AddComponentButton/index.js
View File

@ -8,14 +8,14 @@ import React from 'react';
import PropTypes from 'prop-types';
import { useIntl } from 'react-intl';
import styled from 'styled-components';
import AddIcon from '@strapi/icons/AddIconCircle';
import PlusCircle from '@strapi/icons/PlusCircle';
import { BaseButton } from '@strapi/design-system/BaseButton';
import { Box } from '@strapi/design-system/Box';
import { Flex } from '@strapi/design-system/Flex';
import { Text, ButtonText } from '@strapi/design-system/Text';
import { getTrad } from '../../../../utils';
const StyledAddIcon = styled(AddIcon)`
const StyledAddIcon = styled(PlusCircle)`
transform: ${({ $isOpen }) => ($isOpen ? 'rotate(45deg)' : 'rotate(0deg)')};
> circle {
fill: ${({ theme, $hasError }) =>

12
packages/core/admin/admin/src/content-manager/components/DynamicZone/components/Component/index.js
View File

@ -8,9 +8,9 @@ import { IconButton } from '@strapi/design-system/IconButton';
import { FocusTrap } from '@strapi/design-system/FocusTrap';
import { Box } from '@strapi/design-system/Box';
import { Stack } from '@strapi/design-system/Stack';
import DeleteIcon from '@strapi/icons/DeleteIcon';
import DownIcon from '@strapi/icons/DownIcon1';
import UpIcon from '@strapi/icons/UpIcon1';
import Trash from '@strapi/icons/Trash';
import ArrowDown from '@strapi/icons/ArrowDown';
import ArrowUp from '@strapi/icons/ArrowUp';
// import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
import { useContentTypeLayout } from '../../../../hooks';
import { getTrad } from '../../../../utils';
@ -83,14 +83,14 @@ const Component = ({
<IconButton
label={downLabel}
onClick={handleMoveComponentDown}
icon={<DownIcon />}
icon={<ArrowDown />}
/>
)}
{showUpIcon && (
<IconButton label={upLabel} onClick={handleMoveComponentUp} icon={<UpIcon />} />
<IconButton label={upLabel} onClick={handleMoveComponentUp} icon={<ArrowUp />} />
)}
{isFieldAllowed && (
<IconButton label={deleteLabel} onClick={handleRemove} icon={<DeleteIcon />} />
<IconButton label={deleteLabel} onClick={handleRemove} icon={<Trash />} />
)}
</Stack>
}

4
packages/core/admin/admin/src/content-manager/components/DynamicZone/components/DzLabel/tests/__snapshots__/index.test.js.snap
View File

@ -124,11 +124,11 @@ exports[`<DzLabel /> displays the labelAction correctly 1`] = `
xmlns="http://www.w3.org/2000/svg"
>
<path
d="M12.59 23.679l-.044-.007a.045.045 0 00.043.007zM22.334 8.345a.295.295 0 00-.572-.033.295.295 0 01-.28.206h-.829a.294.294 0 01-.152-.042l-1.199-.72a.293.293 0 00-.152-.042h-1.918a.293.293 0 00-.164.05l-2.365 1.577a.296.296 0 00-.132.248v2.236a.296.296 0 00.157.261l3.101 1.656a.297.297 0 01.156.257L18 15.257a.295.295 0 00.153.255l1.246.69a.296.296 0 01.152.258v2.604a.295.295 0 00.492.221c.502-.442 1.223-1.088 1.319-1.236a11.14 11.14 0 001.174-2.415c.68-1.966.143-5.501-.202-7.289zM13.629 14.507l-3.286-2.464a.214.214 0 00-.129-.043H8.655a.203.203 0 01-.143-.06l-.735-.734a.215.215 0 00-.152-.063h-2.85a.203.203 0 01-.143-.347l.451-.45a.202.202 0 01.144-.06H6.96a.428.428 0 00.413-.312l.369-1.313a.214.214 0 01.107-.132L9.32 7.77a.203.203 0 00.11-.18v-.67c0-.041.013-.082.037-.116l.782-1.126a.2.2 0 01.095-.074l1.095-.411a.203.203 0 00.131-.19v-.61a.203.203 0 00-.09-.17l-1.097-.73a.205.205 0 00-.206-.012l-1.493.747a.202.202 0 01-.214-.022l-.709-.56a.203.203 0 01.006-.321l.575-.424a.202.202 0 00-.005-.33l-.896-.625a.203.203 0 00-.214-.012c-.324.178-1.275.703-1.613.939A11.222 11.222 0 001.964 7.16c-.098.201-.218.406-.23.627-.012.222-.185.716-.258.915a.202.202 0 00.013.166l1.912 3.514a.2.2 0 00.074.077l2.012 1.207a.202.202 0 01.097.147l.403 2.921a.204.204 0 00.086.14l1.57 1.08a.215.215 0 01.088.132l.832 3.954a.193.193 0 00.027.065c.078.126.39.59.766.658-.035.01-.066.031-.101.042.09.015.18.036.268.062.107.029.214.053.321.076.168.034.184.06.265-.09.107-.199.23-.268.321-.292a.206.206 0 00.155-.155l.54-2.501a.214.214 0 01.085-.13l2.411-1.709a.214.214 0 00.09-.175v-3.212a.215.215 0 00-.082-.172z"
d="M12.59 23.679l-.044-.007a.045.045 0 00.043.007zM22.334 8.345a.295.295 0 00-.572-.033.296.296 0 01-.28.206h-.828a.294.294 0 01-.153-.042l-1.199-.72a.293.293 0 00-.152-.042h-1.918a.294.294 0 00-.163.05l-2.366 1.577a.295.295 0 00-.131.248v2.236a.295.295 0 00.156.261l3.101 1.656a.298.298 0 01.157.257L18 15.257a.296.296 0 00.153.255l1.246.69a.297.297 0 01.152.258v2.604a.297.297 0 00.34.292.296.296 0 00.152-.07c.502-.443 1.223-1.09 1.319-1.237a11.186 11.186 0 001.175-2.415c.679-1.966.142-5.501-.203-7.289zM13.629 14.507l-3.286-2.464a.214.214 0 00-.129-.043H8.655a.203.203 0 01-.143-.06l-.735-.734a.216.216 0 00-.152-.063h-2.85a.202.202 0 01-.198-.243.203.203 0 01.055-.104l.451-.45a.202.202 0 01.144-.06H6.96a.428.428 0 00.413-.313l.369-1.312a.214.214 0 01.107-.132L9.32 7.77a.203.203 0 00.11-.18v-.67c0-.042.013-.082.037-.116l.782-1.126a.2.2 0 01.095-.074l1.095-.411a.203.203 0 00.131-.19v-.611a.203.203 0 00-.09-.17l-1.097-.729a.205.205 0 00-.206-.012l-1.493.747a.202.202 0 01-.214-.022l-.709-.56a.204.204 0 01.006-.321l.575-.424a.202.202 0 00-.005-.33l-.896-.625a.203.203 0 00-.214-.012c-.324.177-1.275.702-1.613.939a11.222 11.222 0 00-3.651 4.285c-.098.202-.218.407-.23.628-.012.221-.185.715-.258.915a.202.202 0 00.013.166l1.912 3.514a.2.2 0 00.074.077l2.012 1.207a.201.201 0 01.097.146l.403 2.922a.205.205 0 00.086.14l1.57 1.079a.214.214 0 01.088.133l.832 3.953a.193.193 0 00.027.066c.078.126.39.589.766.658-.035.01-.066.031-.101.041.09.016.18.037.268.063.107.028.214.053.321.076.168.033.184.06.265-.09.107-.2.23-.268.321-.292a.207.207 0 00.155-.156l.54-2.5a.215.215 0 01.085-.13l2.411-1.709a.214.214 0 00.09-.175v-3.212a.215.215 0 00-.082-.172z"
fill="#32324D"
/>
<path
d="M12.322.857s-.196.011-.236.012a11.114 11.114 0 00-3.932.845c.13.09-.093.173-.093.173l.35.684h1.875l1.286.643 1.125-.643-.375-1.714zM17.263 4.718l.863-.75a.215.215 0 00.031-.29.214.214 0 00-.082-.067l-1.007-.467a.214.214 0 00-.284.101l-.415.869a.214.214 0 00.08.274l.56.35a.215.215 0 00.254-.02zM21.302 5.822l-.312-.483a.3.3 0 01-.014-.023c-.056-.115-.522-1.055-.91-1.42-.293-.276-.375-.196-.399-.135a.202.202 0 01-.063.085l-1.545 1.25a.214.214 0 01-.135.047h-.8a.214.214 0 00-.151.062l-.643.643a.215.215 0 000 .304l.643.642a.213.213 0 00.151.063h4.027a.214.214 0 00.215-.223l-.03-.705a.215.215 0 00-.034-.107z"
d="M12.321.857s-.195.011-.235.012a11.113 11.113 0 00-3.932.845c.13.09-.094.173-.094.173l.35.684h1.876l1.285.643 1.125-.643-.375-1.714zM17.262 4.718l.863-.75a.214.214 0 00-.05-.357l-1.008-.467a.214.214 0 00-.284.101l-.415.869a.214.214 0 00.08.274l.56.35a.214.214 0 00.254-.02zM21.302 5.822l-.312-.483a.337.337 0 01-.014-.023c-.056-.115-.521-1.055-.91-1.42-.292-.276-.375-.196-.398-.135a.202.202 0 01-.064.085l-1.545 1.25a.214.214 0 01-.135.047h-.8a.214.214 0 00-.151.062l-.643.643a.215.215 0 000 .304l.643.642a.214.214 0 00.152.063h4.027a.215.215 0 00.214-.223l-.03-.705a.214.214 0 00-.034-.107z"
fill="#32324D"
/>
<path

4
packages/core/admin/admin/src/content-manager/components/DynamicZone/components/DzLabel/tests/index.test.js
View File

@ -7,7 +7,7 @@
import React from 'react';
import { render } from '@testing-library/react';
import { ThemeProvider, lightTheme, Tooltip } from '@strapi/design-system';
import I18N from '@strapi/icons/I18N';
import Earth from '@strapi/icons/Earth';
import { IntlProvider } from 'react-intl';
import styled from 'styled-components';
import DzLabel from '../index';
@ -30,7 +30,7 @@ const LabelAction = () => {
return (
<Tooltip description="i18n">
<Button aria-label="i18n" type="button">
<I18N aria-hidden />
<Earth aria-hidden />
</Button>
</Tooltip>
);

4
packages/core/admin/admin/src/content-manager/components/FieldComponent/index.js
View File

@ -5,7 +5,7 @@ import size from 'lodash/size';
import isEqual from 'react-fast-compare';
import { useIntl } from 'react-intl';
import { NotAllowedInput } from '@strapi/helper-plugin';
import DeleteIcon from '@strapi/icons/DeleteIcon';
import Trash from '@strapi/icons/Trash';
import { Box } from '@strapi/design-system/Box';
import { IconButton } from '@strapi/design-system/IconButton';
import { Flex } from '@strapi/design-system/Flex';
@ -76,7 +76,7 @@ const FieldComponent = ({
id: getTrad('components.reset-entry'),
defaultMessage: 'Reset Entry',
})}
icon={<DeleteIcon />}
icon={<Trash />}
noBorder
onClick={() => {
removeComponentFromField(name, componentUid);

16
packages/core/admin/admin/src/content-manager/components/InputUID/index.js
View File

@ -5,10 +5,10 @@ import { useIntl } from 'react-intl';
import get from 'lodash/get';
import { TextInput } from '@strapi/design-system/TextInput';
import { Text } from '@strapi/design-system/Text';
import Reload from '@strapi/icons/Reload';
import AlertSucessIcon from '@strapi/icons/AlertSucessIcon';
import AlertWarningIcon from '@strapi/icons/AlertWarningIcon';
import LoadingIcon from '@strapi/icons/LoadingIcon';
import Refresh from '@strapi/icons/Refresh';
import CheckCircle from '@strapi/icons/CheckCircle';
import ExclamationMarkCircle from '@strapi/icons/ExclamationMarkCircle';
import Loader from '@strapi/icons/Loader';
import { axiosInstance } from '../../../core/utils';
import { getRequestUrl } from '../../utils';
import useDebounce from './useDebounce';
@ -192,7 +192,7 @@ const InputUID = ({
<EndActionWrapper>
{availability && availability.isAvailable && !regenerateLabel && (
<TextValidation alignItems="center" justifyContent="flex-end">
<AlertSucessIcon />
<CheckCircle />
<Text textColor="success600" small>
{formatMessage({
id: 'content-manager.components.uid.available',
@ -203,7 +203,7 @@ const InputUID = ({
)}
{availability && !availability.isAvailable && !regenerateLabel && (
<TextValidation notAvailable alignItems="center" justifyContent="flex-end">
<AlertWarningIcon />
<ExclamationMarkCircle />
<Text textColor="danger600" small>
{formatMessage({
id: 'content-manager.components.uid.unavailable',
@ -227,10 +227,10 @@ const InputUID = ({
>
{isLoading ? (
<LoadingWrapper>
<LoadingIcon />
<Loader />
</LoadingWrapper>
) : (
<Reload />
<Refresh />
)}
</FieldActionWrapper>
</EndActionWrapper>

4
packages/core/admin/admin/src/content-manager/components/RepeatableComponent/AddFieldButton.js
View File

@ -5,7 +5,7 @@ import { useIntl } from 'react-intl';
import { Box } from '@strapi/design-system/Box';
import { Flex } from '@strapi/design-system/Flex';
import { Text } from '@strapi/design-system/Text';
import AddIcon from '@strapi/icons/AddIcon';
import Plus from '@strapi/icons/Plus';
import { pxToRem } from '@strapi/helper-plugin';
import { getTrad } from '../../utils';
@ -15,7 +15,7 @@ const StyledButton = styled(Box)`
cursor: ${({ disabled }) => (disabled ? 'not-allowed' : 'pointer')};
`;
const StyledIcon = styled(AddIcon)`
const StyledIcon = styled(Plus)`
width: ${pxToRem(10)};
height: ${pxToRem(10)};
margin-right: ${({ theme }) => theme.spaces[2]};

8
packages/core/admin/admin/src/content-manager/components/RepeatableComponent/DragPreview.js
View File

@ -5,9 +5,9 @@ import { Box } from '@strapi/design-system/Box';
import { Flex } from '@strapi/design-system/Flex';
import { Text } from '@strapi/design-system/Text';
import { IconButton } from '@strapi/design-system/IconButton';
import DeleteIcon from '@strapi/icons/DeleteIcon';
import Trash from '@strapi/icons/Trash';
import DragHandle from '@strapi/icons/Drag';
import DropdownIcon from '@strapi/icons/FilterDropdown';
import CarretDown from '@strapi/icons/CarretDown';
const DropdownIconWrapper = styled(Box)`
height: ${32 / 16}rem;
@ -50,7 +50,7 @@ const DragPreview = ({ displayedValue }) => {
<ToggleButton type="button">
<Flex>
<DropdownIconWrapper background="neutral200">
<DropdownIcon />
<CarretDown />
</DropdownIconWrapper>
<Box paddingLeft={6}>
<Text textColor="neutral700" style={{ width: '9vw' }} ellipsis>
@ -61,7 +61,7 @@ const DragPreview = ({ displayedValue }) => {
</ToggleButton>
<Box paddingLeft={3}>
<Flex>
<IconButton icon={<DeleteIcon />} />
<IconButton icon={<Trash />} />
<Box paddingLeft={2}>
<IconButton icon={<DragHandle />} />
</Box>

4
packages/core/admin/admin/src/content-manager/components/RepeatableComponent/DraggedItem/index.js
View File

@ -12,7 +12,7 @@ import { Flex } from '@strapi/design-system/Flex';
import { IconButton } from '@strapi/design-system/IconButton';
import { Grid, GridItem } from '@strapi/design-system/Grid';
import { Stack } from '@strapi/design-system/Stack';
import DeleteIcon from '@strapi/icons/DeleteIcon';
import Trash from '@strapi/icons/Trash';
import DragHandle from '@strapi/icons/Drag';
import ItemTypes from '../../../utils/ItemTypes';
import getTrad from '../../../utils/getTrad';
@ -176,7 +176,7 @@ const DraggedItem = ({
id: getTrad('containers.Edit.delete'),
defaultMessage: 'Edit',
})}
icon={<DeleteIcon />}
icon={<Trash />}
/>
<Box paddingLeft={2}>
<DragHandleWrapper

4
packages/core/admin/admin/src/content-manager/components/SelectWrapper/ClearIndicator.js
View File

@ -1,6 +1,6 @@
import React from 'react';
import { components } from 'react-select';
import CloseAlertIcon from '@strapi/icons/CloseAlertIcon';
import Cross from '@strapi/icons/Cross';
import IconBox from './IconBox';
const ClearIndicator = props => {
@ -9,7 +9,7 @@ const ClearIndicator = props => {
return (
<Component {...props}>
<IconBox as="button" type="button">
<CloseAlertIcon />
<Cross />
</IconBox>
</Component>
);

11
packages/core/admin/admin/src/content-manager/components/SelectWrapper/DropdownIndicator.js
View File

@ -1,10 +1,9 @@
import React from 'react';
import styled from 'styled-components';
import DropdownIcon from '@strapi/icons/FilterDropdownIcon';
import CarretDown from '@strapi/icons/CarretDown';
import IconBox from './IconBox';
export const CaretBox = styled(IconBox)`
export const CarretBox = styled(IconBox)`
display: flex;
background: none;
border: none;
@ -16,9 +15,9 @@ export const CaretBox = styled(IconBox)`
const DropdownIndicator = () => {
return (
<CaretBox as="button" type="button" paddingRight={3}>
<DropdownIcon />
</CaretBox>
<CarretBox as="button" type="button" paddingRight={3}>
<CarretDown />
</CarretBox>
);
};

4
packages/core/admin/admin/src/content-manager/components/Wysiwyg/WysiwygNav.js
View File

@ -10,11 +10,11 @@ import { Flex } from '@strapi/design-system/Flex';
import Bold from '@strapi/icons/Bold';
import Italic from '@strapi/icons/Italic';
import Underline from '@strapi/icons/Underline';
import Strikethrough from '@strapi/icons/Strikethrough';
import Strikethrough from '@strapi/icons/StrikeThrough';
import BulletList from '@strapi/icons/BulletList';
import NumberList from '@strapi/icons/NumberList';
import Code from '@strapi/icons/Code';
import Image from '@strapi/icons/Image';
import Image from '@strapi/icons/Picture';
import Link from '@strapi/icons/Link';
import Quote from '@strapi/icons/Quote';
import More from '@strapi/icons/More';

4
packages/core/admin/admin/src/content-manager/pages/EditView/DeleteLink/index.js
View File

@ -3,7 +3,7 @@ import { useIntl } from 'react-intl';
import get from 'lodash/get';
import isEqual from 'react-fast-compare';
import { Button } from '@strapi/design-system/Button';
import Delete from '@strapi/icons/Delete';
import Trash from '@strapi/icons/Trash';
import { ConfirmDialog, useNotification } from '@strapi/helper-plugin';
import PropTypes from 'prop-types';
import { getTrad } from '../../../utils';
@ -46,7 +46,7 @@ const DeleteLink = ({ isCreatingEntry, onDelete, onDeleteSucceeded, trackerPrope
return (
<>
<Button onClick={toggleWarningDelete} size="S" startIcon={<Delete />} variant="danger-light">
<Button onClick={toggleWarningDelete} size="S" startIcon={<Trash />} variant="danger-light">
{formatMessage({
id: getTrad('containers.Edit.delete-entry'),
defaultMessage: 'Delete this entry',

2
packages/core/admin/admin/src/content-manager/pages/EditView/DraftAndPublishBadge/index.js
View File

@ -5,7 +5,7 @@ import styled from 'styled-components';
import { Box } from '@strapi/design-system/Box';
import { Flex } from '@strapi/design-system/Flex';
import { Text } from '@strapi/design-system/Text';
import Bullet from '@strapi/icons/Bullet';
import Bullet from '@strapi/icons/Dot';
import { pxToRem } from '@strapi/helper-plugin';
import { getTrad } from '../../../utils';
import { connect, select } from './utils';

14
packages/core/admin/admin/src/content-manager/pages/EditView/Header/index.js
View File

@ -4,7 +4,7 @@ import { useHistory } from 'react-router-dom';
import get from 'lodash/get';
import isEqual from 'lodash/isEqual';
import isEmpty from 'lodash/isEmpty';
import BackIcon from '@strapi/icons/BackIcon';
import ArrowLeft from '@strapi/icons/ArrowLeft';
import { HeaderLayout } from '@strapi/design-system/Layout';
import { Box } from '@strapi/design-system/Box';
import { Button } from '@strapi/design-system/Button';
@ -13,8 +13,8 @@ import { Link } from '@strapi/design-system/Link';
import { Flex } from '@strapi/design-system/Flex';
import { Text } from '@strapi/design-system/Text';
import { Stack } from '@strapi/design-system/Stack';
import AlertWarningIcon from '@strapi/icons/AlertWarningIcon';
import CheckIcon from '@strapi/icons/CheckIcon';
import ExclamationMarkCircle from '@strapi/icons/ExclamationMarkCircle';
import Check from '@strapi/icons/Check';
import PropTypes from 'prop-types';
import isEqualFastCompare from 'react-fast-compare';
import { getTrad } from '../../../utils';
@ -109,7 +109,7 @@ const Header = ({
disabled={didChangeData}
loading={isPublishButtonLoading}
onClick={onClick}
startIcon={<CheckIcon />}
startIcon={<Check />}
variant="secondary"
>
{formatMessage(pubishButtonLabel)}
@ -154,7 +154,7 @@ const Header = ({
subtitle={subtitle}
navigationAction={
<Link
startIcon={<BackIcon />}
startIcon={<ArrowLeft />}
// Needed in order to redirect the user with the correct search params
// Since parts is using a link from react-router-dom the best way to do it is to disable the
// event
@ -179,7 +179,7 @@ const Header = ({
describedBy="confirm-description"
isOpen={showWarningUnpublish}
>
<DialogBody icon={<AlertWarningIcon />}>
<DialogBody icon={<ExclamationMarkCircle />}>
<Stack size={2}>
<Flex justifyContent="center" style={{ textAlign: 'center' }}>
<Text id="confirm-description">
@ -234,7 +234,7 @@ const Header = ({
describedBy="confirm-description"
isOpen={showWarningDraftRelation}
>
<DialogBody icon={<AlertWarningIcon />}>
<DialogBody icon={<ExclamationMarkCircle />}>
<Stack size={2}>
<Flex justifyContent="center" style={{ textAlign: 'center' }}>
<Text id="confirm-description">

8
packages/core/admin/admin/src/content-manager/pages/EditView/index.js
View File

@ -11,8 +11,8 @@ import { LinkButton } from '@strapi/design-system/LinkButton';
import { Main } from '@strapi/design-system/Main';
import { Stack } from '@strapi/design-system/Stack';
import { TableLabel } from '@strapi/design-system/Text';
// import ConfigureIcon from '@strapi/icons/ConfigureIcon';
import EditIcon from '@strapi/icons/EditIcon';
// import Layer from '@strapi/icons/Layer';
import Pencil from '@strapi/icons/Pencil';
import { InjectionZone } from '../../../shared/components';
// import permissions from '../../../permissions';
// import Container from '../../components/Container';
@ -315,7 +315,7 @@ const EditView = ({
trackUsage('willEditEditLayout');
}}
size="S"
startIcon={<EditIcon />}
startIcon={<Pencil />}
style={{ width: '100%' }}
to={`/plugins/content-type-builder/content-types/${slug}`}
variant="secondary"
@ -331,7 +331,7 @@ const EditView = ({
{/* <CheckPermissions permissions={configurationPermissions}>
<LinkButton
size="S"
startIcon={<ConfigureIcon />}
startIcon={<Layer />}
style={{ width: '100%' }}
to={configurationsURL}
variant="secondary"

8
packages/core/admin/admin/src/content-manager/pages/ListSettingsView/components/CardPreview.js
View File

@ -4,8 +4,8 @@ import styled from 'styled-components';
import { Flex } from '@strapi/design-system/Flex';
import { ButtonText } from '@strapi/design-system/Text';
import { Stack } from '@strapi/design-system/Stack';
import EditIcon from '@strapi/icons/EditIcon';
import CloseAlertIcon from '@strapi/icons/CloseAlertIcon';
import Pencil from '@strapi/icons/Pencil';
import Cross from '@strapi/icons/Cross';
import Drag from '@strapi/icons/Drag';
import ellipsisCardTitle from '../utils/ellipsisCardTitle';
@ -70,10 +70,10 @@ const CardPreview = ({ labelField }) => {
</Stack>
<Flex paddingLeft={3}>
<ActionBox alignItems="center">
<EditIcon />
<Pencil />
</ActionBox>
<ActionBox alignItems="center">
<CloseAlertIcon />
<Cross />
</ActionBox>
</Flex>
</FieldContainer>

8
packages/core/admin/admin/src/content-manager/pages/ListSettingsView/components/DraggableCard.js
View File

@ -8,8 +8,8 @@ import { Flex } from '@strapi/design-system/Flex';
import { Box } from '@strapi/design-system/Box';
import { ButtonText } from '@strapi/design-system/Text';
import { Stack } from '@strapi/design-system/Stack';
import EditIcon from '@strapi/icons/EditIcon';
import CloseAlertIcon from '@strapi/icons/CloseAlertIcon';
import Pencil from '@strapi/icons/Pencil';
import Cross from '@strapi/icons/Cross';
import Drag from '@strapi/icons/Drag';
import ellipsisCardTitle from '../utils/ellipsisCardTitle';
import { getTrad, ItemTypes } from '../../../utils';
@ -173,7 +173,7 @@ const DraggableCard = ({
)}
type="button"
>
<EditIcon />
<Pencil />
</ActionButton>
<ActionButton
onClick={onRemoveField}
@ -187,7 +187,7 @@ const DraggableCard = ({
)}
type="button"
>
<CloseAlertIcon />
<Cross />
</ActionButton>
</Flex>
</FieldContainer>

14
packages/core/admin/admin/src/content-manager/pages/ListSettingsView/components/EditFieldForm.js
View File

@ -19,28 +19,28 @@ import Date from '@strapi/icons/Date';
import Boolean from '@strapi/icons/Boolean';
import Email from '@strapi/icons/Email';
import Enumeration from '@strapi/icons/Enumeration';
import Media from '@strapi/icons/Media';
import Media from '@strapi/icons/Landscape';
import Relation from '@strapi/icons/Relation';
import Text from '@strapi/icons/Text';
import Uid from '@strapi/icons/Uid';
import Numbers from '@strapi/icons/Numbers';
import Number from '@strapi/icons/Number';
import { getTrad } from '../../../utils';
const iconByTypes = {
biginteger: <Numbers />,
biginteger: <Number />,
boolean: <Boolean />,
date: <Date />,
datetime: <Date />,
decimal: <Numbers />,
decimal: <Number />,
email: <Email />,
enum: <Enumeration />,
enumeration: <Enumeration />,
file: <Media />,
files: <Media />,
float: <Numbers />,
integer: <Numbers />,
float: <Number />,
integer: <Number />,
media: <Media />,
number: <Numbers />,
number: <Number />,
relation: <Relation />,
string: <Text />,
text: <Text />,

4
packages/core/admin/admin/src/content-manager/pages/ListSettingsView/components/SortDisplayedFields.js
View File

@ -8,7 +8,7 @@ import { Stack } from '@strapi/design-system/Stack';
import { H3 } from '@strapi/design-system/Text';
import { SimpleMenu, MenuItem } from '@strapi/design-system/SimpleMenu';
import { IconButton } from '@strapi/design-system/IconButton';
import AddIcon from '@strapi/icons/AddIcon';
import Plus from '@strapi/icons/Plus';
import DraggableCard from './DraggableCard';
import { getTrad } from '../../../utils';
@ -77,7 +77,7 @@ const SortDisplayedFields = ({
defaultMessage: 'Add a field',
})}
as={IconButton}
icon={<AddIcon />}
icon={<Plus />}
disabled={listRemainingFields.length <= 0}
data-testid="add-field"
>

10
packages/core/admin/admin/src/content-manager/pages/ListSettingsView/index.js
View File

@ -14,8 +14,8 @@ import { Layout, HeaderLayout, ContentLayout } from '@strapi/design-system/Layou
import { Link } from '@strapi/design-system/Link';
import { Main } from '@strapi/design-system/Main';
import { Button } from '@strapi/design-system/Button';
import CheckIcon from '@strapi/icons/CheckIcon';
import BackIcon from '@strapi/icons/BackIcon';
import Check from '@strapi/icons/Check';
import ArrowLeft from '@strapi/icons/ArrowLeft';
import { checkIfAttributeIsDisplayable, getTrad } from '../../utils';
import ModelsContext from '../../contexts/ModelsContext';
import { usePluginsQueryParams } from '../../hooks';
@ -190,14 +190,14 @@ const ListSettingsView = ({ layout, slug }) => {
<form onSubmit={handleSubmit}>
<HeaderLayout
navigationAction={
<Link startIcon={<BackIcon />} to={goBackUrl} id="go-back">
<Link startIcon={<ArrowLeft />} to={goBackUrl} id="go-back">
{formatMessage({ id: 'app.components.go-back', defaultMessage: 'Go back' })}
</Link>
}
primaryAction={
<Button
size="L"
startIcon={<CheckIcon />}
startIcon={<Check />}
disabled={isEqual(modifiedData, initialData)}
type="submit"
>
@ -250,7 +250,7 @@ const ListSettingsView = ({ layout, slug }) => {
id: getTrad('popUpWarning.warning.updateAllSettings'),
defaultMessage: 'This will modify all your settings',
}}
iconRightButton={<CheckIcon />}
iconRightButton={<Check />}
isConfirmButtonLoading={isSubmittingForm}
isOpen={showWarningSubmit}
onToggleDialog={toggleWarningSubmit}

694
packages/core/admin/admin/src/content-manager/pages/ListSettingsView/tests/__snapshots__/index.test.js.snap
View File

File diff suppressed because it is too large Load Diff

8
packages/core/admin/admin/src/content-manager/pages/ListView/index.js
View File

@ -24,8 +24,8 @@ import { Main } from '@strapi/design-system/Main';
import { ActionLayout, ContentLayout, HeaderLayout } from '@strapi/design-system/Layout';
import { useNotifyAT } from '@strapi/design-system/LiveRegions';
import { Button } from '@strapi/design-system/Button';
import Add from '@strapi/icons/Add';
import Settings from '@strapi/icons/Settings';
import Plus from '@strapi/icons/Plus';
import Cog from '@strapi/icons/Cog';
import axios from 'axios';
import { axiosInstance } from '../../../core/utils';
import { InjectionZone } from '../../../shared/components';
@ -259,7 +259,7 @@ function ListView({
search: query.plugins ? pluginsQueryParams : '',
});
}}
startIcon={<Add />}
startIcon={<Plus />}
>
{formatMessage({
id: getTrad('HeaderLayout.button.label-add-entry'),
@ -284,7 +284,7 @@ function ListView({
<IconButtonCustom
onClick={() =>
push({ pathname: `${slug}/configurations/list`, search: pluginsQueryParams })}
icon={<Settings />}
icon={<Cog />}
label={formatMessage({
id: 'app.links.configure-view',
defaultMessage: 'Configure the view',

8
packages/core/admin/admin/src/content-manager/pages/NoContentType/index.js
View File

@ -4,8 +4,8 @@ import { Main } from '@strapi/design-system/Main';
import { LinkButton } from '@strapi/design-system/LinkButton';
import { ContentLayout, HeaderLayout } from '@strapi/design-system/Layout';
import { EmptyStateLayout } from '@strapi/design-system/EmptyStateLayout';
import AddIcon from '@strapi/icons/AddIcon';
import EmptyStateDocument from '@strapi/icons/EmptyStateDocument';
import Plus from '@strapi/icons/Plus';
import EmptyDocuments from '@strapi/icons/EmptyDocuments';
import { useIntl } from 'react-intl';
import { getTrad } from '../../utils';
@ -26,7 +26,7 @@ const NoContentType = () => {
action={
<LinkButton
variant="secondary"
startIcon={<AddIcon />}
startIcon={<Plus />}
to="/plugins/content-type-builder/content-types/create-content-type"
>
{formatMessage({
@ -41,7 +41,7 @@ const NoContentType = () => {
"You don't have any content yet, we recommend you to create your first Content-Type.",
})}
hasRadius
icon={<EmptyStateDocument width="10rem" />}
icon={<EmptyDocuments width="10rem" />}
shadow="tableShadow"
/>
</ContentLayout>

8
packages/core/admin/admin/src/content-manager/pages/NoPermissions/tests/index.test.js
View File

File diff suppressed because one or more lines are too long

6
packages/core/admin/admin/src/pages/AuthPage/components/Login/BaseLogin.js
View File

@ -1,6 +1,6 @@
import React, { useState } from 'react';
import Hide from '@strapi/icons/Hide';
import Show from '@strapi/icons/Show';
import EyeStriked from '@strapi/icons/EyeStriked';
import Eye from '@strapi/icons/Eye';
import { Box } from '@strapi/design-system/Box';
import { Stack } from '@strapi/design-system/Stack';
import { Main } from '@strapi/design-system/Main';
@ -125,7 +125,7 @@ const Login = ({ onSubmit, schema, children }) => {
}
)}
>
{passwordShown ? <Show /> : <Hide />}
{passwordShown ? <Eye /> : <EyeStriked />}
</FieldActionWrapper>
}
required

8
packages/core/admin/admin/src/pages/AuthPage/components/Register/index.js
View File

@ -13,8 +13,8 @@ import { TextInput } from '@strapi/design-system/TextInput';
import { Checkbox } from '@strapi/design-system/Checkbox';
import { Grid, GridItem } from '@strapi/design-system/Grid';
import { H1, Subtitle } from '@strapi/design-system/Text';
import Hide from '@strapi/icons/Hide';
import Show from '@strapi/icons/Show';
import EyeStriked from '@strapi/icons/EyeStriked';
import Eye from '@strapi/icons/Eye';
import { Form, useQuery, useNotification } from '@strapi/helper-plugin';
import { useHistory } from 'react-router-dom';
import PropTypes from 'prop-types';
@ -221,7 +221,7 @@ const Register = ({ fieldsToDisable, noSignin, onSubmit, schema }) => {
}
)}
>
{passwordShown ? <Show /> : <Hide />}
{passwordShown ? <Eye /> : <EyeStriked />}
</FieldActionWrapper>
}
hint={formatMessage({
@ -267,7 +267,7 @@ const Register = ({ fieldsToDisable, noSignin, onSubmit, schema }) => {
}
)}
>
{confirmPasswordShown ? <Show /> : <Hide />}
{confirmPasswordShown ? <Eye /> : <EyeStriked />}
</FieldActionWrapper>
}
required

8
packages/core/admin/admin/src/pages/AuthPage/components/ResetPassword/index.js
View File

@ -10,8 +10,8 @@ import { Link } from '@strapi/design-system/Link';
import { Button } from '@strapi/design-system/Button';
import { TextInput } from '@strapi/design-system/TextInput';
import { H1, Text } from '@strapi/design-system/Text';
import Hide from '@strapi/icons/Hide';
import Show from '@strapi/icons/Show';
import EyeStriked from '@strapi/icons/EyeStriked';
import Eye from '@strapi/icons/Eye';
import styled from 'styled-components';
import { Formik } from 'formik';
import UnauthenticatedLayout, {
@ -99,7 +99,7 @@ const ForgotPassword = ({ onSubmit, schema }) => {
}
)}
>
{passwordShown ? <Show /> : <Hide />}
{passwordShown ? <Eye /> : <EyeStriked />}
</FieldActionWrapper>
}
hint={formatMessage({
@ -144,7 +144,7 @@ const ForgotPassword = ({ onSubmit, schema }) => {
}
)}
>
{confirmPasswordShown ? <Show /> : <Hide />}
{confirmPasswordShown ? <Eye /> : <EyeStriked />}
</FieldActionWrapper>
}
required

20
packages/core/admin/admin/src/pages/HomePage/ContentBlocks.js
View File

@ -2,10 +2,10 @@ import React from 'react';
import styled from 'styled-components';
import { useIntl } from 'react-intl';
import { Stack } from '@strapi/design-system/Stack';
import ReadDoc from '@strapi/icons/ReadDoc';
import CodeExample from '@strapi/icons/CodeExample';
import Tutorial from '@strapi/icons/Tutorial';
import Blog from '@strapi/icons/Blog';
import InformationSquare from '@strapi/icons/InformationSquare';
import CodeSquare from '@strapi/icons/CodeSquare';
import PlaySquare from '@strapi/icons/PlaySquare';
import FeatherSquare from '@strapi/icons/FeatherSquare';
import { ContentBox } from '@strapi/helper-plugin';
const BlockLink = styled.a`
@ -31,7 +31,7 @@ const ContentBlocks = () => {
id: 'app.components.BlockLink.documentation.content',
defaultMessage: 'Discover the concepts, reference, guides and tutorials',
})}
icon={<ReadDoc />}
icon={<InformationSquare />}
iconBackground="primary100"
/>
</BlockLink>
@ -49,7 +49,7 @@ const ContentBlocks = () => {
id: 'app.components.BlockLink.code.content',
defaultMessage: 'Learn by testing real project developed by the community',
})}
icon={<CodeExample />}
icon={<CodeSquare />}
iconBackground="warning100"
/>
</BlockLink>
@ -61,13 +61,13 @@ const ContentBlocks = () => {
<ContentBox
title={formatMessage({
id: 'app.components.BlockLink.tutorial',
defaultMessage: 'Tutorial',
defaultMessage: 'PlaySquare',
})}
subtitle={formatMessage({
id: 'app.components.BlockLink.tutorial.content',
defaultMessage: 'Discover the concepts, reference, guides and tutorials',
})}
icon={<Tutorial />}
icon={<PlaySquare />}
iconBackground="secondary100"
/>
</BlockLink>
@ -75,13 +75,13 @@ const ContentBlocks = () => {
<ContentBox
title={formatMessage({
id: 'app.components.BlockLink.blog',
defaultMessage: 'Blog',
defaultMessage: 'FeatherSquare',
})}
subtitle={formatMessage({
id: 'app.components.BlockLink.blog.content',
defaultMessage: 'Discover the concepts, reference, guides and tutorials',
})}
icon={<Blog />}
icon={<FeatherSquare />}
iconBackground="alternative100"
/>
</BlockLink>

4
packages/core/admin/admin/src/pages/HomePage/HomeHeader.js
View File

@ -7,7 +7,7 @@ import { Link } from '@strapi/design-system/Link';
import { Stack } from '@strapi/design-system/Stack';
import { Box } from '@strapi/design-system/Box';
import { Button } from '@strapi/design-system/Button';
import NextIcon from '@strapi/icons/NextIcon';
import ArrowRight from '@strapi/icons/ArrowRight';
const WordWrap = styled(Subtitle)`
word-break: break-word;
@ -56,7 +56,7 @@ const HomeHeader = ({ hasCreatedContentType, onCreateCT }) => {
})}
</Link>
) : (
<Button size="L" onClick={onCreateCT} endIcon={<NextIcon />}>
<Button size="L" onClick={onCreateCT} endIcon={<ArrowRight />}>
{formatMessage({
id: 'app.components.HomePage.create',
defaultMessage: 'Create your first Content type',

9
packages/core/admin/admin/src/pages/HomePage/SocialLinks.js
View File

@ -14,13 +14,16 @@ import { LinkButton } from '@strapi/design-system/LinkButton';
import { Link } from '@strapi/design-system/Link';
import ExternalLink from '@strapi/icons/ExternalLink';
import Github from '@strapi/icons/Github';
import Slack from '@strapi/icons/Slack';
import Discord from '@strapi/icons/Discord';
import Reddit from '@strapi/icons/Reddit';
import Strapi from '@strapi/icons/Strapi';
// FIXME
// eslint-disable-next-line import/no-duplicates
import Strapi from '@strapi/icons/Discourse';
import Twitter from '@strapi/icons/Twitter';
// eslint-disable-next-line import/no-duplicates
import Discourse from '@strapi/icons/Discourse';
const StyledDiscord = styled(Slack)`
const StyledDiscord = styled(Discord)`
path {
fill: #7289da !important;
}

72
packages/core/admin/admin/src/pages/HomePage/tests/index.test.js
View File

@ -1001,7 +1001,7 @@ describe('Homepage', () => {
class="c29"
style="word-break: break-all;"
>
Tutorial
PlaySquare
</span>
</div>
<span
@ -1051,7 +1051,7 @@ describe('Homepage', () => {
class="c29"
style="word-break: break-all;"
>
Blog
FeatherSquare
</span>
</div>
<span
@ -1194,7 +1194,7 @@ describe('Homepage', () => {
xmlns="http://www.w3.org/2000/svg"
>
<g
clip-path="url(#slack_svg__clip0)"
clip-path="url(#Discord_svg__clip0_871:4264)"
>
<path
d="M20.04 0H3.96A2.464 2.464 0 001.5 2.468v16.2a2.464 2.464 0 002.46 2.469h13.608l-.636-2.217 1.536 1.426 1.452 1.342 2.58 2.277V2.468A2.464 2.464 0 0020.04 0zm-4.632 15.65s-.432-.516-.792-.972c1.572-.443 2.172-1.425 2.172-1.425-.492.323-.96.55-1.38.707-.6.251-1.176.419-1.74.515a8.417 8.417 0 01-3.108-.012 10.086 10.086 0 01-1.764-.515 7.053 7.053 0 01-.876-.408c-.036-.024-.072-.036-.108-.06a.166.166 0 01-.048-.036 4.202 4.202 0 01-.336-.203s.576.958 2.1 1.414c-.36.455-.804.994-.804.994-2.652-.084-3.66-1.821-3.66-1.821 0-3.859 1.728-6.986 1.728-6.986 1.728-1.294 3.372-1.258 3.372-1.258l.12.144c-2.16.623-3.156 1.57-3.156 1.57s.264-.144.708-.348c1.284-.563 2.304-.72 2.724-.755.072-.012.132-.024.204-.024A9.792 9.792 0 0116.8 7.297s-.948-.898-2.988-1.521l.168-.192s1.644-.036 3.372 1.258c0 0 1.728 3.127 1.728 6.986 0 0-1.02 1.737-3.672 1.821zm-5.58-5.597c-.684 0-1.224.6-1.224 1.33 0 .731.552 1.33 1.224 1.33.684 0 1.224-.599 1.224-1.33.012-.73-.54-1.33-1.224-1.33zm4.38 0c-.684 0-1.224.6-1.224 1.33 0 .731.552 1.33 1.224 1.33.684 0 1.224-.599 1.224-1.33 0-.73-.54-1.33-1.224-1.33z"
@ -1203,7 +1203,7 @@ describe('Homepage', () => {
</g>
<defs>
<clippath
id="slack_svg__clip0"
id="Discord_svg__clip0_871:4264"
>
<path
d="M0 0h21v24H0z"
@ -1291,7 +1291,7 @@ describe('Homepage', () => {
xmlns="http://www.w3.org/2000/svg"
>
<g
clip-path="url(#twitter_svg__clip0)"
clip-path="url(#twitter_svg__clip0_871:4273)"
>
<path
d="M24 4.557a9.83 9.83 0 01-2.828.775 4.932 4.932 0 002.165-2.724 9.864 9.864 0 01-3.127 1.195 4.916 4.916 0 00-3.594-1.555c-3.179 0-5.515 2.966-4.797 6.045A13.978 13.978 0 011.671 3.149a4.93 4.93 0 001.523 6.574 4.903 4.903 0 01-2.229-.616c-.054 2.281 1.581 4.415 3.949 4.89a4.935 4.935 0 01-2.224.084 4.928 4.928 0 004.6 3.419A9.9 9.9 0 010 19.54a13.94 13.94 0 007.548 2.212c9.142 0 14.307-7.721 13.995-14.646A10.025 10.025 0 0024 4.557z"
@ -1300,7 +1300,7 @@ describe('Homepage', () => {
</g>
<defs>
<clippath
id="twitter_svg__clip0"
id="twitter_svg__clip0_871:4273"
>
<path
d="M0 0h24v24H0z"
@ -1403,22 +1403,28 @@ describe('Homepage', () => {
xmlns="http://www.w3.org/2000/svg"
>
<path
clip-rule="evenodd"
d="M23.498 0H7.68v8.035h7.783c.278 0 .503.224.503.502v7.783H24V.502A.502.502 0 0023.498 0z"
fill="#8E75FF"
fill-rule="evenodd"
d="M12.103 0C5.533 0 0 5.278 0 11.79V24l12.1-.012c6.57 0 11.9-5.481 11.9-11.992C24 5.486 18.666 0 12.103 0z"
fill="#231F20"
/>
<path
clip-rule="evenodd"
d="M7.68 0v8.035H.252a.25.25 0 01-.178-.429L7.68 0zM16.395 23.926a.251.251 0 01-.43-.177V16.32H24l-7.605 7.606z"
fill="#8E75FF"
fill-rule="evenodd"
opacity="0.405"
d="M12.22 4.564a7.43 7.43 0 00-3.644.956 7.346 7.346 0 00-2.692 2.614 7.26 7.26 0 00-.149 7.22L4.4 19.606l4.793-1.072a7.433 7.433 0 006.355-.14 7.36 7.36 0 002.513-2.057 7.28 7.28 0 001.372-2.93 7.243 7.243 0 00-.035-3.228A7.281 7.281 0 0017.96 7.28a7.365 7.365 0 00-2.557-2.002 7.432 7.432 0 00-3.178-.715h-.007z"
fill="#FFF9AE"
/>
<path
d="M7.68 8.035h8.034c.14 0 .252.112.252.25v8.035H8.183a.502.502 0 01-.503-.502V8.035z"
fill="#8E75FF"
opacity="0.405"
d="M18.071 7.426a7.262 7.262 0 011.51 4.499 7.264 7.264 0 01-1.595 4.47 7.38 7.38 0 01-4.028 2.558 7.437 7.437 0 01-4.765-.43L4.4 19.61l4.88-.571a7.432 7.432 0 005.181.858 7.381 7.381 0 004.443-2.778 7.258 7.258 0 00-.833-9.693z"
fill="#00AEEF"
/>
<path
d="M16.713 6.078a7.253 7.253 0 01.86 8.928 7.361 7.361 0 01-3.736 2.962 7.437 7.437 0 01-4.784.065L4.4 19.61l4.793-1.075a7.436 7.436 0 005.24.313 7.362 7.362 0 004.123-3.22 7.249 7.249 0 00.914-5.123 7.296 7.296 0 00-2.757-4.427z"
fill="#00A94F"
/>
<path
d="M6.176 15.515a7.246 7.246 0 01-.26-4.876 7.312 7.312 0 012.9-3.95 7.427 7.427 0 019.26.735 7.387 7.387 0 00-4.603-2.771 7.431 7.431 0 00-5.277 1.068A7.311 7.311 0 005.06 10.06a7.249 7.249 0 00.676 5.294L4.4 19.607l1.776-4.092z"
fill="#F15D22"
/>
<path
d="M5.735 15.353a7.25 7.25 0 01-.764-4.818 7.294 7.294 0 012.465-4.222 7.415 7.415 0 014.596-1.744 7.42 7.42 0 014.681 1.509 7.404 7.404 0 00-4.865-2.26 7.421 7.421 0 00-5.12 1.61 7.293 7.293 0 00-2.66 4.626A7.256 7.256 0 005.28 15.24l-.877 4.37 1.332-4.257z"
fill="#E31B23"
/>
</svg>
</div>
@ -1456,22 +1462,28 @@ describe('Homepage', () => {
xmlns="http://www.w3.org/2000/svg"
>
<path
clip-rule="evenodd"
d="M23.498 0H7.68v8.035h7.783c.278 0 .503.224.503.502v7.783H24V.502A.502.502 0 0023.498 0z"
fill="#8E75FF"
fill-rule="evenodd"
d="M12.103 0C5.533 0 0 5.278 0 11.79V24l12.1-.012c6.57 0 11.9-5.481 11.9-11.992C24 5.486 18.666 0 12.103 0z"
fill="#231F20"
/>
<path
clip-rule="evenodd"
d="M7.68 0v8.035H.252a.25.25 0 01-.178-.429L7.68 0zM16.395 23.926a.251.251 0 01-.43-.177V16.32H24l-7.605 7.606z"
fill="#8E75FF"
fill-rule="evenodd"
opacity="0.405"
d="M12.22 4.564a7.43 7.43 0 00-3.644.956 7.346 7.346 0 00-2.692 2.614 7.26 7.26 0 00-.149 7.22L4.4 19.606l4.793-1.072a7.433 7.433 0 006.355-.14 7.36 7.36 0 002.513-2.057 7.28 7.28 0 001.372-2.93 7.243 7.243 0 00-.035-3.228A7.281 7.281 0 0017.96 7.28a7.365 7.365 0 00-2.557-2.002 7.432 7.432 0 00-3.178-.715h-.007z"
fill="#FFF9AE"
/>
<path
d="M7.68 8.035h8.034c.14 0 .252.112.252.25v8.035H8.183a.502.502 0 01-.503-.502V8.035z"
fill="#8E75FF"
opacity="0.405"
d="M18.071 7.426a7.262 7.262 0 011.51 4.499 7.264 7.264 0 01-1.595 4.47 7.38 7.38 0 01-4.028 2.558 7.437 7.437 0 01-4.765-.43L4.4 19.61l4.88-.571a7.432 7.432 0 005.181.858 7.381 7.381 0 004.443-2.778 7.258 7.258 0 00-.833-9.693z"
fill="#00AEEF"
/>
<path
d="M16.713 6.078a7.253 7.253 0 01.86 8.928 7.361 7.361 0 01-3.736 2.962 7.437 7.437 0 01-4.784.065L4.4 19.61l4.793-1.075a7.436 7.436 0 005.24.313 7.362 7.362 0 004.123-3.22 7.249 7.249 0 00.914-5.123 7.296 7.296 0 00-2.757-4.427z"
fill="#00A94F"
/>
<path
d="M6.176 15.515a7.246 7.246 0 01-.26-4.876 7.312 7.312 0 012.9-3.95 7.427 7.427 0 019.26.735 7.387 7.387 0 00-4.603-2.771 7.431 7.431 0 00-5.277 1.068A7.311 7.311 0 005.06 10.06a7.249 7.249 0 00.676 5.294L4.4 19.607l1.776-4.092z"
fill="#F15D22"
/>
<path
d="M5.735 15.353a7.25 7.25 0 01-.764-4.818 7.294 7.294 0 012.465-4.222 7.415 7.415 0 014.596-1.744 7.42 7.42 0 014.681 1.509 7.404 7.404 0 00-4.865-2.26 7.421 7.421 0 00-5.12 1.61 7.293 7.293 0 00-2.66 4.626A7.256 7.256 0 005.28 15.24l-.877 4.37 1.332-4.257z"
fill="#E31B23"
/>
</svg>
</div>

14
packages/core/admin/admin/src/pages/ProfilePage/index.js
View File

@ -27,9 +27,9 @@ import { useNotifyAT } from '@strapi/design-system/LiveRegions';
import { Select, Option } from '@strapi/design-system/Select';
import { FieldAction } from '@strapi/design-system/Field';
import { TextInput } from '@strapi/design-system/TextInput';
import Show from '@strapi/icons/Show';
import Hide from '@strapi/icons/Hide';
import CheckIcon from '@strapi/icons/CheckIcon';
import Eye from '@strapi/icons/Eye';
import EyeStriked from '@strapi/icons/EyeStriked';
import Check from '@strapi/icons/Check';
import useLocalesProvider from '../../components/LocalesProvider/useLocalesProvider';
import { fetchUser, putUser } from './utils/api';
import schema from './utils/schema';
@ -174,7 +174,7 @@ const ProfilePage = () => {
<HeaderLayout
title={data.username || `${data.firstname} ${data.lastname}`}
primaryAction={
<Button startIcon={<CheckIcon />} loading={isSubmitting} type="submit">
<Button startIcon={<Check />} loading={isSubmitting} type="submit">
{formatMessage({ id: 'form.button.save', defaultMessage: 'Save' })}
</Button>
}
@ -305,7 +305,7 @@ const ProfilePage = () => {
}
)}
>
{currentPasswordShown ? <Show /> : <Hide />}
{currentPasswordShown ? <Eye /> : <EyeStriked />}
</FieldActionWrapper>
}
/>
@ -349,7 +349,7 @@ const ProfilePage = () => {
}
)}
>
{passwordShown ? <Show /> : <Hide />}
{passwordShown ? <Eye /> : <EyeStriked />}
</FieldActionWrapper>
}
/>
@ -390,7 +390,7 @@ const ProfilePage = () => {
}
)}
>
{passwordConfirmShown ? <Show /> : <Hide />}
{passwordConfirmShown ? <Eye /> : <EyeStriked />}
</FieldActionWrapper>
}
/>

4
packages/core/admin/admin/src/pages/ProfilePage/tests/index.test.js
View File

@ -244,6 +244,10 @@ describe('ADMIN | Pages | Profile page', () => {
outline: none;
}
.c37[aria-disabled='true'] {
cursor: not-allowed;
}
.c34 {
font-weight: 500;
font-size: 0.75rem;

4
packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/components/ContentBox/index.js
View File

@ -5,7 +5,7 @@ import { IconButton } from '@strapi/design-system/IconButton';
import Duplicate from '@strapi/icons/Duplicate';
import PropTypes from 'prop-types';
import { CopyToClipboard } from 'react-copy-to-clipboard';
import IconApiTokens from '@strapi/icons/IconApiTokens';
import Key from '@strapi/icons/Key';
const HeaderContentBox = ({ apiToken }) => {
const { formatMessage } = useIntl();
@ -52,7 +52,7 @@ const HeaderContentBox = ({ apiToken }) => {
defaultMessage: 'For security matters, you can only see your token once.',
})
}
icon={<IconApiTokens />}
icon={<Key />}
iconBackground="neutral100"
/>
);

4
packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/components/LoadingView/index.js
View File

@ -7,7 +7,7 @@ import {
import { HeaderLayout, ContentLayout } from '@strapi/design-system/Layout';
import { Main } from '@strapi/design-system/Main';
import { Button } from '@strapi/design-system/Button';
import CheckIcon from '@strapi/icons/CheckIcon';
import Check from '@strapi/icons/Check';
import { useIntl } from 'react-intl';
import PropTypes from 'prop-types';
@ -20,7 +20,7 @@ const LoadingView = ({ apiTokenName }) => {
<SettingsPageTitle name="API Tokens" />
<HeaderLayout
primaryAction={
<Button disabled startIcon={<CheckIcon />} type="button" size="L">
<Button disabled startIcon={<Check />} type="button" size="L">
{formatMessage({ id: 'form.button.save', defaultMessage: 'Save' })}
</Button>
}

8
packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/index.js
View File

@ -10,8 +10,8 @@ import {
import { HeaderLayout, ContentLayout } from '@strapi/design-system/Layout';
import { Main } from '@strapi/design-system/Main';
import { Button } from '@strapi/design-system/Button';
import CheckIcon from '@strapi/icons/CheckIcon';
import BackIcon from '@strapi/icons/BackIcon';
import Check from '@strapi/icons/Check';
import ArrowLeft from '@strapi/icons/ArrowLeft';
import { Link } from '@strapi/design-system/Link';
import { Formik } from 'formik';
import { Stack } from '@strapi/design-system/Stack';
@ -141,7 +141,7 @@ const ApiTokenCreateView = () => {
<Button
disabled={isSubmitting}
loading={isSubmitting}
startIcon={<CheckIcon />}
startIcon={<Check />}
type="submit"
size="L"
>
@ -152,7 +152,7 @@ const ApiTokenCreateView = () => {
</Button>
}
navigationAction={
<Link startIcon={<BackIcon />} to="/settings/api-tokens">
<Link startIcon={<ArrowLeft />} to="/settings/api-tokens">
{formatMessage({
id: 'app.components.go-back',
defaultMessage: 'Go back',

4
packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/ListView/DynamicTable/DeleteButton/index.js
View File

@ -1,5 +1,5 @@
import React from 'react';
import DeleteIcon from '@strapi/icons/DeleteIcon';
import Trash from '@strapi/icons/Trash';
import { IconButton } from '@strapi/design-system/IconButton';
import { Box } from '@strapi/design-system/Box';
import { stopPropagation } from '@strapi/helper-plugin';
@ -21,7 +21,7 @@ const DeleteButton = ({ tokenName, onClickDelete }) => {
{ target: `${tokenName}` }
)}
noBorder
icon={<DeleteIcon />}
icon={<Trash />}
/>
</Box>
);

4
packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/ListView/DynamicTable/UpdateButton/index.js
View File

@ -1,5 +1,5 @@
import React from 'react';
import EditIcon from '@strapi/icons/EditIcon';
import Pencil from '@strapi/icons/Pencil';
import { useIntl } from 'react-intl';
import PropTypes from 'prop-types';
import { Link } from '@strapi/design-system/Link';
@ -39,7 +39,7 @@ const UpdateButton = ({ tokenName, tokenId }) => {
{ target: `${tokenName}` }
)}
>
<EditIcon />
<Pencil />
</LinkUpdate>
);
};

6
packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/ListView/index.js
View File

@ -13,7 +13,7 @@ import { HeaderLayout, ContentLayout } from '@strapi/design-system/Layout';
import { Main } from '@strapi/design-system/Main';
import { Button } from '@strapi/design-system/Button';
import { LinkButton } from '@strapi/design-system/LinkButton';
import AddIcon from '@strapi/icons/AddIcon';
import Plus from '@strapi/icons/Plus';
import { useQuery, useMutation, useQueryClient } from 'react-query';
import { useHistory } from 'react-router-dom';
import qs from 'qs';
@ -98,7 +98,7 @@ const ApiTokenListView = () => {
canCreate ? (
<LinkButton
data-testid="create-api-token-button"
startIcon={<AddIcon />}
startIcon={<Plus />}
size="L"
to="/settings/api-tokens/create"
>
@ -138,7 +138,7 @@ const ApiTokenListView = () => {
defaultMessage: 'Add your first API Token',
}}
action={
<Button variant="secondary" startIcon={<AddIcon />}>
<Button variant="secondary" startIcon={<Plus />}>
{formatMessage({
id: 'Settings.apiTokens.addNewToken',
defaultMessage: 'Add new API Token',

4
packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/ConditionsButton/index.js
View File

@ -1,6 +1,6 @@
import React from 'react';
import PropTypes from 'prop-types';
import Settings from '@strapi/icons/Settings';
import Cog from '@strapi/icons/Cog';
import { Button } from '@strapi/design-system/Button';
import { useIntl } from 'react-intl';
import styled from 'styled-components';
@ -29,7 +29,7 @@ const ConditionsButton = ({ onClick, className, hasConditions, variant }) => {
return (
<Wrapper hasConditions={hasConditions} className={className}>
<Button variant={variant} startIcon={<Settings />} onClick={onClick}>
<Button variant={variant} startIcon={<Cog />} onClick={onClick}>
{formatMessage({
id: 'app.components.LeftMenuLinkContainer.settings',
defaultMessage: 'Settings',

6
packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/ContentTypeCollapse/Collapse/index.js
View File

@ -1,7 +1,7 @@
import React, { useMemo, useState } from 'react';
import PropTypes from 'prop-types';
import Down from '@strapi/icons/Down';
import Up from '@strapi/icons/Up';
import ChevronDown from '@strapi/icons/ChevronDown';
import ChevronUp from '@strapi/icons/ChevronUp';
import { BaseCheckbox } from '@strapi/design-system/BaseCheckbox';
import { Box } from '@strapi/design-system/Box';
import { Flex } from '@strapi/design-system/Flex';
@ -161,7 +161,7 @@ const Collapse = ({
value={hasAllActionsSelected}
isActive={isActive}
>
<Chevron paddingLeft={2}>{isActive ? <Up /> : <Down />}</Chevron>
<Chevron paddingLeft={2}>{isActive ? <ChevronUp /> : <ChevronDown />}</Chevron>
</RowLabelWithCheckbox>
<Flex style={{ flex: 1 }}>

4
packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/ContentTypeCollapse/CollapsePropertyMatrix/CarretIcon/index.js
View File

@ -1,7 +1,7 @@
import styled from 'styled-components';
import Carret from '@strapi/icons/Carret';
import CarretDown from '@strapi/icons/CarretDown';
const CarretIcon = styled(Carret)`
const CarretIcon = styled(CarretDown)`
display: none;
width: ${10 / 16}rem;
transform: rotate(${({ $isActive }) => ($isActive ? '180' : '0')}deg);

4
packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/index.js
View File

@ -14,7 +14,7 @@ import { Main } from '@strapi/design-system/Main';
import { Stack } from '@strapi/design-system/Stack';
import { Formik } from 'formik';
import { Link } from '@strapi/design-system/Link';
import BackIcon from '@strapi/icons/BackIcon';
import ArrowLeft from '@strapi/icons/ArrowLeft';
import get from 'lodash/get';
import { useIntl } from 'react-intl';
import { useRouteMatch } from 'react-router-dom';
@ -132,7 +132,7 @@ const EditPage = () => {
defaultMessage: 'Define the rights given to the role',
})}
navigationAction={
<Link startIcon={<BackIcon />} to="/settings/roles">
<Link startIcon={<ArrowLeft />} to="/settings/roles">
{formatMessage({
id: 'app.components.go-back',
defaultMessage: 'Go back',

14
packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/ListPage/index.js
View File

@ -6,9 +6,9 @@ import {
useTracking,
useFocusWhenNavigate,
} from '@strapi/helper-plugin';
import AddIcon from '@strapi/icons/AddIcon';
import DeleteIcon from '@strapi/icons/DeleteIcon';
import EditIcon from '@strapi/icons/EditIcon';
import Plus from '@strapi/icons/Plus';
import Trash from '@strapi/icons/Trash';
import Pencil from '@strapi/icons/Pencil';
import Duplicate from '@strapi/icons/Duplicate';
import { Button } from '@strapi/design-system/Button';
import { ContentLayout, HeaderLayout } from '@strapi/design-system/Layout';
@ -65,12 +65,12 @@ const useRoleActions = () => {
{
onClick: () => handleGoTo(role.id),
label: formatMessage({ id: 'app.utils.edit', defaultMessage: 'Edit' }),
icon: <EditIcon />,
icon: <Pencil />,
},
{
onClick: handleToggle,
label: formatMessage({ id: 'app.utils.delete', defaultMessage: 'Delete' }),
icon: <DeleteIcon />,
icon: <Trash />,
},
],
[formatMessage, handleToggle, handleGoTo]
@ -106,7 +106,7 @@ const RoleListPage = () => {
<SettingsPageTitle name="Roles" />
<HeaderLayout
primaryAction={
<Button onClick={handleToggleModalForCreatingRole} startIcon={<AddIcon />} size="L">
<Button onClick={handleToggleModalForCreatingRole} startIcon={<Plus />} size="L">
{formatMessage({
id: 'Settings.roles.list.button.add',
defaultMessage: 'Add new role',
@ -127,7 +127,7 @@ const RoleListPage = () => {
colCount={colCount}
rowCount={rowCount}
footer={
<TFooter onClick={handleToggleModalForCreatingRole} icon={<AddIcon />}>
<TFooter onClick={handleToggleModalForCreatingRole} icon={<Plus />}>
{formatMessage({
id: 'Settings.roles.list.button.add',
defaultMessage: 'Add new role',

12
packages/core/admin/admin/src/pages/SettingsPage/pages/Users/EditPage/index.js
View File

@ -26,8 +26,8 @@ import { Link } from '@strapi/design-system/Link';
import { H3 } from '@strapi/design-system/Text';
import { Main } from '@strapi/design-system/Main';
import { Stack } from '@strapi/design-system/Stack';
import BackIcon from '@strapi/icons/BackIcon';
import CheckIcon from '@strapi/icons/CheckIcon';
import ArrowLeft from '@strapi/icons/ArrowLeft';
import Check from '@strapi/icons/Check';
import MagicLink from 'ee_else_ce/pages/SettingsPage/pages/Users/components/MagicLink';
import { formatAPIErrors } from '../../../../../utils';
import { fetchUser, putUser } from './utils/api';
@ -141,13 +141,13 @@ const EditPage = ({ canUpdate }) => {
<SettingsPageTitle name="Users" />
<HeaderLayout
primaryAction={
<Button disabled startIcon={<CheckIcon />} type="button" size="L">
<Button disabled startIcon={<Check />} type="button" size="L">
{formatMessage({ id: 'form.button.save', defaultMessage: 'Save' })}
</Button>
}
title={title}
navigationAction={
<Link startIcon={<BackIcon />} to="/settings/users?pageSize=10&page=1&sort=firstname">
<Link startIcon={<ArrowLeft />} to="/settings/users?pageSize=10&page=1&sort=firstname">
{formatMessage({
id: 'app.components.go-back',
defaultMessage: 'Go back',
@ -178,7 +178,7 @@ const EditPage = ({ canUpdate }) => {
primaryAction={
<Button
disabled={isSubmitting || !canUpdate}
startIcon={<CheckIcon />}
startIcon={<Check />}
loading={isSubmitting}
type="submit"
size="L"
@ -189,7 +189,7 @@ const EditPage = ({ canUpdate }) => {
title={title}
navigationAction={
<Link
startIcon={<BackIcon />}
startIcon={<ArrowLeft />}
to="/settings/users?pageSize=10&page=1&sort=firstname"
>
{formatMessage({

8
packages/core/admin/admin/src/pages/SettingsPage/pages/Users/ListPage/DynamicTable/TableRows/index.js
View File

@ -6,8 +6,8 @@ import { IconButton } from '@strapi/design-system/IconButton';
import { Flex } from '@strapi/design-system/Flex';
import { Text } from '@strapi/design-system/Text';
import { Tbody, Td, Tr } from '@strapi/design-system/Table';
import EditIcon from '@strapi/icons/EditIcon';
import DeleteIcon from '@strapi/icons/DeleteIcon';
import Pencil from '@strapi/icons/Pencil';
import Trash from '@strapi/icons/Trash';
import { useHistory } from 'react-router-dom';
import { useIntl } from 'react-intl';
import { stopPropagation, onRowClick } from '@strapi/helper-plugin';
@ -80,7 +80,7 @@ const TableRows = ({
{ target: `${data.firstname} ${data.lastname}` }
)}
noBorder
icon={<EditIcon />}
icon={<Pencil />}
/>
{canDelete && (
@ -92,7 +92,7 @@ const TableRows = ({
{ target: `${data.firstname} ${data.lastname}` }
)}
noBorder
icon={<DeleteIcon />}
icon={<Trash />}
/>
</Box>
)}

4
packages/core/admin/admin/src/pages/SettingsPage/pages/Users/ListPage/Filters/index.js
View File

@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
import { useIntl } from 'react-intl';
import { Button } from '@strapi/design-system/Button';
import { Box } from '@strapi/design-system/Box';
import FilterIcon from '@strapi/icons/FilterIcon';
import Filter from '@strapi/icons/Filter';
import { FilterListURLQuery, FilterPopoverURLQuery } from '@strapi/helper-plugin';
const Filters = ({ displayedFilters }) => {
@ -21,7 +21,7 @@ const Filters = ({ displayedFilters }) => {
<Button
variant="tertiary"
ref={buttonRef}
startIcon={<FilterIcon />}
startIcon={<Filter />}
onClick={handleToggle}
size="S"
>

6
packages/core/admin/admin/src/pages/SettingsPage/pages/Users/ListPage/PaginationFooter/tests/__snapshots__/index.test.js.snap
View File

@ -247,6 +247,10 @@ exports[`DynamicTable renders and matches the snapshot 1`] = `
outline: none;
}
.c6[aria-disabled='true'] {
cursor: not-allowed;
}
.c10 {
font-weight: 400;
font-size: 0.875rem;
@ -553,7 +557,7 @@ exports[`DynamicTable renders and matches the snapshot 1`] = `
xmlns="http://www.w3.org/2000/svg"
>
<path
d="M0 1.88L6.107 8 0 14.12 1.88 16l8-8-8-8L0 1.88z"
d="M.12 1.88L6.227 8 .12 14.12 2 16l8-8-8-8L.12 1.88z"
fill="#32324D"
/>
</svg>

9
packages/core/admin/admin/src/pages/SettingsPage/pages/Users/ListPage/index.js
View File

@ -12,7 +12,7 @@ import { ActionLayout, ContentLayout, HeaderLayout } from '@strapi/design-system
import { Button } from '@strapi/design-system/Button';
import { Main } from '@strapi/design-system/Main';
import { useNotifyAT } from '@strapi/design-system/LiveRegions';
import Mail from '@strapi/icons/Mail';
import Envelop from '@strapi/icons/Envelop';
import { useLocation } from 'react-router-dom';
import { useIntl } from 'react-intl';
import { useMutation, useQuery, useQueryClient } from 'react-query';
@ -96,7 +96,12 @@ const ListPage = () => {
(status !== 'success' && status !== 'error') || (status === 'success' && isFetching);
const createAction = canCreate ? (
<Button data-testid="create-user-button" onClick={handleToggle} startIcon={<Mail />} size="L">
<Button
data-testid="create-user-button"
onClick={handleToggle}
startIcon={<Envelop />}
size="L"
>
{formatMessage({
id: 'Settings.permissions.users.create',
defaultMessage: 'Create new user',

14
packages/core/admin/admin/src/pages/SettingsPage/pages/Users/ListPage/tests/index.test.js
View File

@ -691,6 +691,10 @@ describe('ADMIN | Pages | USERS | ListPage', () => {
outline: none;
}
.c54[aria-disabled='true'] {
cursor: not-allowed;
}
.c58 {
font-weight: 400;
font-size: 0.875rem;
@ -1106,20 +1110,20 @@ describe('ADMIN | Pages | USERS | ListPage', () => {
<svg
fill="none"
height="1em"
viewBox="0 0 24 20"
viewBox="0 0 24 24"
width="1em"
xmlns="http://www.w3.org/2000/svg"
>
<path
d="M0 .8A.8.8 0 01.8 0h22.4a.8.8 0 01.8.8v2.71a1 1 0 01-1 1H1a1 1 0 01-1-1V.8z"
d="M0 2.8A.8.8 0 01.8 2h22.4a.8.8 0 01.8.8v2.71a1 1 0 01-1 1H1a1 1 0 01-1-1V2.8z"
fill="#32324D"
/>
<path
d="M1.922 5.991C.197 4.675 0 4.252 0 3.289h23.953c.305 1.363-1.594 2.506-2.297 3.125-1.953 1.363-6.253 4.36-7.828 5.45-1.575 1.09-3.031.455-3.562 0-2.063-1.41-6.62-4.557-8.344-5.873zM22.8 16H1.2c-.663 0-1.2.471-1.2 1.053v1.894C0 19.529.537 20 1.2 20h21.6c.663 0 1.2-.471 1.2-1.053v-1.894c0-.582-.537-1.053-1.2-1.053z"
d="M1.922 7.991C.197 6.675 0 6.252 0 5.289h23.953c.305 1.363-1.594 2.506-2.297 3.125-1.953 1.363-6.253 4.36-7.828 5.45-1.575 1.09-3.031.455-3.562 0-2.063-1.41-6.62-4.557-8.344-5.873zM22.8 18H1.2c-.663 0-1.2.471-1.2 1.053v1.894C0 21.529.537 22 1.2 22h21.6c.663 0 1.2-.471 1.2-1.053v-1.894c0-.582-.537-1.053-1.2-1.053z"
fill="#32324D"
/>
<path
d="M0 7.555v10.972h24V7.554c-2.633 1.95-8.367 6.113-9.96 7.165-1.595 1.053-3.352.439-4.032 0L0 7.555z"
d="M0 9.555v10.972h24V9.554c-2.633 1.95-8.367 6.113-9.96 7.166-1.595 1.052-3.352.438-4.032 0L0 9.555z"
fill="#32324D"
/>
</svg>
@ -1615,7 +1619,7 @@ describe('ADMIN | Pages | USERS | ListPage', () => {
xmlns="http://www.w3.org/2000/svg"
>
<path
d="M0 1.88L6.107 8 0 14.12 1.88 16l8-8-8-8L0 1.88z"
d="M.12 1.88L6.227 8 .12 14.12 2 16l8-8-8-8L.12 1.88z"
fill="#32324D"
/>
</svg>

2
packages/core/admin/admin/src/pages/SettingsPage/pages/Users/components/SelectRoles/index.js
View File

@ -4,7 +4,7 @@ import { useIntl } from 'react-intl';
import { Select, Option } from '@strapi/design-system/Select';
import { useQuery } from 'react-query';
import styled, { keyframes } from 'styled-components';
import LoadingIcon from '@strapi/icons/LoadingIcon';
import LoadingIcon from '@strapi/icons/Loader';
import { axiosInstance } from '../../../../../../core/utils';
const rotation = keyframes`

4
packages/core/admin/admin/src/pages/SettingsPage/pages/Webhooks/EditView/components/HeadersInput/index.js
View File

@ -1,6 +1,6 @@
import React from 'react';
import { RemoveRoundedButton } from '@strapi/helper-plugin';
import AddIcon from '@strapi/icons/AddIcon';
import Plus from '@strapi/icons/Plus';
import { Box } from '@strapi/design-system/Box';
import { FieldLabel } from '@strapi/design-system/Field';
import { Grid, GridItem } from '@strapi/design-system/Grid';
@ -97,7 +97,7 @@ const HeadersInput = () => {
onClick={() => {
push({ key: '', value: '' });
}}
startIcon={<AddIcon />}
startIcon={<Plus />}
>
{formatMessage({
id: 'Settings.webhooks.create.header',

15
packages/core/admin/admin/src/pages/SettingsPage/pages/Webhooks/EditView/components/TriggerContainer/index.js
View File

@ -1,9 +1,8 @@
import React from 'react';
import PropTypes from 'prop-types';
import CheckIcon from '@strapi/icons/CheckIcon';
import ClearField from '@strapi/icons/ClearField';
import Close from '@strapi/icons/Close';
import LoadingIcon from '@strapi/icons/LoadingIcon';
import Check from '@strapi/icons/Check';
import Cross from '@strapi/icons/Cross';
import Loader from '@strapi/icons/Loader';
import { Box } from '@strapi/design-system/Box';
import { Flex } from '@strapi/design-system/Flex';
import { Text } from '@strapi/design-system/Text';
@ -30,7 +29,7 @@ const Status = ({ isPending, statusCode }) => {
if (isPending) {
return (
<Stack horizontal size={2} style={{ alignItems: 'center' }}>
<Icon as={LoadingIcon} />
<Icon as={Loader} />
<Text>
{formatMessage({ id: 'Settings.webhooks.trigger.pending', defaultMessage: 'pending' })}
</Text>
@ -41,7 +40,7 @@ const Status = ({ isPending, statusCode }) => {
if (statusCode >= 200 && statusCode < 300) {
return (
<Stack horizontal size={2} style={{ alignItems: 'center' }}>
<Icon as={CheckIcon} color="success700" />
<Icon as={Check} color="success700" />
<Text>
{formatMessage({ id: 'Settings.webhooks.trigger.success', defaultMessage: 'success' })}
</Text>
@ -52,7 +51,7 @@ const Status = ({ isPending, statusCode }) => {
if (statusCode >= 300) {
return (
<Stack horizontal size={2} style={{ alignItems: 'center' }}>
<Icon as={Close} color="danger700" />
<Icon as={Cross} color="danger700" />
<Text>
{formatMessage({ id: 'Settings.error', defaultMessage: 'error' })} {statusCode}
</Text>
@ -124,7 +123,7 @@ const CancelButton = ({ onCancel }) => {
<Text textColor="neutral400">
{formatMessage({ id: 'Settings.webhooks.trigger.cancel', defaultMessage: 'cancel' })}
</Text>
<Icon as={ClearField} color="neutral400" />
<Icon as={Cross} color="neutral400" />
</Stack>
</button>
</Flex>

10
packages/core/admin/admin/src/pages/SettingsPage/pages/Webhooks/EditView/components/WebhookForm/index.js
View File

@ -1,9 +1,9 @@
import React, { useState } from 'react';
import PropTypes from 'prop-types';
import { Form } from '@strapi/helper-plugin';
import BackIcon from '@strapi/icons/BackIcon';
import CheckIcon from '@strapi/icons/CheckIcon';
import Publish from '@strapi/icons/Publish';
import ArrowLeft from '@strapi/icons/ArrowLeft';
import Check from '@strapi/icons/Check';
import Publish from '@strapi/icons/Play';
import { ContentLayout, HeaderLayout } from '@strapi/design-system/Layout';
import { Box } from '@strapi/design-system/Box';
import { Button } from '@strapi/design-system/Button';
@ -66,7 +66,7 @@ const WebhookForm = ({
defaultMessage: 'Trigger',
})}
</Button>
<Button startIcon={<CheckIcon />} onClick={handleSubmit} type="submit" size="L">
<Button startIcon={<Check />} onClick={handleSubmit} type="submit" size="L">
{formatMessage({
id: 'app.components.Button.save',
defaultMessage: 'Save',
@ -83,7 +83,7 @@ const WebhookForm = ({
: data?.name
}
navigationAction={
<Link startIcon={<BackIcon />} to="/settings/webhooks">
<Link startIcon={<ArrowLeft />} to="/settings/webhooks">
{formatMessage({
id: 'app.components.go-back',
defaultMessage: 'Go back',

22
packages/core/admin/admin/src/pages/SettingsPage/pages/Webhooks/ListView/index.js
View File

@ -33,10 +33,10 @@ import { Main } from '@strapi/design-system/Main';
import { LinkButton } from '@strapi/design-system/LinkButton';
import { useNotifyAT } from '@strapi/design-system/LiveRegions';
import { Box } from '@strapi/design-system/Box';
import AddIcon from '@strapi/icons/AddIcon';
import EditIcon from '@strapi/icons/EditIcon';
import DeleteIcon from '@strapi/icons/DeleteIcon';
import EmptyStateDocument from '@strapi/icons/EmptyStateDocument';
import Plus from '@strapi/icons/Plus';
import Pencil from '@strapi/icons/Pencil';
import Trash from '@strapi/icons/Trash';
import EmptyDocuments from '@strapi/icons/EmptyDocuments';
import reducer, { initialState } from './reducer';
import adminPermissions from '../../../../../permissions';
@ -254,7 +254,7 @@ const ListView = () => {
canCreate &&
!loadingWebhooks && (
<LinkButton
startIcon={<AddIcon />}
startIcon={<Plus />}
variant="default"
to={`${pathname}/create`}
size="L"
@ -283,7 +283,7 @@ const ListView = () => {
</Subtitle>
<Button
onClick={() => handleDeleteClick('all')}
startIcon={<DeleteIcon />}
startIcon={<Trash />}
size="L"
variant="danger-light"
>
@ -307,7 +307,7 @@ const ListView = () => {
footer={
<TFooter
onClick={() => (canCreate ? handleGoTo('create') : {})}
icon={<AddIcon />}
icon={<Plus />}
>
{formatMessage({
id: 'Settings.webhooks.list.button.add',
@ -426,7 +426,7 @@ const ListView = () => {
id: 'Settings.webhooks.events.update',
defaultMessage: 'Update',
})}
icon={<EditIcon />}
icon={<Pencil />}
noBorder
/>
)}
@ -437,7 +437,7 @@ const ListView = () => {
id: 'Settings.webhooks.events.delete',
defaultMessage: 'Delete',
})}
icon={<DeleteIcon />}
icon={<Trash />}
noBorder
id={`delete-${webhook.id}`}
/>
@ -450,7 +450,7 @@ const ListView = () => {
</Table>
) : (
<EmptyStateLayout
icon={<EmptyStateDocument width="160px" />}
icon={<EmptyDocuments width="160px" />}
content={formatMessage({
id: 'Settings.webhooks.list.empty.description',
defaultMessage: 'Add your first webhook',
@ -458,7 +458,7 @@ const ListView = () => {
action={
<Button
variant="secondary"
startIcon={<AddIcon />}
startIcon={<Plus />}
onClick={() => (canCreate ? handleGoTo('create') : {})}
>
{formatMessage({

4
packages/core/admin/ee/admin/pages/SettingsPage/SingleSignOn/index.js
View File

@ -6,7 +6,7 @@ import {
LoadingIndicatorPage,
useFocusWhenNavigate,
} from '@strapi/helper-plugin';
import CheckIcon from '@strapi/icons/CheckIcon';
import Check from '@strapi/icons/Check';
import { ContentLayout, HeaderLayout, Layout } from '@strapi/design-system/Layout';
import { Box } from '@strapi/design-system/Box';
import { Button } from '@strapi/design-system/Button';
@ -79,7 +79,7 @@ export const SingleSignOn = () => {
data-testid="save-button"
disabled={isHeaderButtonDisabled}
loading={showHeaderButtonLoader}
startIcon={<CheckIcon />}
startIcon={<Check />}
type="submit"
size="L"
>

4
packages/core/admin/ee/admin/pages/SettingsPage/pages/Roles/CreatePage/index.js
View File

@ -21,7 +21,7 @@ import { Stack } from '@strapi/design-system/Stack';
import { Text } from '@strapi/design-system/Text';
import { TextInput } from '@strapi/design-system/TextInput';
import { Textarea } from '@strapi/design-system/Textarea';
import BackIcon from '@strapi/icons/BackIcon';
import ArrowLeft from '@strapi/icons/ArrowLeft';
import { Formik } from 'formik';
import get from 'lodash/get';
import isEmpty from 'lodash/isEmpty';
@ -161,7 +161,7 @@ const CreatePage = () => {
defaultMessage: 'Define the rights given to the role',
})}
navigationAction={
<Link startIcon={<BackIcon />} to="/settings/roles">
<Link startIcon={<ArrowLeft />} to="/settings/roles">
{formatMessage({
id: 'app.components.go-back',
defaultMessage: 'Go back',

14
packages/core/admin/ee/admin/pages/SettingsPage/pages/Roles/ListPage/index.js
View File

@ -9,10 +9,10 @@ import {
useRBAC,
useFocusWhenNavigate,
} from '@strapi/helper-plugin';
import AddIcon from '@strapi/icons/AddIcon';
import DeleteIcon from '@strapi/icons/DeleteIcon';
import Plus from '@strapi/icons/Plus';
import Trash from '@strapi/icons/Trash';
import Duplicate from '@strapi/icons/Duplicate';
import EditIcon from '@strapi/icons/EditIcon';
import Pencil from '@strapi/icons/Pencil';
import { Button } from '@strapi/design-system/Button';
import { ActionLayout, ContentLayout, HeaderLayout } from '@strapi/design-system/Layout';
import { VisuallyHidden } from '@strapi/design-system/VisuallyHidden';
@ -175,7 +175,7 @@ const useRoleActions = ({ getData, canCreate, canDelete, canUpdate }) => {
{
onClick: () => handleGoTo(role.id),
label: formatMessage({ id: 'app.utils.edit', defaultMessage: 'Edit' }),
icon: <EditIcon />,
icon: <Pencil />,
},
]
: []),
@ -184,7 +184,7 @@ const useRoleActions = ({ getData, canCreate, canDelete, canUpdate }) => {
{
onClick: e => handleClickDelete(e, role),
label: formatMessage({ id: 'app.utils.delete', defaultMessage: 'Delete' }),
icon: <DeleteIcon />,
icon: <Trash />,
},
]
: []),
@ -259,7 +259,7 @@ const RoleListPage = () => {
<HeaderLayout
primaryAction={
canCreate ? (
<Button onClick={handleNewRoleClick} startIcon={<AddIcon />} size="L">
<Button onClick={handleNewRoleClick} startIcon={<Plus />} size="L">
{formatMessage({
id: 'Settings.roles.list.button.add',
defaultMessage: 'Add new role',
@ -293,7 +293,7 @@ const RoleListPage = () => {
rowCount={rowCount}
footer={
canCreate ? (
<TFooter onClick={handleNewRoleClick} icon={<AddIcon />}>
<TFooter onClick={handleNewRoleClick} icon={<Plus />}>
{formatMessage({
id: 'Settings.roles.list.button.add',
defaultMessage: 'Add new role',

4
packages/core/admin/package.json
View File

@ -40,8 +40,8 @@
"@fortawesome/react-fontawesome": "^0.1.14",
"@strapi/babel-plugin-switch-ee-ce": "1.0.0",
"@strapi/helper-plugin": "3.6.8",
"@strapi/icons": "0.0.1-alpha.51",
"@strapi/design-system": "0.0.1-alpha.51",
"@strapi/icons": "0.0.1-alpha.52",
"@strapi/design-system": "0.0.1-alpha.52",
"@strapi/utils": "3.6.8",
"axios": "^0.21.1",
"babel-loader": "8.2.2",

16
packages/core/content-type-builder/admin/src/components/AttributeIcon/index.js
View File

@ -3,29 +3,29 @@ import styled from 'styled-components';
import PropTypes from 'prop-types';
import { Box } from '@strapi/design-system/Box';
import Component from '@strapi/icons/Component';
import CT from '@strapi/icons/Ct';
import CollectionType from '@strapi/icons/CollectionType';
import Date from '@strapi/icons/Date';
import Boolean from '@strapi/icons/Boolean';
import DynamicZone from '@strapi/icons/DynamicZone';
import Email from '@strapi/icons/Email';
import Enumeration from '@strapi/icons/Enumeration';
import Json from '@strapi/icons/Json';
import LongDescription from '@strapi/icons/LongDescription';
import Media from '@strapi/icons/Media';
import LongDescription from '@strapi/icons/RichText';
import Media from '@strapi/icons/Picture';
import Password from '@strapi/icons/Password';
import Relation from '@strapi/icons/Relation';
import St from '@strapi/icons/St';
import SingleType from '@strapi/icons/SingleType';
import Text from '@strapi/icons/Text';
import Uid from '@strapi/icons/Uid';
import Numbers from '@strapi/icons/Numbers';
import Numbers from '@strapi/icons/Number';
import { pxToRem } from '@strapi/helper-plugin';
const iconByTypes = {
biginteger: Numbers,
boolean: Boolean,
collectionType: CT,
collectionType: CollectionType,
component: Component,
contentType: CT,
contentType: CollectionType,
date: Date,
datetime: Date,
decimal: Numbers,
@ -44,7 +44,7 @@ const iconByTypes = {
password: Password,
relation: Relation,
richtext: LongDescription,
singleType: St,
singleType: SingleType,
string: Text,
text: Text,
time: Date,

4
packages/core/content-type-builder/admin/src/components/ComponentCard/index.js
View File

@ -11,7 +11,7 @@ import { Box } from '@strapi/design-system/Box';
import { Stack } from '@strapi/design-system/Stack';
import { Text } from '@strapi/design-system/Text';
import { pxToRem } from '@strapi/helper-plugin';
import Close from '@strapi/icons/Close';
import Cross from '@strapi/icons/Cross';
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
import styled from 'styled-components';
@ -109,7 +109,7 @@ function ComponentCard({ component, dzName, index, isActive, isInDevelopmentMode
onKeyDown={e => (e.key === 'Enter' || e.key === ' ') && onClose(e)}
onClick={onClose}
>
<Close />
<Cross />
</CloseButton>
)}
</ComponentBox>

4
packages/core/content-type-builder/admin/src/components/ComponentIconPicker/index.js
View File

@ -4,7 +4,7 @@ import { useIntl } from 'react-intl';
import { AutoSizer, Collection } from 'react-virtualized';
import { Searchbar } from '@strapi/design-system/Searchbar';
import { IconButton } from '@strapi/design-system/IconButton';
import SearchIcon from '@strapi/icons/SearchIcon';
import Search from '@strapi/icons/Search';
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
import { Box } from '@strapi/design-system/Box';
import { Flex } from '@strapi/design-system/Flex';
@ -104,7 +104,7 @@ const ComponentIconPicker = ({ error, isCreating, intlLabel, name, onChange, val
</Searchbar>
</div>
) : (
<IconButton onClick={toggleSearch} aria-label="Edit" icon={<SearchIcon />} noBorder />
<IconButton onClick={toggleSearch} aria-label="Edit" icon={<Search />} noBorder />
)}
</Flex>
<Stack size={1}>

4
packages/core/content-type-builder/admin/src/components/ContentTypeBuilderNav/index.js
View File

@ -1,5 +1,5 @@
import React from 'react';
import AddIcon from '@strapi/icons/AddIcon';
import Plus from '@strapi/icons/Plus';
import { Box } from '@strapi/design-system/Box';
import {
SubNav,
@ -72,7 +72,7 @@ const ContentTypeBuilderNav = () => {
</SubNavSection>
{section.customLink && (
<Box as="li" paddingLeft={7}>
<TextButton onClick={section.customLink.onClick} startIcon={<AddIcon />}>
<TextButton onClick={section.customLink.onClick} startIcon={<Plus />}>
{formatMessage({
id: section.customLink.id,
defaultMessage: section.customLink.defaultMessage,

4
packages/core/content-type-builder/admin/src/components/DraftAndPublishToggle/index.js
View File

@ -13,7 +13,7 @@ import { Text } from '@strapi/design-system/Text';
import { Flex } from '@strapi/design-system/Flex';
import { Stack } from '@strapi/design-system/Stack';
import { Button } from '@strapi/design-system/Button';
import AlertWarningIcon from '@strapi/icons/AlertWarningIcon';
import ExclamationMarkCircle from '@strapi/icons/ExclamationMarkCircle';
import { getTrad } from '../../utils';
const DraftAndPublishToggle = ({
@ -79,7 +79,7 @@ const DraftAndPublishToggle = ({
/>
{showWarning && (
<Dialog onClose={handleToggle} title="Confirmation" isOpen={showWarning}>
<DialogBody icon={<AlertWarningIcon />}>
<DialogBody icon={<ExclamationMarkCircle />}>
<Stack size={2}>
<Flex justifyContent="center" style={{ textAlign: 'center' }}>
<Text id="confirm-description">

4
packages/core/content-type-builder/admin/src/components/DynamicZoneList/index.js
View File

@ -8,7 +8,7 @@
import React, { useState } from 'react';
import PropTypes from 'prop-types';
import { pxToRem } from '@strapi/helper-plugin';
import AddIcon from '@strapi/icons/AddIcon';
import Plus from '@strapi/icons/Plus';
import { Box } from '@strapi/design-system/Box';
import { Stack } from '@strapi/design-system/Stack';
import { Text } from '@strapi/design-system/Text';
@ -20,7 +20,7 @@ import ComponentCard from '../ComponentCard';
import ComponentList from '../ComponentList';
import Tr from '../Tr';
const StyledAddIcon = styled(AddIcon)`
const StyledAddIcon = styled(Plus)`
width: ${pxToRem(32)};
height: ${pxToRem(32)};
padding: ${pxToRem(9)};

10
packages/core/content-type-builder/admin/src/components/FormModalEndActions/index.js
View File

@ -8,7 +8,7 @@ import React from 'react';
import { useIntl } from 'react-intl';
import PropTypes from 'prop-types';
import { Button } from '@strapi/design-system/Button';
import AddIcon from '@strapi/icons/AddIcon';
import Plus from '@strapi/icons/Plus';
import { getTrad } from '../../utils';
const FormModalEndActions = ({
@ -55,7 +55,7 @@ const FormModalEndActions = ({
onSubmitAddComponentToDz(e, true);
}}
startIcon={<AddIcon />}
startIcon={<Plus />}
>
{formatMessage({
id: getTrad('form.button.add-first-field-to-created-component'),
@ -113,7 +113,7 @@ const FormModalEndActions = ({
onSubmitCreateDz(e, true);
}}
startIcon={<AddIcon />}
startIcon={<Plus />}
>
{formatMessage({
id: getTrad('form.button.add-components-to-dynamiczone'),
@ -174,7 +174,7 @@ const FormModalEndActions = ({
onSubmitAddComponentAttribute(e, true);
}}
startIcon={<AddIcon />}
startIcon={<Plus />}
>
{isCreatingComponentWhileAddingAField
? formatMessage({
@ -215,7 +215,7 @@ const FormModalEndActions = ({
onSubmitEditAttribute(e, true);
}}
startIcon={<AddIcon />}
startIcon={<Plus />}
>
{formatMessage({
id: getTrad('form.button.add-field'),

8
packages/core/content-type-builder/admin/src/components/List/index.js
View File

@ -12,7 +12,7 @@ import { Box } from '@strapi/design-system/Box';
import { Button } from '@strapi/design-system/Button';
import { TableLabel } from '@strapi/design-system/Text';
import { Table, Thead, Tr, Th, TFooter } from '@strapi/design-system/Table';
import AddIcon from '@strapi/icons/AddIcon';
import Plus from '@strapi/icons/Plus';
import { useIntl } from 'react-intl';
import useFormModalNavigation from '../../hooks/useFormModalNavigation';
import useDataManager from '../../hooks/useDataManager';
@ -96,7 +96,7 @@ function List({
</Thead>
<EmptyBodyTable
action={
<Button onClick={onClickAddField} size="L" startIcon={<AddIcon />} variant="secondary">
<Button onClick={onClickAddField} size="L" startIcon={<Plus />} variant="secondary">
{formatMessage({
id: getTrad('table.button.no-fields'),
defaultMessage: 'Add new field',
@ -189,7 +189,7 @@ function List({
</Box>
{isMain && isInDevelopmentMode && (
<TFooter icon={<AddIcon />} onClick={onClickAddField}>
<TFooter icon={<Plus />} onClick={onClickAddField}>
{formatMessage({
id: getTrad(
`form.button.add.field.to.${
@ -204,7 +204,7 @@ function List({
)}
{isSub && isInDevelopmentMode && (
<NestedTFooter
icon={<AddIcon />}
icon={<Plus />}
onClick={onClickAddField}
color={isFromDynamicZone ? 'primary' : 'neutral'}
>

8
packages/core/content-type-builder/admin/src/components/ListRow/index.js
View File

@ -7,8 +7,8 @@ import { IconButton } from '@strapi/design-system/IconButton';
import { Flex } from '@strapi/design-system/Flex';
import { Stack } from '@strapi/design-system/Stack';
import { Text } from '@strapi/design-system/Text';
import EditIcon from '@strapi/icons/EditIcon';
import DeleteIcon from '@strapi/icons/DeleteIcon';
import Pencil from '@strapi/icons/Pencil';
import Trash from '@strapi/icons/Trash';
import { stopPropagation, onRowClick } from '@strapi/helper-plugin';
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
import useDataManager from '../../hooks/useDataManager';
@ -143,7 +143,7 @@ function ListRow({
formatMessage: 'Edit',
})} ${name}`}
noBorder
icon={<EditIcon />}
icon={<Pencil />}
/>
)}
<IconButton
@ -160,7 +160,7 @@ function ListRow({
defaultMessage: 'Delete',
})} ${name}`}
noBorder
icon={<DeleteIcon />}
icon={<Trash />}
/>
</Stack>
) : (

12
packages/core/content-type-builder/admin/src/components/Relation/RelationNaturePicker/index.js
View File

@ -5,12 +5,12 @@ import { useDispatch } from 'react-redux';
import get from 'lodash/get';
import truncate from 'lodash/truncate';
import pluralize from 'pluralize';
import OneToOne from '@strapi/icons/IconRelation11';
import OneWay from '@strapi/icons/IconRelationUnidirectional11';
import ManyWay from '@strapi/icons/IconRelationUnidirectional1N';
import OneToMany from '@strapi/icons/IconRelation1N';
import ManyToOne from '@strapi/icons/IconRelationN1';
import ManyToMany from '@strapi/icons/IconRelationNN';
import OneToOne from '@strapi/icons/OneToOne';
import OneWay from '@strapi/icons/OneWay';
import ManyWay from '@strapi/icons/ManyWays';
import OneToMany from '@strapi/icons/OneToMany';
import ManyToOne from '@strapi/icons/ManyToOne';
import ManyToMany from '@strapi/icons/ManyToMany';
import { Flex } from '@strapi/design-system/Flex';
import { Text } from '@strapi/design-system/Text';
import { KeyboardNavigable } from '@strapi/design-system/KeyboardNavigable';

4
packages/core/content-type-builder/admin/src/pages/ListView/LinkToCMSettingsView/index.js
View File

@ -2,7 +2,7 @@ import React, { memo } from 'react';
import PropTypes from 'prop-types';
import { CheckPermissions } from '@strapi/helper-plugin';
import { Button } from '@strapi/design-system/Button';
import ConfigureIcon from '@strapi/icons/ConfigureIcon';
import Layer from '@strapi/icons/Layer';
import { useHistory } from 'react-router-dom';
import { useIntl } from 'react-intl';
@ -69,7 +69,7 @@ const LinkToCMSettingsView = ({
return (
<CheckPermissions permissions={permissionsToApply}>
<Button
startIcon={<ConfigureIcon />}
startIcon={<Layer />}
variant="tertiary"
onClick={handleClick}
disabled={isTemporary || disabled}

16
packages/core/content-type-builder/admin/src/pages/ListView/index.js
View File

@ -1,9 +1,9 @@
import React from 'react';
import { useTracking } from '@strapi/helper-plugin';
import AddIcon from '@strapi/icons/AddIcon';
import BackIcon from '@strapi/icons/BackIcon';
import CheckIcon from '@strapi/icons/CheckIcon';
import EditIcon from '@strapi/icons/EditIcon';
import Plus from '@strapi/icons/Plus';
import ArrowLeft from '@strapi/icons/ArrowLeft';
import Check from '@strapi/icons/Check';
import Pencil from '@strapi/icons/Pencil';
import { Button } from '@strapi/design-system/Button';
import { Link } from '@strapi/design-system/Link';
import { Flex } from '@strapi/design-system/Flex';
@ -123,7 +123,7 @@ const ListView = () => {
{/* DON'T display the add field button when the content type has not been created */}
{!isCreatingFirstContentType && (
<Button
startIcon={<AddIcon />}
startIcon={<Plus />}
variant="secondary"
onClick={() => {
onOpenModalAddField({ forTarget, targetUid });
@ -133,7 +133,7 @@ const ListView = () => {
</Button>
)}
<Button
startIcon={<CheckIcon />}
startIcon={<Check />}
onClick={() => submitData()}
type="submit"
disabled={isEqual(modifiedData, initialData)}
@ -150,7 +150,7 @@ const ListView = () => {
isInDevelopmentMode &&
!isFromPlugin &&
!isCreatingFirstContentType && (
<Button startIcon={<EditIcon />} variant="tertiary" onClick={onEdit}>
<Button startIcon={<Pencil />} variant="tertiary" onClick={onEdit}>
{formatMessage({
id: getTrad('app.utils.edit'),
defaultMessage: 'Edit',
@ -164,7 +164,7 @@ const ListView = () => {
defaultMessage: 'Build the data architecture of your content.',
})}
navigationAction={
<Link startIcon={<BackIcon />} to="/plugins/content-type-builder/">
<Link startIcon={<ArrowLeft />} to="/plugins/content-type-builder/">
{formatMessage({
id: 'app.components.go-back',
defaultMessage: 'Go back',

433
packages/core/content-type-builder/admin/src/pages/ListView/tests/__snapshots__/index.test.js.snap
View File

File diff suppressed because it is too large Load Diff

4
packages/core/email/admin/src/pages/Settings/index.js
View File

@ -18,7 +18,7 @@ import { H3 } from '@strapi/design-system/Text';
import { TextInput } from '@strapi/design-system/TextInput';
import { Button } from '@strapi/design-system/Button';
import { useNotifyAT } from '@strapi/design-system/LiveRegions';
import CheckIcon from '@strapi/icons/CheckIcon';
import Check from '@strapi/icons/Check';
import Configuration from './components/Configuration';
import schema from '../../utils/schema';
import pluginPermissions from '../../permissions';
@ -204,7 +204,7 @@ const SettingsPage = () => {
</GridItem>
<GridItem col={7} s={12}>
{/* to replace with envelope icon */}
<Button loading={isSubmitting} type="submit" startIcon={<CheckIcon />}>
<Button loading={isSubmitting} type="submit" startIcon={<Check />}>
Test email
</Button>
</GridItem>

4
packages/core/email/admin/src/pages/Settings/tests/index.test.js
View File

@ -209,6 +209,10 @@ describe('Email | Pages | Settings', () => {
outline: none;
}
.c26[aria-disabled='true'] {
cursor: not-allowed;
}
.c23 {
font-weight: 500;
font-size: 0.75rem;

4
packages/core/helper-plugin/lib/src/components/AnErrorOccurred/index.js
View File

@ -1,5 +1,5 @@
import React from 'react';
import AlertWarningIcon from '@strapi/icons/AlertWarningIcon';
import ExclamationMarkCircle from '@strapi/icons/ExclamationMarkCircle';
import { EmptyStateLayout } from '@strapi/design-system/EmptyStateLayout';
import PropTypes from 'prop-types';
import { useIntl } from 'react-intl';
@ -9,7 +9,7 @@ const AnErrorOccurred = ({ content, ...rest }) => {
return (
<EmptyStateLayout
icon={<AlertWarningIcon width="10rem" />}
icon={<ExclamationMarkCircle width="10rem" />}
content={formatMessage(
{ id: content.id, defaultMessage: content.defaultMessage },
content.values

8
packages/core/helper-plugin/lib/src/components/ConfirmDialog/ConfirmDialog.stories.mdx
View File

@ -3,8 +3,8 @@
import { useState } from 'react';
import { ArgsTable, Meta, Canvas, Story } from '@storybook/addon-docs';
import { Button } from '@strapi/design-system/Button';
import CheckIcon from '@strapi/icons/CheckIcon';
import HelpIcon from '@strapi/icons/HelpIcon';
import Check from '@strapi/icons/Check';
import Information from '@strapi/icons/Information';
import ConfirmDialog from './index';
<Meta title="components/ConfirmDialog" />
@ -77,8 +77,8 @@ TODO
id: 'app.components',
defaultMessage: 'Are you sure you want to unpublish it?',
}}
iconBody={<HelpIcon />}
iconRightButton={<CheckIcon />}
iconBody={<Information />}
iconRightButton={<Check />}
isConfirmButtonLoading={isLoading}
isOpen={dialogOpen}
onToggleDialog={handleToggle}

8
packages/core/helper-plugin/lib/src/components/ConfirmDialog/index.js
View File

@ -6,8 +6,8 @@ import { Stack } from '@strapi/design-system/Stack';
import { Flex } from '@strapi/design-system/Flex';
import { Text } from '@strapi/design-system/Text';
import { Button } from '@strapi/design-system/Button';
import AlertWarningIcon from '@strapi/icons/AlertWarningIcon';
import DeleteIcon from '@strapi/icons/DeleteIcon';
import ExclamationMarkCircle from '@strapi/icons/ExclamationMarkCircle';
import Trash from '@strapi/icons/Trash';
const ConfirmDialog = ({
bodyText,
@ -80,8 +80,8 @@ ConfirmDialog.defaultProps = {
id: 'components.popUpWarning.message',
defaultMessage: 'Are you sure you want to delete this?',
},
iconBody: <AlertWarningIcon />,
iconRightButton: <DeleteIcon />,
iconBody: <ExclamationMarkCircle />,
iconRightButton: <Trash />,
isConfirmButtonLoading: false,
leftButtonText: {
id: 'app.components.Button.cancel',

20
packages/core/helper-plugin/lib/src/components/ContentBox/ContentBox.stories.mdx
View File

@ -5,10 +5,10 @@ import { ArgsTable, Meta, Canvas, Story } from '@storybook/addon-docs';
import ContentBox from './index';
import { Stack } from '@strapi/design-system/Stack';
import { IconButton } from '@strapi/design-system/IconButton';
import ReadDoc from '@strapi/icons/ReadDoc';
import CodeExample from '@strapi/icons/CodeExample';
import Tutorial from '@strapi/icons/Tutorial';
import Blog from '@strapi/icons/Blog';
import InformationSquare from '@strapi/icons/InformationSquare';
import CodeSquare from '@strapi/icons/CodeSquare';
import PlaySquare from '@strapi/icons/PlaySquare';
import FeatherSquare from '@strapi/icons/FeatherSquare';
import Duplicate from '@strapi/icons/Duplicate';
<Meta title="components/ContentBox" />
@ -24,26 +24,26 @@ TODO
<Stack size={4}>
<ContentBox
title="Read the documentation"
subtitle="Discover the concepts, reference, guides and tutorials"
icon={<ReadDoc />}
subtitle="Discover the concepts, reference, guides and PlaySquares"
icon={<InformationSquare />}
iconBackground="primary100"
/>
<ContentBox
title="Code example"
subtitle="Learn by testing real project developed by the community"
icon={<CodeExample />}
icon={<CodeSquare />}
iconBackground="warning100"
/>
<ContentBox
title="Tutorial"
title="PlaySquare"
subtitle="Discover the concepts, reference, guides and tutorials"
icon={<Tutorial />}
iconBackground="secondary100"
/>
<ContentBox
title="Blog"
title="FeatherSquare"
subtitle="Discover the concepts, reference, guides and tutorials"
icon={<Blog />}
icon={<FeatherSquare />}
iconBackground="alternative100"
/>
<ContentBox

10
packages/core/helper-plugin/lib/src/components/DynamicTable/DynamicTable.stories.mdx
View File

@ -11,7 +11,7 @@ import { Dialog, DialogBody, DialogFooter } from '@strapi/design-system/Dialog';
import { Tbody, Td, Tr } from '@strapi/design-system/Table';
import { Text } from '@strapi/design-system/Text';
import { IconButton } from '@strapi/design-system/IconButton';
import { AddIcon, EditIcon, DeleteIcon } from '@strapi/icons';
import { Plus, Pencil, Trash } from '@strapi/icons';
import useQueryParams from '../../hooks/useQueryParams';
import DynamicTable from './index';
@ -197,14 +197,14 @@ import { DynamicTable } from '@strapi/helper-plugin';
onClick={() => console.log(`${pathname}/${data.id}`)}
label={`Edit ${data.firstname} ${data.lastname}`}
noBorder
icon={<EditIcon />}
icon={<Pencil />}
/>
<Box paddingLeft={1}>
<IconButton
onClick={() => onClickDelete(data.id)}
label={`Delete ${data.firstname} ${data.lastname}`}
noBorder
icon={<DeleteIcon />}
icon={<Trash />}
/>
</Box>
</Flex>
@ -308,14 +308,14 @@ import { DynamicTable } from '@strapi/helper-plugin';
onClick={() => console.log(`${pathname}/${data.id}`)}
label={`Edit ${data.firstname} ${data.lastname}`}
noBorder
icon={<EditIcon />}
icon={<Pencil />}
/>
<Box paddingLeft={1}>
<IconButton
onClick={() => onClickDelete(data.id)}
label={`Delete ${data.firstname} ${data.lastname}`}
noBorder
icon={<DeleteIcon />}
icon={<Trash />}
/>
</Box>
</Flex>

4
packages/core/helper-plugin/lib/src/components/DynamicTable/index.js
View File

@ -6,7 +6,7 @@ import { Button } from '@strapi/design-system/Button';
import { Subtitle } from '@strapi/design-system/Text';
import { Table as TableCompo } from '@strapi/design-system/Table';
import { useIntl } from 'react-intl';
import DeleteIcon from '@strapi/icons/DeleteIcon';
import Trash from '@strapi/icons/Trash';
import styled from 'styled-components';
import useQueryParams from '../../hooks/useQueryParams';
import ConfirmDialog from '../ConfirmDialog';
@ -140,7 +140,7 @@ const Table = ({
</Subtitle>
<Button
onClick={handleToggleConfirmDeleteAll}
startIcon={<DeleteIcon />}
startIcon={<Trash />}
size="L"
variant="danger-light"
>

12
packages/core/helper-plugin/lib/src/components/EmptyStateLayout/index.js
View File

@ -1,15 +1,15 @@
import React from 'react';
import { EmptyStateLayout as Layout } from '@strapi/design-system/EmptyStateLayout';
import EmptyStateDocument from '@strapi/icons/EmptyStateDocument';
import EmptyStatePermissions from '@strapi/icons/EmptyStatePermissions';
import EmptyStatePicture from '@strapi/icons/EmptyStatePicture';
import EmptyDocuments from '@strapi/icons/EmptyDocuments';
import EmptyPermissions from '@strapi/icons/EmptyPermissions';
import EmptyPictures from '@strapi/icons/EmptyPictures';
import { useIntl } from 'react-intl';
import PropTypes from 'prop-types';
const icons = {
document: EmptyStateDocument,
media: EmptyStatePicture,
permissions: EmptyStatePermissions,
document: EmptyDocuments,
media: EmptyPictures,
permissions: EmptyPermissions,
};
const EmptyStateLayout = ({ action, content, hasRadius, icon, shadow }) => {

4
packages/core/helper-plugin/lib/src/components/FilterListURLQuery/AttributeTag.js
View File

@ -1,7 +1,7 @@
import React from 'react';
import PropTypes from 'prop-types';
import { Box } from '@strapi/design-system/Box';
import Close from '@strapi/icons/Close';
import Cross from '@strapi/icons/Cross';
import { Tag } from '@strapi/design-system/Tag';
import { useIntl } from 'react-intl';
@ -49,7 +49,7 @@ const AttributeTag = ({ attribute, filter, onClick, operator, value }) => {
return (
<Box padding={1} onClick={handleClick}>
<Tag icon={<Close />}>{content}</Tag>
<Tag icon={<Cross />}>{content}</Tag>
</Box>
);
};

26
packages/core/helper-plugin/lib/src/components/FilterListURLQuery/tests/__snapshots__/index.test.js.snap
View File

@ -99,7 +99,7 @@ exports[`<FilterListURLQuery /> renders and matches the snapshot 1`] = `
>
<path
d="M24 2.417L21.583 0 12 9.583 2.417 0 0 2.417 9.583 12 0 21.583 2.417 24 12 14.417 21.583 24 24 21.583 14.417 12 24 2.417z"
fill="#32324D"
fill="#212134"
/>
</svg>
</div>
@ -136,7 +136,7 @@ exports[`<FilterListURLQuery /> renders and matches the snapshot 1`] = `
>
<path
d="M24 2.417L21.583 0 12 9.583 2.417 0 0 2.417 9.583 12 0 21.583 2.417 24 12 14.417 21.583 24 24 21.583 14.417 12 24 2.417z"
fill="#32324D"
fill="#212134"
/>
</svg>
</div>
@ -173,7 +173,7 @@ exports[`<FilterListURLQuery /> renders and matches the snapshot 1`] = `
>
<path
d="M24 2.417L21.583 0 12 9.583 2.417 0 0 2.417 9.583 12 0 21.583 2.417 24 12 14.417 21.583 24 24 21.583 14.417 12 24 2.417z"
fill="#32324D"
fill="#212134"
/>
</svg>
</div>
@ -210,7 +210,7 @@ exports[`<FilterListURLQuery /> renders and matches the snapshot 1`] = `
>
<path
d="M24 2.417L21.583 0 12 9.583 2.417 0 0 2.417 9.583 12 0 21.583 2.417 24 12 14.417 21.583 24 24 21.583 14.417 12 24 2.417z"
fill="#32324D"
fill="#212134"
/>
</svg>
</div>
@ -247,7 +247,7 @@ exports[`<FilterListURLQuery /> renders and matches the snapshot 1`] = `
>
<path
d="M24 2.417L21.583 0 12 9.583 2.417 0 0 2.417 9.583 12 0 21.583 2.417 24 12 14.417 21.583 24 24 21.583 14.417 12 24 2.417z"
fill="#32324D"
fill="#212134"
/>
</svg>
</div>
@ -284,7 +284,7 @@ exports[`<FilterListURLQuery /> renders and matches the snapshot 1`] = `
>
<path
d="M24 2.417L21.583 0 12 9.583 2.417 0 0 2.417 9.583 12 0 21.583 2.417 24 12 14.417 21.583 24 24 21.583 14.417 12 24 2.417z"
fill="#32324D"
fill="#212134"
/>
</svg>
</div>
@ -321,7 +321,7 @@ exports[`<FilterListURLQuery /> renders and matches the snapshot 1`] = `
>
<path
d="M24 2.417L21.583 0 12 9.583 2.417 0 0 2.417 9.583 12 0 21.583 2.417 24 12 14.417 21.583 24 24 21.583 14.417 12 24 2.417z"
fill="#32324D"
fill="#212134"
/>
</svg>
</div>
@ -358,7 +358,7 @@ exports[`<FilterListURLQuery /> renders and matches the snapshot 1`] = `
>
<path
d="M24 2.417L21.583 0 12 9.583 2.417 0 0 2.417 9.583 12 0 21.583 2.417 24 12 14.417 21.583 24 24 21.583 14.417 12 24 2.417z"
fill="#32324D"
fill="#212134"
/>
</svg>
</div>
@ -395,7 +395,7 @@ exports[`<FilterListURLQuery /> renders and matches the snapshot 1`] = `
>
<path
d="M24 2.417L21.583 0 12 9.583 2.417 0 0 2.417 9.583 12 0 21.583 2.417 24 12 14.417 21.583 24 24 21.583 14.417 12 24 2.417z"
fill="#32324D"
fill="#212134"
/>
</svg>
</div>
@ -432,7 +432,7 @@ exports[`<FilterListURLQuery /> renders and matches the snapshot 1`] = `
>
<path
d="M24 2.417L21.583 0 12 9.583 2.417 0 0 2.417 9.583 12 0 21.583 2.417 24 12 14.417 21.583 24 24 21.583 14.417 12 24 2.417z"
fill="#32324D"
fill="#212134"
/>
</svg>
</div>
@ -469,7 +469,7 @@ exports[`<FilterListURLQuery /> renders and matches the snapshot 1`] = `
>
<path
d="M24 2.417L21.583 0 12 9.583 2.417 0 0 2.417 9.583 12 0 21.583 2.417 24 12 14.417 21.583 24 24 21.583 14.417 12 24 2.417z"
fill="#32324D"
fill="#212134"
/>
</svg>
</div>
@ -506,7 +506,7 @@ exports[`<FilterListURLQuery /> renders and matches the snapshot 1`] = `
>
<path
d="M24 2.417L21.583 0 12 9.583 2.417 0 0 2.417 9.583 12 0 21.583 2.417 24 12 14.417 21.583 24 24 21.583 14.417 12 24 2.417z"
fill="#32324D"
fill="#212134"
/>
</svg>
</div>
@ -543,7 +543,7 @@ exports[`<FilterListURLQuery /> renders and matches the snapshot 1`] = `
>
<path
d="M24 2.417L21.583 0 12 9.583 2.417 0 0 2.417 9.583 12 0 21.583 2.417 24 12 14.417 21.583 24 24 21.583 14.417 12 24 2.417z"
fill="#32324D"
fill="#212134"
/>
</svg>
</div>

4
packages/core/helper-plugin/lib/src/components/FilterPopoverURLQuery/index.js
View File

@ -13,7 +13,7 @@ import { Popover } from '@strapi/design-system/Popover';
import { Stack } from '@strapi/design-system/Stack';
import { FocusTrap } from '@strapi/design-system/FocusTrap';
import { Select, Option } from '@strapi/design-system/Select';
import AddIcon from '@strapi/icons/AddIcon';
import Plus from '@strapi/icons/Plus';
import { useIntl } from 'react-intl';
import useQueryParams from '../../hooks/useQueryParams';
import useTracking from '../../hooks/useTracking';
@ -175,7 +175,7 @@ const FilterPopoverURLQuery = ({ displayedFilters, isVisible, onToggle, source }
</Box>
)}
<Box>
<FullWidthButton size="L" variant="secondary" startIcon={<AddIcon />} type="submit">
<FullWidthButton size="L" variant="secondary" startIcon={<Plus />} type="submit">
{formatMessage({ id: 'app.utils.add-filter', defaultMessage: 'Add filter' })}
</FullWidthButton>
</Box>

6
packages/core/helper-plugin/lib/src/components/GenericInput/index.js
View File

@ -17,8 +17,8 @@ import { Textarea } from '@strapi/design-system/Textarea';
import { TextInput } from '@strapi/design-system/TextInput';
import { TimePicker } from '@strapi/design-system/TimePicker';
import { ToggleInput } from '@strapi/design-system/ToggleInput';
import Hide from '@strapi/icons/Hide';
import Show from '@strapi/icons/Show';
import EyeStriked from '@strapi/icons/EyeStriked';
import Eye from '@strapi/icons/Eye';
const GenericInput = ({
autoComplete,
@ -209,7 +209,7 @@ const GenericInput = ({
}}
type="button"
>
{showPassword ? <Show /> : <Hide />}
{showPassword ? <Eye /> : <EyeStriked />}
</button>
}
label={label}

4
packages/core/helper-plugin/lib/src/components/NoContent/index.js
View File

@ -1,5 +1,5 @@
import React from 'react';
import EmptyStateDocument from '@strapi/icons/EmptyStateDocument';
import EmptyDocuments from '@strapi/icons/EmptyDocuments';
import { EmptyStateLayout } from '@strapi/design-system/EmptyStateLayout';
import PropTypes from 'prop-types';
import { useIntl } from 'react-intl';
@ -9,7 +9,7 @@ const NoContent = ({ content, ...rest }) => {
return (
<EmptyStateLayout
icon={<EmptyStateDocument width="10rem" />}
icon={<EmptyDocuments width="10rem" />}
{...rest}
content={formatMessage(
{ id: content.id, defaultMessage: content.defaultMessage },

4
packages/core/helper-plugin/lib/src/components/NoMedia/index.js
View File

@ -1,9 +1,9 @@
import React from 'react';
import EmptyStatePicture from '@strapi/icons/EmptyStatePicture';
import EmptyPictures from '@strapi/icons/EmptyPictures';
import { EmptyStateLayout } from '@strapi/design-system/EmptyStateLayout';
const NoMedia = props => {
return <EmptyStateLayout icon={<EmptyStatePicture width="10rem" />} {...props} />;
return <EmptyStateLayout icon={<EmptyPictures width="10rem" />} {...props} />;
};
export default NoMedia;

4
packages/core/helper-plugin/lib/src/components/NoPermissions/index.js
View File

@ -1,7 +1,7 @@
import React from 'react';
import PropTypes from 'prop-types';
import { useIntl } from 'react-intl';
import EmptyStatePermissions from '@strapi/icons/EmptyStatePermissions';
import EmptyPermissions from '@strapi/icons/EmptyPermissions';
import { EmptyStateLayout } from '@strapi/design-system/EmptyStateLayout';
const NoPermissions = ({ action }) => {
@ -9,7 +9,7 @@ const NoPermissions = ({ action }) => {
return (
<EmptyStateLayout
icon={<EmptyStatePermissions width="10rem" />}
icon={<EmptyPermissions width="10rem" />}
content={formatMessage({
id: 'app.components.EmptyStateLayout.content-permissions',
defaultMessage: "You don't have the permissions to access that content",

4
packages/core/helper-plugin/lib/src/components/NotAllowedInput/index.js
View File

@ -9,9 +9,9 @@ import { useIntl } from 'react-intl';
import { TextInput } from '@strapi/design-system/TextInput';
import PropTypes from 'prop-types';
import styled from 'styled-components';
import Hide from '@strapi/icons/Hide';
import EyeStriked from '@strapi/icons/EyeStriked';
const StyledIcon = styled(Hide)`
const StyledIcon = styled(EyeStriked)`
> path {
fill: ${({ theme }) => theme.colors.neutral600};
}

4
packages/core/helper-plugin/lib/src/components/PageSizeURLQuery/tests/index.test.js
View File

@ -72,6 +72,10 @@ describe('<PageSizeURLQuery />', () => {
outline: none;
}
.c4[aria-disabled='true'] {
cursor: not-allowed;
}
.c8 {
font-weight: 400;
font-size: 0.875rem;

4
packages/core/helper-plugin/lib/src/components/PaginationURLQuery/tests/__snapshots__/index.test.js.snap
View File

@ -354,7 +354,7 @@ exports[`<PaginationURLQuery /> should display the dots correctly 1`] = `
xmlns="http://www.w3.org/2000/svg"
>
<path
d="M0 1.88L6.107 8 0 14.12 1.88 16l8-8-8-8L0 1.88z"
d="M.12 1.88L6.227 8 .12 14.12 2 16l8-8-8-8L.12 1.88z"
fill="#32324D"
/>
</svg>
@ -676,7 +676,7 @@ exports[`<PaginationURLQuery /> should work when the pageCount is inferior or eq
xmlns="http://www.w3.org/2000/svg"
>
<path
d="M0 1.88L6.107 8 0 14.12 1.88 16l8-8-8-8L0 1.88z"
d="M.12 1.88L6.227 8 .12 14.12 2 16l8-8-8-8L.12 1.88z"
fill="#32324D"
/>
</svg>

Some files were not shown because too many files have changed in this diff Show More