Added backend logic to workouts, workin on testing it and PB

Author: KushK04

KonditionExpo/app/(tabs)/progress.tsx

@@ -1,4 +1,4 @@
-import React, { useState } from 'react';
+import React, { useState, useEffect } from 'react';
 import { 
   SafeAreaView, 
   View, 
@@ -15,7 +15,7 @@ import { useWorkout, Workout } from '@/contexts/WorkoutContext';
 import { Button } from '@/components/ui/Button';
 import { Input } from '@/components/ui/Input';
 import { router } from 'expo-router';
-
+import { useAuth } from '@/contexts/AuthContext';
 const { width } = Dimensions.get('window');
 
 interface WorkoutItemProps {
@@ -51,14 +51,31 @@ const WorkoutItem = ({ workout, onPress }: WorkoutItemProps) => {
   );
 };
 
+
+
 const ProgressScreen = () => {
-  const { workouts, currentWorkout, startWorkout } = useWorkout();
+  const { workouts, currentWorkout, startWorkout, getWorkouts } = useWorkout();
+  const { isAuthenticated, isLoading } = useAuth();
   const [showNewWorkoutModal, setShowNewWorkoutModal] = useState(false);
   const [newWorkoutName, setNewWorkoutName] = useState('');
-  
   const backgroundColor = '#FFFFFF';
   const textColor = '#333';
   const tintColor = '#70A1FF';
+  
+  // ⬇️ Load backend workouts once auth is ready
+  useEffect(() => {
+    if (isAuthenticated && !isLoading) {
+      getWorkouts();
+    }
+  }, [isAuthenticated, isLoading]);
+
+  if (isLoading || !isAuthenticated) {
+    return (
+      <SafeAreaView style={styles.container}>
+        <Text style={{ textAlign: 'center', marginTop: 100 }}>Loading your progress...</Text>
+      </SafeAreaView>
+    );
+  }
 
   const handleStartWorkout = () => {
     if (!newWorkoutName.trim()) {

KonditionExpo/app/workout.tsx

@@ -149,25 +149,21 @@ const WorkoutScreen = () => {
     addSetToExercise(exerciseId, newSet);
   };
 
-  const handleFinishWorkout = () => {
+  const handleFinishWorkout = async () => {
     if (!currentWorkout) return;
-    
-    Alert.alert(
-      'Finish Workout',
-      'Are you sure you want to finish this workout?',
-      [
-        { text: 'Cancel', style: 'cancel' },
-        {
-          text: 'Finish',
-          onPress: () => {
-            const duration = Math.round((new Date().getTime() - startTime.getTime()) / 60000);
-            const updatedWorkout = { ...currentWorkout, duration };
-            endWorkout();
-            router.replace('/(tabs)');
-          },
-        },
-      ]
-    );
+  
+    const duration = Math.round((new Date().getTime() - startTime.getTime()) / 60000);
+    const updatedWorkout = { ...currentWorkout, duration };
+  
+    console.log("FinishWorkout-UpdatedWorkout: ", updatedWorkout);
+  
+    try {
+      await endWorkout(updatedWorkout); // wait for backend POST to complete
+      router.replace('/(tabs)');
+    } catch (error) {
+      console.error("Error finishing workout:", error);
+      // Optionally show UI feedback
+    }
   };
 
   if (!currentWorkout) {

KonditionExpo/contexts/WorkoutContext.tsx

@@ -1,4 +1,6 @@
 import React, { createContext, useContext, useState, ReactNode } from 'react';
+import axios from 'axios';
+import { useAuth } from '@/contexts/AuthContext'; // adjust if needed
 
 export interface Exercise {
   id: string;
@@ -34,11 +36,12 @@ export interface Workout {
 interface WorkoutContextType {
   workouts: Workout[];
   currentWorkout: Workout | null;
-  addWorkout: (workout: Workout) => void;
+  addWorkout: (workout: Workout) => Promise<void>; // <-- async now
   updateWorkout: (workoutId: string, workout: Workout) => void;
+  getWorkouts: () => void;
   deleteWorkout: (workoutId: string) => void;
   startWorkout: (name: string) => void;
-  endWorkout: () => void;
+  endWorkout: (updatedWorkout: Workout) => Promise<void>; // <-- async now
   addExerciseToCurrentWorkout: (exercise: Exercise) => void;
   addSetToExercise: (exerciseId: string, set: Omit<WorkoutSet, 'id'>) => void;
   removeSetFromExercise: (exerciseId: string, setId: string) => void;
@@ -50,18 +53,72 @@ const WorkoutContext = createContext<WorkoutContextType | undefined>(undefined);
 export const WorkoutProvider = ({ children }: { children: ReactNode }) => {
   const [workouts, setWorkouts] = useState<Workout[]>([]);
   const [currentWorkout, setCurrentWorkout] = useState<Workout | null>(null);
+  const { token, isAuthenticated, isLoading } = useAuth(); //token of user
+
+
+  // Early return while loading or not authenticated
+  if (isLoading || !isAuthenticated || !token) {
+    return null; // or <LoadingIndicator />
+  }
+  console.log("In WorkoutContext - Current User token is: ", token);
 
   const generateId = () => Math.random().toString(36).substr(2, 9);
 
-  const addWorkout = (workout: Workout) => {
-    setWorkouts(prev => [...prev, workout]);
+  const addWorkout = async (workout: Workout) => {
+    try {
+      const response = await axios.post(
+        'http://localhost:8000/api/v1/workouts/', // Replace with deployment endpoint
+        workout,
+        {
+          headers: {
+            Authorization: `Bearer ${token}`,
+          },
+        }
+      );
+      console.log("Response from POST /workouts: ", response);
+      const savedWorkout = response.data;
+      setWorkouts(prev => [...prev, savedWorkout]);
+    } catch (error) {
+      console.error('Failed to save workout to backend:', error.response?.data || error.message);
+    }
   };
 
-  const updateWorkout = (workoutId: string, updatedWorkout: Workout) => {
+  const getWorkouts = async () => {
+    try {
+      const response = await axios.get('http://localhost:8000/api/v1/workouts/', {
+        headers: {
+          Authorization: `Bearer ${token}`,
+        },
+      });
+  
+      // Extract array properly
+      const workoutArray = response.data.data;
+  
+      // Convert string dates to Date objects
+      const parsed = workoutArray.map((w: any) => ({
+        ...w,
+        date: new Date(w.created_at),
+        exercises: w.exercises || [], // fallback to empty array
+        duration: w.duration_minutes || 0,
+      }));
+  
+      setWorkouts(parsed);
+    } catch (error) {
+      console.error('Failed to load workouts:', error.response?.data || error.message);
+    }
+  };
+  const endWorkout = async (updatedWorkout: Workout) => {
+    await addWorkout(updatedWorkout);
+    setCurrentWorkout(null);
+  };
+
+  //Everything below this is old - only updates local state rather than send backend requests
+
+  const updateWorkout = (workoutId: string, updatedWorkout: Workout) => { //Old
     setWorkouts(prev => prev.map(w => w.id === workoutId ? updatedWorkout : w));
   };
 
-  const deleteWorkout = (workoutId: string) => {
+  const deleteWorkout = (workoutId: string) => { // Old
     setWorkouts(prev => prev.filter(w => w.id !== workoutId));
   };
 
@@ -76,13 +133,6 @@ export const WorkoutProvider = ({ children }: { children: ReactNode }) => {
     setCurrentWorkout(newWorkout);
   };
 
-  const endWorkout = () => {
-    if (currentWorkout) {
-      addWorkout(currentWorkout);
-      setCurrentWorkout(null);
-    }
-  };
-
   const addExerciseToCurrentWorkout = (exercise: Exercise) => {
     if (!currentWorkout) return;
 
@@ -155,11 +205,12 @@ export const WorkoutProvider = ({ children }: { children: ReactNode }) => {
       updateWorkout,
       deleteWorkout,
       startWorkout,
-      endWorkout,
+      endWorkout,   
       addExerciseToCurrentWorkout,
       addSetToExercise,
       removeSetFromExercise,
       updateSet,
+      getWorkouts,
     }}>
       {children}
     </WorkoutContext.Provider>

KonditionExpo/package-lock.json

@@ -19,6 +19,7 @@
     "@react-navigation/bottom-tabs": "^7.3.10",
     "@react-navigation/elements": "^2.3.8",
     "@react-navigation/native": "^7.1.6",
+    "axios": "^1.9.0",
     "d3-shape": "^3.2.0",
     "expo": "^53.0.9",
     "expo-blur": "~14.1.4",

KonditionExpo/package.json

@@ -0,0 +1,25 @@
+"""merge post_privacy and cascade heads
+
+Revision ID: feaaa16caba8
+Revises: 1a31ce608336, 20250604_add_post_privacy
+Create Date: 2025-06-05 12:15:19.781955
+
+"""
+from alembic import op
+import sqlalchemy as sa
+import sqlmodel.sql.sqltypes
+
+
+# revision identifiers, used by Alembic.
+revision = 'feaaa16caba8'
+down_revision = ('1a31ce608336', '20250604_add_post_privacy')
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    pass
+
+
+def downgrade():
+    pass