From 09166b3b3626e152222568dbc3d7c1e1c10f009d Mon Sep 17 00:00:00 2001 From: soupette Date: Mon, 4 Oct 2021 15:22:16 +0200 Subject: [PATCH 1/4] Fix preview for repeatable components Signed-off-by: soupette --- .../components/RepeatableComponent/DragPreview.js | 8 ++++---- .../RepeatableComponent/DraggedItem/Preview.js | 11 ++++++++--- .../RepeatableComponent/DraggedItem/index.js | 1 + .../components/RepeatableComponent/index.js | 5 ++++- 4 files changed, 17 insertions(+), 8 deletions(-) diff --git a/packages/core/admin/admin/src/content-manager/components/RepeatableComponent/DragPreview.js b/packages/core/admin/admin/src/content-manager/components/RepeatableComponent/DragPreview.js index 1d1b514336..505ee66332 100644 --- a/packages/core/admin/admin/src/content-manager/components/RepeatableComponent/DragPreview.js +++ b/packages/core/admin/admin/src/content-manager/components/RepeatableComponent/DragPreview.js @@ -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' }} > - + - + {displayedValue} diff --git a/packages/core/admin/admin/src/content-manager/components/RepeatableComponent/DraggedItem/Preview.js b/packages/core/admin/admin/src/content-manager/components/RepeatableComponent/DraggedItem/Preview.js index 0791ebe011..db1cc0479f 100644 --- a/packages/core/admin/admin/src/content-manager/components/RepeatableComponent/DraggedItem/Preview.js +++ b/packages/core/admin/admin/src/content-manager/components/RepeatableComponent/DraggedItem/Preview.js @@ -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 ( - - + + - + ); }; diff --git a/packages/core/admin/admin/src/content-manager/components/RepeatableComponent/DraggedItem/index.js b/packages/core/admin/admin/src/content-manager/components/RepeatableComponent/DraggedItem/index.js index af2cc23fa2..b1057cd971 100644 --- a/packages/core/admin/admin/src/content-manager/components/RepeatableComponent/DraggedItem/index.js +++ b/packages/core/admin/admin/src/content-manager/components/RepeatableComponent/DraggedItem/index.js @@ -44,6 +44,7 @@ const DraggedItem = ({ // hasErrors, // hasMinError, // isFirst, + isOdd, isOpen, isReadOnly, diff --git a/packages/core/admin/admin/src/content-manager/components/RepeatableComponent/index.js b/packages/core/admin/admin/src/content-manager/components/RepeatableComponent/index.js index 9e1f8a18eb..47da735046 100644 --- a/packages/core/admin/admin/src/content-manager/components/RepeatableComponent/index.js +++ b/packages/core/admin/admin/src/content-manager/components/RepeatableComponent/index.js @@ -253,6 +253,9 @@ RepeatableComponent.propTypes = { const Memoized = memo(RepeatableComponent); -export default connect(Memoized, select); +export default connect( + Memoized, + select +); export { RepeatableComponent }; From 8225a8fcfe88a5e33f80f16fbb905526dde13995 Mon Sep 17 00:00:00 2001 From: ronronscelestes Date: Tue, 5 Oct 2021 14:52:03 +0200 Subject: [PATCH 2/4] fixed auth links style --- .../AuthPage/components/ForgotPassword/index.js | 4 +--- .../components/ForgotPasswordSuccess/index.js | 2 +- .../src/pages/AuthPage/components/Oops/index.js | 2 +- .../AuthPage/components/Oops/tests/index.test.js | 6 +----- .../AuthPage/components/ResetPassword/index.js | 4 +--- .../components/ResetPassword/tests/index.test.js | 13 +------------ 6 files changed, 6 insertions(+), 25 deletions(-) diff --git a/packages/core/admin/admin/src/pages/AuthPage/components/ForgotPassword/index.js b/packages/core/admin/admin/src/pages/AuthPage/components/ForgotPassword/index.js index da46dd0a93..d499f508ca 100644 --- a/packages/core/admin/admin/src/pages/AuthPage/components/ForgotPassword/index.js +++ b/packages/core/admin/admin/src/pages/AuthPage/components/ForgotPassword/index.js @@ -89,9 +89,7 @@ const ForgotPassword = ({ onSubmit, schema }) => { - - {formatMessage({ id: 'Auth.link.ready', defaultMessage: 'Ready to sign in?' })} - + {formatMessage({ id: 'Auth.link.ready', defaultMessage: 'Ready to sign in?' })} diff --git a/packages/core/admin/admin/src/pages/AuthPage/components/ForgotPasswordSuccess/index.js b/packages/core/admin/admin/src/pages/AuthPage/components/ForgotPasswordSuccess/index.js index 67e8d8c295..8514974026 100644 --- a/packages/core/admin/admin/src/pages/AuthPage/components/ForgotPasswordSuccess/index.js +++ b/packages/core/admin/admin/src/pages/AuthPage/components/ForgotPasswordSuccess/index.js @@ -48,7 +48,7 @@ const ForgotPasswordSuccess = () => { - {formatMessage({ id: 'Auth.link.signin', defaultMessage: 'Sign in' })} + {formatMessage({ id: 'Auth.link.signin', defaultMessage: 'Sign in' })} diff --git a/packages/core/admin/admin/src/pages/AuthPage/components/Oops/index.js b/packages/core/admin/admin/src/pages/AuthPage/components/Oops/index.js index 12e2a626f0..648e464bfd 100644 --- a/packages/core/admin/admin/src/pages/AuthPage/components/Oops/index.js +++ b/packages/core/admin/admin/src/pages/AuthPage/components/Oops/index.js @@ -48,7 +48,7 @@ const Oops = () => { - {formatMessage({ id: 'Auth.link.signin', defaultMessage: 'Sign in' })} + {formatMessage({ id: 'Auth.link.signin', defaultMessage: 'Sign in' })} diff --git a/packages/core/admin/admin/src/pages/AuthPage/components/Oops/tests/index.test.js b/packages/core/admin/admin/src/pages/AuthPage/components/Oops/tests/index.test.js index b93f38be7f..c5f9a8617d 100644 --- a/packages/core/admin/admin/src/pages/AuthPage/components/Oops/tests/index.test.js +++ b/packages/core/admin/admin/src/pages/AuthPage/components/Oops/tests/index.test.js @@ -350,11 +350,7 @@ describe('ADMIN | PAGES | AUTH | Oops', () => { - - Sign in - + Sign in diff --git a/packages/core/admin/admin/src/pages/AuthPage/components/ResetPassword/index.js b/packages/core/admin/admin/src/pages/AuthPage/components/ResetPassword/index.js index b96a305e58..75980d0a78 100644 --- a/packages/core/admin/admin/src/pages/AuthPage/components/ResetPassword/index.js +++ b/packages/core/admin/admin/src/pages/AuthPage/components/ResetPassword/index.js @@ -161,9 +161,7 @@ const ForgotPassword = ({ onSubmit, schema }) => { - - {formatMessage({ id: 'Auth.link.ready', defaultMessage: 'Ready to sign in?' })} - + {formatMessage({ id: 'Auth.link.ready', defaultMessage: 'Ready to sign in?' })} diff --git a/packages/core/admin/admin/src/pages/AuthPage/components/ResetPassword/tests/index.test.js b/packages/core/admin/admin/src/pages/AuthPage/components/ResetPassword/tests/index.test.js index e7c82f3ce3..b712098d85 100644 --- a/packages/core/admin/admin/src/pages/AuthPage/components/ResetPassword/tests/index.test.js +++ b/packages/core/admin/admin/src/pages/AuthPage/components/ResetPassword/tests/index.test.js @@ -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', () => { - - Ready to sign in? - + Ready to sign in? From 2dae4e7865741d911ad5d2425028455e2e3210b5 Mon Sep 17 00:00:00 2001 From: HichamELBSI Date: Tue, 5 Oct 2021 16:09:38 +0200 Subject: [PATCH 3/4] Temporary fix the timepicker step Signed-off-by: HichamELBSI --- .../components/Inputs/utils/getStep.js | 4 ++- .../pages/App/tests/index.test.js | 32 ------------------- 2 files changed, 3 insertions(+), 33 deletions(-) diff --git a/packages/core/admin/admin/src/content-manager/components/Inputs/utils/getStep.js b/packages/core/admin/admin/src/content-manager/components/Inputs/utils/getStep.js index caf9fe8d80..900f25b483 100644 --- a/packages/core/admin/admin/src/content-manager/components/Inputs/utils/getStep.js +++ b/packages/core/admin/admin/src/content-manager/components/Inputs/utils/getStep.js @@ -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; } diff --git a/packages/core/admin/admin/src/content-manager/pages/App/tests/index.test.js b/packages/core/admin/admin/src/content-manager/pages/App/tests/index.test.js index 71baedffe2..cefb8b5b35 100644 --- a/packages/core/admin/admin/src/content-manager/pages/App/tests/index.test.js +++ b/packages/core/admin/admin/src/content-manager/pages/App/tests/index.test.js @@ -291,8 +291,6 @@ describe('Content manager | App | main', () => { border-radius: 4px; background: #ffffff; border: 1px solid #dcdce4; - position: relative; - outline: none; } .c5 svg { @@ -309,36 +307,6 @@ describe('Content manager | App | main', () => { pointer-events: none; } - .c5:after { - -webkit-transition-property: all; - transition-property: all; - -webkit-transition-duration: 0.2s; - transition-duration: 0.2s; - border-radius: 8px; - content: ''; - position: absolute; - top: -4px; - bottom: -4px; - left: -4px; - right: -4px; - border: 2px solid transparent; - } - - .c5:focus-visible { - outline: none; - } - - .c5:focus-visible:after { - border-radius: 8px; - content: ''; - position: absolute; - top: -5px; - bottom: -5px; - left: -5px; - right: -5px; - border: 2px solid #4945ff; - } - .c6 { display: -webkit-box; display: -webkit-flex; From f37ca08c417635f3a192bb342dfa0807936ea57e Mon Sep 17 00:00:00 2001 From: ronronscelestes Date: Tue, 5 Oct 2021 18:26:26 +0200 Subject: [PATCH 4/4] fixed application page label color and trad --- .../pages/App/tests/index.test.js | 32 ++++++++++++ .../pages/ApplicationInfosPage/index.js | 6 +-- .../ApplicationInfosPage/tests/index.test.js | 51 +++++++++++-------- .../core/admin/admin/src/translations/en.json | 2 +- 4 files changed, 65 insertions(+), 26 deletions(-) diff --git a/packages/core/admin/admin/src/content-manager/pages/App/tests/index.test.js b/packages/core/admin/admin/src/content-manager/pages/App/tests/index.test.js index cefb8b5b35..71baedffe2 100644 --- a/packages/core/admin/admin/src/content-manager/pages/App/tests/index.test.js +++ b/packages/core/admin/admin/src/content-manager/pages/App/tests/index.test.js @@ -291,6 +291,8 @@ describe('Content manager | App | main', () => { border-radius: 4px; background: #ffffff; border: 1px solid #dcdce4; + position: relative; + outline: none; } .c5 svg { @@ -307,6 +309,36 @@ describe('Content manager | App | main', () => { pointer-events: none; } + .c5:after { + -webkit-transition-property: all; + transition-property: all; + -webkit-transition-duration: 0.2s; + transition-duration: 0.2s; + border-radius: 8px; + content: ''; + position: absolute; + top: -4px; + bottom: -4px; + left: -4px; + right: -4px; + border: 2px solid transparent; + } + + .c5:focus-visible { + outline: none; + } + + .c5:focus-visible:after { + border-radius: 8px; + content: ''; + position: absolute; + top: -5px; + bottom: -5px; + left: -5px; + right: -5px; + border: 2px solid #4945ff; + } + .c6 { display: -webkit-box; display: -webkit-flex; diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/index.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/index.js index 8d6bfe2948..51d4451725 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/index.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/index.js @@ -52,7 +52,7 @@ const ApplicationInfosPage = () => { - + {formatMessage({ id: 'Settings.application.details', defaultMessage: 'details', @@ -61,7 +61,7 @@ const ApplicationInfosPage = () => { {appInfos.latestStrapiReleaseTag} - + {formatMessage({ id: 'Settings.application.edition-title', defaultMessage: 'current plan', @@ -103,7 +103,7 @@ const ApplicationInfosPage = () => { - + {formatMessage({ id: 'Settings.application.node-version', defaultMessage: 'node version', diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/tests/index.test.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/tests/index.test.js index c2ef57f850..75166ada88 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/tests/index.test.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/tests/index.test.js @@ -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

v3.6.8

@@ -369,7 +376,7 @@ describe('Application page', () => { current plan

Enterprise Edition

@@ -386,19 +393,19 @@ describe('Application page', () => { class="" > Upgrade your admin panel