summaryrefslogtreecommitdiff
path: root/recipeBuddy/src/app/pre-cook-pop-up
diff options
context:
space:
mode:
authorTucker Evans <tuckerevans24@gmail.com>2019-12-12 11:59:29 -0500
committerGitHub <noreply@github.com>2019-12-12 11:59:29 -0500
commit7d8b3b712274613b20c299efc48e4041e3fc6d72 (patch)
tree585ffdf67ea07d78efaedbebf42da2e8a446e9cd /recipeBuddy/src/app/pre-cook-pop-up
parentafd1a8106feca31ab644fbb412c87eca69bfd737 (diff)
parent47254348140fce18c985e9a0ffb592390b226c80 (diff)
Merge pull request #28 from tuckerevans/elim
Elim
Diffstat (limited to 'recipeBuddy/src/app/pre-cook-pop-up')
-rw-r--r--recipeBuddy/src/app/pre-cook-pop-up/pre-cook-pop-up.component.css1
-rw-r--r--recipeBuddy/src/app/pre-cook-pop-up/pre-cook-pop-up.component.html4
-rw-r--r--recipeBuddy/src/app/pre-cook-pop-up/pre-cook-pop-up.component.ts11
3 files changed, 9 insertions, 7 deletions
diff --git a/recipeBuddy/src/app/pre-cook-pop-up/pre-cook-pop-up.component.css b/recipeBuddy/src/app/pre-cook-pop-up/pre-cook-pop-up.component.css
index 809e58b..7c98c34 100644
--- a/recipeBuddy/src/app/pre-cook-pop-up/pre-cook-pop-up.component.css
+++ b/recipeBuddy/src/app/pre-cook-pop-up/pre-cook-pop-up.component.css
@@ -6,6 +6,7 @@ h4 { text-align: center;
display:grid;
width: 400px;
margin: auto;
+ margin-top: 30px;
padding: 10px;
border: solid;
align-content: center;
diff --git a/recipeBuddy/src/app/pre-cook-pop-up/pre-cook-pop-up.component.html b/recipeBuddy/src/app/pre-cook-pop-up/pre-cook-pop-up.component.html
index c1ef1ef..0f046ad 100644
--- a/recipeBuddy/src/app/pre-cook-pop-up/pre-cook-pop-up.component.html
+++ b/recipeBuddy/src/app/pre-cook-pop-up/pre-cook-pop-up.component.html
@@ -2,7 +2,7 @@
<h1>{{cookedRecipe.name}}</h1>
<div class="input-box">
- Serving<input (keyup)="updateRecipe($event)">
+ Serving<input placeholder={{cookedRecipe.servingSize}} (keyup)="updateRecipe($event)">
</div>
<h4>Ingredients:</h4>
@@ -13,4 +13,4 @@
</div>
</div>
-<button class="button" routerLink="/cook"> Ready </button>
+<button mat-stroked-button class="button" routerLink="/cook"> Ready </button>
diff --git a/recipeBuddy/src/app/pre-cook-pop-up/pre-cook-pop-up.component.ts b/recipeBuddy/src/app/pre-cook-pop-up/pre-cook-pop-up.component.ts
index 208993f..7ec8ef2 100644
--- a/recipeBuddy/src/app/pre-cook-pop-up/pre-cook-pop-up.component.ts
+++ b/recipeBuddy/src/app/pre-cook-pop-up/pre-cook-pop-up.component.ts
@@ -21,15 +21,16 @@ export class PreCookPopUpComponent implements OnInit {
constructor(private recipePass: RecipePassService, private backend: BackendService, private router: Router) { }
ngOnInit() {
- this.backend.getRecipe(15).subscribe(res =>
- {
- console.log(res);
- this.cookedRecipe = res;
+ this.cookedRecipe = this.recipePass.getRecipe();
+// this.backend.getRecipe(20).subscribe(res =>
+// {
+// this.cookedRecipe = res;
this.originalSize = this.cookedRecipe.servingSize;
for(var _i = 0; _i < this.cookedRecipe.ingredients.length; _i++) {
this.originalAmounts[_i] = this.cookedRecipe.ingredients[_i].amount;
}
- });
+ this.recipePass.setRecipe(this.cookedRecipe);
+// });
}
updateRecipe(event: any) {