yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-19 21:38:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'releases/v4' of github.com:strapi/strapi into v4/ctb

Browse Source
This commit is contained in:
soupette 2021-10-06 13:57:25 +02:00
commit e7bba66adf
14 changed files with 59 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/core/admin/admin/src/content-manager/components/Inputs/utils/getStep.js
View File

@ -4,7 +4,9 @@ const getStep = type => {
if (type === 'float' || type === 'decimal') {
step = 0.01;
} else if (type === 'time' || type === 'datetime') {
step = 30;
// Since we cannot set a value that is not in the list of the time picker, we need to set the step to 1
// TODO: Fix the timepicker in order to be able to set any value regardless of the list
step = 1;
} else {
step = 1;
}

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

@ -21,7 +21,7 @@ const DropdownIconWrapper = styled(Box)`
height: ${6 / 16}rem;
width: ${11 / 16}rem;
> path {
fill: ${({ theme }) => theme.colors.primary600};
fill: ${({ theme }) => theme.colors.neutral600};
}
}
`;
@ -43,17 +43,17 @@ const DragPreview = ({ displayedValue }) => {
paddingTop={3}
paddingBottom={3}
hasRadius
background="primary100"
background="neutral0"
style={{ width: '20vw' }}
>
<Row justifyContent="space-between">
<ToggleButton type="button">
<Row>
<DropdownIconWrapper background="primary200">
<DropdownIconWrapper background="neutral200">
<DropdownIcon />
</DropdownIconWrapper>
<Box paddingLeft={6}>
<Text textColor="primary700" style={{ width: '9vw' }} ellipsis>
<Text textColor="neutral700" style={{ width: '9vw' }} ellipsis>
{displayedValue}
</Text>
</Box>

11
packages/core/admin/admin/src/content-manager/components/RepeatableComponent/DraggedItem/Preview.js
View File

@ -1,14 +1,19 @@
import React from 'react';
import styled from 'styled-components';
import { Box } from '@strapi/parts/Box';
import { Row } from '@strapi/parts/Row';
const StyledBox = styled(Box)`
border: 1px dashed ${({ theme }) => theme.colors.primary500};
`;
const Preview = () => {
return (
<Box padding={6}>
<Box background="primary600" paddingTop={2}>
<StyledBox padding={8} background="primary100">
<Box>
<Row />
</Box>
</Box>
</StyledBox>
);
};

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

@ -44,6 +44,7 @@ const DraggedItem = ({
// hasErrors,
// hasMinError,
// isFirst,
isOdd,
isOpen,
isReadOnly,

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

@ -253,6 +253,9 @@ RepeatableComponent.propTypes = {
const Memoized = memo(RepeatableComponent);
export default connect(Memoized, select);
export default connect(
Memoized,
select
);
export { RepeatableComponent };

4
packages/core/admin/admin/src/pages/AuthPage/components/ForgotPassword/index.js
View File

@ -89,9 +89,7 @@ const ForgotPassword = ({ onSubmit, schema }) => {
<Row justifyContent="center">
<Box paddingTop={4}>
<Link to="/auth/login">
<Text small>
{formatMessage({ id: 'Auth.link.ready', defaultMessage: 'Ready to sign in?' })}
</Text>
{formatMessage({ id: 'Auth.link.ready', defaultMessage: 'Ready to sign in?' })}
</Link>
</Box>
</Row>

2
packages/core/admin/admin/src/pages/AuthPage/components/ForgotPasswordSuccess/index.js
View File

@ -48,7 +48,7 @@ const ForgotPasswordSuccess = () => {
<Row justifyContent="center">
<Box paddingTop={4}>
<Link to="/auth/login">
<Text>{formatMessage({ id: 'Auth.link.signin', defaultMessage: 'Sign in' })}</Text>
{formatMessage({ id: 'Auth.link.signin', defaultMessage: 'Sign in' })}
</Link>
</Box>
</Row>

2
packages/core/admin/admin/src/pages/AuthPage/components/Oops/index.js
View File

@ -48,7 +48,7 @@ const Oops = () => {
<Row justifyContent="center">
<Box paddingTop={4}>
<Link to="/auth/login">
<Text>{formatMessage({ id: 'Auth.link.signin', defaultMessage: 'Sign in' })}</Text>
{formatMessage({ id: 'Auth.link.signin', defaultMessage: 'Sign in' })}
</Link>
</Box>
</Row>

6
packages/core/admin/admin/src/pages/AuthPage/components/Oops/tests/index.test.js
View File

@ -350,11 +350,7 @@ describe('ADMIN | PAGES | AUTH | Oops', () => {
<span
class="c19 c20 c21"
>
<span
class="c15"
>
Sign in
</span>
Sign in
</span>
</a>
</div>

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

@ -161,9 +161,7 @@ const ForgotPassword = ({ onSubmit, schema }) => {
<Row justifyContent="center">
<Box paddingTop={4}>
<Link to="/auth/login">
<Text small>
{formatMessage({ id: 'Auth.link.ready', defaultMessage: 'Ready to sign in?' })}
</Text>
{formatMessage({ id: 'Auth.link.ready', defaultMessage: 'Ready to sign in?' })}
</Link>
</Box>
</Row>

13
packages/core/admin/admin/src/pages/AuthPage/components/ResetPassword/tests/index.test.js
View File

@ -283,13 +283,6 @@ describe('ADMIN | PAGES | AUTH | ResetPassword', () => {
color: #32324d;
}
.c37 {
font-weight: 400;
font-size: 0.75rem;
line-height: 1.33;
color: #32324d;
}
.c18 {
font-weight: 500;
font-size: 0.75rem;
@ -797,11 +790,7 @@ describe('ADMIN | PAGES | AUTH | ResetPassword', () => {
<span
class="c34 c35 c36"
>
<span
class="c37"
>
Ready to sign in?
</span>
Ready to sign in?
</span>
</a>
</div>

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

@ -52,7 +52,7 @@ const ApplicationInfosPage = () => {
<Grid paddingTop={1}>
<GridItem col={6} s={12}>
<TableLabel>
<TableLabel textColor="neutral600">
{formatMessage({
id: 'Settings.application.details',
defaultMessage: 'details',
@ -61,7 +61,7 @@ const ApplicationInfosPage = () => {
<Text as="p">{appInfos.latestStrapiReleaseTag}</Text>
</GridItem>
<GridItem col={6} s={12}>
<TableLabel>
<TableLabel textColor="neutral600">
{formatMessage({
id: 'Settings.application.edition-title',
defaultMessage: 'current plan',
@ -103,7 +103,7 @@ const ApplicationInfosPage = () => {
</Grid>
<Box paddingTop={1}>
<TableLabel>
<TableLabel textColor="neutral600">
{formatMessage({
id: 'Settings.application.node-version',
defaultMessage: 'node version',

51
packages/core/admin/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/tests/index.test.js
View File

@ -42,7 +42,7 @@ describe('Application page', () => {
box-shadow: 0px 1px 4px rgba(33,33,52,0.1);
}
.c26 {
.c27 {
padding-top: 4px;
}
@ -73,6 +73,13 @@ describe('Application page', () => {
}
.c17 {
font-weight: 400;
font-size: 0.875rem;
line-height: 1.43;
color: #666687;
}
.c20 {
font-weight: 400;
font-size: 0.875rem;
line-height: 1.43;
@ -186,30 +193,30 @@ describe('Application page', () => {
grid-column: span 6;
}
.c21 {
.c22 {
font-weight: 400;
font-size: 0.875rem;
line-height: 1.43;
color: #4945ff;
}
.c22 {
.c23 {
font-weight: 600;
line-height: 1.14;
}
.c23 {
.c24 {
font-weight: 600;
font-size: 0.6875rem;
line-height: 1.45;
text-transform: uppercase;
}
.c24 {
.c25 {
padding-left: 8px;
}
.c20 {
.c21 {
display: -webkit-inline-box;
display: -webkit-inline-flex;
display: -ms-inline-flexbox;
@ -225,15 +232,15 @@ describe('Application page', () => {
outline: none;
}
.c20 svg path {
.c21 svg path {
fill: #4945ff;
}
.c20 svg {
.c21 svg {
font-size: 0.625rem;
}
.c20:after {
.c21:after {
-webkit-transition-property: all;
transition-property: all;
-webkit-transition-duration: 0.2s;
@ -248,11 +255,11 @@ describe('Application page', () => {
border: 2px solid transparent;
}
.c20:focus-visible {
.c21:focus-visible {
outline: none;
}
.c20:focus-visible:after {
.c21:focus-visible:after {
border-radius: 8px;
content: '';
position: absolute;
@ -263,7 +270,7 @@ describe('Application page', () => {
border: 2px solid #4945ff;
}
.c25 {
.c26 {
display: -webkit-box;
display: -webkit-flex;
display: -ms-flexbox;
@ -351,7 +358,7 @@ describe('Application page', () => {
details
</span>
<p
class="c17"
class="c20"
>
v3.6.8
</p>
@ -369,7 +376,7 @@ describe('Application page', () => {
current plan
</span>
<p
class="c17"
class="c20"
>
Enterprise Edition
</p>
@ -386,19 +393,19 @@ describe('Application page', () => {
class=""
>
<a
class="c20"
class="c21"
href="https://github.com/strapi/strapi/releases/tag/v3.6.8"
rel="noreferrer noopener"
target="_blank"
>
<span
class="c21 c22 c23"
class="c22 c23 c24"
>
Upgrade your admin panel
</span>
<span
aria-hidden="true"
class="c24 c25"
class="c25 c26"
>
<svg
fill="none"
@ -423,19 +430,19 @@ describe('Application page', () => {
class=""
>
<a
class="c20"
class="c21"
href="https://strapi.io/pricing-self-hosted"
rel="noreferrer noopener"
target="_blank"
>
<span
class="c21 c22 c23"
class="c22 c23 c24"
>
See all pricing
</span>
<span
aria-hidden="true"
class="c24 c25"
class="c25 c26"
>
<svg
fill="none"
@ -455,7 +462,7 @@ describe('Application page', () => {
</div>
</div>
<div
class="c26"
class="c27"
>
<span
class="c17 c18 c19"
@ -463,7 +470,7 @@ describe('Application page', () => {
node version
</span>
<p
class="c17"
class="c20"
/>
</div>
</div>

2
packages/core/admin/admin/src/translations/en.json
View File

@ -299,7 +299,7 @@
"app.components.ToggleCheckbox.on-label": "On",
"app.components.UpgradePlanModal.button": "Learn more",
"app.components.UpgradePlanModal.limit-reached": "You have reached the limit",
"app.components.UpgradePlanModal.text-ce": "COMMUNITY EDITION",
"app.components.UpgradePlanModal.text-ce": "Community Edition",
"app.components.UpgradePlanModal.text-ee": "Enterprise Edition",
"app.components.UpgradePlanModal.text-power": "Unlock the full power of Strapi by upgrading your plan to the Enterprise Edition",
"app.components.UpgradePlanModal.text-strapi": "of Strapi by upgrading your plan to the",