fix: rebase fixes
This commit is contained in:
parent
20370fcd1d
commit
53e37e2850
1 changed files with 4 additions and 1 deletions
|
|
@ -1,6 +1,7 @@
|
||||||
import { useMutation, useQuery } from '@apollo/react-hooks'
|
import { useMutation, useQuery } from '@apollo/react-hooks'
|
||||||
import { Dialog, DialogContent, SvgIcon, IconButton } from '@material-ui/core'
|
import { Dialog, DialogContent, SvgIcon, IconButton } from '@material-ui/core'
|
||||||
import { makeStyles } from '@material-ui/core/styles'
|
import { makeStyles } from '@material-ui/core/styles'
|
||||||
|
import classnames from 'classnames'
|
||||||
import { Form, Formik, FastField } from 'formik'
|
import { Form, Formik, FastField } from 'formik'
|
||||||
import gql from 'graphql-tag'
|
import gql from 'graphql-tag'
|
||||||
import QRCode from 'qrcode.react'
|
import QRCode from 'qrcode.react'
|
||||||
|
|
@ -14,6 +15,9 @@ import { TextInput } from 'src/components/inputs/formik'
|
||||||
import Sidebar from 'src/components/layout/Sidebar'
|
import Sidebar from 'src/components/layout/Sidebar'
|
||||||
import { Info2, P } from 'src/components/typography'
|
import { Info2, P } from 'src/components/typography'
|
||||||
import { ReactComponent as CloseIcon } from 'src/styling/icons/action/close/zodiac.svg'
|
import { ReactComponent as CloseIcon } from 'src/styling/icons/action/close/zodiac.svg'
|
||||||
|
import { ReactComponent as CompleteStageIconZodiac } from 'src/styling/icons/stage/zodiac/complete.svg'
|
||||||
|
import { ReactComponent as CurrentStageIconZodiac } from 'src/styling/icons/stage/zodiac/current.svg'
|
||||||
|
import { ReactComponent as EmptyStageIconZodiac } from 'src/styling/icons/stage/zodiac/empty.svg'
|
||||||
import { ReactComponent as WarningIcon } from 'src/styling/icons/warning-icon/comet.svg'
|
import { ReactComponent as WarningIcon } from 'src/styling/icons/warning-icon/comet.svg'
|
||||||
import { primaryColor } from 'src/styling/variables'
|
import { primaryColor } from 'src/styling/variables'
|
||||||
|
|
||||||
|
|
@ -83,7 +87,6 @@ const validationSchema = Yup.object().shape({
|
||||||
const MachineNameComponent = ({ nextStep, classes, setQrCode, setName }) => {
|
const MachineNameComponent = ({ nextStep, classes, setQrCode, setName }) => {
|
||||||
const [register] = useMutation(SAVE_CONFIG, {
|
const [register] = useMutation(SAVE_CONFIG, {
|
||||||
onCompleted: ({ createPairingTotem }) => {
|
onCompleted: ({ createPairingTotem }) => {
|
||||||
console.log(createPairingTotem)
|
|
||||||
setQrCode(createPairingTotem)
|
setQrCode(createPairingTotem)
|
||||||
nextStep()
|
nextStep()
|
||||||
},
|
},
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue