From 74c017cb1c0cc0c52c4165fc5bf506e6caf4d03e Mon Sep 17 00:00:00 2001
From: Abin <abinth250@gmail.com>
Date: Mon, 24 Jul 2023 14:59:29 +0530
Subject: [PATCH 1/4] image fixed for students enrolled course

---
 .../pages/studentDash/MyCourseCard.tsx        | 17 +++---
 .../adapters/controllers/courseController.ts  | 58 +++++++++++++------
 server/src/app/usecases/course/listCourse.ts  | 46 +++++++++------
 .../src/app/usecases/course/recommendation.ts | 39 ++++++++++---
 .../repositories/courseReposMongoDb.ts        |  4 +-
 5 files changed, 113 insertions(+), 51 deletions(-)

diff --git a/client/src/components/pages/studentDash/MyCourseCard.tsx b/client/src/components/pages/studentDash/MyCourseCard.tsx
index fd25551..87a4959 100644
--- a/client/src/components/pages/studentDash/MyCourseCard.tsx
+++ b/client/src/components/pages/studentDash/MyCourseCard.tsx
@@ -21,7 +21,8 @@ const MyCourseCard: React.FC<CourseInterface> = ({
       <CardHeader shadow={false} floated={false} className='h-48'>
         <img
           src={thumbnailUrl}  
-          className='w-full h-full object-cover transition-transform duration-300 transform hover:scale-105'
+          
+          className='w-full h-30 object-cover transition-transform duration-300 transform hover:scale-105'
         />
       </CardHeader>
       <CardBody>
@@ -29,17 +30,19 @@ const MyCourseCard: React.FC<CourseInterface> = ({
           <Typography color='blue-gray' className='font-medium'>
             {title}
           </Typography>
-          <Typography color='blue-gray' className='font-medium'>
-            {duration} h
+          <Typography color='blue-gray' className='font-medium mr-2'>
+            {duration}w
           </Typography>
         </div>
-        <Typography
+        <p className="text-gray text-sm line-clamp-1">{description}</p>
+
+        {/* <Typography  
           variant='small'
           color='gray'
-          className='font-normal opacity-75'
+          className='opacity-75 text-sm line-clamp-1'
         >
-          {description}
-        </Typography>
+          {description}  
+        </Typography> */}
       </CardBody>
       <CardFooter className='pt-0'>
         <Button
diff --git a/server/src/adapters/controllers/courseController.ts b/server/src/adapters/controllers/courseController.ts
index ce85e1c..8daf171 100644
--- a/server/src/adapters/controllers/courseController.ts
+++ b/server/src/adapters/controllers/courseController.ts
@@ -3,7 +3,10 @@ import asyncHandler from 'express-async-handler';
 import { CourseRepositoryMongoDbInterface } from '../../frameworks/database/mongodb/repositories/courseReposMongoDb';
 import { CourseDbRepositoryInterface } from '../../app/repositories/courseDbRepository';
 import { addCourses } from '../../app/usecases/course/addCourse';
-import { AddCourseInfoInterface, EditCourseInfo } from '../../types/courseInterface';
+import {
+  AddCourseInfoInterface,
+  EditCourseInfo
+} from '../../types/courseInterface';
 import { CustomRequest } from '../../types/customRequest';
 import {
   getAllCourseU,
@@ -71,7 +74,13 @@ const courseController = (
       const course: AddCourseInfoInterface = req.body;
       const files: Express.Multer.File[] = req.files as Express.Multer.File[];
       const instructorId = req.user?.Id;
-      const response = await addCourses(instructorId,course,files,cloudService, dbRepositoryCourse);
+      const response = await addCourses(
+        instructorId,
+        course,
+        files,
+        cloudService,
+        dbRepositoryCourse
+      );
       res.status(200).json({
         status: 'success',
         message:
@@ -86,7 +95,7 @@ const courseController = (
       const course: EditCourseInfo = req.body;
       const files: Express.Multer.File[] = req.files as Express.Multer.File[];
       const instructorId = req.user?.Id;
-      const courseId:string = req.params.courseId
+      const courseId: string = req.params.courseId;
       if (instructorId) {
         course.instructorId = instructorId;
       }
@@ -105,18 +114,17 @@ const courseController = (
           course.introductionVideo = videos[0];
         }
       }
-      const response = await editCourseU(courseId,course, dbRepositoryCourse);
+      const response = await editCourseU(courseId, course, dbRepositoryCourse);
       res.status(200).json({
         status: 'success',
-        message:
-          'Successfully edited the course',
+        message: 'Successfully edited the course',
         data: response
       });
     }
   );
 
   const getAllCourses = asyncHandler(async (req: Request, res: Response) => {
-    const courses = await getAllCourseU(cloudService,dbRepositoryCourse);
+    const courses = await getAllCourseU(cloudService, dbRepositoryCourse);
     res.status(200).json({
       status: 'success',
       message: 'Successfully retrieved all courses',
@@ -127,7 +135,11 @@ const courseController = (
   const getIndividualCourse = asyncHandler(
     async (req: Request, res: Response) => {
       const courseId: string = req.params.courseId;
-      const course = await getCourseByIdU(courseId,cloudService, dbRepositoryCourse);
+      const course = await getCourseByIdU(
+        courseId,
+        cloudService,
+        dbRepositoryCourse
+      );
       res.status(200).json({
         status: 'success',
         message: 'Successfully retrieved the course',
@@ -320,6 +332,7 @@ const courseController = (
       const studentId: string = req.user?.Id ?? '';
       const courses = await getRecommendedCourseByStudentU(
         studentId,
+        cloudService,
         dbRepositoryCourse
       );
       res.status(200).json({
@@ -332,7 +345,10 @@ const courseController = (
 
   const getTrendingCourses = asyncHandler(
     async (req: Request, res: Response) => {
-      const courses = await getTrendingCourseU(dbRepositoryCourse);
+      const courses = await getTrendingCourseU(
+        cloudService,
+        dbRepositoryCourse
+      );
       res.status(200).json({
         status: 'success',
         message: 'Successfully retrieved trending courses',
@@ -341,15 +357,21 @@ const courseController = (
     }
   );
 
-  const getCourseByStudent = asyncHandler(async(req:CustomRequest,res:Response)=>{
-    const studentId:string|undefined = req.user?.Id
-    const courses = await getCourseByStudentU(studentId,dbRepositoryCourse)
-    res.status(200).json({
-      status: 'success',
-      message: 'Successfully retrieved courses based on students',
-      data: courses
-    });
-  })
+  const getCourseByStudent = asyncHandler(
+    async (req: CustomRequest, res: Response) => {
+      const studentId: string | undefined = req.user?.Id;
+      const courses = await getCourseByStudentU(
+        studentId,
+        cloudService,
+        dbRepositoryCourse
+      );
+      res.status(200).json({
+        status: 'success',
+        message: 'Successfully retrieved courses based on students',
+        data: courses
+      });
+    }
+  );
 
   return {
     addCourse,
diff --git a/server/src/app/usecases/course/listCourse.ts b/server/src/app/usecases/course/listCourse.ts
index cb5b57a..20bf399 100644
--- a/server/src/app/usecases/course/listCourse.ts
+++ b/server/src/app/usecases/course/listCourse.ts
@@ -4,17 +4,17 @@ import { CourseDbRepositoryInterface } from '../../repositories/courseDbReposito
 import { CourseInterface } from '@src/types/courseInterface';
 import { CloudServiceInterface } from '@src/app/services/cloudServiceInterface';
 
-
 export const getAllCourseU = async (
   cloudService: ReturnType<CloudServiceInterface>,
   courseDbRepository: ReturnType<CourseDbRepositoryInterface>
 ) => {
-  const courses: CourseInterface[] | null = await courseDbRepository.getAllCourse();
+  const courses: CourseInterface[] | null =
+    await courseDbRepository.getAllCourse();
 
   await Promise.all(
     courses.map(async (course) => {
       if (course.thumbnail) {
-        course.thumbnailUrl = await cloudService.getFile(course.thumbnail.key)
+        course.thumbnailUrl = await cloudService.getFile(course.thumbnail.key);
       }
     })
   );
@@ -32,27 +32,39 @@ export const getCourseByIdU = async (
       HttpStatusCodes.BAD_REQUEST
     );
   }
-  const course:CourseInterface|null = await courseDbRepository.getCourseById(courseId);
-  if(course){
-      if (course.thumbnail) {
-        const thumbnail = await cloudService.getFile(course.thumbnail.key);
-        course.thumbnailUrl = thumbnail;
-      }
-      if(course.guidelines){
-       const guidelines = await cloudService.getFile(course.guidelines.key)
-       course.guidelinesUrl = guidelines
-      }
-    };
-    return course;
+  const course: CourseInterface | null = await courseDbRepository.getCourseById(
+    courseId
+  );
+  if (course) {
+    if (course.thumbnail) {
+      const thumbnail = await cloudService.getFile(course.thumbnail.key);
+      course.thumbnailUrl = thumbnail;
+    }
+    if (course.guidelines) {
+      const guidelines = await cloudService.getFile(course.guidelines.key);
+      course.guidelinesUrl = guidelines;
+    }
   }
+  return course;
+};
 
 export const getCourseByStudentU = async (
   studentId: string | undefined,
+  cloudService: ReturnType<CloudServiceInterface>,
   courseDbRepository: ReturnType<CourseDbRepositoryInterface>
 ) => {
   if (!studentId) {
     throw new AppError('Invalid student id ', HttpStatusCodes.BAD_REQUEST);
   }
-  const course = await courseDbRepository.getCourseByStudent(studentId);
-  return course;
+  const courses = await courseDbRepository.getCourseByStudent(studentId);
+
+  await Promise.all(
+    courses.map(async (course) => {
+      if (course.thumbnail) {
+        course.thumbnailUrl = await cloudService.getFile(course.thumbnail.key);
+      }
+    })
+  );
+  console.log(courses)
+  return courses;
 };
diff --git a/server/src/app/usecases/course/recommendation.ts b/server/src/app/usecases/course/recommendation.ts
index aac3176..cf9b492 100644
--- a/server/src/app/usecases/course/recommendation.ts
+++ b/server/src/app/usecases/course/recommendation.ts
@@ -1,21 +1,46 @@
 import HttpStatusCodes from '../../../constants/HttpStatusCodes';
 import AppError from '../../../utils/appError';
 import { CourseDbRepositoryInterface } from '../../repositories/courseDbRepository';
+import { CloudServiceInterface } from '@src/app/services/cloudServiceInterface';
 
 export const getRecommendedCourseByStudentU = async (
-    studentId:string,
+  studentId: string,
+  cloudService: ReturnType<CloudServiceInterface>,
   courseDbRepository: ReturnType<CourseDbRepositoryInterface>
 ) => {
-    if(!studentId){
-        throw new AppError("Please provide a valid student id ",HttpStatusCodes.BAD_REQUEST)
-    }
-  const courses = await courseDbRepository.getRecommendedCourseByStudentInterest(studentId)
+  if (!studentId) {
+    throw new AppError(
+      'Please provide a valid student id ',
+      HttpStatusCodes.BAD_REQUEST
+    );
+  }
+
+  const courses =
+    await courseDbRepository.getRecommendedCourseByStudentInterest(studentId);
+  await Promise.all(
+    courses.map(async (course) => {
+      if (course.thumbnail) {
+        course.thumbnailUrl = await cloudService.getFile(course.thumbnail.key);
+      }
+    })
+  );
+  console.log(courses)
+
   return courses;
 };
 
 export const getTrendingCourseU = async (
+  cloudService: ReturnType<CloudServiceInterface>,
   courseDbRepository: ReturnType<CourseDbRepositoryInterface>
 ) => {
-  const course = await courseDbRepository.getTrendingCourse()
-  return course;
+  const courses = await courseDbRepository.getTrendingCourse();
+  await Promise.all(
+    courses.map(async (course) => {
+      if (course.thumbnail) {
+        course.thumbnailUrl = await cloudService.getFile(course.thumbnail.key);
+      }
+    })
+  );
+  console.log(courses)
+  return courses;
 };
diff --git a/server/src/frameworks/database/mongodb/repositories/courseReposMongoDb.ts b/server/src/frameworks/database/mongodb/repositories/courseReposMongoDb.ts
index e32df7f..0c4e019 100644
--- a/server/src/frameworks/database/mongodb/repositories/courseReposMongoDb.ts
+++ b/server/src/frameworks/database/mongodb/repositories/courseReposMongoDb.ts
@@ -142,9 +142,9 @@ export const courseRepositoryMongodb = () => {
   };
 
   const getCourseByStudent = async (id: string) => {
-    const courses = await Course.find({
+    const courses:CourseInterface[]|null = await Course.find({
       coursesEnrolled: {
-        $in: [new mongoose.Types.ObjectId('648d8672320950d1ec7454ac')]
+        $in: [new mongoose.Types.ObjectId(id)]
       }
     });
     return courses;

From b6e2e18a978b091ad01b69d07d8052869b8e0e9c Mon Sep 17 00:00:00 2001
From: Abin <abinth250@gmail.com>
Date: Mon, 24 Jul 2023 16:59:21 +0530
Subject: [PATCH 2/4] image issue fixed instructor side

---
 .../api/services/instructorManageService.ts   |  3 +-
 .../apiResponseHomePageListing.ts             |  9 +++-
 .../apiResponses/apiResponseInstructors.ts    |  1 +
 .../addLessons/ListCourseForIstructors.tsx    | 22 ++--------
 .../components/pages/home/RecommendedCard.tsx |  7 ++--
 .../components/pages/home/TrendingCard.tsx    |  5 ++-
 .../pages/instructors/InstructorCard.tsx      | 14 +++----
 .../pages/instructors/MyStudents.tsx          | 16 ++++++--
 .../pages/instructors/ViewInstructor.tsx      | 27 ++++++++----
 .../adapters/controllers/courseController.ts  |  1 +
 .../controllers/instructorController.ts       | 41 ++++++++++++-------
 server/src/app/usecases/course/listCourse.ts  |  1 -
 .../src/app/usecases/course/recommendation.ts | 13 ++++--
 server/src/app/usecases/course/viewCourse.ts  | 11 +++++
 server/src/app/usecases/instructor.ts         | 11 +++++
 .../management/instructorManagement.ts        | 11 +++++
 .../repositories/courseReposMongoDb.ts        | 40 ++++++++++--------
 .../frameworks/webserver/routes/instructor.ts |  2 +-
 18 files changed, 153 insertions(+), 82 deletions(-)

diff --git a/client/src/api/services/instructorManageService.ts b/client/src/api/services/instructorManageService.ts
index 84cf604..8139556 100644
--- a/client/src/api/services/instructorManageService.ts
+++ b/client/src/api/services/instructorManageService.ts
@@ -1,5 +1,6 @@
 import CONSTANTS_COMMON from "../../constants/common";
 import api from "../middlewares/protectedInterceptor";
+import axiosInstance from "../middlewares/interceptor";
 export const getInstructors = async (endpoint: string) => {
   const response = await api.get(
     `${CONSTANTS_COMMON.API_BASE_URL}/${endpoint}`
@@ -69,7 +70,7 @@ export const getBlockedInstructor = async (endpoint: string) => {
 };
 
 export const getIndividualInstructor = async (endpoint:string,instructorId:string)=>{
-  const response = await api.get(
+  const response = await axiosInstance.get(
     `${CONSTANTS_COMMON.API_BASE_URL}/${endpoint}/${instructorId}`
   );
   return response;
diff --git a/client/src/api/types/apiResponses/apiResponseHomePageListing.ts b/client/src/api/types/apiResponses/apiResponseHomePageListing.ts
index 9e88c2b..feadf32 100644
--- a/client/src/api/types/apiResponses/apiResponseHomePageListing.ts
+++ b/client/src/api/types/apiResponses/apiResponseHomePageListing.ts
@@ -1,7 +1,11 @@
 export interface ApiResponseRecommended {
   _id: string
   instructor: Instructor
-  course: Course
+  course: Course,
+  media:{
+    profileUrl:string,
+    thumbnailUrl:string,
+  }
 }
 
 export interface Instructor {
@@ -46,7 +50,8 @@ export interface Course {
   export interface ApiResponseTrending {
     _id: string
     title: string
-    thumbnail: string
+    thumbnailUrl: string;
+    profileUrl:string;
     instructorFirstName: string
     instructorLastName: string
   }
\ No newline at end of file
diff --git a/client/src/api/types/apiResponses/apiResponseInstructors.ts b/client/src/api/types/apiResponses/apiResponseInstructors.ts
index 49d8d3f..7ea47a2 100644
--- a/client/src/api/types/apiResponses/apiResponseInstructors.ts
+++ b/client/src/api/types/apiResponses/apiResponseInstructors.ts
@@ -33,6 +33,7 @@ export interface GetCourseByInstructorInterface {
     title: string
     thumbnail?: string
     introductionVideo?: string
+    thumbnailUrl:string;
     description: string
     category: string
     instructorId: string
diff --git a/client/src/components/pages/addLessons/ListCourseForIstructors.tsx b/client/src/components/pages/addLessons/ListCourseForIstructors.tsx
index 1e73275..0a624c5 100644
--- a/client/src/components/pages/addLessons/ListCourseForIstructors.tsx
+++ b/client/src/components/pages/addLessons/ListCourseForIstructors.tsx
@@ -62,7 +62,7 @@ const ListCourseForInstructors: React.FC = () => {
     goToPage,
     goToPreviousPage,
     goToNextPage,
-  } = usePagination(courses, 5);
+  } = usePagination(courses, 4);
   const searchResult = useSearch(courses, searchQuery);
   const fetData = async () => {
     const response = await getCourseByInstructor();
@@ -151,7 +151,7 @@ const ListCourseForInstructors: React.FC = () => {
                   {
                     _id,
                     title,
-                    thumbnail,
+                    thumbnailUrl,
                     description,
                     category,
                     createdAt,
@@ -168,7 +168,7 @@ const ListCourseForInstructors: React.FC = () => {
                       <tr key={_id}>
                         <td className={classes}>
                           <div className='flex items-center gap-3'>
-                            <Avatar src={thumbnail} alt={"image"} size='sm' />
+                            <Avatar src={thumbnailUrl} alt={"image"} size='sm' />
                             <div className='flex flex-col'>
                               <Typography
                                 variant='small'
@@ -177,14 +177,7 @@ const ListCourseForInstructors: React.FC = () => {
                               >
                                 {title}
                               </Typography>
-                              {/* <Typography
-                                variant='small'
-                                color='blue-gray'
-                                className='font-normal opacity-70'
-                              >
-                                {description}
-                              </Typography> */}
-                            </div>
+                            </div>  
                           </div>
                         </td>
                         <td className={classes}>
@@ -196,13 +189,6 @@ const ListCourseForInstructors: React.FC = () => {
                             >
                               {category}
                             </Typography>
-                            {/* <Typography
-                              variant='small'
-                              color='blue-gray'
-                              className='font-normal opacity-70'
-                            >
-                              {category}
-                            </Typography> */}
                           </div>
                         </td>
                         <td className={classes}>
diff --git a/client/src/components/pages/home/RecommendedCard.tsx b/client/src/components/pages/home/RecommendedCard.tsx
index 63b7080..9589051 100644
--- a/client/src/components/pages/home/RecommendedCard.tsx
+++ b/client/src/components/pages/home/RecommendedCard.tsx
@@ -12,8 +12,9 @@ interface Props {
 }
 
 const RecommendedCard: React.FC<Props> = ({ courseInfo }) => {
-  const { course, instructor } = courseInfo;
-  const imageUrl = course?.thumbnail;
+  const { course, instructor, media } = courseInfo;
+  const imageUrl = media.thumbnailUrl;
+  const profileUrl = media.profileUrl;
   return (
     <Card
       shadow={false}
@@ -44,7 +45,7 @@ const RecommendedCard: React.FC<Props> = ({ courseInfo }) => {
           variant='circular'
           alt='tania andrew'
           className='border-2 border-white'
-          src='https://images.unsplash.com/photo-1633332755192-727a05c4013d?ixlib=rb-1.2.1&ixid=MnwxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8&auto=format&fit=crop&w=1480&q=80'
+          src={profileUrl}
         />
       </CardBody>
     </Card>
diff --git a/client/src/components/pages/home/TrendingCard.tsx b/client/src/components/pages/home/TrendingCard.tsx
index af85100..cd2edd4 100644
--- a/client/src/components/pages/home/TrendingCard.tsx
+++ b/client/src/components/pages/home/TrendingCard.tsx
@@ -12,7 +12,8 @@ interface Props {
 }
 
 const TrendingCard: React.FC<Props> = ({ courseInfo }) => {
-  const imageUrl = courseInfo?.thumbnail;
+  const imageUrl = courseInfo?.thumbnailUrl;
+  const profileUrl = courseInfo.profileUrl
   return (
     <div>
       <Card
@@ -46,7 +47,7 @@ const TrendingCard: React.FC<Props> = ({ courseInfo }) => {
             variant='circular'
             alt='tania andrew'
             className='border-2 border-white'
-            src='https://images.unsplash.com/photo-1633332755192-727a05c4013d?ixlib=rb-1.2.1&ixid=MnwxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8&auto=format&fit=crop&w=1480&q=80'
+            src={profileUrl}
           />
         </CardBody>
       </Card>
diff --git a/client/src/components/pages/instructors/InstructorCard.tsx b/client/src/components/pages/instructors/InstructorCard.tsx
index c6d89b8..98efc29 100644
--- a/client/src/components/pages/instructors/InstructorCard.tsx
+++ b/client/src/components/pages/instructors/InstructorCard.tsx
@@ -14,7 +14,7 @@ const InstructorCard: React.FC<InstructorApiResponse> = ({
   subjects,
   qualification,
   skills,
-  profilePic,
+  profileUrl,
   about,
 }) => {
   return (
@@ -33,14 +33,12 @@ const InstructorCard: React.FC<InstructorApiResponse> = ({
           variant='circular'
           alt='tania andrew'  
           className='border-2 border-white'
-          src={profilePic??"https://images.unsplash.com/photo-1633332755192-727a05c4013d?ixlib=rb-1.2.1&ixid=MnwxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8&auto=format&fit=crop&w=1480&q=80"}
+          src={profileUrl??"https://images.unsplash.com/photo-1633332755192-727a05c4013d?ixlib=rb-1.2.1&ixid=MnwxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8&auto=format&fit=crop&w=1480&q=80"}
         />
         <Typography variant='h5' className='mb-4'>
           {firstName + " " + lastName}
         </Typography>
-        <Typography variant='p' className=''>
-          {about}
-        </Typography>
+        <p className="text-gray pl-2 pr-2  text-md line-clamp-2">{about}</p>
       </CardHeader>
       <CardBody
         className='relative  px-6 md:px-12'
@@ -49,10 +47,10 @@ const InstructorCard: React.FC<InstructorApiResponse> = ({
         <Typography
           variant='h6'
           color='black'
-          className='mb-6 font-medium leading-[1.5]'
+          className='mb-6 text-gray text-md leading-[1.5]'
         >
-          {skills+", "+subjects+", "+qualification},
-        </Typography>
+          {skills+", "+subjects},
+        </Typography>  
       </CardBody>
     </Card>
   );
diff --git a/client/src/components/pages/instructors/MyStudents.tsx b/client/src/components/pages/instructors/MyStudents.tsx
index 21b4339..7b732a3 100644
--- a/client/src/components/pages/instructors/MyStudents.tsx
+++ b/client/src/components/pages/instructors/MyStudents.tsx
@@ -27,12 +27,19 @@ export interface Students {
   email: string;
   mobile: string;
   dateJoined: string;
+  isGoogleUser:boolean;
+  profilePic:{
+    name:string;
+    url:string;
+    id:string
+  }
+  profileUrl:string;
   isBlocked: boolean;
 }
 const TABLE_HEAD = ["Student", "Course", "Status", "Joined"];
 
 const MyStudents: React.FC = () => {
-  const [students, setStudents] = useState([]);
+  const [students, setStudents] = useState<Students[]>([]);
   const ITEMS_PER_PAGE = 5;  
   const {
     currentPage,
@@ -112,7 +119,10 @@ const MyStudents: React.FC = () => {
                     course,
                     mobile,
                     isBlocked,
+                    isGoogleUser,
                     dateJoined,
+                    profileUrl,
+                    profilePic
                   },
                   index
                 ) => {
@@ -126,9 +136,7 @@ const MyStudents: React.FC = () => {
                       <td className={classes}>
                         <div className='flex items-center gap-3'>
                           <Avatar
-                            src={
-                              "https://demos.creative-tim.com/test/corporate-ui-dashboard/assets/img/team-5.jpg"
-                            }
+                            src={isGoogleUser?profilePic?.url:profileUrl}
                             alt={"image"}  
                             size='sm'
                           />
diff --git a/client/src/components/pages/instructors/ViewInstructor.tsx b/client/src/components/pages/instructors/ViewInstructor.tsx
index 1673714..e1ebe2b 100644
--- a/client/src/components/pages/instructors/ViewInstructor.tsx
+++ b/client/src/components/pages/instructors/ViewInstructor.tsx
@@ -47,7 +47,7 @@ const ViewInstructor: React.FC = (props: Props) => {
     fetchInstructor();
   }, []);
   if (isLoading) {
-    return <ViewInstructorShimmer/>
+    return <ViewInstructorShimmer />;
   }
 
   return (
@@ -73,7 +73,7 @@ const ViewInstructor: React.FC = (props: Props) => {
                 <Avatar
                   className='h-32 w-32 mx-auto sm:mt-5'
                   src={
-                    instructor?.profilePic ??
+                    instructor?.profileUrl ??
                     "https://img.freepik.com/free-icon/user_318-159711.jpg"
                   }
                   alt='avatar'
@@ -85,11 +85,24 @@ const ViewInstructor: React.FC = (props: Props) => {
               </div>
             </div>
           </div>
-          <div className='w-full md:w-3/4 p-4 md:pt-14 md:pr-14 pb-14'>
-            <p className='text-sm md:text-base'>{instructor?.about}</p>
-            <p className='text-sm md:text-base'>{instructor?.skills}</p>
-            <p className='text-sm md:text-base'>{instructor?.qualification}</p>
-            <p className='text-sm md:text-base'>{instructor?.experience}</p>
+          <div className='w-full md:w-3/4 p-4 md:pt-14 text-customFontColorBlack  md:pr-14 pb-14'>
+            <h2 className='text-xl font-semibold   mb-4'>About Me</h2>
+            <p className='text-base'>{instructor?.about}</p>
+
+            <div className='mt-8'>
+              <h2 className='text-xl font-semibold mb-2'>Skills</h2>
+              <p className='text-base'>{instructor?.skills}</p>
+            </div>
+
+            <div className='mt-8'>
+              <h2 className='text-xl font-semibold mb-2'>Qualification</h2>
+              <p className='text-base'>{instructor?.qualification}</p>
+            </div>
+
+            <div className='mt-8'>
+              <h2 className='text-xl font-semibold mb-2'>Experience</h2>
+              <p className='text-base'>{instructor?.experience}</p>
+            </div>
           </div>
         </div>
       </div>
diff --git a/server/src/adapters/controllers/courseController.ts b/server/src/adapters/controllers/courseController.ts
index 8daf171..550f7bf 100644
--- a/server/src/adapters/controllers/courseController.ts
+++ b/server/src/adapters/controllers/courseController.ts
@@ -153,6 +153,7 @@ const courseController = (
       const instructorId = req.user?.Id;
       const courses = await getCourseByInstructorU(
         instructorId,
+        cloudService,
         dbRepositoryCourse
       );
       res.status(200).json({
diff --git a/server/src/adapters/controllers/instructorController.ts b/server/src/adapters/controllers/instructorController.ts
index 0e2631a..3ae1ece 100644
--- a/server/src/adapters/controllers/instructorController.ts
+++ b/server/src/adapters/controllers/instructorController.ts
@@ -17,7 +17,11 @@ import { InstructorRepositoryMongoDb } from '../../frameworks/database/mongodb/r
 import { CustomRequest } from '../../types/customRequest';
 import { CloudServiceInterface } from '../../app/services/cloudServiceInterface';
 import { CloudServiceImpl } from '../../frameworks/services/s3CloudService';
-import { changePasswordU, getStudentsForInstructorsU, updateProfileU } from '../../app/usecases/instructor';
+import {
+  changePasswordU,
+  getStudentsForInstructorsU,
+  updateProfileU
+} from '../../app/usecases/instructor';
 import { AuthServiceInterface } from '../../app/services/authServicesInterface';
 import { AuthService } from '../../frameworks/services/authService';
 import { CourseRepositoryMongoDbInterface } from '@src/frameworks/database/mongodb/repositories/courseReposMongoDb';
@@ -27,8 +31,8 @@ const instructorController = (
   authServiceImpl: AuthService,
   instructorDbRepository: InstructorDbInterface,
   instructorDbRepositoryImpl: InstructorRepositoryMongoDb,
-  courseDbRepository:CourseDbRepositoryInterface,
-  courseDbRepositoryImpl:CourseRepositoryMongoDbInterface,
+  courseDbRepository: CourseDbRepositoryInterface,
+  courseDbRepositoryImpl: CourseRepositoryMongoDbInterface,
   emailServiceInterface: SendEmailServiceInterface,
   emailServiceImpl: SendEmailService,
   cloudServiceInterface: CloudServiceInterface,
@@ -38,7 +42,7 @@ const instructorController = (
   const dbRepositoryInstructor = instructorDbRepository(
     instructorDbRepositoryImpl()
   );
-  const dbRepositoryCourse = courseDbRepository(courseDbRepositoryImpl())
+  const dbRepositoryCourse = courseDbRepository(courseDbRepositoryImpl());
   const emailService = emailServiceInterface(emailServiceImpl());
   const cloudService = cloudServiceInterface(cloudServiceImpl());
 
@@ -85,7 +89,10 @@ const instructorController = (
   });
 
   const getAllInstructor = asyncHandler(async (req: Request, res: Response) => {
-    const instructors = await getAllInstructors(dbRepositoryInstructor);
+    const instructors = await getAllInstructors(
+      cloudService,
+      dbRepositoryInstructor
+    );
     res.json({
       status: 'success',
       message: 'Successfully fetched all instructor information',
@@ -192,15 +199,21 @@ const instructorController = (
     }
   );
 
-  const getStudentsForInstructors = asyncHandler(async (req:CustomRequest,res:Response)=>{
-    const instructorId:string|undefined = req.user?.Id
-    const students = await getStudentsForInstructorsU(instructorId,dbRepositoryCourse)
-    res.status(200).json({
-      status: 'success',
-      message: 'Successfully retrieved all students',
-      data: students
-    })
-  })
+  const getStudentsForInstructors = asyncHandler(
+    async (req: CustomRequest, res: Response) => {
+      const instructorId: string | undefined = req.user?.Id;
+      const students = await getStudentsForInstructorsU(
+        instructorId,
+        cloudService,
+        dbRepositoryCourse
+      );
+      res.status(200).json({
+        status: 'success',
+        message: 'Successfully retrieved all students',
+        data: students
+      });
+    }
+  );
 
   return {
     getInstructorRequests,
diff --git a/server/src/app/usecases/course/listCourse.ts b/server/src/app/usecases/course/listCourse.ts
index 20bf399..befc494 100644
--- a/server/src/app/usecases/course/listCourse.ts
+++ b/server/src/app/usecases/course/listCourse.ts
@@ -65,6 +65,5 @@ export const getCourseByStudentU = async (
       }
     })
   );
-  console.log(courses)
   return courses;
 };
diff --git a/server/src/app/usecases/course/recommendation.ts b/server/src/app/usecases/course/recommendation.ts
index cf9b492..a417dd5 100644
--- a/server/src/app/usecases/course/recommendation.ts
+++ b/server/src/app/usecases/course/recommendation.ts
@@ -19,12 +19,15 @@ export const getRecommendedCourseByStudentU = async (
     await courseDbRepository.getRecommendedCourseByStudentInterest(studentId);
   await Promise.all(
     courses.map(async (course) => {
-      if (course.thumbnail) {
-        course.thumbnailUrl = await cloudService.getFile(course.thumbnail.key);
+      course.media={thumbnailUrl:"",profileUrl:""}
+      if (course.course) {
+        course.media.thumbnailUrl = await cloudService.getFile(course.course.thumbnailKey);
+      }
+      if (course.instructor) {
+        course.media.profileUrl = await cloudService.getFile(course.instructor.profileKey);
       }
     })
   );
-  console.log(courses)
 
   return courses;
 };
@@ -39,8 +42,10 @@ export const getTrendingCourseU = async (
       if (course.thumbnail) {
         course.thumbnailUrl = await cloudService.getFile(course.thumbnail.key);
       }
+      if (course.instructorProfile) {
+        course.profileUrl = await cloudService.getFile(course.instructorProfile.key);
+      }
     })
   );
-  console.log(courses)
   return courses;
 };
diff --git a/server/src/app/usecases/course/viewCourse.ts b/server/src/app/usecases/course/viewCourse.ts
index e7c024d..f577e9f 100644
--- a/server/src/app/usecases/course/viewCourse.ts
+++ b/server/src/app/usecases/course/viewCourse.ts
@@ -1,9 +1,11 @@
 import { CourseDbRepositoryInterface } from '../../repositories/courseDbRepository';
 import HttpStatusCodes from '../../../constants/HttpStatusCodes';
 import AppError from '../../../utils/appError';
+import { CloudServiceInterface } from '@src/app/services/cloudServiceInterface';
 
 export const getCourseByInstructorU = async (
   instructorId: string | undefined,
+  cloudService: ReturnType<CloudServiceInterface>,
   courseDbRepository: ReturnType<CourseDbRepositoryInterface>
 ) => {
   if (!instructorId && instructorId !== '') {
@@ -15,5 +17,14 @@ export const getCourseByInstructorU = async (
   const courses = await courseDbRepository.getCourseByInstructorId(
     instructorId
   );
+  await Promise.all(
+    courses.map(async (course) => {
+      if (course.thumbnail) {
+        course.thumbnailUrl = await cloudService.getFile(course.thumbnail.key);
+      }
+    })
+  );
+
+  console.log(courses);
   return courses;
 };
diff --git a/server/src/app/usecases/instructor.ts b/server/src/app/usecases/instructor.ts
index 1d2c15f..cf7ce54 100644
--- a/server/src/app/usecases/instructor.ts
+++ b/server/src/app/usecases/instructor.ts
@@ -71,6 +71,7 @@ export const updateProfileU = async (
 
 export const getStudentsForInstructorsU = async (
   instructorId: string|undefined,
+  cloudService: ReturnType<CloudServiceInterface>,
   courseDbRepository: ReturnType<CourseDbRepositoryInterface>
 ) => {
   if (!instructorId) {
@@ -82,5 +83,15 @@ export const getStudentsForInstructorsU = async (
   const students = await courseDbRepository.getStudentsByCourseForInstructor(
     instructorId
   );
+  console.log(students)
+  await Promise.all(
+    students.map(async (student) => {
+      if (student.profilePic.key) {
+        student.profileUrl = ""
+        student.profileUrl = await cloudService.getFile(student.profilePic.key);
+      }
+    })
+  );
+  console.log(students)
   return students;
 };
diff --git a/server/src/app/usecases/management/instructorManagement.ts b/server/src/app/usecases/management/instructorManagement.ts
index c836b62..5acd551 100644
--- a/server/src/app/usecases/management/instructorManagement.ts
+++ b/server/src/app/usecases/management/instructorManagement.ts
@@ -68,9 +68,19 @@ export const rejectInstructorRequest = async (
 };
 
 export const getAllInstructors = async (
+  cloudService: ReturnType<CloudServiceInterface>,
   instructorRepository: ReturnType<InstructorDbInterface>
 ) => {
   const instructors = await instructorRepository.getAllInstructors();
+  await Promise.all(
+    instructors.map(async (instructor) => {
+      if (instructor.profilePic) {
+        instructor.profileUrl = await cloudService.getFile(
+          instructor.profilePic.key ?? ''
+        );
+      }
+    })
+  );
   return instructors;
 };
 
@@ -126,5 +136,6 @@ export const getInstructorByIdUseCase = async (
   if (instructor) {
     instructor.password = 'no password';
   }
+  console.log(instructor)
   return instructor;
 };
diff --git a/server/src/frameworks/database/mongodb/repositories/courseReposMongoDb.ts b/server/src/frameworks/database/mongodb/repositories/courseReposMongoDb.ts
index 0c4e019..676cb59 100644
--- a/server/src/frameworks/database/mongodb/repositories/courseReposMongoDb.ts
+++ b/server/src/frameworks/database/mongodb/repositories/courseReposMongoDb.ts
@@ -23,12 +23,12 @@ export const courseRepositoryMongodb = () => {
   };
 
   const getAllCourse = async () => {
-    const courses:CourseInterface[]|null = await Course.find({});
+    const courses: CourseInterface[] | null = await Course.find({});
     return courses;
   };
 
   const getCourseById = async (courseId: string) => {
-    const course:CourseInterface|null = await Course.findOne({
+    const course: CourseInterface | null = await Course.findOne({
       _id: new mongoose.Types.ObjectId(courseId)
     });
     return course;
@@ -58,6 +58,7 @@ export const courseRepositoryMongodb = () => {
   };
 
   const getRecommendedCourseByStudentInterest = async (studentId: string) => {
+    console.log(studentId);
     const pipeline = [
       { $match: { _id: new mongoose.Types.ObjectId(studentId) } },
       { $unwind: '$interests' },
@@ -73,8 +74,8 @@ export const courseRepositoryMongodb = () => {
       {
         $lookup: {
           from: 'course',
-          localField: 'category._id',
-          foreignField: 'categoryId',
+          localField: 'category.name',
+          foreignField: 'category',
           as: 'courses'
         }
       },
@@ -97,13 +98,14 @@ export const courseRepositoryMongodb = () => {
           course: {
             _id: '$courses._id',
             name: '$courses.title',
-            thumbnail: '$courses.thumbnail'
+            thumbnailKey: '$courses.thumbnail.key'
           },
           instructor: {
             _id: '$instructor._id',
             firstName: '$instructor.firstName',
             lastName: '$instructor.lastName',
-            email: '$instructor.email'
+            email: '$instructor.email',
+            profileKey: '$instructor.profilePic.key'
           }
         }
       }
@@ -134,7 +136,9 @@ export const courseRepositoryMongodb = () => {
           coursesEnrolled: '$coursesEnrolled',
           thumbnail: '$thumbnail',
           instructorFirstName: { $arrayElemAt: ['$instructor.firstName', 0] },
-          instructorLastName: { $arrayElemAt: ['$instructor.lastName', 0] }
+          instructorLastName: { $arrayElemAt: ['$instructor.lastName', 0] },
+          instructorProfile: { $arrayElemAt: ['$instructor.profilePic', 0] },
+          profileUrl: ''
         }
       }
     ]);
@@ -142,7 +146,7 @@ export const courseRepositoryMongodb = () => {
   };
 
   const getCourseByStudent = async (id: string) => {
-    const courses:CourseInterface[]|null = await Course.find({
+    const courses: CourseInterface[] | null = await Course.find({
       coursesEnrolled: {
         $in: [new mongoose.Types.ObjectId(id)]
       }
@@ -202,15 +206,17 @@ export const courseRepositoryMongodb = () => {
         }
       },
       {
-        $project: {
-          course: '$courseName',
-          firstName: '$student.firstName',
-          lastName: '$student.lastName',
-          email: '$student.email',
-          mobile: '$student.mobile',
-          dateJoined: '$student.dateJoined',
-          isBlocked: '$student.isBlocked',
-          profilePic: '$student.profilePic'
+        $group: {
+          _id: '$student._id',
+          course: { $first: '$courseName' },
+          firstName: { $first: '$student.firstName' },
+          lastName: { $first: '$student.lastName' },
+          email: { $first: '$student.email' },
+          mobile: { $first: '$student.mobile' },
+          dateJoined: { $first: '$student.dateJoined' },
+          isBlocked: { $first: '$student.isBlocked' },
+          profilePic: { $first: '$student.profilePic' },
+          isGoogleUser: { $first: '$student.isGoogleUser' }
         }
       }
     ]);
diff --git a/server/src/frameworks/webserver/routes/instructor.ts b/server/src/frameworks/webserver/routes/instructor.ts
index 844d174..f203f4c 100644
--- a/server/src/frameworks/webserver/routes/instructor.ts
+++ b/server/src/frameworks/webserver/routes/instructor.ts
@@ -54,7 +54,7 @@ const instructorRouter = () => {
 
   router.get(
     '/view-instructor/:instructorId',
-    jwtAuthMiddleware,
+    // jwtAuthMiddleware,
     controller.getInstructorById
   );
 

From 0bd426e8fe4dd6462923fa9420750ecb9e1efc54 Mon Sep 17 00:00:00 2001
From: Abin <abinth250@gmail.com>
Date: Mon, 24 Jul 2023 17:07:21 +0530
Subject: [PATCH 3/4] seperated api to get instructor details

---
 client/src/api/endpoints/instructor.ts        |  5 ++++
 client/src/api/services/instructor.ts         |  7 ++++++
 .../pages/instructors/ProfileForm.tsx         |  7 +++---
 client/src/constants/endpoints.ts             |  3 ++-
 .../controllers/instructorController.ts       | 25 +++++++++++++++----
 .../frameworks/webserver/routes/instructor.ts |  9 ++++---
 6 files changed, 43 insertions(+), 13 deletions(-)

diff --git a/client/src/api/endpoints/instructor.ts b/client/src/api/endpoints/instructor.ts
index 824a4af..f6d87e3 100644
--- a/client/src/api/endpoints/instructor.ts
+++ b/client/src/api/endpoints/instructor.ts
@@ -2,6 +2,7 @@ import {
   updateProfileService,
   changePasswordService,
   getMyStudentsService,
+  getInstructorDetailsService,
 } from "../services/instructor";
 import { PasswordInfo } from "../types/student/student";
 import END_POINTS from "../../constants/endpoints";
@@ -23,3 +24,7 @@ export const updateProfile = (profileInfo: FormData) => {
 export const getMyStudents = () => {
   return getMyStudentsService(END_POINTS.GET_MY_STUDENTS);
 };
+
+export const getInstructorDetails = ()=>{
+  return getInstructorDetailsService(END_POINTS.GET_INSTRUCTOR_DETAILS)
+}
diff --git a/client/src/api/services/instructor.ts b/client/src/api/services/instructor.ts
index a7b3b71..d4b0856 100644
--- a/client/src/api/services/instructor.ts
+++ b/client/src/api/services/instructor.ts
@@ -30,3 +30,10 @@ export const getMyStudentsService = async (endpoint: string) => {
   );
   return response.data;
 };
+
+export const getInstructorDetailsService = async(endpoint:string)=>{
+  const response = await api.get(
+    `${CONSTANTS_COMMON.API_BASE_URL}/${endpoint}`
+  );
+  return response.data;
+}
\ No newline at end of file
diff --git a/client/src/components/pages/instructors/ProfileForm.tsx b/client/src/components/pages/instructors/ProfileForm.tsx
index 73a6980..851d963 100644
--- a/client/src/components/pages/instructors/ProfileForm.tsx
+++ b/client/src/components/pages/instructors/ProfileForm.tsx
@@ -1,10 +1,9 @@
 import { useState, useEffect } from "react";
 import { useFormik } from "formik";
 import { toast } from "react-toastify";
-import { updateProfile } from "../../../api/endpoints/instructor";
+import { getInstructorDetails, updateProfile } from "../../../api/endpoints/instructor";
 import { UpdateProfileInfo } from "../../../api/types/instructor/instructor";
 import { Avatar } from "@material-tailwind/react";
-import { getIndividualInstructors } from "../../../api/endpoints/instructorManagement";
 import { InstructorApiResponse } from "../../../api/types/apiResponses/apiResponseInstructors";
 
 interface Props {
@@ -37,8 +36,8 @@ const ProfileForm: React.FC<Props> = ({ editMode, setEditMode }) => {
   const fetchInstructor = async () => {
     try {
       setProfileLoading(true);
-      const response = await getIndividualInstructors("fromProfile");
-      setInstructor(response?.data?.data);
+      const response = await getInstructorDetails();
+      setInstructor(response?.data);
       setProfileLoading(false);
     } catch (error) {
       setProfileLoading(false);
diff --git a/client/src/constants/endpoints.ts b/client/src/constants/endpoints.ts
index 8517a2d..5304120 100644
--- a/client/src/constants/endpoints.ts
+++ b/client/src/constants/endpoints.ts
@@ -51,6 +51,7 @@ const END_POINTS = {
     GET_GRAPH_DATA_ADMIN:"api/admin/graph-data",
     INSTRUCTOR_CHANGE_PASSWORD:"api/instructors/change-password",
     INSTRUCTOR_UPDATE_PROFILE:"api/instructors/update-profile",
-    GET_MY_STUDENTS:"api/instructors/get-students-by-instructor"
+    GET_MY_STUDENTS:"api/instructors/get-students-by-instructor",
+    GET_INSTRUCTOR_DETAILS:"api/instructors/get-instructor-details"
 }
 export default END_POINTS
\ No newline at end of file
diff --git a/server/src/adapters/controllers/instructorController.ts b/server/src/adapters/controllers/instructorController.ts
index 3ae1ece..76220a8 100644
--- a/server/src/adapters/controllers/instructorController.ts
+++ b/server/src/adapters/controllers/instructorController.ts
@@ -143,10 +143,7 @@ const instructorController = (
 
   const getInstructorById = asyncHandler(
     async (req: CustomRequest, res: Response) => {
-      let instructorId =
-        req.params.instructorId === 'fromProfile'
-          ? req.user?.Id ?? ''
-          : req.params.instructorId;
+      let instructorId = req.params.instructorId;
       const response = await getInstructorByIdUseCase(
         instructorId,
         cloudService,
@@ -215,6 +212,23 @@ const instructorController = (
     }
   );
 
+  const getInstructorDetails = asyncHandler(
+    async (req: CustomRequest, res: Response) => {
+      const instructorId = req.user?.Id;
+      const instructor = await getInstructorByIdUseCase(
+        instructorId ?? '',
+        cloudService,
+        dbRepositoryInstructor
+      );
+      console.log(instructor);
+      res.status(200).json({
+        status: 'success',
+        message: 'Successfully retrieved all students',
+        data: instructor
+      });
+    }
+  );
+
   return {
     getInstructorRequests,
     verifyInstructor,
@@ -226,7 +240,8 @@ const instructorController = (
     getInstructorById,
     updateProfile,
     changePassword,
-    getStudentsForInstructors
+    getStudentsForInstructors,
+    getInstructorDetails
   };
 };
 
diff --git a/server/src/frameworks/webserver/routes/instructor.ts b/server/src/frameworks/webserver/routes/instructor.ts
index f203f4c..8bac32e 100644
--- a/server/src/frameworks/webserver/routes/instructor.ts
+++ b/server/src/frameworks/webserver/routes/instructor.ts
@@ -52,10 +52,13 @@ const instructorRouter = () => {
 
   router.get('/get-blocked-instructors', controller.getBlockedInstructor);
 
+  router.get('/view-instructor/:instructorId', controller.getInstructorById);
+
   router.get(
-    '/view-instructor/:instructorId',
-    // jwtAuthMiddleware,
-    controller.getInstructorById
+    '/get-instructor-details',
+    jwtAuthMiddleware,
+    instructorRoleCheckMiddleware,
+    controller.getInstructorDetails
   );
 
   router.put(

From d9493a05bf05fca902057f0a268c732f6e49e5d4 Mon Sep 17 00:00:00 2001
From: Abin <abinth250@gmail.com>
Date: Mon, 24 Jul 2023 18:28:35 +0530
Subject: [PATCH 4/4] image issues fixed

---
 client/src/api/types/student/student.ts       | 18 ++++++++
 .../ViewBlockedInstructors.tsx                |  4 +-
 .../ViewInstructorRequests.tsx                |  2 -
 .../InstructorManagement/ViewInstructors.tsx  |  4 +-
 .../pages/instructors/MyStudents.tsx          | 18 +-------
 .../studentManagement/BlockedStudents.tsx     | 30 +++++++++----
 .../pages/studentManagement/ViewStudents.tsx  | 44 +++++++++++++------
 client/src/constants/common.ts                |  1 +
 .../controllers/instructorController.ts       |  5 ++-
 .../adapters/controllers/studentController.ts |  4 +-
 .../management/instructorManagement.ts        | 10 +++++
 .../usecases/management/studentManagement.ts  | 25 ++++++++++-
 .../repositories/studentsRepoMongoDb.ts       |  4 +-
 server/src/types/studentInterface.ts          |  1 +
 14 files changed, 117 insertions(+), 53 deletions(-)

diff --git a/client/src/api/types/student/student.ts b/client/src/api/types/student/student.ts
index c4e4405..1ee151c 100644
--- a/client/src/api/types/student/student.ts
+++ b/client/src/api/types/student/student.ts
@@ -9,3 +9,21 @@ export interface UpdateProfileInfo {
   mobile?: string;
   profilePic?: File | null;
 }
+
+export interface Students {
+  _id: string;
+  course:string;
+  firstName: string;
+  lastName: string;
+  email: string;
+  mobile: string;
+  dateJoined: string;
+  isGoogleUser:boolean;
+  profilePic:{
+    name:string;
+    url:string;
+    id:string
+  }
+  profileUrl:string;
+  isBlocked: boolean;
+}
\ No newline at end of file
diff --git a/client/src/components/pages/InstructorManagement/ViewBlockedInstructors.tsx b/client/src/components/pages/InstructorManagement/ViewBlockedInstructors.tsx
index ff8ce78..1bb5334 100644
--- a/client/src/components/pages/InstructorManagement/ViewBlockedInstructors.tsx
+++ b/client/src/components/pages/InstructorManagement/ViewBlockedInstructors.tsx
@@ -112,7 +112,7 @@ const ViewBlockedInstructors: React.FC = () => {
               (
                 {
                   _id,
-                  img,
+                  profileUrl,
                   firstName,
                   lastName,
                   email,
@@ -132,7 +132,7 @@ const ViewBlockedInstructors: React.FC = () => {
                     <td className={classes}>
                       <div className='flex items-center gap-3'>
                         <Avatar
-                          src={img}
+                          src={profileUrl}
                           alt='image'
                           size='md'
                           className='border border-blue-gray-50 bg-blue-gray-50/50 object-contain p-1'
diff --git a/client/src/components/pages/InstructorManagement/ViewInstructorRequests.tsx b/client/src/components/pages/InstructorManagement/ViewInstructorRequests.tsx
index 0d1d742..58cd0dd 100644
--- a/client/src/components/pages/InstructorManagement/ViewInstructorRequests.tsx
+++ b/client/src/components/pages/InstructorManagement/ViewInstructorRequests.tsx
@@ -6,8 +6,6 @@ import { toast } from "react-toastify";
 import { Link } from "react-router-dom";
 import useTimeAgo from "../../../hooks/useTimeAgo";
 import { InstructorApiResponse } from "../../../api/types/apiResponses/apiResponseInstructors";
-import { Button,CardFooter } from "@material-tailwind/react";
-import {IconButton} from "@material-tailwind/react";
 
 
 
diff --git a/client/src/components/pages/InstructorManagement/ViewInstructors.tsx b/client/src/components/pages/InstructorManagement/ViewInstructors.tsx
index 52e7617..629e1b3 100644
--- a/client/src/components/pages/InstructorManagement/ViewInstructors.tsx
+++ b/client/src/components/pages/InstructorManagement/ViewInstructors.tsx
@@ -124,13 +124,13 @@ const ViewInstructors: React.FC = () => {
               (
                 {
                   _id,
-                  img,
                   firstName,
                   lastName,
                   email,
                   dateJoined,
                   isBlocked,
                   isVerified,
+                  profileUrl,
                 },
                 index
               ) => {
@@ -144,7 +144,7 @@ const ViewInstructors: React.FC = () => {
                     <td className={classes}>
                       <div className='flex items-center gap-3'>
                         <Avatar
-                          src={img}
+                          src={profileUrl}
                           alt='image'
                           size='md'
                           className='border border-blue-gray-50 bg-blue-gray-50/50 object-contain p-1'
diff --git a/client/src/components/pages/instructors/MyStudents.tsx b/client/src/components/pages/instructors/MyStudents.tsx
index 7b732a3..7b2beac 100644
--- a/client/src/components/pages/instructors/MyStudents.tsx
+++ b/client/src/components/pages/instructors/MyStudents.tsx
@@ -19,23 +19,7 @@ import { useState, useEffect } from "react";
 import usePagination from "../../../hooks/usePagination";
 import { formatDate } from "../../../utils/helpers";
 import { toast } from "react-toastify";
-export interface Students {
-  _id: string;
-  course:string;
-  firstName: string;
-  lastName: string;
-  email: string;
-  mobile: string;
-  dateJoined: string;
-  isGoogleUser:boolean;
-  profilePic:{
-    name:string;
-    url:string;
-    id:string
-  }
-  profileUrl:string;
-  isBlocked: boolean;
-}
+import { Students } from "../../../api/types/student/student";
 const TABLE_HEAD = ["Student", "Course", "Status", "Joined"];
 
 const MyStudents: React.FC = () => {
diff --git a/client/src/components/pages/studentManagement/BlockedStudents.tsx b/client/src/components/pages/studentManagement/BlockedStudents.tsx
index e4fabd8..1a68248 100644
--- a/client/src/components/pages/studentManagement/BlockedStudents.tsx
+++ b/client/src/components/pages/studentManagement/BlockedStudents.tsx
@@ -23,16 +23,18 @@ import {
   unblockStudent,
 } from "../../../api/endpoints/studentManagement";
 
+import { Students } from "../../../api/types/student/student";
+import { USER_AVATAR } from "../../../constants/common";
 const TABLE_HEAD = ["Name", "Email", "Date Joined", "Status", "Actions", ""];
 
 interface Props {
-  updated:boolean;
-  setUpdated:(val:boolean)=>void
+  updated: boolean;
+  setUpdated: (val: boolean) => void;
 }
-const BlockedStudents: React.FC<Props> = ({updated,setUpdated}) => {
-  const [students, setStudents] = useState([]);
+const BlockedStudents: React.FC<Props> = ({ updated, setUpdated }) => {
+  const [students, setStudents] = useState<Students[]>([]);
   // const [updated, setUpdated] = useState(false);
-  const ITEMS_PER_PAGE = 4;  
+  const ITEMS_PER_PAGE = 4;
   const {
     currentPage,
     totalPages,
@@ -110,10 +112,14 @@ const BlockedStudents: React.FC<Props> = ({updated,setUpdated}) => {
               ))}
             </tr>
           </thead>
-          <tbody className="">
+          <tbody className=''>
             {currentData.length === 0 ? (
               <tr className='p-5'>
-                <Typography color='gray' variant="h6" className='mt-1 p-2 font-normal'>
+                <Typography
+                  color='gray'
+                  variant='h6'
+                  className='mt-1 p-2 font-normal'
+                >
                   No blocked students found
                 </Typography>
               </tr>
@@ -122,12 +128,14 @@ const BlockedStudents: React.FC<Props> = ({updated,setUpdated}) => {
                 (
                   {
                     _id,
-                    img,
+                    profilePic,
+                    profileUrl,
                     firstName,
                     lastName,
                     email,
                     dateJoined,
                     isBlocked,
+                    isGoogleUser,
                   },
                   index
                 ) => {
@@ -141,7 +149,11 @@ const BlockedStudents: React.FC<Props> = ({updated,setUpdated}) => {
                       <td className={classes}>
                         <div className='flex items-center gap-3'>
                           <Avatar
-                            src={img}
+                            src={
+                              isGoogleUser && profilePic && profilePic.url
+                                ? profilePic.url
+                                : profileUrl || USER_AVATAR
+                            }
                             alt='image'
                             size='md'
                             className='border border-blue-gray-50 bg-blue-gray-50/50 object-contain p-1'
diff --git a/client/src/components/pages/studentManagement/ViewStudents.tsx b/client/src/components/pages/studentManagement/ViewStudents.tsx
index c13e157..ffe79bd 100644
--- a/client/src/components/pages/studentManagement/ViewStudents.tsx
+++ b/client/src/components/pages/studentManagement/ViewStudents.tsx
@@ -1,7 +1,7 @@
 import React, { useEffect, useState } from "react";
 import { PencilIcon } from "@heroicons/react/24/solid";
 import { MagnifyingGlassIcon } from "@heroicons/react/24/outline";
-import { Dispatch,SetStateAction } from "react";
+import { Dispatch, SetStateAction } from "react";
 import {
   Card,
   CardHeader,
@@ -26,25 +26,27 @@ import BlockReasonModal from "../InstructorManagement/BlockReasonModal";
 import usePagination from "../../../hooks/usePagination";
 import StudentsTab from "./StudentsTab";
 import BlockStudentModal from "./BlockStudentModal";
+import { Students } from "../../../api/types/student/student";
+import { USER_AVATAR } from "../../../constants/common";
 
 const TABLE_HEAD = ["Name", "Email", "Date Joined", "Status", "Actions"];
 
 interface Props {
-  updated:boolean;
-  setUpdated:Dispatch<SetStateAction<boolean>>
+  updated: boolean;
+  setUpdated: Dispatch<SetStateAction<boolean>>;
 }
-const ViewStudents: React.FC<Props> = ({updated,setUpdated}) => {
-  const [students, setStudents] = useState([]);   
+const ViewStudents: React.FC<Props> = ({ updated, setUpdated }) => {
+  const [students, setStudents] = useState<Students[]>([]);
   const [open, setOpen] = useState(false);
   // const [updated, setUpdated] = useState(false);
   const [id, setId] = useState("");
-  const ITEMS_PER_PAGE = 4;  
-  const {  
-    currentPage,   
+  const ITEMS_PER_PAGE = 4;
+  const {
+    currentPage,
     totalPages,  
     currentData,
     goToPage,
-    goToPreviousPage,  
+    goToPreviousPage,
     goToNextPage,
   } = usePagination(students, ITEMS_PER_PAGE);
 
@@ -53,7 +55,7 @@ const ViewStudents: React.FC<Props> = ({updated,setUpdated}) => {
       const response = await getAllStudents();
       setStudents(response?.data);
     } catch (error: any) {
-      toast.error(error.data.message, {  
+      toast.error(error.data.message, {
         position: toast.POSITION.BOTTOM_RIGHT,
       });
     }
@@ -74,9 +76,9 @@ const ViewStudents: React.FC<Props> = ({updated,setUpdated}) => {
         position: toast.POSITION.BOTTOM_RIGHT,
       });
     }
-  };   
+  };
   return (
-    <Card className='h-full w-full'>          
+    <Card className='h-full w-full'>
       {open && (
         <BlockStudentModal
           open={open}
@@ -129,7 +131,17 @@ const ViewStudents: React.FC<Props> = ({updated,setUpdated}) => {
           <tbody>
             {currentData?.map(
               (
-                { _id, img, firstName, lastName, email, dateJoined, isBlocked },
+                {
+                  _id,
+                  firstName,
+                  profileUrl,
+                  profilePic,
+                  isGoogleUser,
+                  lastName,
+                  email,
+                  dateJoined,
+                  isBlocked,
+                },
                 index
               ) => {
                 const isLast = index === students?.length - 1;
@@ -142,7 +154,11 @@ const ViewStudents: React.FC<Props> = ({updated,setUpdated}) => {
                     <td className={classes}>
                       <div className='flex items-center gap-3'>
                         <Avatar
-                          src={img}
+                          src={
+                            isGoogleUser && profilePic && profilePic.url
+                              ? profilePic.url
+                              : profileUrl || USER_AVATAR
+                          }
                           alt='image'
                           size='md'
                           className='border border-blue-gray-50 bg-blue-gray-50/50 object-contain p-1'
diff --git a/client/src/constants/common.ts b/client/src/constants/common.ts
index 37bd145..ee42a98 100644
--- a/client/src/constants/common.ts
+++ b/client/src/constants/common.ts
@@ -2,6 +2,7 @@
  export const client_id = "868341844656-jr4d6pb4gro123nbet4d3th7cvogpbpq.apps.googleusercontent.com"
  export const redirect_uri = 'http://localhost:3000'
  export const STRIPE_PUBLISHABLE_KEY='pk_test_51NRzOqSFuPFI6PEIm2JqtP4KzHSXPAzJUGsRziDz2lzr71fjzyebwf6V59coC03n6ZWHtxk51GWUE4x8OnjEzNYG00mLqdPeaG'
+ export const USER_AVATAR = 'https://res.cloudinary.com/dwucedjmy/image/upload/v1690203086/images_2_d4e6fp.jpg'
  export const APP_LOGO = "https://res.cloudinary.com/dwucedjmy/image/upload/v1689941689/logo-no-background_pkibmn.png"
  const CONSTANTS_COMMON = {
     API_BASE_URL: 'http://localhost:5000',
diff --git a/server/src/adapters/controllers/instructorController.ts b/server/src/adapters/controllers/instructorController.ts
index 76220a8..4ae93b8 100644
--- a/server/src/adapters/controllers/instructorController.ts
+++ b/server/src/adapters/controllers/instructorController.ts
@@ -132,7 +132,10 @@ const instructorController = (
 
   const getBlockedInstructor = asyncHandler(
     async (req: Request, res: Response) => {
-      const response = await getBlockedInstructors(dbRepositoryInstructor);
+      const response = await getBlockedInstructors(
+        cloudService,
+        dbRepositoryInstructor
+      );
       res.json({
         status: 'success',
         message: 'Successfully fetched blocked instructors',
diff --git a/server/src/adapters/controllers/studentController.ts b/server/src/adapters/controllers/studentController.ts
index e3842dc..7825003 100644
--- a/server/src/adapters/controllers/studentController.ts
+++ b/server/src/adapters/controllers/studentController.ts
@@ -102,7 +102,7 @@ const studentController = (
   );
 
   const getAllStudents = asyncHandler(async (req:Request,res:Response)=>{
-    const students = await getAllStudentsU(dbRepositoryStudent)
+    const students = await getAllStudentsU(cloudService,dbRepositoryStudent)
     res.status(200).json({
       status: 'success',
       message: 'Successfully retrieved all student details',
@@ -132,7 +132,7 @@ const studentController = (
   })
 
   const getAllBlockedStudents = asyncHandler(async(req:Request,res:Response)=>{
-    const students = await getAllBlockedStudentsU(dbRepositoryStudent)
+    const students = await getAllBlockedStudentsU(cloudService,dbRepositoryStudent)
     res.status(200).json({
       status: 'success',
       message: 'Successfully unblocked student ',
diff --git a/server/src/app/usecases/management/instructorManagement.ts b/server/src/app/usecases/management/instructorManagement.ts
index 5acd551..2be2dc6 100644
--- a/server/src/app/usecases/management/instructorManagement.ts
+++ b/server/src/app/usecases/management/instructorManagement.ts
@@ -114,9 +114,19 @@ export const unblockInstructors = async (
 };
 
 export const getBlockedInstructors = async (
+  cloudService: ReturnType<CloudServiceInterface>,
   instructorRepository: ReturnType<InstructorDbInterface>
 ) => {
   const blockedInstructors = await instructorRepository.getBlockedInstructors();
+  await Promise.all(
+    blockedInstructors.map(async (instructor) => {
+      if (instructor.profilePic) {
+        instructor.profileUrl = await cloudService.getFile(
+          instructor.profilePic.key ?? ''
+        );
+      }
+    })
+  );
   return blockedInstructors;
 };
 
diff --git a/server/src/app/usecases/management/studentManagement.ts b/server/src/app/usecases/management/studentManagement.ts
index 675a221..ec9555f 100644
--- a/server/src/app/usecases/management/studentManagement.ts
+++ b/server/src/app/usecases/management/studentManagement.ts
@@ -1,11 +1,22 @@
+import { StudentInterface } from '@src/types/studentInterface';
 import HttpStatusCodes from '../../../constants/HttpStatusCodes';
 import AppError from '../../../utils/appError';
 import { StudentsDbInterface } from '@src/app/repositories/studentDbRepository';
+import { CloudServiceInterface } from '@src/app/services/cloudServiceInterface';
 
 export const getAllStudentsU = async (
+  cloudService:ReturnType<CloudServiceInterface>,
   studentRepository: ReturnType<StudentsDbInterface>
 ) => {
-  const students = await studentRepository.getAllStudents();
+  const students:StudentInterface[]|null = await studentRepository.getAllStudents();
+  await Promise.all(
+    students.map(async (student) => {
+      if (student?.profilePic?.key) {
+        student.profileUrl = ""
+        student.profileUrl = await cloudService.getFile(student.profilePic.key);
+      }
+    })
+  );
   return students;
 };
 
@@ -45,8 +56,18 @@ export const unblockStudentU = async (
 
 
 export const getAllBlockedStudentsU = async (
+  cloudService:ReturnType<CloudServiceInterface>,
   studentRepository: ReturnType<StudentsDbInterface>
 ) => {
-  const blockedStudents = await studentRepository.getAllBlockedStudents();
+  const blockedStudents:StudentInterface[]|null = await studentRepository.getAllBlockedStudents();
+  await Promise.all(
+    blockedStudents.map(async (student) => {
+      if (student?.profilePic?.key) {
+        student.profileUrl = ""
+        student.profileUrl = await cloudService.getFile(student.profilePic.key);
+      }
+    })
+  );
+  console.log(blockedStudents)
   return blockedStudents;
 };
diff --git a/server/src/frameworks/database/mongodb/repositories/studentsRepoMongoDb.ts b/server/src/frameworks/database/mongodb/repositories/studentsRepoMongoDb.ts
index 74c4930..8557227 100644
--- a/server/src/frameworks/database/mongodb/repositories/studentsRepoMongoDb.ts
+++ b/server/src/frameworks/database/mongodb/repositories/studentsRepoMongoDb.ts
@@ -36,7 +36,7 @@ export const studentRepositoryMongoDB = () => {
   };
 
   const getAllStudents = async () => {
-    const students = await Student.find({});
+    const students:StudentInterface[]|null = await Student.find({});
     return students;
   };
 
@@ -55,7 +55,7 @@ export const studentRepositoryMongoDB = () => {
   };
 
   const getAllBlockedStudents = async ()=>{
-   const blockedStudents =  await Student.find({isBlocked:true})
+   const blockedStudents:StudentInterface[]|null =  await Student.find({isBlocked:true})
    return blockedStudents
   }
 
diff --git a/server/src/types/studentInterface.ts b/server/src/types/studentInterface.ts
index 6deb5ba..870e2a0 100644
--- a/server/src/types/studentInterface.ts
+++ b/server/src/types/studentInterface.ts
@@ -12,6 +12,7 @@ export interface StudentInterface {
   password: string;
   isGoogleUser: boolean;
   isBlocked:boolean
+  profileUrl:string;
 }
 
 export interface StudentUpdateInfo {