Skip to content

Commit 001457c

Browse files
committed
Fix module thumbnail upload and img fitting
1 parent eb97d4b commit 001457c

File tree

2 files changed

+11
-14
lines changed

2 files changed

+11
-14
lines changed

backend/services/implementations/courseModuleService.ts

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* eslint-disable class-methods-use-this */
2-
import { ClientSession, Schema, startSession } from "mongoose";
2+
import { ClientSession, startSession } from "mongoose";
33
import { PDFDocument } from "pdf-lib";
44
import MgCourseModule, {
55
CourseModule,
@@ -8,6 +8,7 @@ import CoursePageModel, {
88
LessonPageModel,
99
} from "../../models/coursepage.mgmodel";
1010
import MgCourseUnit, { CourseUnit } from "../../models/courseunit.mgmodel";
11+
import feedbackMgmodel from "../../models/feedback.mgmodel";
1112
import {
1213
CourseModuleDTO,
1314
CourseModuleLeanDTO,
@@ -19,7 +20,6 @@ import { getErrorMessage } from "../../utilities/errorUtils";
1920
import logger from "../../utilities/logger";
2021
import ICourseModuleService from "../interfaces/courseModuleService";
2122
import FileStorageService from "./fileStorageService";
22-
import feedbackMgmodel from "../../models/feedback.mgmodel";
2323

2424
const Logger = logger(__filename);
2525

@@ -75,6 +75,7 @@ class CourseModuleService implements ICourseModuleService {
7575
const courseModule: CourseModule | null = await MgCourseModule.findById(
7676
courseModuleId,
7777
)
78+
.populate("pages")
7879
.lean()
7980
.exec();
8081
if (!courseModule) {
@@ -94,19 +95,10 @@ class CourseModuleService implements ICourseModuleService {
9495
);
9596
}
9697

97-
const fetchPage = async (page: Schema.Types.ObjectId) => {
98-
const pageObject = await CoursePageModel.findById(page).lean().exec();
99-
if (!pageObject) {
100-
throw new Error(`Page with id ${page} not found.`);
101-
}
102-
return pageObject;
103-
};
104-
const pageObjects = Promise.all(courseModule.pages.map(fetchPage));
10598
return {
10699
...courseModule,
107100
unitId: courseUnit._id.toString(), // eslint-disable-line no-underscore-dangle
108-
pages: await pageObjects,
109-
};
101+
} as unknown as CourseModuleDTO;
110102
} catch (error) {
111103
Logger.error(
112104
`Failed to get course module with id: ${courseModuleId}. Reason = ${getErrorMessage(

frontend/src/components/course_viewing/library-viewing/ModuleCardAdmin.tsx

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ import BlankImg from "../../assets/blankSlide.png";
3131
import ChangeThumbnailModal from "../modals/ChangeThumbnailModal";
3232
import DeleteModuleModal from "../modals/DeleteModuleModal";
3333
import EditModuleModal from "../modals/EditModuleModal";
34-
import UnpublishModuleModal from "../modals/UnpublishModuleModal";
3534
import EditPublishedModuleModal from "../modals/EditPublishedModuleModal";
3635
import PublishModuleModal from "../modals/PublishModuleModal";
36+
import UnpublishModuleModal from "../modals/UnpublishModuleModal";
3737

3838
const ItemType = "MODULE_CARD";
3939

@@ -274,7 +274,12 @@ const ModuleCardAdmin = ({
274274
component="img"
275275
image={module.imageURL ? module.imageURL : BlankImg}
276276
alt={module.title}
277-
sx={{ aspectRatio: "16 / 9" }}
277+
sx={{
278+
aspectRatio: "16 / 9",
279+
borderRadius: "4px",
280+
width: "100%",
281+
objectFit: "contain",
282+
}}
278283
/>
279284
<Stack
280285
direction="row"

0 commit comments

Comments
 (0)