fix: update

Desc : update project

Project/Backend/Server_Node/controllers/userProgress.controller.js

@@ -6,15 +6,14 @@ export const subscribeCurriculum = async (req, res) => {
 
     try {
         // Check if the user is already subscribed to the curriculum
-        const userProgress = await UserProgress.findOne({ userId });
+        let userProgress = await UserProgress.findOne({ userId });
 
         if (!userProgress) {
             // If there is no user progress record for this user, create a new one
-            const newUserProgress = new UserProgress({
+            userProgress = new UserProgress({
                 userId,
                 curriculums: [curriculum],
             });
-            await newUserProgress.save();
         } else {
             // If there is an existing user progress record, check if the curriculum already exists
             const existingCurriculumIndex = userProgress.curriculums.findIndex(c => c.curriculumCode === curriculum.curriculumCode);
@@ -37,7 +36,7 @@ export const subscribeCurriculum = async (req, res) => {
         userProgress.totalCurriculumsMarks = totalCurriculumsMarks;
 
         const curriculumCode = curriculum.curriculumCode
-        
+
         // Now, update the curriculum collection with the subscribed user
         await Curriculum.updateOne(
             { curriculumCode },

Project/Frontend/SignConnectPlus/src/pages/learning-management/learning-curriculums/list/list.tsx

@@ -47,6 +47,7 @@ const allColumns = [
 const List = () => {
     const dispatch = useDispatch();
     const { curriculums, error, success, isLoading } = useSelector(state => state.curriculum);
+    const { success: userProgressSuccess } = useSelector(state => state.userProgress);
 
     const [data, setData] = useState<curriculumType[]>([])
 
@@ -83,7 +84,7 @@ const List = () => {
         setPage(p);
         _DATA.jump(p);
     };
- 
+
 
     /**
      * API Config 
@@ -91,7 +92,7 @@ const List = () => {
      */
     useEffect(() => {
         dispatch(fetchCurriculums());
-    }, [dispatch]);
+    }, [dispatch, userProgressSuccess]);
 
     useEffect(() => {
         setData(curriculums);

Project/Frontend/SignConnectPlus/src/sections/learning-management/learning-curriculums/CurriculumCard.tsx

@@ -15,7 +15,7 @@ import {
 import MainCard from 'components/MainCard';
 
 // assets
-import { PlusOutlined, SendOutlined } from '@ant-design/icons';
+import { MinusOutlined, PlusOutlined, SendOutlined } from '@ant-design/icons';
 import AnimateButton from 'components/@extended/AnimateButton';
 import useAuth from 'hooks/useAuth';
 import { useDispatch, useSelector } from 'store';
@@ -46,13 +46,14 @@ const CurriculumCard = ({ curriculum }: { curriculum: curriculumType }) => {
 
   const [desc, setDesc] = useState(curriculum.curriculumDescription?.slice(0, 100))
   const [readMore, setReadMore] = useState(false)
+  const [isSubscribed, setIsSubscribed] = useState(false)
 
   /**
    * API Config 
    * User Progress API
    */
 
-  const FollowCurriculum = () => { 
+  const FollowCurriculum = () => {
     if (!user) {
       // User is missing
       dispatch(
@@ -97,7 +98,7 @@ const CurriculumCard = ({ curriculum }: { curriculum: curriculumType }) => {
       dispatch(addUserProgress(user.id, curriculum));
     }
   }
-  
+
   //  handel error 
   useEffect(() => {
     if (error != null) {
@@ -135,6 +136,20 @@ const CurriculumCard = ({ curriculum }: { curriculum: curriculumType }) => {
     }
   }, [success])
 
+  useEffect(() => {
+    if (curriculum.subscribedUser) {
+      const userId = user?.id; // Assuming user.id is how you get the user's ID
+      const isUserSubscribed = curriculum.subscribedUser.includes(userId!);
+
+      if (isUserSubscribed) {
+        setIsSubscribed(true)
+      }
+    }
+  }, [curriculum, user]);
+
+
+
+
   return (
     <>
       <Animation
@@ -168,27 +183,33 @@ const CurriculumCard = ({ curriculum }: { curriculum: curriculumType }) => {
               </Typography>
             </Grid>
             <Grid item xs={6}>
-              <Box sx={{ display: 'inline-block' }}>
+              <Box sx={{ display: 'inline-block', width: "100%" }}>
                 <AnimateButton>
                   <Button
                     fullWidth
+                    size='small'
                     variant="outlined"
-                    endIcon={<PlusOutlined />}
+                    endIcon={isSubscribed ? <MinusOutlined /> : <PlusOutlined />}
                     sx={{ my: 2, width: "100%" }}
-                    onClick={FollowCurriculum}
-                    color='success'
+                    onClick={() => {
+                      if (!isSubscribed) {
+                        FollowCurriculum()
+                      }
+                    }}
+                    color={isSubscribed ? 'secondary' : 'success'}
                     disabled={isLoading}
                   >
-                    {isLoading ? <CircularProgress /> : 'Follow Curriculum'}
+                    {isLoading ? <CircularProgress /> : <>{isSubscribed ? 'Un Follow Curriculum' : 'Follow Curriculum'} </>}
                   </Button>
                 </AnimateButton>
               </Box>
             </Grid>
             <Grid item xs={6}>
-              <Box sx={{ display: 'inline-block' }}>
+              <Box sx={{ display: 'inline-block', width: "100%" }}>
                 <AnimateButton>
                   <Button
                     fullWidth
+                    size='small'
                     variant="outlined"
                     endIcon={<SendOutlined />}
                     sx={{ my: 2, width: "100%" }}

Project/Frontend/SignConnectPlus/src/types/curriculum.ts

@@ -14,7 +14,7 @@ export interface curriculumType {
     createdAt?: Date
     updatedBy?: string
     updatedAt?: Date
-    subscribedUser?: any[]
+    subscribedUser?: string[]
 }
 
 export type Curriculum = {