added finish step

andorsk · May 6, 2024 · f6f6ce3 · f6f6ce3
1 parent f8c699e
commit f6f6ce3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 32 deletions.
diff --git a/src/components/workout/WorkoutManager.tsx b/src/components/workout/WorkoutManager.tsx
@@ -236,13 +236,12 @@ export class WorkoutManager implements WorkoutManagerI {
       throw new Error("Invalid step set. Must be valid and session created.");
     }
 
-    if (this._currentStep >= this.workout.steps.length - 1) {
+    this._set = true;
+    this._currentStep = step;
+    if (step >= this.workout.steps.length - 1) {
       await this.endWorkout();
       return;
     }
-
-    this._set = true;
-    this._currentStep = step;
     if (this._timer && this._workout) {
       this._timer.setTime(this._workout?.steps[step]?.duration);
     }

diff --git a/src/pages/PlayScreen/index.tsx b/src/pages/PlayScreen/index.tsx
@@ -32,6 +32,7 @@ function StepView() {
     if (workoutState.manager?.workout?.steps.length === 0) {
       return;
     }
+    console.log("setting step to", index);
     workoutState.manager?.setStep(index);
   };
 
@@ -52,33 +53,6 @@ function StepView() {
     );
   }, [workoutState]);
 
-  // useEffect(() => {
-  //   const h = async (workoutState: WorkoutState, web5state: Web5State) => {
-  //     if (
-  //       workoutState?.manager?.started &&
-  //       web5state?.loaded &&
-  //       !isUpdating &&
-  //       workoutState.manager.workout &&
-  //       web5state.web5
-  //     ) {
-  //       try {
-  //         await updateSession(workoutState?.manager?.workout, web5state.web5);
-  //       } catch (e) {
-  //         console.error("failed to get session", e);
-  //       }
-  //     }
-  //   };
-  //   // TODO. Fix
-  //   // @ts-ignore
-  //   h(workoutState, web5state);
-  // }, [
-  //   workoutState.manager.currentStep,
-  //   workoutState.manager.isWorkoutActive,
-  //   workoutState.manager.workout._completed,
-  //   workoutState.manager.started,
-  //   workoutState.manager.ready,
-  // ]);
-
   const whiteListedNames = [
     "Rest Between Sets",
     "Cool Down",
@@ -136,7 +110,6 @@ function Footer() {
       workoutState?.manager.workout?.steps[workoutState?.manager.currentStep],
     );
     if (!workoutState.manager.ready) {
-      alert("no workout set. routing you to select first");
       router.push("/");
     }
   }, [workoutState]);