Merge branch 'develop' into 'main'

 add picture modify

See merge request !11

backend/routes/auth.js

@@ -105,6 +105,7 @@ router.post('/me/update', passport.authenticate('jwt', {session: false}), async
     const date_birth = req.body.date_birth;
     const oldPassword = req.body.oldpassword;
     const newPassword = req.body.password;
+    const newPicture= req.body.picture;
 
     if (!firstname && !lastname && !email && !date_birth && !passport)
         return res.status(200);
@@ -135,6 +136,8 @@ router.post('/me/update', passport.authenticate('jwt', {session: false}), async
         dbUser.email = email;
     if (date_birth)
         dbUser.date_birth = date_birth;
+    if (newPicture)
+        dbUser.picture = newPicture;
 
     try {
         await dbUser.save();

frontend/src/containers/Profile.container.js

@@ -150,6 +150,15 @@ export class Profile extends React.Component {
                 />
               </Form.Group>
             }
+             <Form.Group controlId="picture">
+              <Form.Label>Avatar</Form.Label>
+              <Form.Control
+                defaultValue={this.props.state.me.picture}
+                onChange={this.handleChange}
+                type="text"
+                readOnly={this.state.readOnly}
+              />
+            </Form.Group>
             { !this.state.readOnly &&
               <Button
                 block