diff --git a/new-lamassu-admin/src/pages/Customers/CustomerData.js b/new-lamassu-admin/src/pages/Customers/CustomerData.js index a12c92bb..7cd7d501 100644 --- a/new-lamassu-admin/src/pages/Customers/CustomerData.js +++ b/new-lamassu-admin/src/pages/Customers/CustomerData.js @@ -31,23 +31,23 @@ import { getName } from './helper.js' const useStyles = makeStyles(styles) -const imageWidth = 165 -const imageHeight = 45 -const popupImageWidth = 360 -const popupImageHeight = 240 +const IMAGE_WIDTH = 165 +const IMAGE_HEIGHT = 45 +const POPUP_IMAGE_WIDTH = 360 +const POPUP_IMAGE_HEIGHT = 240 const Photo = ({ show, src }) => { - const classes = useStyles({ width: imageWidth }) + const classes = useStyles({ width: IMAGE_WIDTH }) return ( <> {show ? ( ) : (
diff --git a/new-lamassu-admin/src/pages/Customers/Wizard.js b/new-lamassu-admin/src/pages/Customers/Wizard.js index bc1652ec..87bebaa8 100644 --- a/new-lamassu-admin/src/pages/Customers/Wizard.js +++ b/new-lamassu-admin/src/pages/Customers/Wizard.js @@ -1,7 +1,7 @@ import { makeStyles } from '@material-ui/core' -import { Form, Formik, useFormikContext } from 'formik' +import { Form, Formik } from 'formik' import * as R from 'ramda' -import React, { useState, Fragment, useEffect } from 'react' +import React, { useState, Fragment } from 'react' import ErrorMessage from 'src/components/ErrorMessage' import Modal from 'src/components/Modal' @@ -57,29 +57,17 @@ const getStep = (step, selectedValues) => { } } -const GetValues = ({ setValues }) => { - const { values } = useFormikContext() - - useEffect(() => { - setValues && values && setValues(values) - }, [setValues, values]) - - return null -} - const Wizard = ({ onClose, save, error }) => { const classes = useStyles() const [selectedValues, setSelectedValues] = useState(null) - const [liveValues, setLiveValues] = useState({}) const [{ step, config }, setState] = useState({ step: 1 }) - // TODO forms error handling const isLastStep = step === LAST_STEP - const stepOptions = getStep(step, selectedValues, liveValues) + const stepOptions = getStep(step, selectedValues) const onContinue = async it => { const newConfig = R.merge(config, stepOptions.schema.cast(it)) @@ -116,7 +104,6 @@ const Wizard = ({ onClose, save, error }) => { initialValues={stepOptions.initialValues} validationSchema={stepOptions.schema}>
- - Created with Sketch. diff --git a/new-lamassu-admin/src/styling/icons/button/data/white.svg b/new-lamassu-admin/src/styling/icons/button/data/white.svg index d6410eb2..4e50be4f 100644 --- a/new-lamassu-admin/src/styling/icons/button/data/white.svg +++ b/new-lamassu-admin/src/styling/icons/button/data/white.svg @@ -1,6 +1,5 @@ - icon/button/data/white diff --git a/new-lamassu-admin/src/styling/icons/button/data/zodiac.svg b/new-lamassu-admin/src/styling/icons/button/data/zodiac.svg index ec78d0d6..66e0049c 100644 --- a/new-lamassu-admin/src/styling/icons/button/data/zodiac.svg +++ b/new-lamassu-admin/src/styling/icons/button/data/zodiac.svg @@ -1,6 +1,5 @@ - icon/button/data/zodiac diff --git a/new-lamassu-admin/src/styling/icons/button/discount/comet.svg b/new-lamassu-admin/src/styling/icons/button/discount/comet.svg index ac2ab03c..4ad0de56 100644 --- a/new-lamassu-admin/src/styling/icons/button/discount/comet.svg +++ b/new-lamassu-admin/src/styling/icons/button/discount/comet.svg @@ -1,6 +1,5 @@ - icon/button/loyalty/comet diff --git a/new-lamassu-admin/src/styling/icons/button/discount/white.svg b/new-lamassu-admin/src/styling/icons/button/discount/white.svg index 538dc4f6..56d5d8ad 100644 --- a/new-lamassu-admin/src/styling/icons/button/discount/white.svg +++ b/new-lamassu-admin/src/styling/icons/button/discount/white.svg @@ -1,6 +1,5 @@ - icon/button/loyalty/white diff --git a/new-lamassu-admin/src/styling/icons/button/discount/zodiac.svg b/new-lamassu-admin/src/styling/icons/button/discount/zodiac.svg index e7a46dc3..15d095d6 100644 --- a/new-lamassu-admin/src/styling/icons/button/discount/zodiac.svg +++ b/new-lamassu-admin/src/styling/icons/button/discount/zodiac.svg @@ -1,6 +1,5 @@ - icon/button/loyalty/zodiac diff --git a/new-lamassu-admin/src/styling/icons/button/photo/white-resized.svg b/new-lamassu-admin/src/styling/icons/button/photo/white-resized.svg index aac48e3e..fc199166 100644 --- a/new-lamassu-admin/src/styling/icons/button/photo/white-resized.svg +++ b/new-lamassu-admin/src/styling/icons/button/photo/white-resized.svg @@ -1,6 +1,5 @@ - icon/button/photo/white-resized diff --git a/new-lamassu-admin/src/styling/icons/button/photo/zodiac-resized.svg b/new-lamassu-admin/src/styling/icons/button/photo/zodiac-resized.svg index ef919c56..1065bc1f 100644 --- a/new-lamassu-admin/src/styling/icons/button/photo/zodiac-resized.svg +++ b/new-lamassu-admin/src/styling/icons/button/photo/zodiac-resized.svg @@ -1,6 +1,5 @@ - icon/button/photo/zodiac-resized diff --git a/new-lamassu-admin/src/styling/icons/button/replace/white.svg b/new-lamassu-admin/src/styling/icons/button/replace/white.svg index ffdd826b..dd3d3f3c 100644 --- a/new-lamassu-admin/src/styling/icons/button/replace/white.svg +++ b/new-lamassu-admin/src/styling/icons/button/replace/white.svg @@ -1,6 +1,5 @@ - icon/button/replace/white diff --git a/new-lamassu-admin/src/styling/icons/button/replace/zodiac.svg b/new-lamassu-admin/src/styling/icons/button/replace/zodiac.svg index 07c20af3..65d17fb1 100644 --- a/new-lamassu-admin/src/styling/icons/button/replace/zodiac.svg +++ b/new-lamassu-admin/src/styling/icons/button/replace/zodiac.svg @@ -1,6 +1,5 @@ - icon/button/replace/zodiac diff --git a/new-lamassu-admin/src/styling/icons/button/upload-file/white-resized.svg b/new-lamassu-admin/src/styling/icons/button/upload-file/white-resized.svg index 6f12177b..63e43664 100644 --- a/new-lamassu-admin/src/styling/icons/button/upload-file/white-resized.svg +++ b/new-lamassu-admin/src/styling/icons/button/upload-file/white-resized.svg @@ -1,6 +1,5 @@ - icon/button/upload-file/white-resized diff --git a/new-lamassu-admin/src/styling/icons/button/upload-file/white.svg b/new-lamassu-admin/src/styling/icons/button/upload-file/white.svg index bdf4c81d..c59dca65 100644 --- a/new-lamassu-admin/src/styling/icons/button/upload-file/white.svg +++ b/new-lamassu-admin/src/styling/icons/button/upload-file/white.svg @@ -1,6 +1,5 @@ - icon/button/upload-file/white diff --git a/new-lamassu-admin/src/styling/icons/button/upload-file/zodiac-resized.svg b/new-lamassu-admin/src/styling/icons/button/upload-file/zodiac-resized.svg index 97022d63..5d7e61f1 100644 --- a/new-lamassu-admin/src/styling/icons/button/upload-file/zodiac-resized.svg +++ b/new-lamassu-admin/src/styling/icons/button/upload-file/zodiac-resized.svg @@ -1,6 +1,5 @@ - icon/button/upload-file/zodiac-resized diff --git a/new-lamassu-admin/src/styling/icons/button/upload-file/zodiac.svg b/new-lamassu-admin/src/styling/icons/button/upload-file/zodiac.svg index 4d091e39..26bab67b 100644 --- a/new-lamassu-admin/src/styling/icons/button/upload-file/zodiac.svg +++ b/new-lamassu-admin/src/styling/icons/button/upload-file/zodiac.svg @@ -1,6 +1,5 @@ - icon/button/upload-file/zodiac diff --git a/new-lamassu-admin/src/styling/icons/circle buttons/customer-list-view/white.svg b/new-lamassu-admin/src/styling/icons/circle buttons/customer-list-view/white.svg index f9188caa..c610ebf5 100644 --- a/new-lamassu-admin/src/styling/icons/circle buttons/customer-list-view/white.svg +++ b/new-lamassu-admin/src/styling/icons/circle buttons/customer-list-view/white.svg @@ -1,6 +1,5 @@ - icon/sf-small/listing/white diff --git a/new-lamassu-admin/src/styling/icons/circle buttons/customer-list-view/zodiac.svg b/new-lamassu-admin/src/styling/icons/circle buttons/customer-list-view/zodiac.svg index b8aa5902..6e07620e 100644 --- a/new-lamassu-admin/src/styling/icons/circle buttons/customer-list-view/zodiac.svg +++ b/new-lamassu-admin/src/styling/icons/circle buttons/customer-list-view/zodiac.svg @@ -1,6 +1,5 @@ - icon/sf-small/listing/zodiac diff --git a/new-lamassu-admin/src/styling/icons/circle buttons/overview/comet.svg b/new-lamassu-admin/src/styling/icons/circle buttons/overview/comet.svg index 46a0342c..2ab2ffd7 100644 --- a/new-lamassu-admin/src/styling/icons/circle buttons/overview/comet.svg +++ b/new-lamassu-admin/src/styling/icons/circle buttons/overview/comet.svg @@ -1,6 +1,5 @@ - icon/sf-small/overview/comet diff --git a/new-lamassu-admin/src/styling/icons/circle buttons/overview/white.svg b/new-lamassu-admin/src/styling/icons/circle buttons/overview/white.svg index 3af8ca54..aa7c2af6 100644 --- a/new-lamassu-admin/src/styling/icons/circle buttons/overview/white.svg +++ b/new-lamassu-admin/src/styling/icons/circle buttons/overview/white.svg @@ -1,6 +1,5 @@ - icon/sf-small/overview/white diff --git a/new-lamassu-admin/src/styling/icons/circle buttons/overview/zodiac.svg b/new-lamassu-admin/src/styling/icons/circle buttons/overview/zodiac.svg index 112c8d25..db0c70ec 100644 --- a/new-lamassu-admin/src/styling/icons/circle buttons/overview/zodiac.svg +++ b/new-lamassu-admin/src/styling/icons/circle buttons/overview/zodiac.svg @@ -1,6 +1,5 @@ - icon/sf-small/overview/zodiac diff --git a/new-lamassu-admin/src/styling/icons/customer-nav/data/comet.svg b/new-lamassu-admin/src/styling/icons/customer-nav/data/comet.svg index 471c383b..3504ab61 100644 --- a/new-lamassu-admin/src/styling/icons/customer-nav/data/comet.svg +++ b/new-lamassu-admin/src/styling/icons/customer-nav/data/comet.svg @@ -1,6 +1,5 @@ - icon/customer-nav/data/comet diff --git a/new-lamassu-admin/src/styling/icons/customer-nav/data/white.svg b/new-lamassu-admin/src/styling/icons/customer-nav/data/white.svg index 20cf2885..b517414e 100644 --- a/new-lamassu-admin/src/styling/icons/customer-nav/data/white.svg +++ b/new-lamassu-admin/src/styling/icons/customer-nav/data/white.svg @@ -1,6 +1,5 @@ - icon/customer-nav/data/white diff --git a/new-lamassu-admin/src/styling/icons/customer-nav/data/zodiac.svg b/new-lamassu-admin/src/styling/icons/customer-nav/data/zodiac.svg index ffc069f2..735c8741 100644 --- a/new-lamassu-admin/src/styling/icons/customer-nav/data/zodiac.svg +++ b/new-lamassu-admin/src/styling/icons/customer-nav/data/zodiac.svg @@ -1,6 +1,5 @@ - icon/customer-nav/data/zodiac diff --git a/new-lamassu-admin/src/styling/icons/customer-nav/overview/comet.svg b/new-lamassu-admin/src/styling/icons/customer-nav/overview/comet.svg index c0ef3b45..8bb25dc1 100644 --- a/new-lamassu-admin/src/styling/icons/customer-nav/overview/comet.svg +++ b/new-lamassu-admin/src/styling/icons/customer-nav/overview/comet.svg @@ -1,6 +1,5 @@ - icon/customer-nav/overview/comet diff --git a/new-lamassu-admin/src/styling/icons/customer-nav/overview/white.svg b/new-lamassu-admin/src/styling/icons/customer-nav/overview/white.svg index 87c8dc82..77d347eb 100644 --- a/new-lamassu-admin/src/styling/icons/customer-nav/overview/white.svg +++ b/new-lamassu-admin/src/styling/icons/customer-nav/overview/white.svg @@ -1,6 +1,5 @@ - icon/customer-nav/overview/white diff --git a/new-lamassu-admin/src/styling/icons/customer-nav/overview/zodiac.svg b/new-lamassu-admin/src/styling/icons/customer-nav/overview/zodiac.svg index 9e2819a5..b0d4319a 100644 --- a/new-lamassu-admin/src/styling/icons/customer-nav/overview/zodiac.svg +++ b/new-lamassu-admin/src/styling/icons/customer-nav/overview/zodiac.svg @@ -1,6 +1,5 @@ - icon/customer-nav/overview/zodiac diff --git a/new-lamassu-admin/src/styling/icons/file/comet.svg b/new-lamassu-admin/src/styling/icons/file/comet.svg index 231d341b..86dc1d0d 100644 --- a/new-lamassu-admin/src/styling/icons/file/comet.svg +++ b/new-lamassu-admin/src/styling/icons/file/comet.svg @@ -1,6 +1,5 @@ - icon/file/zip/comet diff --git a/new-lamassu-admin/src/styling/icons/file/spring.svg b/new-lamassu-admin/src/styling/icons/file/spring.svg index d8650af5..26d73281 100644 --- a/new-lamassu-admin/src/styling/icons/file/spring.svg +++ b/new-lamassu-admin/src/styling/icons/file/spring.svg @@ -1,6 +1,5 @@ - icon/file/zip/spring diff --git a/new-lamassu-admin/src/styling/icons/file/tomato.svg b/new-lamassu-admin/src/styling/icons/file/tomato.svg index 0a7733b0..f7cae5ad 100644 --- a/new-lamassu-admin/src/styling/icons/file/tomato.svg +++ b/new-lamassu-admin/src/styling/icons/file/tomato.svg @@ -1,6 +1,5 @@ - icon/file/zip/tomato