Merge remote-tracking branch 'origin/main' into Rejig-database-schema

2020-11-01 12:54:20 +11:00
parent fa0f42d88b a5ee65d9fd
commit e11593a794
8 changed files with 35 additions and 25 deletions
--- 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
  }
--- a/web/public/favi2.jpg
+++ b/web/public/favi2.jpg
--- 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);
  });
 }
+
--- 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 }) => {
            </tr>
            <tr>
              <th>Image</th>
-              <td>{user.image}</td>
+              <td><CloudinaryImage
+                  className="object-cover w-full rounded shadow"
+                  cloudName="irevdev"
+                  publicId={user.image}
+                  width="300"
+                  crop="scale"
+                /></td>
            </tr>
            <tr>
              <th>Bio</th>
--- 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 }}
        />
        <FieldError name="email" className="rw-field-error" />
-
-        <Label
-          name="image"
-          className="rw-label"
-          errorClassName="rw-label rw-label-error"
-        >
-          Image
-        </Label>
-        <TextField
-          name="image"
-          defaultValue={props.user?.image}
-          className="rw-input"
-          errorClassName="rw-input rw-input-error"
-        />
-        <FieldError name="image" className="rw-field-error" />
+        <ImageUploader onImageUpload={({cloudinaryPublicId}) => setImageUrl(cloudinaryPublicId)} />

        <Label
          name="bio"
@@ -65,6 +62,7 @@ const UserForm = (props) => {
          defaultValue={props.user?.bio}
          className="rw-input"
          errorClassName="rw-input rw-input-error"
+          validation={{ required: true }}
        />
        <FieldError name="bio" className="rw-field-error" />

--- a/web/src/index.html
+++ b/web/src/index.html
@@ -3,8 +3,10 @@
  <head>
    <meta charset="UTF-8" />
    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <link rel="icon" type="image/png" href="/favicon.png" />
-    <title>CadHub</title>
+
+    <link rel="icon" type="image/png" href="/favi2.jpg" />
+    <title><%= htmlWebpackPlugin.options.title %></title>
+
    <script>
      // Install Cascade Studio as a Progressive Web App for Offline Access
      // This needs to be put before ANY HTTP Requests are made, so it can cache them.
--- a/web/src/layouts/MainLayout/Logo_2.jpg
+++ b/web/src/layouts/MainLayout/Logo_2.jpg
--- a/web/src/layouts/MainLayout/MainLayout.js
+++ b/web/src/layouts/MainLayout/MainLayout.js
@@ -5,6 +5,7 @@ import Tooltip from '@material-ui/core/Tooltip';

 import avatar from 'src/assets/harold.jpg'
 import Svg from 'src/components/Svg'
+import logo from 'src/layouts/MainLayout/Logo_2.jpg'

 const MainLayout = ({ children }) => {
  const { logIn, logOut, isAuthenticated } = useAuth()
@@ -16,7 +17,9 @@ const MainLayout = ({ children }) => {
            <li>
              <Link to={routes.home()}>
                <Tooltip title="We need a logo!" >
-                  <div className="h-10 w-10 bg-indigo-500 rounded-full" data-tip="hello world" data-place="bottom"></div>
+
+                <img src={logo} style={{marginLeft : '50px'}}/>            
+
                </Tooltip>
              </Link>
            </li>