From 5fafc6a63a12d49c52b9ade00958f9b119a1c0be Mon Sep 17 00:00:00 2001 From: Brandon Presley Date: Sun, 30 Oct 2022 14:08:41 +1300 Subject: [PATCH] Fix plan starting --- StartPlan.tsx | 8 ++++---- deploy.sh | 11 +++++++---- install.sh | 3 ++- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/StartPlan.tsx b/StartPlan.tsx index 079b813..5d75f7c 100644 --- a/StartPlan.tsx +++ b/StartPlan.tsx @@ -95,10 +95,10 @@ export default function StartPlan() { async (index: number) => { setSelected(index); console.log(`${StartPlan.name}.next:`, {name}); - if (!counts) return; - const workout = counts[index]; + if (!workouts) return; + const workout = workouts[index]; console.log(`${StartPlan.name}.next:`, {workout}); - const newBest = await getBestSet(workout.name); + const newBest = await getBestSet(workout); setMinutes(newBest.minutes); setSeconds(newBest.seconds); setName(newBest.name); @@ -107,7 +107,7 @@ export default function StartPlan() { setUnit(newBest.unit); setBest(newBest); }, - [name, counts], + [name, workouts], ); const getDescription = useCallback( diff --git a/deploy.sh b/deploy.sh index bc8f303..97dd119 100755 --- a/deploy.sh +++ b/deploy.sh @@ -1,10 +1,13 @@ #!/bin/sh set -ex -yarn tsc -yarn lint -yarn test -git push origin HEAD > /dev/null & + +tsp yarn tsc +tsp yarn lint +tsp yarn test +tsp -w +tsp git push origin HEAD + cd android || exit 1 build=app/build.gradle versionCode=$( diff --git a/install.sh b/install.sh index d47dc98..294ac93 100755 --- a/install.sh +++ b/install.sh @@ -1,5 +1,6 @@ #!/bin/sh -cd android || exit 1 +set -ex +cd android ./gradlew assembleRelease adb -d install app/build/outputs/apk/release/app-arm64-v8a-release.apk