From 7b59e36cb4e27e5934a8c24aea2c812555e07f78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20F=C3=A9lix?= <5789328+lcsfelix@users.noreply.github.com> Date: Wed, 15 Jan 2020 22:41:47 +0000 Subject: [PATCH] feat: add operator info page feat: save/load operator info feat: add formik switch component feat: add input validation fix: correct formik switch behaviour fix: change infoCardEnabled to a radio input style: move styles out of js feat: add error feedback --- .../src/components/ErrorMessage.js | 41 +++ .../src/components/inputs/base/RadioGroup.js | 6 +- .../src/components/inputs/base/index.js | 4 +- .../inputs/formik/PhoneNumberInput.js | 5 +- .../components/inputs/formik/RadioGroup.js | 42 +++ .../src/pages/OperatorInfo/ContactInfo.js | 304 ++++++++++++++++++ .../src/pages/OperatorInfo/OperatorInfo.js | 58 ++++ .../pages/OperatorInfo/OperatorInfo.styles.js | 54 ++++ new-lamassu-admin/src/routing/routes.js | 5 +- .../src/styling/icons/action/edit/enabled.svg | 15 +- 10 files changed, 516 insertions(+), 18 deletions(-) create mode 100644 new-lamassu-admin/src/components/ErrorMessage.js create mode 100644 new-lamassu-admin/src/components/inputs/formik/RadioGroup.js create mode 100644 new-lamassu-admin/src/pages/OperatorInfo/ContactInfo.js create mode 100644 new-lamassu-admin/src/pages/OperatorInfo/OperatorInfo.js create mode 100644 new-lamassu-admin/src/pages/OperatorInfo/OperatorInfo.styles.js diff --git a/new-lamassu-admin/src/components/ErrorMessage.js b/new-lamassu-admin/src/components/ErrorMessage.js new file mode 100644 index 00000000..2d95bbb4 --- /dev/null +++ b/new-lamassu-admin/src/components/ErrorMessage.js @@ -0,0 +1,41 @@ +import React from 'react' +import classnames from 'classnames' +import { makeStyles } from '@material-ui/core' + +import { ReactComponent as ErrorIcon } from 'src/styling/icons/warning-icon/tomato.svg' +import { errorColor } from 'src/styling/variables' + +import { Info3 } from './typography' + +const styles = { + wrapper: { + display: 'flex', + alignItems: 'center', + '& > svg': { + marginRight: 10 + } + }, + message: { + display: 'flex', + alignItems: 'center', + color: errorColor, + margin: 0, + whiteSpace: 'break-spaces', + width: 250 + } +} + +const useStyles = makeStyles(styles) + +const ErrorMessage = ({ className, children, ...props }) => { + const classes = useStyles() + + return ( +
+ + {children} +
+ ) +} + +export default ErrorMessage diff --git a/new-lamassu-admin/src/components/inputs/base/RadioGroup.js b/new-lamassu-admin/src/components/inputs/base/RadioGroup.js index ded7fbe9..a6953dd9 100644 --- a/new-lamassu-admin/src/components/inputs/base/RadioGroup.js +++ b/new-lamassu-admin/src/components/inputs/base/RadioGroup.js @@ -48,12 +48,12 @@ const RadioGroup = ({ value={value} onChange={onChange} className={classnames(className)}> - {options.map((options, idx) => ( + {options.map((option, idx) => (