Changeset e882b92 for chapterx-frontend/src

Timestamp:

08/24/26 20:57:09 (13 days ago)

Author:

kikisrbinoska <srbinoskakristina07@…>

Branches:

main

Parents:

a6e33d1

Message:

Added corrected entitef from the ER diagram and changes for the logic to be coresponding to the ddl

Location:

chapterx-frontend/src

Files:

• components/admin/ContentModerationTable.tsx (modified) (1 diff)
• components/story/CommentSection.tsx (modified) (1 diff)
• components/story/LikeButton.tsx (modified) (1 diff)
• components/writer/CollaboratorManager.tsx (modified) (1 diff)
• store/notificationStore.ts (modified) (3 diffs)
• store/storyStore.ts (modified) (7 diffs)

chapterx-frontend/src/components/admin/ContentModerationTable.tsx

@@ -20 +20 @@
     deleteStory(story.story_id)
     addNotification({
-      user_id: story.user_id,
-      type: 'system',
-      title: 'Story Removed',
-      message: `Your story "${story.title}" has been removed by an administrator.`,
+      userId: story.user_id,
+      contentType: 'system',
+      content: `Your story "${story.title}" has been removed by an administrator.`,
     })
     addToast(`"${story.title}" removed from platform`, 'info')

chapterx-frontend/src/components/story/CommentSection.tsx

@@ -80 +80 @@
       if (currentUser.user_id !== authorUserId) {
         await addNotification({
-          recipientUserId: authorUserId,
-          type: 'comment',
+          userId: authorUserId,
+          contentType: 'comment',
           content: `${currentUser.username} commented: "${text.trim().slice(0, 60)}${text.length > 60 ? '...' : ''}"`,
+          storyId,
           link: `/story/${storyId}`,
         })

chapterx-frontend/src/components/story/LikeButton.tsx

@@ -59 +59 @@
         if (currentUser.user_id !== authorUserId) {
           await addNotification({
-            recipientUserId: authorUserId,
-            type: 'like',
+            userId: authorUserId,
+            contentType: 'like',
             content: `${currentUser.username} liked your story.`,
+            storyId,
             link: `/story/${storyId}`,
           })

chapterx-frontend/src/components/writer/CollaboratorManager.tsx

@@ -62 +62 @@
     addCollaboration(newCollab)
     addNotification({
-      recipientUserId: user.user_id,
-      type: 'collaboration',
+      userId: user.user_id,
+      contentType: 'collaboration',
       content: `You've been invited to collaborate on "${storyTitle}" as ${selectedRole}.`,
+      storyId,
       link: `/story/${storyId}`,
     })

chapterx-frontend/src/store/notificationStore.ts

@@ -17 +17 @@
   notifications: Notification[]
   fetchUserNotifications: (userId: number) => Promise<void>
-  addNotification: (n: { recipientUserId: number; type: string; content: string; link?: string }) => Promise<void>
+  addNotification: (n: { userId: number; contentType: string; content: string; storyId?: number; link?: string }) => Promise<void>
   markAllRead: () => Promise<void>
   markRead: (id: number) => Promise<void>
@@ -33 +33 @@
         notification_id: n.id,
         user_id: userId,
-        type: n.type ?? 'info',
-        title: n.type ?? 'Notification',
+        type: n.contentType ?? 'info',
+        title: n.contentType ?? 'Notification',
         message: n.content,
         link: n.link,
@@ -46 +46 @@
   },
 
-  addNotification: async ({ recipientUserId, type, content, link }) => {
+  addNotification: async ({ userId, contentType, content, storyId, link }) => {
     try {
       await axios.post(`${API}/notifications`, {
         content,
-        recipientUserId,
-        type,
+        contentType,
+        userId,
+        storyId,
         link,
       }, { headers: getAuthHeaders() })

chapterx-frontend/src/store/storyStore.ts

@@ -144 +144 @@
         cover_image: s.image ?? undefined,
         mature_content: s.matureContent,
-        status: 'published' as StoryStatus,
+        status: (s.status ?? 'draft') as StoryStatus,
         author_username: s.writer?.user?.username ?? '',
         created_at: s.createdAt,
@@ -193 +193 @@
         name: c.name ?? c.username ?? '',
         story_title: '',
-        role: 'editor' as any,
-        permission_level: 3 as any,
+        role: c.role as any,
+        permission_level: (c.permissionLevel ?? 3) as any,
         joined_at: c.createdAt,
       }))
@@ -246 +246 @@
         image: imageUrl,
         content: partial.content ?? story.content,
+        status: partial.status ?? story.status,
       }, { headers: getAuthHeaders() })
     } catch {
@@ -266 +267 @@
   },
 
-  updateStoryStatus: (id, status) =>
+  updateStoryStatus: (id, status) => {
     set(state => ({
       stories: state.stories.map(s =>
         s.story_id === id ? { ...s, status, updated_at: new Date().toISOString() } : s
       ),
-    })),
+    }))
+    get().updateStory(id, { status })
+  },
 
   addChapter: async (chapter) => {
@@ -407 +410 @@
         storyId: collab.story_id,
         role: collab.role,
+        permissionLevel: collab.permission_level,
       }, { headers: getAuthHeaders() })
     } catch {
@@ -445 +449 @@
         original_text: s.originalText,
         suggested_text: s.suggestedText,
-        suggestion_type: (s.suggestionTypes?.[0] ?? 'style') as SuggestionType,
+        suggestion_type: (s.suggestionType ?? 'style') as SuggestionType,
+        explanation: s.explanation ?? '',
         accepted: s.accepted === true ? true : s.accepted === false ? false : null,
+        created_at: s.createdAt ?? new Date().toISOString(),
         applied_at: s.appliedAt ?? undefined,
       }))
@@ -506 +512 @@
         originalText: suggestion.original_text,
         suggestedText: suggestion.suggested_text,
+        suggestionType: suggestion.suggestion_type,
         storyId: suggestion.chapter_id,
       }, { headers: getAuthHeaders() })