Index: chapterx-frontend/src/App.tsx =================================================================== --- chapterx-frontend/src/App.tsx (revision 73b69b22fa1e9888b8530a66db4a150efb8f52bc) +++ chapterx-frontend/src/App.tsx (revision 7fbb91c66b46c3063caa934a83d6d0681406c83c) @@ -52,5 +52,4 @@ if (!currentUser) { - addToast('Please sign in to access this page.', 'warning') return } @@ -68,9 +67,10 @@ function App() { - const { fetchStories, fetchChapters, fetchReadingLists } = useStoryStore() + const { fetchStories, fetchChapters, fetchCollaborations, fetchReadingLists } = useStoryStore() useEffect(() => { fetchStories() fetchChapters() + fetchCollaborations() fetchReadingLists() }, []) Index: chapterx-frontend/src/components/writer/CollaboratorManager.tsx =================================================================== --- chapterx-frontend/src/components/writer/CollaboratorManager.tsx (revision 73b69b22fa1e9888b8530a66db4a150efb8f52bc) +++ chapterx-frontend/src/components/writer/CollaboratorManager.tsx (revision 7fbb91c66b46c3063caa934a83d6d0681406c83c) @@ -32,5 +32,5 @@ }) => { const { collaborations, addCollaboration, removeCollaboration, updateCollaborationPermission } = useStoryStore() - const { allUsers } = useAuthStore() + const { allUsers, fetchAllUsers } = useAuthStore() const { addNotification } = useNotificationStore() const { addToast } = useUIStore() @@ -43,5 +43,5 @@ const storyCollabs = collaborations.filter(c => c.story_id === storyId) const collabUserIds = new Set(storyCollabs.map(c => c.user_id)) - const availableUsers = allUsers.filter(u => u.user_id !== ownerId && !collabUserIds.has(u.user_id)) + const availableUsers = allUsers.filter(u => u.user_id !== ownerId && !collabUserIds.has(u.user_id) && (u.role === 'writer' || u.role === 'admin')) const handleInvite = () => { @@ -62,8 +62,7 @@ addCollaboration(newCollab) addNotification({ - user_id: user.user_id, + recipientUserId: user.user_id, type: 'collaboration', - title: 'Collaboration Invite', - message: `You've been invited to collaborate on "${storyTitle}" as ${selectedRole}.`, + content: `You've been invited to collaborate on "${storyTitle}" as ${selectedRole}.`, link: `/story/${storyId}`, }) @@ -86,5 +85,5 @@ ({storyCollabs.length}) - )} - {isOwner && ( + {(isOwner || isCollaborator) && ( + -
- - -
- - ))} + ) + })} )} Index: chapterx-frontend/src/store/authStore.ts =================================================================== --- chapterx-frontend/src/store/authStore.ts (revision 73b69b22fa1e9888b8530a66db4a150efb8f52bc) +++ chapterx-frontend/src/store/authStore.ts (revision 7fbb91c66b46c3063caa934a83d6d0681406c83c) @@ -19,4 +19,5 @@ updateUserRole: (userId: number, role: UserRole) => void addUser: (user: User) => void + fetchAllUsers: () => Promise } @@ -135,4 +136,25 @@ addUser: (user: User) => set(state => ({ allUsers: [...state.allUsers, user] })), + + fetchAllUsers: async () => { + try { + const res = await axios.get(`${API_BASE}/users`) + const data: any[] = res.data?.users ?? res.data ?? [] + const users: User[] = data.map((u: any) => ({ + user_id: u.id, + username: u.username, + email: u.email ?? '', + name: u.name ?? u.username, + surname: u.surname ?? '', + role: (u.role ?? 'regular') as UserRole, + created_at: u.createdAt ?? new Date().toISOString(), + follower_count: 0, + following_count: 0, + })) + set({ allUsers: users }) + } catch { + // keep existing + } + }, }), { Index: chapterx-frontend/src/store/storyStore.ts =================================================================== --- chapterx-frontend/src/store/storyStore.ts (revision 73b69b22fa1e9888b8530a66db4a150efb8f52bc) +++ chapterx-frontend/src/store/storyStore.ts (revision 7fbb91c66b46c3063caa934a83d6d0681406c83c) @@ -73,4 +73,5 @@ fetchStories: () => Promise fetchChapters: () => Promise + fetchCollaborations: () => Promise fetchReadingLists: () => Promise fetchUserReadingLists: (userId: number) => Promise @@ -98,7 +99,7 @@ // Collaboration actions - addCollaboration: (collab: Collaboration) => void + addCollaboration: (collab: Collaboration) => Promise updateCollaborationPermission: (userId: number, storyId: number, level: PermissionLevel) => void - removeCollaboration: (userId: number, storyId: number) => void + removeCollaboration: (userId: number, storyId: number) => Promise // AI Suggestion actions @@ -175,4 +176,25 @@ } catch { // keep mock data on failure + } + }, + + fetchCollaborations: async () => { + try { + const res = await axios.get(`${API}/collaborations`) + const data: any[] = res.data ?? [] + const collaborations: Collaboration[] = data.map((c: any) => ({ + collab_id: c.id, + story_id: c.storyId, + user_id: c.userId, + username: c.username ?? '', + name: c.name ?? c.username ?? '', + story_title: '', + role: 'editor' as any, + permission_level: 3 as any, + joined_at: c.createdAt, + })) + set({ collaborations }) + } catch { + // keep existing } }, @@ -364,6 +386,16 @@ get().likedStories.some(l => l.userId === userId && l.storyId === storyId), - addCollaboration: (collab) => - set(state => ({ collaborations: [...state.collaborations, collab] })), + addCollaboration: async (collab) => { + set(state => ({ collaborations: [...state.collaborations, collab] })) + try { + await axios.post(`${API}/collaborations`, { + userId: collab.user_id, + storyId: collab.story_id, + role: collab.role, + }, { headers: getAuthHeaders() }) + } catch { + // keep optimistic + } + }, updateCollaborationPermission: (userId, storyId, level) => @@ -376,10 +408,16 @@ })), - removeCollaboration: (userId, storyId) => + removeCollaboration: async (userId, storyId) => { set(state => ({ collaborations: state.collaborations.filter( c => !(c.user_id === userId && c.story_id === storyId) ), - })), + })) + try { + await axios.delete(`${API}/collaborations/user/${userId}/story/${storyId}`, { headers: getAuthHeaders() }) + } catch { + // keep optimistic + } + }, fetchSuggestions: async () => {