diff --git a/api/src/graphql/users.sdl.js b/api/src/graphql/users.sdl.js index 52c3411..366075d 100644 --- a/api/src/graphql/users.sdl.js +++ b/api/src/graphql/users.sdl.js @@ -15,14 +15,14 @@ export const schema = gql` input CreateUserInput { email: String! - issuer: String! + # issuer: String! image: String bio: String } input UpdateUserInput { email: String - issuer: String + # issuer: String image: String bio: String } diff --git a/web/src/components/PartForm/ImageUploader.js b/web/src/components/PartForm/ImageUploader.js index b88023e..0314a13 100644 --- a/web/src/components/PartForm/ImageUploader.js +++ b/web/src/components/PartForm/ImageUploader.js @@ -117,3 +117,4 @@ function getCroppedImg(image, crop, fileName) { }, 'image/jpeg', 1); }); } + diff --git a/web/src/components/User/User.js b/web/src/components/User/User.js index 2b50035..bc23faf 100644 --- a/web/src/components/User/User.js +++ b/web/src/components/User/User.js @@ -1,6 +1,6 @@ import { useMutation, useFlash } from '@redwoodjs/web' import { Link, routes, navigate } from '@redwoodjs/router' - +import { Image as CloudinaryImage } from 'cloudinary-react' const DELETE_USER_MUTATION = gql` mutation DeleteUserMutation($id: Int!) { deleteUser(id: $id) { @@ -72,7 +72,13 @@ const User = ({ user }) => { Image - {user.image} + Bio diff --git a/web/src/components/UserForm/UserForm.js b/web/src/components/UserForm/UserForm.js index 2527758..fdc74c2 100644 --- a/web/src/components/UserForm/UserForm.js +++ b/web/src/components/UserForm/UserForm.js @@ -6,10 +6,21 @@ import { TextField, Submit, } from '@redwoodjs/forms' - +import { useState } from 'react'; +import { navigate, routes } from '@redwoodjs/router' +import { useFlash } from '@redwoodjs/web' +import ImageUploader from '../PartForm/ImageUploader' const UserForm = (props) => { - const onSubmit = (data) => { - props.onSave(data, props?.user?.id) + const { addMessage } = useFlash() + // const [bio, setBio] = useState(props?.user?.bio) + const [imageUrl, setImageUrl] = useState(props?.user?.image) + const onSubmit = async (data, e) => { + + await props.onSave({ + ...data, + image: imageUrl + }, props?.user?.id) + addMessage('User updated.', { classes: 'rw-flash-success' }) } return ( @@ -37,21 +48,7 @@ const UserForm = (props) => { validation={{ required: true }} /> - - - - + setImageUrl(cloudinaryPublicId)} />