🍀 update functionality for Admin profile (#931)

* update functionality for Admin profile * update functionality for Admin profile * update functionality admin page * update functionality admin page * #update functionality admin page * #update functionality admin page * #update functionality admin page * update admin api fix
HITK-TECH-Community · May 22, 2024 · 9c7e4b9 · 9c7e4b9
1 parent 03ab618
commit 9c7e4b9
Show file tree

Hide file tree

Showing 8 changed files with 290 additions and 33 deletions.
diff --git a/backend/app/models/Admin.js b/backend/app/models/Admin.js
@@ -33,6 +33,10 @@ const adminSchema = new Schema(
       trim: true,
       unique: true,
     },
+    image: {
+      type: String,
+      trim: true,
+    },
   },
   { timestamps: { createdAt: 'createdAt', updatedAt: 'updatedAt' } }
 );

diff --git a/backend/app/routes/admin/getAdmins.js b/backend/app/routes/admin/getAdmins.js
@@ -15,6 +15,7 @@ const getAdminsAggregate = (match, page) => {
         email: 1,
         contact: 1,
         isSuperAdmin: 1,
+        image:1
       },
     },
     { $skip: constants.PAGINATION_LIMIT.GET_ADMINS * (Number(page) - 1) },

diff --git a/backend/app/routes/admin/index.js b/backend/app/routes/admin/index.js
@@ -1,7 +1,9 @@
 const router = require('express').Router({ mergeParams: true });
+const multer = require('multer');
+const { nanoid } = require('nanoid');
+const path = require('path');
 const validationMiddleware = require('../../../helpers/middlewares/validation');
 const { authMiddleware } = require('../../../helpers/middlewares/auth');
-
 const {
   postSuperAdminSchema,
   getAdminsSchema,
@@ -23,6 +25,17 @@ const resetPassword = require('./resetPassword');
 const updateAdmin = require('./updateAdmin');
 const deleteAdmin = require('./deleteAdmin');
 
+
+
+const store = multer.diskStorage({
+  destination: 'uploads/Admin/',
+  filename: (req, file, cb) => {
+    const uniqueFilename = nanoid() + path.extname(file.originalname);
+    cb(null, uniqueFilename);
+  },
+});
+const upload = multer({ storage: store });
+
 router.get('/', validationMiddleware(getAdminsSchema, 'query'), authMiddleware, getAdmins);
 router.get('/createSuperAdmin', createSuperAdmin);
 
@@ -33,7 +46,7 @@ router.post('/forgotpassword', validationMiddleware(forgotPasswordSchema), forgo
 router.post('/resetpassword/:token', validationMiddleware(resetPasswordSchema), resetPassword);
 
 router.put('/password', validationMiddleware(passwordChangeSchema), authMiddleware, changePassword);
-router.put('/:id/:token', validationMiddleware(updateAdminSchema), updateAdmin);
+router.put('/:id/:token', validationMiddleware(updateAdminSchema),upload.single('image') ,updateAdmin);
 
 router.delete('/deleteAdmin', validationMiddleware(deleteAdminSchema), authMiddleware, deleteAdmin);
 

diff --git a/backend/app/routes/admin/updateAdmin.js b/backend/app/routes/admin/updateAdmin.js
@@ -1,18 +1,42 @@
 const Admin = require('../../models/Admin');
+const fs = require('fs');
+const path = require('path');
 
 module.exports =async (req, res) => {
+   const admin = await Admin.findById(req.params.id);
 
+    if (!admin) {
+      return res.status(404).json({ error: 'Admin not found' });
+    }
+
+   // Delete previous image if it exists
+    if (admin.image && admin.image!=="undefined" && req.file?.path) {
+      if (fs.existsSync(path.join(__dirname,'..' ,'..','..', admin.image))) {
+        fs.unlinkSync(path.join(__dirname,'..' ,'..','..', admin.image)); 
+      }
+    }
+
     try {
-        const updatedAdmin = await Admin.findByIdAndUpdate(
-          req.params.id,
-          {
-            $set: req.body,
-          },
-          { new: true }
-        );
-        res.status(200).json(updatedAdmin);
+      const updateFields = {
+            firstName:req.body.firstName,
+            lastName:req.body.lastName,
+            contact:req.body.contact,
+            username:req.body.username
+          };
+    if (req.file?.path) {
+      updateFields.image = req.file.path;
+    }else{
+      updateFields.image = admin.image;
+    }
+    const updatedAdmin = await Admin.findByIdAndUpdate(
+      req.params.id,
+      { $set: updateFields },
+      { new: true }
+    );
+      return  res.status(200).json({"Req.Body":updateFields,"updatedDoc":updatedAdmin});
       } catch (err) {
-        res.status(500).json(err);
+      return res.status(500).json(err);
       }
+
   res.send('Done');
 };
diff --git a/frontend/src/pages/Admin/Admin.jsx b/frontend/src/pages/Admin/Admin.jsx
@@ -33,12 +33,13 @@ export const Admin = (props) => {
   const toggleNav = () => setIsMenuOpen(!isMenuOpen);
   const closeMobileMenu = () => setIsMenuOpen(false);
   const dispatch = useDispatch();
-  const firstName = localStorage.getItem("firstName");
+  const [update,setUpdate]=useState(true);
   const [qId,setQId] = useState("")
   const [adminData, setAdminData] = useState({});
+  const [image,setImage]=useState('./images/admin.png');
   const FetchAdminData = async () => {
     try {
-      const baseUrl = `${END_POINT}/admin`;
+      const baseUrl = `${END_POINT}/admin/`;
       const params = {
         type: "self",
         email: localStorage.getItem("email"),
@@ -47,8 +48,18 @@ export const Admin = (props) => {
         "Content-Type": "application/json",
         Authorization: `Bearer ${localStorage.getItem("token")}`,
       };
-      // Make the GET request using Axios
+
       const response = await axios.get(baseUrl, { params, headers });
+      let formattedPath = response.data[0].image?.replace(/\\/g, "/");
+      if (formattedPath?.startsWith("uploads/")) {
+        formattedPath = formattedPath.replace("uploads/", "");
+        if (formattedPath && formattedPath !=="undefined") {
+          formattedPath = `${END_POINT}/${formattedPath}`;
+        }
+      }
+      if(formattedPath!=="undefined" && formattedPath){
+          setImage(formattedPath);
+        }
       setAdminData(response.data[0]);
     } catch (error) {
       console.error("There was a problem with the fetch operation:", error);
@@ -68,15 +79,15 @@ export const Admin = (props) => {
       logout(dispatch);
     }
     return true;
-  }, [dispatch]);
+  }, [dispatch,update]);
 
   return (
     <div style={{ minHeight: "100vh" }}>
       <div className={style["dashing"]}>
         <div className={style["left"]}>
           <div className={style["welcome-section"]} onClick={() => setTab(0)}>
             <img
-              src="./images/admin.png"
+              src={image}
               className={style["img-admin"]}
               alt="admin_img"
             />
@@ -212,7 +223,7 @@ export const Admin = (props) => {
         </div>
         <div className={style["right"]}>
           {tab === 0 ? (
-            <Profile adminData={adminData} />
+            <Profile adminData={{...adminData,image}} update={()=>{setUpdate(!update)}} />
           ) : tab === 1 ? (
             <Dashboard setTab={setTab} />
           ) : tab === 2 ? (