yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-03 14:28:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move Buttonmodal from ctb to helper plugin

Browse Source
This commit is contained in:
soupette 2019-09-11 16:38:42 +02:00
parent 4f1b2973fc
commit bf73d73f8e
14 changed files with 57 additions and 134 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
packages/strapi-helper-plugin/lib/src/assets/icons/icon_check.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 702 B

4
packages/strapi-plugin-content-type-builder/admin/src/components/ButtonModalSecondary/StyledButtonModalSecondary.js → packages/strapi-helper-plugin/lib/src/components/ButtonModal/StyledButtonSecondary.js
View File

@ -1,7 +1,7 @@
import styled from 'styled-components';
import { Button } from 'reactstrap';
const StyledButtonModalSecondary = styled(Button)`
const StyledButtonSecondary = styled(Button)`
font-family: Lato;
color: #f64d0a;
border: 0.1rem solid #f64d0a;
@ -22,4 +22,4 @@ const StyledButtonModalSecondary = styled(Button)`
border-radius: 3px;
`;
export default StyledButtonModalSecondary;
export default StyledButtonSecondary;

3
packages/strapi-plugin-content-type-builder/admin/src/components/ButtonModalSuccess/StyledButtonModalSuccess.js → packages/strapi-helper-plugin/lib/src/components/ButtonModal/StyledButtonSuccess.js
View File

@ -2,8 +2,7 @@ import styled from 'styled-components';
import { Button } from 'reactstrap';
import img from '../../assets/icons/icon_check.png';
import { colors } from 'strapi-helper-plugin';
import colors from '../../assets/styles/colors';
const StyledButtonModalSuccess = styled(Button)`
position: relative;

37
packages/strapi-helper-plugin/lib/src/components/ButtonModal/index.js Normal file
View File

@ -0,0 +1,37 @@
/**
*
* ButtonModalSecondary
*
*/
import React, { memo } from 'react';
import PropTypes from 'prop-types';
import { FormattedMessage } from 'react-intl';
import ButtonSecondary from './StyledButtonSecondary';
import ButtonSuccess from './StyledButtonSuccess';
function ButtonModal({ message, onClick, type, isSecondary }) {
const Component = isSecondary ? ButtonSecondary : ButtonSuccess;
return (
<Component onClick={onClick} type={type}>
<FormattedMessage id={message} />
</Component>
);
}
ButtonModal.defaultProps = {
isSecondary: false,
type: 'button',
};
ButtonModal.propTypes = {
isSecondary: PropTypes.bool,
message: PropTypes.string.isRequired,
onClick: PropTypes.func.isRequired,
type: PropTypes.string,
};
export default memo(ButtonModal);
export { ButtonModal };

1
packages/strapi-helper-plugin/lib/src/index.js
View File

@ -9,6 +9,7 @@ export { default as routerPropTypes } from './commonPropTypes/router';
export { default as BackHeader } from './components/BackHeader';
export { default as BlockerComponent } from './components/BlockerComponent';
export { default as Button } from './components/Button';
export { default as ButtonModal } from './components/ButtonModal';
export { default as ContainerFluid } from './components/ContainerFluid';
export {
default as EmptyAttributesBlock,

32
packages/strapi-plugin-content-type-builder/admin/src/components/ButtonModalSecondary/index.js
View File

@ -1,32 +0,0 @@
/**
*
* ButtonModalSecondary
*
*/
import React, { memo } from 'react';
import PropTypes from 'prop-types';
import { FormattedMessage } from 'react-intl';
import StyledButtonModalSecondary from './StyledButtonModalSecondary';
function ButtonModalSecondary({ message, onClick, type }) {
return (
<StyledButtonModalSecondary onClick={onClick} type={type}>
<FormattedMessage id={message} />
</StyledButtonModalSecondary>
);
}
ButtonModalSecondary.defaultProps = {
type: 'button',
};
ButtonModalSecondary.propTypes = {
message: PropTypes.string.isRequired,
onClick: PropTypes.func.isRequired,
type: PropTypes.string,
};
export default memo(ButtonModalSecondary);
export { ButtonModalSecondary };

20
packages/strapi-plugin-content-type-builder/admin/src/components/ButtonModalSecondary/styles.scss
View File

@ -1,20 +0,0 @@
.buttonModalSecondary {
font-family: Lato;
color: #f64d0a;
border: 0.1rem solid #f64d0a;
padding-left: 1.5rem;
padding-right: 1.5rem;
cursor: pointer;
background-color: transparent;
&:hover,
&:active {
color: #f64d0a;
background-color: white;
border: 0.1rem solid #f64d0a;
}
height: 3rem;
color: #f64d0a;
border: 0.1rem solid #f64d0a;
position: relative;
border-radius: 3px;
}

15
packages/strapi-plugin-content-type-builder/admin/src/components/ButtonModalSecondary/tests/index.test.js
View File

@ -1,15 +0,0 @@
import React from 'react';
import { shallow } from 'enzyme';
import { ButtonModalSecondary } from '../index';
describe('<ButtonModalSecondary />', () => {
it('should not crash', () => {
shallow(
<ButtonModalSecondary
onClick={jest.fn()}
message="app.utils.defaultMessage"
/>
);
});
});

33
packages/strapi-plugin-content-type-builder/admin/src/components/ButtonModalSuccess/index.js
View File

@ -1,33 +0,0 @@
/**
*
* ButtonModalSecondary
*
*/
import React, { memo } from 'react';
import PropTypes from 'prop-types';
import { FormattedMessage } from 'react-intl';
import StyledButtonModalSuccess from './StyledButtonModalSuccess';
function ButtonModalSuccess({ message, onClick, type }) {
return (
<StyledButtonModalSuccess onClick={onClick} type={type}>
<FormattedMessage id={message} />
</StyledButtonModalSuccess>
);
}
ButtonModalSuccess.defaultProps = {
onClick: () => {},
type: 'button',
};
ButtonModalSuccess.propTypes = {
message: PropTypes.string.isRequired,
onClick: PropTypes.func,
type: PropTypes.string,
};
export default memo(ButtonModalSuccess);
export { ButtonModalSuccess };

10
packages/strapi-plugin-content-type-builder/admin/src/components/ButtonModalSuccess/tests/index.test.js
View File

@ -1,10 +0,0 @@
import React from 'react';
import { shallow } from 'enzyme';
import { ButtonModalSuccess } from '../index';
describe('<ButtonModalSuccess />', () => {
it('should not crash', () => {
shallow(<ButtonModalSuccess onClick={jest.fn()} message="" />);
});
});

9
packages/strapi-plugin-content-type-builder/admin/src/containers/AttributeForm/index.js
View File

@ -9,14 +9,12 @@ import PropTypes from 'prop-types';
import { FormattedMessage } from 'react-intl';
import { get, isEmpty } from 'lodash';
import { InputsIndex as Input } from 'strapi-helper-plugin';
import { ButtonModal, InputsIndex as Input } from 'strapi-helper-plugin';
import pluginId from '../../pluginId';
import BodyModal from '../../components/BodyModal';
import ButtonModalPrimary from '../../components/ButtonModalPrimary';
import ButtonModalSecondary from '../../components/ButtonModalSecondary';
import ButtonModalSuccess from '../../components/ButtonModalSuccess';
import CustomCheckbox from '../../components/CustomCheckbox';
import FooterModal from '../../components/FooterModal';
import FormModal from '../../components/FormModal';
@ -370,11 +368,12 @@ class AttributeForm extends React.Component {
/>
</section>
<section>
<ButtonModalSecondary
<ButtonModal
message={`${pluginId}.form.button.cancel`}
onClick={this.handleCancel}
isSecondary
/>
<ButtonModalSuccess
<ButtonModal
message={`${pluginId}.form.button.done`}
type="button"
onClick={this.handleSubmit}

9
packages/strapi-plugin-content-type-builder/admin/src/containers/ModelForm/index.js
View File

@ -9,13 +9,11 @@ import PropTypes from 'prop-types';
import { FormattedMessage } from 'react-intl';
import { get, isEmpty, upperFirst } from 'lodash';
import { InputsIndex as Input } from 'strapi-helper-plugin';
import { ButtonModal, InputsIndex as Input } from 'strapi-helper-plugin';
import pluginId from '../../pluginId';
import BodyModal from '../../components/BodyModal';
import ButtonModalSecondary from '../../components/ButtonModalSecondary';
import ButtonModalSuccess from '../../components/ButtonModalSuccess';
import FooterModal from '../../components/FooterModal';
import HeaderModal from '../../components/HeaderModal';
import HeaderModalTitle from '../../components/HeaderModalTitle';
@ -266,11 +264,12 @@ class ModelForm extends React.Component {
<BodyModal>{currentForm.items.map(this.renderInput)}</BodyModal>
<FooterModal>
<section>
<ButtonModalSecondary
<ButtonModal
isSecondary
message={`${pluginId}.form.button.cancel`}
onClick={this.handleCancel}
/>
<ButtonModalSuccess
<ButtonModal
message={`${pluginId}.form.button.done`}
type="submit"
/>

9
packages/strapi-plugin-content-type-builder/admin/src/containers/RelationForm/index.js
View File

@ -9,14 +9,12 @@ import PropTypes from 'prop-types';
import { FormattedMessage } from 'react-intl';
import { get, isEmpty } from 'lodash';
import { InputsIndex as Input } from 'strapi-helper-plugin';
import { ButtonModal, InputsIndex as Input } from 'strapi-helper-plugin';
import pluginId from '../../pluginId';
import BodyModal from '../../components/BodyModal';
import ButtonModalPrimary from '../../components/ButtonModalPrimary';
import ButtonModalSecondary from '../../components/ButtonModalSecondary';
import ButtonModalSuccess from '../../components/ButtonModalSuccess';
import FooterModal from '../../components/FooterModal';
import FormModal from '../../components/FormModal';
import HeaderModal from '../../components/HeaderModal';
@ -337,11 +335,12 @@ class RelationForm extends React.Component {
/>
</section>
<section>
<ButtonModalSecondary
<ButtonModal
isSecondary
message={`${pluginId}.form.button.cancel`}
onClick={this.handleCancel}
/>
<ButtonModalSuccess
<ButtonModal
message={`${pluginId}.form.button.done`}
type="button"
onClick={this.handleSubmit}

9
packages/strapi-plugin-content-type-builder/admin/src/containers/RelationFormGroup/index.js
View File

@ -9,14 +9,12 @@ import PropTypes from 'prop-types';
import { FormattedMessage } from 'react-intl';
import { get, isEmpty } from 'lodash';
import { InputsIndex as Input } from 'strapi-helper-plugin';
import { ButtonModal, InputsIndex as Input } from 'strapi-helper-plugin';
import pluginId from '../../pluginId';
import BodyModal from '../../components/BodyModal';
import ButtonModalPrimary from '../../components/ButtonModalPrimary';
import ButtonModalSecondary from '../../components/ButtonModalSecondary';
import ButtonModalSuccess from '../../components/ButtonModalSuccess';
import FooterModal from '../../components/FooterModal';
import FormModal from '../../components/FormModal';
import HeaderModal from '../../components/HeaderModal';
@ -347,11 +345,12 @@ class RelationFormGroup extends React.Component {
/>
</section>
<section>
<ButtonModalSecondary
<ButtonModal
isSecondary
message={`${pluginId}.form.button.cancel`}
onClick={this.handleCancel}
/>
<ButtonModalSuccess
<ButtonModal
message={`${pluginId}.form.button.done`}
type="button"
onClick={this.handleSubmit}