summaryrefslogtreecommitdiff
path: root/recipeBuddy/src/app/cook-page
diff options
context:
space:
mode:
authorTucker Evans <tuckerevans24@gmail.com>2019-12-10 19:34:30 -0500
committerTucker Evans <tuckerevans24@gmail.com>2019-12-10 19:34:30 -0500
commit34ceddd42d6e44f57f4697a254533872c53f4844 (patch)
treed9e88018342ff635c7a4d999227f83d71dd0502f /recipeBuddy/src/app/cook-page
parent10e1f5849fb7f64dd188f08b5e5f682d0b162777 (diff)
Revert steps.instructions -> step.instruction
For compatibility with backend JSON.
Diffstat (limited to 'recipeBuddy/src/app/cook-page')
-rw-r--r--recipeBuddy/src/app/cook-page/cook-page.component.ts16
1 files changed, 8 insertions, 8 deletions
diff --git a/recipeBuddy/src/app/cook-page/cook-page.component.ts b/recipeBuddy/src/app/cook-page/cook-page.component.ts
index 9dfc605..3def7db 100644
--- a/recipeBuddy/src/app/cook-page/cook-page.component.ts
+++ b/recipeBuddy/src/app/cook-page/cook-page.component.ts
@@ -37,9 +37,9 @@ export class CookPageComponent implements OnInit {
this.steps = recipe.steps;
this.servingSize = recipe.servingSize;
this.stepNum = 1;
- this.currentStep = this.steps[this.stepNum-1].instructions;
+ this.currentStep = this.steps[this.stepNum-1].instruction;
if(this.steps.length > 1)
- this.nextStep = this.steps[this.stepNum].instructions;
+ this.nextStep = this.steps[this.stepNum].instruction;
else
this.lastStep = true;
// this.timeLeft = this.steps[this.stepNum-1].timer;
@@ -59,10 +59,10 @@ export class CookPageComponent implements OnInit {
if(this.stepNum == this.steps.length) {
this.lastStep = true;
} else {
- this.nextStep = this.steps[this.stepNum].instructions;
+ this.nextStep = this.steps[this.stepNum].instruction;
}
- this.previousStep = this.steps[this.stepNum-2].instructions;
- this.currentStep = this.steps[this.stepNum-1].instructions;
+ this.previousStep = this.steps[this.stepNum-2].instruction;
+ this.currentStep = this.steps[this.stepNum-1].instruction;
this.timeLeft = this.steps[this.stepNum-1].timer;
}
@@ -73,10 +73,10 @@ export class CookPageComponent implements OnInit {
if(this.stepNum == 1) {
this.firstStep = true;
} else {
- this.previousStep = this.steps[this.stepNum-2].instructions;
+ this.previousStep = this.steps[this.stepNum-2].instruction;
}
- this.currentStep = this.steps[this.stepNum-1].instructions;
- this.nextStep = this.steps[this.stepNum].instructions;
+ this.currentStep = this.steps[this.stepNum-1].instruction;
+ this.nextStep = this.steps[this.stepNum].instruction;
this.timeLeft = this.steps[this.stepNum-1].timer;
}