Merge pull request #127 from pluginpal/feature/beta-testing

Beta testing
pluginpal · May 31, 2024 · 00bc2dd · 00bc2dd
2 parents 980593d + fb897c7
commit 00bc2dd
Show file tree

Hide file tree

Showing 9 changed files with 1,060 additions and 780 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -29,6 +29,7 @@
     "import/no-unresolved": [2, {
       "ignore": [
         "@strapi/strapi/admin",
+        "@strapi/icons/symbols",
         "@strapi/admin/strapi-admin"
       ]
     }],

diff --git a/admin/src/components/ConfirmModal/index.jsx b/admin/src/components/ConfirmModal/index.jsx
@@ -8,13 +8,12 @@ import {
   DialogFooter,
   Flex,
   Typography,
-  Stack,
   Button,
   Checkbox,
   Divider,
   Box,
 } from '@strapi/design-system';
-import { ExclamationMarkCircle } from '@strapi/icons';
+import { WarningCircle } from '@strapi/icons';
 
 const ConfirmModal = ({ isOpen, onClose, onSubmit, type }) => {
   const soft = useSelector((state) => state.getIn(['config', 'appEnv', 'config', 'soft'], false));
@@ -29,15 +28,15 @@ const ConfirmModal = ({ isOpen, onClose, onSubmit, type }) => {
       title={formatMessage({ id: "config-sync.popUpWarning.Confirmation" })}
       isOpen={isOpen}
     >
-      <DialogBody icon={<ExclamationMarkCircle />}>
-        <Stack size={2}>
+      <DialogBody icon={<WarningCircle />}>
+        <Flex size={2}>
           <Flex justifyContent="center">
             <Typography variant="omega" id="confirm-description" style={{ textAlign: 'center' }}>
               {formatMessage({ id: `config-sync.popUpWarning.warning.${type}_1` })}<br />
               {formatMessage({ id: `config-sync.popUpWarning.warning.${type}_2` })}
             </Typography>
           </Flex>
-        </Stack>
+        </Flex>
       </DialogBody>
       {(soft && type === 'import') && (
         <React.Fragment>

diff --git a/admin/src/components/FirstExport/index.jsx b/admin/src/components/FirstExport/index.jsx
@@ -3,7 +3,8 @@ import { useIntl } from 'react-intl';
 import { useDispatch } from 'react-redux';
 import { getFetchClient, useNotification } from '@strapi/strapi/admin';
 import { Button, EmptyStateLayout } from '@strapi/design-system';
-import { EmptyDocuments } from '@strapi/icons';
+import { EmptyDocuments } from '@strapi/icons/symbols';
+
 
 import { exportAllConfig } from '../../state/actions/Config';
 import ConfirmModal from '../ConfirmModal';

diff --git a/admin/src/components/Header/index.jsx b/admin/src/components/Header/index.jsx
@@ -7,14 +7,15 @@
 import React, { memo } from 'react';
 import { useIntl } from 'react-intl';
 
-import { HeaderLayout, Box } from '@strapi/design-system';
+import { Layouts } from '@strapi/admin/strapi-admin';
+import { Box } from '@strapi/design-system';
 
 const HeaderComponent = () => {
   const { formatMessage } = useIntl();
 
   return (
     <Box background="neutral100">
-      <HeaderLayout
+      <Layouts.Header
         title={formatMessage({ id: 'config-sync.Header.Title' })}
         subtitle={formatMessage({ id: 'config-sync.Header.Description' })}
         as="h2"

diff --git a/admin/src/components/NoChanges/index.jsx b/admin/src/components/NoChanges/index.jsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { EmptyStateLayout } from '@strapi/design-system';
 import { useIntl } from 'react-intl';
-import { EmptyDocuments } from '@strapi/icons';
+import { EmptyDocuments } from '@strapi/icons/symbols';
 
 const NoChanges = () => {
   const { formatMessage } = useIntl();

diff --git a/admin/src/containers/ConfigPage/index.jsx b/admin/src/containers/ConfigPage/index.jsx
@@ -3,12 +3,11 @@ import { useDispatch, useSelector } from 'react-redux';
 import { Map } from 'immutable';
 import {
   Box,
-  ContentLayout,
   Alert,
   Typography,
 } from '@strapi/design-system';
 import { useNotification } from '@strapi/strapi/admin';
-import { getFetchClient } from '@strapi/admin/strapi-admin';
+import { getFetchClient, Layouts } from '@strapi/admin/strapi-admin';
 import { useIntl } from 'react-intl';
 
 import { getAllConfigDiff, getAppEnv } from '../../state/actions/Config';
@@ -31,7 +30,7 @@ const ConfigPage = () => {
   }, []);
 
   return (
-    <ContentLayout paddingBottom={8}>
+    <Layouts.Content paddingBottom={8}>
       {appEnv === 'production' && (
         <Box paddingBottom={4}>
           <Alert variant="danger">
@@ -43,7 +42,7 @@ const ConfigPage = () => {
       )}
       <ActionButtons />
       <ConfigList isLoading={isLoading} diff={configDiff.toJS()} />
-    </ContentLayout>
+    </Layouts.Content>
   );
 };
 

diff --git a/package.json b/package.json
@@ -55,13 +55,13 @@
     "strapi-server.js"
   ],
   "peerDependencies": {
-    "@strapi/strapi": "^5.0.0-beta.2"
+    "@strapi/strapi": "^5.0.0-beta.8"
   },
   "devDependencies": {
-    "@strapi/design-system": "^1.16.0",
-    "@strapi/icons": "^1.16.0",
-    "@strapi/utils": "5.0.0-beta.2",
-    "@strapi/strapi": "5.0.0-beta.2",
+    "@strapi/design-system": "2.0.0-beta.4",
+    "@strapi/icons": "2.0.0-beta.4",
+    "@strapi/utils": "5.0.0-beta.8",
+    "@strapi/strapi": "5.0.0-beta.8",
     "babel-eslint": "9.0.0",
     "eslint": "^7.32.0",
     "eslint-config-airbnb": "^18.2.1",

diff --git a/playground/package.json b/playground/package.json
@@ -16,15 +16,15 @@
     "supertest": "^6.3.3"
   },
   "dependencies": {
-    "@strapi/strapi": "5.0.0-beta.2",
-    "@strapi/plugin-users-permissions": "5.0.0-beta.2",
-    "@strapi/plugin-cloud": "5.0.0-beta.2",
+    "@strapi/strapi": "5.0.0-beta.8",
+    "@strapi/plugin-users-permissions": "5.0.0-beta.8",
+    "@strapi/plugin-cloud": "5.0.0-beta.8",
     "better-sqlite3": "9.4.3",
     "react": "^18.0.0",
     "react-dom": "^18.0.0",
     "react-router-dom": "^6.0.0",
     "strapi-plugin-config-sync": "./..",
-    "styled-components": "5.3.3"
+    "styled-components": "^6.0.0"
   },
   "author": {
     "name": "A Strapi developer"