ExerciseType added

vrnvu · Apr 29, 2024 · 7372901 · 7372901
1 parent fe95a81
commit 7372901
Show file tree

Hide file tree

Showing 6 changed files with 74 additions and 90 deletions.
diff --git a/src/App.tsx b/src/App.tsx
@@ -5,7 +5,7 @@ import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs"
 
 import PlanView from './views/PlanView'
 import ProgramView from './views/ProgramView'
-import { UserConfigProvider } from './context/UserConfigContext'
+import { UserConfigProvider } from './contexts/UserConfigContext'
 
 
 function App() {

diff --git a/src/components/Cluster.tsx b/src/components/Cluster.tsx
@@ -15,11 +15,18 @@ import {
   TableHeader,
   TableRow,
 } from "@/components/ui/table"
-import { UserConfig, useUserConfig } from "@/context/UserConfigContext";
+import { ExerciseType, UserConfig, useUserConfig } from "@/contexts/UserConfigContext";
 
 export interface ClusterProps {}
 export default function Cluster({}: ClusterProps) {
 	const userConfig: UserConfig = useUserConfig();
+  const [benchPress, setBenchPress] = userConfig.exercises.get(ExerciseType.BENCH_PRESS)!;
+  const [backSquat, setBackSquat] = userConfig.exercises.get(ExerciseType.BACK_SQUAT)!;
+  const [weightedPullups, setWeightedPullups] = userConfig.exercises.get(ExerciseType.WEIGHTED_PULLUPS)!;
+
+  const [lastBenchPress, setLastBenchPress] = userConfig.lastExercises.get(ExerciseType.BENCH_PRESS)!;
+  const [lastBackSquat, setLastBackSquat] = userConfig.lastExercises.get(ExerciseType.BACK_SQUAT)!;
+  const [lastWeightedPullups, setLastWeightedPullups] = userConfig.lastExercises.get(ExerciseType.WEIGHTED_PULLUPS)!;
 
   return (
     <Card>
@@ -45,13 +52,13 @@ export default function Cluster({}: ClusterProps) {
                 <Label htmlFor="ex-1" className="sr-only">
                   Current 1RM
                 </Label>
-                <Input id="ex-1" type="number" min={0} defaultValue={userConfig.benchPress} onChange={(e) => userConfig.setBenchPress(e.target.valueAsNumber)}/>
+                <Input id="ex-1" type="number" min={0} defaultValue={benchPress} onChange={(e) => setBenchPress(e.target.valueAsNumber)}/>
               </TableCell>
               <TableCell>
                 <Label htmlFor="last-ex-1" className="sr-only">
                   Last 1RM
                 </Label>
-                <Input id="last-ex-1" type="number" min={0} defaultValue={userConfig.lastBenchPress} onChange={(e) => userConfig.setLastBenchPress(e.target.valueAsNumber)}/>
+                <Input id="last-ex-1" type="number" min={0} defaultValue={lastBenchPress} onChange={(e) => setLastBenchPress(e.target.valueAsNumber)}/>
               </TableCell>
             </TableRow>
 
@@ -61,13 +68,13 @@ export default function Cluster({}: ClusterProps) {
                 <Label htmlFor="ex-2" className="sr-only">
                   Current 1RM
                 </Label>
-                <Input id="ex-2" type="number" min={0} defaultValue={userConfig.backSquat} onChange={(e) => userConfig.setBackSquat(e.target.valueAsNumber)}/>
+                <Input id="ex-2" type="number" min={0} defaultValue={backSquat} onChange={(e) => setBackSquat(e.target.valueAsNumber)}/>
               </TableCell>
               <TableCell>
                 <Label htmlFor="last-ex-2" className="sr-only">
                   Last 1RM
                 </Label>
-                <Input id="last-ex-2" type="number" min={0} defaultValue={userConfig.lastBackSquat} onChange={(e) => userConfig.setLastBackSquat(e.target.valueAsNumber)}/>
+                <Input id="last-ex-2" type="number" min={0} defaultValue={lastBackSquat} onChange={(e) => setLastBackSquat(e.target.valueAsNumber)}/>
               </TableCell>
             </TableRow>
 
@@ -77,13 +84,13 @@ export default function Cluster({}: ClusterProps) {
                 <Label htmlFor="ex-3" className="sr-only">
                   Current 1RM
                 </Label>
-                <Input id="ex-3" type="number" min={0} defaultValue={userConfig.weightedPullups} onChange={(e) => userConfig.setWeightedPullups(e.target.valueAsNumber)}/>
+                <Input id="ex-3" type="number" min={0} defaultValue={weightedPullups} onChange={(e) => setWeightedPullups(e.target.valueAsNumber)}/>
               </TableCell>
               <TableCell>
                 <Label htmlFor="last-ex-3" className="sr-only">
                   Last 1RM
                 </Label>
-                <Input id="last-ex-2" type="number" min={0} defaultValue={userConfig.lastWeightedPullups} onChange={(e) => userConfig.setLastWeightedPullups(e.target.valueAsNumber)}/>
+                <Input id="last-ex-2" type="number" min={0} defaultValue={lastWeightedPullups} onChange={(e) => setLastWeightedPullups(e.target.valueAsNumber)}/>
               </TableCell>
             </TableRow>
           </TableBody>

diff --git a/src/context/UserConfigContext.tsx b/src/context/UserConfigContext.tsx
diff --git a/src/contexts/UserConfigContext.tsx b/src/contexts/UserConfigContext.tsx
@@ -0,0 +1,47 @@
+import React, { Dispatch, SetStateAction } from "react";
+import { createContext, useState } from "react";
+
+export enum ExerciseType {
+  BENCH_PRESS,
+  BACK_SQUAT,
+  WEIGHTED_PULLUPS
+}
+
+export interface UserConfig {
+  exercises: Map<ExerciseType, [number, Dispatch<SetStateAction<number>>]>;
+  lastExercises: Map<ExerciseType, [number, Dispatch<SetStateAction<number>>]>;
+}
+
+const UserConfigContext = createContext<UserConfig | undefined>(undefined);
+
+export const useUserConfig: () => UserConfig = () => {
+  const userConfig = React.useContext(UserConfigContext);
+  if (userConfig == undefined) {
+    throw new Error("UserConfig context not initialized");
+  }
+
+  return userConfig;
+}
+
+export function UserConfigProvider({ children }: { children: React.ReactNode }) {
+  const exercises = new Map<ExerciseType, [number, Dispatch<SetStateAction<number>>]>();
+  exercises.set(ExerciseType.BENCH_PRESS, useState<number>(0));
+  exercises.set(ExerciseType.BACK_SQUAT, useState<number>(0));
+  exercises.set(ExerciseType.WEIGHTED_PULLUPS, useState<number>(0));
+
+  const lastExercises = new Map<ExerciseType, [number, Dispatch<SetStateAction<number>>]>();
+  lastExercises.set(ExerciseType.BENCH_PRESS, useState<number>(0));
+  lastExercises.set(ExerciseType.BACK_SQUAT, useState<number>(0));
+  lastExercises.set(ExerciseType.WEIGHTED_PULLUPS, useState<number>(0));
+
+  const userConfig: UserConfig = {
+    exercises,
+    lastExercises,
+  };
+
+  return (
+    <UserConfigContext.Provider value={userConfig}>
+      {children}
+    </UserConfigContext.Provider>
+  );
+}
diff --git a/src/views/PlanView.tsx b/src/views/PlanView.tsx
@@ -1,19 +1,20 @@
 import Cluster from "@/components/Cluster";
 import Component from "@/components/Component";
-import { UserConfig, useUserConfig } from "@/context/UserConfigContext";
+import { ExerciseType, UserConfig, useUserConfig } from "@/contexts/UserConfigContext";
 
 export interface PlanViewProps {}
 export default function PlanView({}: PlanViewProps) {
 	const userConfig: UserConfig = useUserConfig();
 
-	const benchPress = userConfig.benchPress;
-	const backSquat = userConfig.backSquat;
-	const weightedPullups = userConfig.weightedPullups;
+	const benchPress = userConfig.exercises.get(ExerciseType.BENCH_PRESS)![0];
+	const backSquat = userConfig.exercises.get(ExerciseType.BACK_SQUAT)![0];
+	const weightedPullups = userConfig.exercises.get!(ExerciseType.WEIGHTED_PULLUPS)![0];
 	const total = benchPress + backSquat + weightedPullups;
 
-	const lastBenchPress = userConfig.lastBenchPress;
-	const lastBackSquat = userConfig.lastBackSquat;
-	const lastWeightedPullups = userConfig.lastWeightedPullups;
+	const lastBenchPress = userConfig.lastExercises.get(ExerciseType.BENCH_PRESS)![0]; 
+	const lastBackSquat = userConfig.lastExercises.get(ExerciseType.BACK_SQUAT)![0]; 
+	const lastWeightedPullups = userConfig.lastExercises.get!(ExerciseType.WEIGHTED_PULLUPS)![0];
+
 	const lastTotal = lastBenchPress + lastBackSquat + lastWeightedPullups;
 
 	const benchIncrease = Math.round(((benchPress - lastBenchPress)/ lastBenchPress) * 100); 

diff --git a/src/views/ProgramView.tsx b/src/views/ProgramView.tsx
@@ -8,16 +8,16 @@ import {
   AccordionItem,
   AccordionTrigger,
 } from "@/components/ui/accordion"
-import { UserConfig, useUserConfig } from "@/context/UserConfigContext";
+import { ExerciseType, UserConfig, useUserConfig } from "@/contexts/UserConfigContext";
 
 export interface ProgramViewProps {}
 export default function ProgramView({}: ProgramViewProps) {
   const userConfig: UserConfig = useUserConfig();
 
   const exercieses: StrengthExercise[] =  [
-      {name: "Bench press", sets: "3x5", weight: userConfig.benchPress},
-      {name: "Back squat", sets: "3x5", weight: userConfig.backSquat},
-      {name: "Weighted pullups", sets: "3x5", weight: userConfig.weightedPullups}
+      {name: "Bench press", sets: "3x5", weight: userConfig.exercises.get(ExerciseType.BENCH_PRESS)![0]},
+      {name: "Back squat", sets: "3x5", weight: userConfig.exercises.get(ExerciseType.BACK_SQUAT)![0]},
+      {name: "Weighted pullups", sets: "3x5", weight: userConfig.exercises.get(ExerciseType.WEIGHTED_PULLUPS)![0]}
   ];
 
   const weekIds = ["item-1", "item-2", "item-3", "item-4", "item-5", "item-6", "item-7"];