From fc244419be6f965878d23d112ce8400e990f8b0c Mon Sep 17 00:00:00 2001
From: mukimovd <41473651-mukimovd@users.noreply.replit.com>
Date: Thu, 1 May 2025 03:21:57 +0000
Subject: [PATCH] Improve how literary works are displayed and add annotation
 support

Refactors EnhancedReadingView to handle optional tags, updates apiRequest to return a generic type, and introduces the Annotation type.

Replit-Commit-Author: Agent
Replit-Commit-Session-Id: cbacfb18-842a-4116-a907-18c0105ad8ec
Replit-Commit-Screenshot-Url: https://storage.googleapis.com/screenshot-production-us-central1/39b5c689-6e8a-4d5a-9792-69cc81a56534/87f6d858-e481-4210-ae2d-1b5aa7299a3e.jpg
---
 .../src/components/reading/EnhancedReadingView.tsx |  6 +++---
 client/src/lib/queryClient.ts                      |  6 +++---
 client/src/lib/types.ts                            | 14 ++++++++++++++
 client/src/pages/collections/CreateCollection.tsx  |  2 +-
 4 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/client/src/components/reading/EnhancedReadingView.tsx b/client/src/components/reading/EnhancedReadingView.tsx
index c9203e8..3b23b89 100644
--- a/client/src/components/reading/EnhancedReadingView.tsx
+++ b/client/src/components/reading/EnhancedReadingView.tsx
@@ -246,11 +246,11 @@ export function EnhancedReadingView({ work, translations }: EnhancedReadingViewP
                     <p className="text-xs text-navy/70 dark:text-cream/70 font-sans">Written in {work.year}</p>
                   )}
                   <p className="text-xs text-navy/70 dark:text-cream/70 font-sans capitalize">
-                    {work.type} • {work.language} • {work.tags.length} tags
+                    {work.type} • {work.language} • {work.tags?.length || 0} tags
                   </p>
                 </div>
                 <div className="flex flex-wrap gap-1">
-                  {work.tags.map(tag => (
+                  {work.tags?.map(tag => (
                     <Badge 
                       key={tag.id}
                       variant="outline"
@@ -384,7 +384,7 @@ export function EnhancedReadingView({ work, translations }: EnhancedReadingViewP
                 <div className="my-4">
                   <h4 className="text-xs uppercase tracking-wider text-navy/60 dark:text-cream/60 font-sans font-medium mb-2">Tags</h4>
                   <div className="flex flex-wrap gap-1">
-                    {work.tags.map(tag => (
+                    {work.tags?.map(tag => (
                       <Badge 
                         key={tag.id}
                         variant="outline"
diff --git a/client/src/lib/queryClient.ts b/client/src/lib/queryClient.ts
index a8b3fc1..199fdea 100644
--- a/client/src/lib/queryClient.ts
+++ b/client/src/lib/queryClient.ts
@@ -7,11 +7,11 @@ async function throwIfResNotOk(res: Response) {
   }
 }
 
-export async function apiRequest(
+export async function apiRequest<T = any>(
   method: string,
   url: string,
   data?: unknown | undefined,
-): Promise<Response> {
+): Promise<T> {
   const res = await fetch(url, {
     method,
     headers: data ? { "Content-Type": "application/json" } : {},
@@ -20,7 +20,7 @@ export async function apiRequest(
   });
 
   await throwIfResNotOk(res);
-  return res;
+  return await res.json();
 }
 
 type UnauthorizedBehavior = "returnNull" | "throw";
diff --git a/client/src/lib/types.ts b/client/src/lib/types.ts
index 39e7039..d59d305 100644
--- a/client/src/lib/types.ts
+++ b/client/src/lib/types.ts
@@ -82,3 +82,17 @@ export interface ReadingContext {
   fontSizeClass: string;
   zenMode: boolean;
 }
+
+export interface Annotation {
+  id: number;
+  workId: number;
+  translationId?: number;
+  lineNumber: number;
+  userId: number;
+  userName: string;
+  userAvatar: string | null;
+  content: string;
+  createdAt: Date;
+  likes: number;
+  liked: boolean;
+}
diff --git a/client/src/pages/collections/CreateCollection.tsx b/client/src/pages/collections/CreateCollection.tsx
index 137f248..067c24f 100644
--- a/client/src/pages/collections/CreateCollection.tsx
+++ b/client/src/pages/collections/CreateCollection.tsx
@@ -40,7 +40,7 @@ export default function CreateCollection() {
   // Create collection mutation
   const createMutation = useMutation({
     mutationFn: async (values: FormValues) => {
-      return await apiRequest<{ id: number; slug: string }>('POST', '/api/collections', {
+      return await apiRequest('POST', '/api/collections', {
         name: values.name,
         description: values.description || '',
         isPublic: values.isPublic,