@configuratorware/configurator-frontendgui 1.30.4 → 1.31.2

package/src/App/Shared/Components/ReceiveOfferForm/index.js

@@ -16,7 +16,7 @@ const styles = theme => ({
         marginTop: 0,
     },
     outlinedInput: {
-        padding: 14,
+        padding: 10,
         fontSize: 15,
         [theme.breakpoints.down('xs')]: {
             padding: 19,
@@ -91,7 +91,6 @@ class ReceiveOfferForm extends React.Component {
         this.handleChange = this.handleChange.bind(this);
         this.handleBlur = this.handleBlur.bind(this);
         this.setInputRef = this.setInputRef.bind(this);
-        this.designApprovalRef = React.createRef();
     }
 
     setInputRef = ref => {
@@ -175,7 +174,7 @@ class ReceiveOfferForm extends React.Component {
                     onChange={this.handleChange}
                     onBlur={this.handleBlur}
                     label={t('receiveOfferForm.email')}
-                    margin="normal"
+                    margin="dense"
                     variant="outlined"
                     fullWidth
                     error={!!email.error}
@@ -201,7 +200,7 @@ class ReceiveOfferForm extends React.Component {
                     onChange={this.handleChange}
                     onBlur={this.handleBlur}
                     label={t('receiveOfferForm.name')}
-                    margin="normal"
+                    margin="dense"
                     variant="outlined"
                     fullWidth
                     error={!!name.error}
@@ -224,7 +223,7 @@ class ReceiveOfferForm extends React.Component {
                     onChange={this.handleChange}
                     onBlur={this.handleBlur}
                     label={t('receiveOfferForm.company')}
-                    margin="normal"
+                    margin="dense"
                     variant="outlined"
                     fullWidth
                     error={!!company.error}
@@ -247,7 +246,7 @@ class ReceiveOfferForm extends React.Component {
                     onChange={this.handleChange}
                     onBlur={this.handleBlur}
                     label={t('receiveOfferForm.phonenumber')}
-                    margin="normal"
+                    margin="dense"
                     variant="outlined"
                     fullWidth
                     error={!!phonenumber.error}
@@ -272,7 +271,7 @@ class ReceiveOfferForm extends React.Component {
                             onChange={this.handleChange}
                             onBlur={this.handleBlur}
                             label={t('receiveOfferForm.zip')}
-                            margin="normal"
+                            margin="dense"
                             variant="outlined"
                             fullWidth
                             error={!!zip.error}
@@ -297,7 +296,7 @@ class ReceiveOfferForm extends React.Component {
                             onChange={this.handleChange}
                             onBlur={this.handleBlur}
                             label={t('receiveOfferForm.city')}
-                            margin="normal"
+                            margin="dense"
                             variant="outlined"
                             fullWidth
                             error={!!city.error}
@@ -322,7 +321,7 @@ class ReceiveOfferForm extends React.Component {
                     onChange={this.handleChange}
                     onBlur={this.handleBlur}
                     label={t('receiveOfferForm.street')}
-                    margin="normal"
+                    margin="dense"
                     variant="outlined"
                     fullWidth
                     error={!!street.error}
@@ -345,7 +344,7 @@ class ReceiveOfferForm extends React.Component {
                     onChange={this.handleChange}
                     onBlur={this.handleBlur}
                     label={t('receiveOfferForm.country')}
-                    margin="normal"
+                    margin="dense"
                     variant="outlined"
                     fullWidth
                     error={!!country.error}

package/src/App/configuration.js

@@ -186,6 +186,20 @@ let applicationConfiguration = {
     designer: {
         dpi: 300, // the default canvas dpi as project specific option
         maxColorAmount: 10, // the default max number of colors in the colorizing feature
+        allowedImageUploadFormats: [
+            // the image formats users can upload to designareas / designer items
+            'jpg',
+            'jpeg',
+            'svg',
+            'png',
+            'pdf',
+            'bmp',
+            'tif',
+            'tiff',
+            'eps',
+            'ai',
+            'gif',
+        ],
     },
 
     vectorizeImageQuality: 45000,

package/App/Screens/Configurator/Components/DesignApproval/index.js

@@ -1,76 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports["default"] = void 0;
-
-var _react = _interopRequireDefault(require("react"));
-
-var _propTypes = _interopRequireDefault(require("prop-types"));
-
-var _core = require("@material-ui/core");
-
-var _FormControlLabel = _interopRequireDefault(require("@material-ui/core/FormControlLabel"));
-
-var _Checkbox = _interopRequireDefault(require("@material-ui/core/Checkbox"));
-
-var _FormHelperText = _interopRequireDefault(require("@material-ui/core/FormHelperText"));
-
-var _i18n = require("../../../../../Framework/i18n");
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
-
-var styles = function styles(theme) {
-  return {
-    link: {
-      '& a': {
-        color: theme.palette.primary.main
-      }
-    }
-  };
-};
-
-var DesignApproval = function DesignApproval(props) {
-  var handleChange = function handleChange(event) {
-    var onChange = props.onChange;
-    onChange(event.target.checked);
-  };
-
-  var classes = props.classes,
-      checked = props.checked,
-      error = props.error,
-      link = props.link;
-  return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_FormControlLabel["default"], {
-    control: /*#__PURE__*/_react["default"].createElement(_Checkbox["default"], {
-      name: "approval",
-      checked: checked,
-      onChange: handleChange,
-      color: "primary"
-    }),
-    label: /*#__PURE__*/_react["default"].createElement("div", {
-      className: classes.link,
-      dangerouslySetInnerHTML: {
-        __html: (0, _i18n.t)('receiveOfferForm.approval', {
-          link: link
-        })
-      }
-    })
-  }), error && /*#__PURE__*/_react["default"].createElement(_FormHelperText["default"], {
-    error: true
-  }, (0, _i18n.t)('receiveOfferForm.errors.notApproved')));
-};
-
-DesignApproval.propTypes = {
-  classes: _propTypes["default"].object,
-  onChange: _propTypes["default"].func,
-  checked: _propTypes["default"].bool,
-  error: _propTypes["default"].bool,
-  link: _propTypes["default"].string
-};
-
-var _default = (0, _core.withStyles)(styles, {
-  name: 'DesignApproval'
-})(DesignApproval);
-
-exports["default"] = _default;

package/App/Screens/Configurator/Components/DesignApproval/index.story.js

@@ -1,27 +0,0 @@
-"use strict";
-
-var _react = _interopRequireDefault(require("react"));
-
-var _noop = _interopRequireDefault(require("lodash/noop"));
-
-var _react2 = require("@storybook/react");
-
-var _index = _interopRequireDefault(require("./index"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
-
-(0, _react2.storiesOf)('DesignApproval', module).add('without error', function () {
-  return /*#__PURE__*/_react["default"].createElement(_index["default"], {
-    checked: true,
-    error: false,
-    link: 'fakeLink',
-    onChange: _noop["default"]
-  });
-}).add('with error', function () {
-  return /*#__PURE__*/_react["default"].createElement(_index["default"], {
-    checked: false,
-    error: true,
-    link: 'fakeLink',
-    onChange: _noop["default"]
-  });
-});

package/App/Screens/Configurator/Components/DesignApproval/index.test.js

@@ -1,31 +0,0 @@
-"use strict";
-
-var _react = _interopRequireDefault(require("react"));
-
-var _noop = _interopRequireDefault(require("lodash/noop"));
-
-var _enzyme = require("enzyme");
-
-var _index = _interopRequireDefault(require("./index"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
-
-/* eslint-env jest */
-it('renders correctly without error', function () {
-  var tree = (0, _enzyme.render)( /*#__PURE__*/_react["default"].createElement(_index["default"], {
-    checked: true,
-    error: false,
-    link: 'fakeLink',
-    onChange: _noop["default"]
-  }));
-  expect(tree).toMatchSnapshot();
-});
-it('renders correctly with error', function () {
-  var tree = (0, _enzyme.render)( /*#__PURE__*/_react["default"].createElement(_index["default"], {
-    checked: false,
-    error: true,
-    link: 'fakeLink',
-    onChange: _noop["default"]
-  }));
-  expect(tree).toMatchSnapshot();
-});

package/src/App/Screens/Configurator/Components/DesignApproval/__snapshots__/index.test.jsx.snap

@@ -1,91 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`renders correctly with error 1`] = `
-Array [
-  <label
-    class="MuiFormControlLabel-root"
-  >
-    <span
-      aria-disabled="false"
-      class="MuiButtonBase-root MuiIconButton-root PrivateSwitchBase-root-2 MuiCheckbox-root MuiCheckbox-colorPrimary MuiIconButton-colorPrimary"
-    >
-      <span
-        class="MuiIconButton-label"
-      >
-        <input
-          class="PrivateSwitchBase-input-5"
-          data-indeterminate="false"
-          name="approval"
-          type="checkbox"
-        />
-        <svg
-          aria-hidden="true"
-          class="MuiSvgIcon-root"
-          focusable="false"
-          viewBox="0 0 24 24"
-        >
-          <path
-            d="M19 5v14H5V5h14m0-2H5c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h14c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2z"
-          />
-        </svg>
-      </span>
-    </span>
-    <span
-      class="MuiTypography-root MuiFormControlLabel-label MuiTypography-body1"
-    >
-      <div
-        class="DesignApproval-link-1"
-      >
-        receiveOfferForm.approval
-      </div>
-    </span>
-  </label>,
-  <p
-    class="MuiFormHelperText-root Mui-error"
-  >
-    receiveOfferForm.errors.notApproved
-  </p>,
-]
-`;
-
-exports[`renders correctly without error 1`] = `
-<label
-  class="MuiFormControlLabel-root"
->
-  <span
-    aria-disabled="false"
-    class="MuiButtonBase-root MuiIconButton-root PrivateSwitchBase-root-2 MuiCheckbox-root MuiCheckbox-colorPrimary PrivateSwitchBase-checked-3 Mui-checked MuiIconButton-colorPrimary"
-  >
-    <span
-      class="MuiIconButton-label"
-    >
-      <input
-        checked=""
-        class="PrivateSwitchBase-input-5"
-        data-indeterminate="false"
-        name="approval"
-        type="checkbox"
-      />
-      <svg
-        aria-hidden="true"
-        class="MuiSvgIcon-root"
-        focusable="false"
-        viewBox="0 0 24 24"
-      >
-        <path
-          d="M19 3H5c-1.11 0-2 .9-2 2v14c0 1.1.89 2 2 2h14c1.11 0 2-.9 2-2V5c0-1.1-.89-2-2-2zm-9 14l-5-5 1.41-1.41L10 14.17l7.59-7.59L19 8l-9 9z"
-        />
-      </svg>
-    </span>
-  </span>
-  <span
-    class="MuiTypography-root MuiFormControlLabel-label MuiTypography-body1"
-  >
-    <div
-      class="DesignApproval-link-1"
-    >
-      receiveOfferForm.approval
-    </div>
-  </span>
-</label>
-`;

package/src/App/Screens/Configurator/Components/DesignApproval/index.js

@@ -1,54 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import { withStyles } from '@material-ui/core';
-import FormControlLabel from '@material-ui/core/FormControlLabel';
-import Checkbox from '@material-ui/core/Checkbox';
-import FormHelperText from '@material-ui/core/FormHelperText';
-import { t } from 'Framework/i18n';
-
-const styles = theme => ({
-    link: {
-        '& a': {
-            color: theme.palette.primary.main,
-        },
-    },
-});
-
-const DesignApproval = props => {
-    const handleChange = event => {
-        const { onChange } = props;
-
-        onChange(event.target.checked);
-    };
-
-    const { classes, checked, error, link } = props;
-
-    return (
-        <React.Fragment>
-            <FormControlLabel
-                control={
-                    <Checkbox name="approval" checked={checked} onChange={handleChange} color="primary" />
-                }
-                label={
-                    <div
-                        className={classes.link}
-                        dangerouslySetInnerHTML={{ __html: t('receiveOfferForm.approval', { link }) }}
-                    />
-                }
-            />
-            {error && (
-                <FormHelperText error={true}>{t('receiveOfferForm.errors.notApproved')}</FormHelperText>
-            )}
-        </React.Fragment>
-    );
-};
-
-DesignApproval.propTypes = {
-    classes: PropTypes.object,
-    onChange: PropTypes.func,
-    checked: PropTypes.bool,
-    error: PropTypes.bool,
-    link: PropTypes.string,
-};
-
-export default withStyles(styles, { name: 'DesignApproval' })(DesignApproval);

package/src/App/Screens/Configurator/Components/DesignApproval/index.story.js

@@ -1,12 +0,0 @@
-import React from 'react';
-import noop from 'lodash/noop';
-import { storiesOf } from '@storybook/react';
-import DesignApproval from './index';
-
-storiesOf('DesignApproval', module)
-    .add('without error', () => (
-        <DesignApproval checked={true} error={false} link={'fakeLink'} onChange={noop} />
-    ))
-    .add('with error', () => (
-        <DesignApproval checked={false} error={true} link={'fakeLink'} onChange={noop} />
-    ));

package/src/App/Screens/Configurator/Components/DesignApproval/index.test.jsx

@@ -1,17 +0,0 @@
-/* eslint-env jest */
-import React from 'react';
-import noop from 'lodash/noop';
-import { render } from 'enzyme';
-import DesignApproval from './index';
-
-it('renders correctly without error', () => {
-    const tree = render(<DesignApproval checked={true} error={false} link={'fakeLink'} onChange={noop} />);
-
-    expect(tree).toMatchSnapshot();
-});
-
-it('renders correctly with error', () => {
-    const tree = render(<DesignApproval checked={false} error={true} link={'fakeLink'} onChange={noop} />);
-
-    expect(tree).toMatchSnapshot();
-});

package/src/App/Screens/Configurator/Containers/DesignApproval.js

@@ -1,76 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import { getClientTexts } from 'App/Reducers/Configurator/Selectors';
-import DesignApproval from '../Components/DesignApproval';
-import { containerConnect } from 'Framework/ComponentContainer';
-
-class DesignApprovalContainer extends React.Component {
-    static propTypes = {
-        termsAndConditionsLink: PropTypes.string,
-        DesignApprovalComponent: PropTypes.func,
-    };
-
-    static defaultProps = {
-        DesignApprovalComponent: DesignApproval,
-    };
-
-    constructor(props) {
-        super(props);
-
-        this.state = {
-            approval: {
-                checked: false,
-                error: false,
-            },
-        };
-    }
-
-    handleApprovalChange = checked => {
-        this.setState({
-            approval: {
-                checked,
-                error: false,
-            },
-        });
-    };
-
-    validate() {
-        const {
-            approval: { checked },
-        } = this.state;
-
-        if (checked) {
-            return true;
-        }
-
-        this.setState({
-            approval: {
-                checked,
-                error: true,
-            },
-        });
-
-        return false;
-    }
-
-    render() {
-        const { approval } = this.state;
-        const { termsAndConditionsLink, DesignApprovalComponent } = this.props;
-
-        return (
-            <DesignApprovalComponent
-                checked={approval.checked}
-                error={approval.error}
-                link={termsAndConditionsLink}
-                onChange={this.handleApprovalChange}
-            />
-        );
-    }
-}
-
-const mapStateToProps = ({ configurator }) => ({
-    Component: DesignApprovalContainer,
-    termsAndConditionsLink: getClientTexts(configurator).termsAndConditionsLink,
-});
-
-export default containerConnect(mapStateToProps);