Code maintainability fixes

src/services/api.ts

@@ -13,12 +13,12 @@ const headers = () => {
 };
 
 export const api = {
-    get: async (endpoint: string) => {
+    get: async <T = any>(endpoint: string): Promise<T> => {
         const res = await fetch(`${API_URL}${endpoint}`, { headers: headers() });
         if (!res.ok) throw new Error(await res.text());
         return res.json();
     },
-    post: async (endpoint: string, data: any) => {
+    post: async <T = any>(endpoint: string, data: any): Promise<T> => {
         const res = await fetch(`${API_URL}${endpoint}`, {
             method: 'POST',
             headers: headers(),
@@ -27,7 +27,7 @@ export const api = {
         if (!res.ok) throw new Error(await res.text());
         return res.json();
     },
-    put: async (endpoint: string, data: any) => {
+    put: async <T = any>(endpoint: string, data: any): Promise<T> => {
         const res = await fetch(`${API_URL}${endpoint}`, {
             method: 'PUT',
             headers: headers(),
@@ -36,7 +36,7 @@ export const api = {
         if (!res.ok) throw new Error(await res.text());
         return res.json();
     },
-    delete: async (endpoint: string) => {
+    delete: async <T = any>(endpoint: string): Promise<T> => {
         const res = await fetch(`${API_URL}${endpoint}`, {
             method: 'DELETE',
             headers: headers()
@@ -44,7 +44,7 @@ export const api = {
         if (!res.ok) throw new Error(await res.text());
         return res.json();
     },
-    patch: async (endpoint: string, data: any) => {
+    patch: async <T = any>(endpoint: string, data: any): Promise<T> => {
         const res = await fetch(`${API_URL}${endpoint}`, {
             method: 'PATCH',
             headers: headers(),

src/services/exercises.ts

@@ -0,0 +1,27 @@
+import { ExerciseDef, WorkoutSet } from '../types';
+import { api } from './api';
+
+export const getExercises = async (userId: string): Promise<ExerciseDef[]> => {
+    try {
+        return await api.get<ExerciseDef[]>('/exercises');
+    } catch {
+        return [];
+    }
+};
+
+export const saveExercise = async (userId: string, exercise: ExerciseDef): Promise<void> => {
+    await api.post('/exercises', exercise);
+};
+
+export const getLastSetForExercise = async (userId: string, exerciseId: string): Promise<WorkoutSet | undefined> => {
+    try {
+        const response = await api.get<{ success: boolean; set?: WorkoutSet }>(`/exercises/${exerciseId}/last-set`);
+        if (response.success && response.set) {
+            return response.set;
+        }
+        return undefined;
+    } catch (error) {
+        console.error("Failed to fetch last set:", error);
+        return undefined;
+    }
+};

src/services/plans.ts

@@ -0,0 +1,18 @@
+import { WorkoutPlan } from '../types';
+import { api } from './api';
+
+export const getPlans = async (userId: string): Promise<WorkoutPlan[]> => {
+    try {
+        return await api.get<WorkoutPlan[]>('/plans');
+    } catch {
+        return [];
+    }
+};
+
+export const savePlan = async (userId: string, plan: WorkoutPlan): Promise<void> => {
+    await api.post('/plans', plan);
+};
+
+export const deletePlan = async (userId: string, id: string): Promise<void> => {
+    await api.delete(`/plans/${id}`);
+};

src/services/sessions.ts

@@ -0,0 +1,85 @@
+import { WorkoutSession, WorkoutSet, ExerciseType } from '../types';
+import { api } from './api';
+
+// Define the shape of session coming from API (Prisma include)
+interface ApiSession extends Omit<WorkoutSession, 'startTime' | 'endTime' | 'sets'> {
+    startTime: string | number; // JSON dates are strings
+    endTime?: string | number;
+    sets: (Omit<WorkoutSet, 'exerciseName' | 'type'> & {
+        exercise?: {
+            name: string;
+            type: ExerciseType;
+        }
+    })[];
+}
+
+export const getSessions = async (userId: string): Promise<WorkoutSession[]> => {
+    try {
+        const sessions = await api.get<ApiSession[]>('/sessions');
+        // Convert ISO date strings to timestamps
+        return sessions.map((session) => ({
+            ...session,
+            startTime: new Date(session.startTime).getTime(),
+            endTime: session.endTime ? new Date(session.endTime).getTime() : undefined,
+            sets: session.sets.map((set) => ({
+                ...set,
+                exerciseName: set.exercise?.name || 'Unknown',
+                type: set.exercise?.type || ExerciseType.STRENGTH
+            })) as WorkoutSet[]
+        }));
+    } catch {
+        return [];
+    }
+};
+
+export const saveSession = async (userId: string, session: WorkoutSession): Promise<void> => {
+    await api.post('/sessions', session);
+};
+
+export const getActiveSession = async (userId: string): Promise<WorkoutSession | null> => {
+    try {
+        const response = await api.get<{ success: boolean; session?: ApiSession }>('/sessions/active');
+        if (!response.success || !response.session) {
+            return null;
+        }
+        const session = response.session;
+        // Convert ISO date strings to timestamps
+        return {
+            ...session,
+            startTime: new Date(session.startTime).getTime(),
+            endTime: session.endTime ? new Date(session.endTime).getTime() : undefined,
+            sets: session.sets.map((set) => ({
+                ...set,
+                exerciseName: set.exercise?.name || 'Unknown',
+                type: set.exercise?.type || ExerciseType.STRENGTH
+            })) as WorkoutSet[]
+        };
+    } catch {
+        return null;
+    }
+};
+
+export const updateActiveSession = async (userId: string, session: WorkoutSession): Promise<void> => {
+    await api.put('/sessions/active', session);
+};
+
+export const deleteSetFromActiveSession = async (userId: string, setId: string): Promise<void> => {
+    await api.delete(`/sessions/active/set/${setId}`);
+};
+
+export const updateSetInActiveSession = async (userId: string, setId: string, setData: Partial<WorkoutSet>): Promise<WorkoutSet> => {
+    const response = await api.put<{ success: boolean; updatedSet: WorkoutSet }>(`/sessions/active/set/${setId}`, setData);
+    return response.updatedSet;
+};
+
+export const deleteActiveSession = async (userId: string): Promise<void> => {
+    await api.delete('/sessions/active');
+};
+
+export const deleteSession = async (userId: string, id: string): Promise<void> => {
+    await api.delete(`/sessions/${id}`);
+};
+
+export const deleteAllUserData = (userId: string) => {
+    // Not implemented in frontend
+};

src/services/storage.ts

@@ -1,114 +1,3 @@
-import { WorkoutSession, ExerciseDef, ExerciseType, WorkoutSet, WorkoutPlan } from '../types';
-import { api } from './api';
-
-export const getSessions = async (userId: string): Promise<WorkoutSession[]> => {
-  try {
-    const sessions = await api.get('/sessions');
-    // Convert ISO date strings to timestamps
-    return sessions.map((session: any) => ({
-      ...session,
-      startTime: new Date(session.startTime).getTime(),
-      endTime: session.endTime ? new Date(session.endTime).getTime() : undefined,
-      sets: session.sets.map((set: any) => ({
-        ...set,
-        exerciseName: set.exercise?.name || 'Unknown',
-        type: set.exercise?.type || 'STRENGTH'
-      }))
-    }));
-  } catch {
-    return [];
-  }
-};
-
-export const saveSession = async (userId: string, session: WorkoutSession): Promise<void> => {
-  await api.post('/sessions', session);
-};
-
-export const getActiveSession = async (userId: string): Promise<WorkoutSession | null> => {
-  try {
-    const response = await api.get('/sessions/active');
-    if (!response.success || !response.session) {
-      return null;
-    }
-    const session = response.session;
-    // Convert ISO date strings to timestamps
-    return {
-      ...session,
-      startTime: new Date(session.startTime).getTime(),
-      endTime: session.endTime ? new Date(session.endTime).getTime() : undefined,
-      sets: session.sets.map((set: any) => ({
-        ...set,
-        exerciseName: set.exercise?.name || 'Unknown',
-        type: set.exercise?.type || 'STRENGTH'
-      }))
-    };
-  } catch {
-    return null;
-  }
-};
-
-export const updateActiveSession = async (userId: string, session: WorkoutSession): Promise<void> => {
-  await api.put('/sessions/active', session);
-};
-
-export const deleteSetFromActiveSession = async (userId: string, setId: string): Promise<void> => {
-  await api.delete(`/sessions/active/set/${setId}`);
-};
-
-export const updateSetInActiveSession = async (userId: string, setId: string, setData: Partial<WorkoutSet>): Promise<WorkoutSet> => {
-  const response = await api.put(`/sessions/active/set/${setId}`, setData);
-  return response.updatedSet;
-};
-
-export const deleteActiveSession = async (userId: string): Promise<void> => {
-  await api.delete('/sessions/active');
-};
-
-export const deleteSession = async (userId: string, id: string): Promise<void> => {
-  await api.delete(`/sessions/${id}`);
-};
-
-export const deleteAllUserData = (userId: string) => {
-  // Not implemented in frontend
-};
-
-export const getExercises = async (userId: string): Promise<ExerciseDef[]> => {
-  try {
-    return await api.get('/exercises');
-  } catch {
-    return [];
-  }
-};
-
-export const saveExercise = async (userId: string, exercise: ExerciseDef): Promise<void> => {
-  await api.post('/exercises', exercise);
-};
-
-export const getLastSetForExercise = async (userId: string, exerciseId: string): Promise<WorkoutSet | undefined> => {
-  try {
-    const response = await api.get(`/exercises/${exerciseId}/last-set`);
-    if (response.success && response.set) {
-      return response.set;
-    }
-    return undefined;
-  } catch (error) {
-    console.error("Failed to fetch last set:", error);
-    return undefined;
-  }
-};
-
-export const getPlans = async (userId: string): Promise<WorkoutPlan[]> => {
-  try {
-    return await api.get('/plans');
-  } catch {
-    return [];
-  }
-};
-
-export const savePlan = async (userId: string, plan: WorkoutPlan): Promise<void> => {
-  await api.post('/plans', plan);
-};
-
-export const deletePlan = async (userId: string, id: string): Promise<void> => {
-  await api.delete(`/plans/${id}`);
-};
+export * from './exercises';
+export * from './sessions';
+export * from './plans';