fix bookmark and view of bookmark (#1232)

code100x · Oct 4, 2024 · 59a4586 · 59a4586
1 parent 700e6b1
commit 59a4586
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 4 deletions.
diff --git a/src/actions/bookmark/types.ts b/src/actions/bookmark/types.ts
@@ -17,5 +17,6 @@ export type ReturnTypeDeleteBookmark = ActionState<
 export type TBookmarkWithContent = Bookmark & {
   content: Content & {
     parent: { id: number; courses: CourseContent[] } | null;
+    courses: CourseContent[];
   };
 };
diff --git a/src/components/CourseView.tsx b/src/components/CourseView.tsx
@@ -64,7 +64,7 @@ export const CourseView = ({
             description: courseContent?.value?.description || '',
             markAsCompleted:
               courseContent?.value?.videoProgress?.markAsCompleted || false,
-            bookmark: courseContent?.value.bookmark ?? null,
+            bookmark: courseContent?.value.bookmark || null,
           }}
         />
       ) : null}
@@ -95,7 +95,7 @@ export const CourseView = ({
             percentComplete: getFolderPercentCompleted(x?.children),
             videoFullDuration: x?.videoProgress?.videoFullDuration || 0,
             duration: x?.videoProgress?.duration || 0,
-            bookmark: null,
+            bookmark: x.bookmark || null,
           }))}
           courseId={parseInt(course.id, 10)}
         />

diff --git a/src/components/bookmark/BookmarkList.tsx b/src/components/bookmark/BookmarkList.tsx
@@ -21,13 +21,29 @@ const BookmarkList = ({
         {bookmarkData.map((bookmark) => {
           const {
             contentId,
-            content: { type, parent, title, hidden, thumbnail },
+            content: { type, parent, title, hidden, thumbnail, courses },
           } = bookmark;
-          if (type === 'video' && parent && !hidden) {
+          if ((type === 'video' || type === 'notion') && parent && !hidden) {
             const { id: folderId, courses } = parent;
             const courseId = courses[0].courseId;
             const videoUrl = `/courses/${courseId}/${folderId}/${contentId}`;
 
+            return (
+              <ContentCard
+                type={type}
+                key={contentId}
+                title={title}
+                image={thumbnail || ''}
+                onClick={() => {
+                  router.push(videoUrl);
+                }}
+                bookmark={bookmark}
+                contentId={contentId}
+              />
+            );
+          } else if (type === 'folder' && !parent) {
+            const videoUrl = `/courses/${courses[0].courseId}/${courses[0].contentId}`;
+
             return (
               <ContentCard
                 type={type}

diff --git a/src/db/bookmark.ts b/src/db/bookmark.ts
@@ -25,6 +25,12 @@ export const getBookmarkDataWithContent = async (): Promise<
               courses: true,
             },
           },
+          courses: {
+            select: {
+              courseId: true,
+              contentId: true,
+            },
+          },
         },
       },
     },