From 2b43753e546b85ad3aea411df9636b23153fb9d8 Mon Sep 17 00:00:00 2001
From: schencej <schencej@clarkson.edu>
Date: Mon, 9 Dec 2019 17:46:39 -0500
Subject: added pre cooking page

---
 recipeBuddy/src/app/app-routing.module.ts          |  2 ++
 recipeBuddy/src/app/app.module.ts                  | 12 ++++++-----
 .../pre-cook-pop-up/pre-cook-pop-up.component.css  |  0
 .../pre-cook-pop-up/pre-cook-pop-up.component.html | 13 +++++++++++
 .../pre-cook-pop-up.component.spec.ts              | 25 ++++++++++++++++++++++
 .../pre-cook-pop-up/pre-cook-pop-up.component.ts   | 24 +++++++++++++++++++++
 6 files changed, 71 insertions(+), 5 deletions(-)
 create mode 100644 recipeBuddy/src/app/pre-cook-pop-up/pre-cook-pop-up.component.css
 create mode 100644 recipeBuddy/src/app/pre-cook-pop-up/pre-cook-pop-up.component.html
 create mode 100644 recipeBuddy/src/app/pre-cook-pop-up/pre-cook-pop-up.component.spec.ts
 create mode 100644 recipeBuddy/src/app/pre-cook-pop-up/pre-cook-pop-up.component.ts

(limited to 'recipeBuddy/src/app')

diff --git a/recipeBuddy/src/app/app-routing.module.ts b/recipeBuddy/src/app/app-routing.module.ts
index a6e4399..3e4d67a 100644
--- a/recipeBuddy/src/app/app-routing.module.ts
+++ b/recipeBuddy/src/app/app-routing.module.ts
@@ -2,9 +2,11 @@ import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
 
 import { CookPageComponent } from './cook-page/cook-page.component';
+import { PreCookPopUpComponent } from './pre-cook-pop-up/pre-cook-pop-up.component';
 
 const routes: Routes = [
 	{ path: '', redirectTo: '/cook', pathMatch: 'full' },
+	{path: 'preCook' , component: PreCookPopUpComponent },
 	{ path: 'cook', component: CookPageComponent }
 ];
 
diff --git a/recipeBuddy/src/app/app.module.ts b/recipeBuddy/src/app/app.module.ts
index eaa0553..9b7a049 100644
--- a/recipeBuddy/src/app/app.module.ts
+++ b/recipeBuddy/src/app/app.module.ts
@@ -2,20 +2,22 @@ import { BrowserModule } from '@angular/platform-browser';
 import { NgModule } from '@angular/core';
 import { FormsModule } from '@angular/forms';
 import { MatCardModule } from '@angular/material';
+import { MatDialogModule } from '@angular/material';
 
 import { AppComponent } from './app.component';
 import { CookPageComponent} from './cook-page/cook-page.component';
-import { StepCardComponent } from './cook-page/step-card/step-card.component';
 
 import { AppRoutingModule } from './app-routing.module';
 
-import {HttpClientModule } from '@angular/common/http'
+import { HttpClientModule } from '@angular/common/http';
+import { PreCookPopUpComponent } from './pre-cook-pop-up/pre-cook-pop-up.component';
+import { RecipePassService } from './recipePass/recipe-pass.service'
 
 @NgModule({
   declarations: [
     AppComponent,
     CookPageComponent,
-    StepCardComponent
+    PreCookPopUpComponent,
   ],
   imports: [
     BrowserModule,
@@ -23,7 +25,7 @@ import {HttpClientModule } from '@angular/common/http'
     MatCardModule,
     HttpClientModule
   ],
-  providers: [],
-  bootstrap: [AppComponent]
+  providers: [RecipePassService],
+  bootstrap: [AppComponent],
 })
 export class AppModule { }
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
new file mode 100644
index 0000000..e69de29
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
new file mode 100644
index 0000000..dc87efd
--- /dev/null
+++ b/recipeBuddy/src/app/pre-cook-pop-up/pre-cook-pop-up.component.html
@@ -0,0 +1,13 @@
+<div>
+{{cookedRecipe.name}}
+	<div>
+		Serving Size: {{cookedRecipe.servingSize}} 
+	</div>
+	<div> Ingredients:
+		<li *ngFor="let ing of cookedRecipe.ingredients">
+			{{ing.name}}, {{ing.amount}} unit: {{ing.units}}
+	
+	</div>
+</div>
+
+<button routerLink="/cook"> Ready </button>
diff --git a/recipeBuddy/src/app/pre-cook-pop-up/pre-cook-pop-up.component.spec.ts b/recipeBuddy/src/app/pre-cook-pop-up/pre-cook-pop-up.component.spec.ts
new file mode 100644
index 0000000..b355855
--- /dev/null
+++ b/recipeBuddy/src/app/pre-cook-pop-up/pre-cook-pop-up.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { PreCookPopUpComponent } from './pre-cook-pop-up.component';
+
+describe('PreCookPopUpComponent', () => {
+  let component: PreCookPopUpComponent;
+  let fixture: ComponentFixture<PreCookPopUpComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ PreCookPopUpComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(PreCookPopUpComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
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
new file mode 100644
index 0000000..396784d
--- /dev/null
+++ b/recipeBuddy/src/app/pre-cook-pop-up/pre-cook-pop-up.component.ts
@@ -0,0 +1,24 @@
+import { Component, OnInit } from '@angular/core';
+import { RecipePassService } from '../RecipePass/recipe-pass.service';
+import { Recipe } from '../DataModels/recipe';
+import { BackendService } from '../REST_service/backend.service';
+
+@Component({
+  selector: 'app-pre-cook-pop-up',
+  templateUrl: './pre-cook-pop-up.component.html',
+  styleUrls: ['./pre-cook-pop-up.component.css']
+})
+export class PreCookPopUpComponent implements OnInit {
+
+  cookedRecipe: Recipe;
+
+  constructor(private recipePass: RecipePassService, private backend: BackendService) { }
+
+  ngOnInit() {
+	this.backend.getRecipe(1).subscribe(res =>
+	{
+		this.cookedRecipe = res
+	});
+	//this.recipeToBeCooked = this.recipePass.getRecipe();
+  }
+}
-- 
cgit v1.1


From 365d78a6a7884b21fe588df9d502240c4c52bf05 Mon Sep 17 00:00:00 2001
From: schencej <schencej@clarkson.edu>
Date: Tue, 10 Dec 2019 22:22:35 -0500
Subject: added funcitonality to cook-page

---
 .../src/app/cook-page/cook-page.component.css      | 14 +----
 .../src/app/cook-page/cook-page.component.html     |  4 +-
 .../src/app/cook-page/cook-page.component.ts       | 69 +++++++++++++---------
 3 files changed, 47 insertions(+), 40 deletions(-)

(limited to 'recipeBuddy/src/app')

diff --git a/recipeBuddy/src/app/cook-page/cook-page.component.css b/recipeBuddy/src/app/cook-page/cook-page.component.css
index 4f44224..b2b97e5 100644
--- a/recipeBuddy/src/app/cook-page/cook-page.component.css
+++ b/recipeBuddy/src/app/cook-page/cook-page.component.css
@@ -1,14 +1,3 @@
-.previous-step {
-	
-}
-
-.current-step {
-
-}
-
-.next-step {
-}
-
 .previous {
 	margin: auto;
 	width: 200px;
@@ -17,6 +6,7 @@
 	align: center;
 	text-align: center;
 	grid-column: 1;
+	background-color: grey;
 
 	
 }
@@ -28,6 +18,7 @@
 	border: solid;
 	text-align: center;
 	grid-column: 2;
+	background-color: grey;
 }
 
 .next {
@@ -38,6 +29,7 @@
 	align: center;
 	text-align: center;
 	grid-column: 3;
+	background-color: grey;
 
 }
 
diff --git a/recipeBuddy/src/app/cook-page/cook-page.component.html b/recipeBuddy/src/app/cook-page/cook-page.component.html
index db1c0a8..c0a00d1 100644
--- a/recipeBuddy/src/app/cook-page/cook-page.component.html
+++ b/recipeBuddy/src/app/cook-page/cook-page.component.html
@@ -1,4 +1,5 @@
 <div class="container">
+	Serving {{servingSize}}
 	<div class="previous" *ngIf="!firstStep">
 		<h1>Step {{stepNum -1}}</h1>
 		<p>{{previousStep}}</p>
@@ -8,7 +9,8 @@
 		<h1>Step {{stepNum}}</h1>
 		<p>{{currentStep}}</p>
 		<div *ngIf="hasTimer()">
-			<p>{{timeLeft}}</p>
+			
+<h4>{{timeHoursFirst}}{{timeHoursSecond}}:{{timeMinutesFirst}}{{timeMinutesSecond}}:{{timeSecondsFirst}}{{timeSecondsSecond}}</h4>
 			<button (click)="startTimer()">Start Timer</button>
 		</div>
 		<button *ngIf="!firstStep" (click)="previous()">Previous</button>
diff --git a/recipeBuddy/src/app/cook-page/cook-page.component.ts b/recipeBuddy/src/app/cook-page/cook-page.component.ts
index f114634..9dfc605 100644
--- a/recipeBuddy/src/app/cook-page/cook-page.component.ts
+++ b/recipeBuddy/src/app/cook-page/cook-page.component.ts
@@ -6,7 +6,7 @@ import {RecipePassService} from '../recipePass/recipe-pass.service'
 @Component({
   selector: 'app-cook-page',
   templateUrl: './cook-page.component.html',
-  styleUrls: ['./cook-page.component.css'],
+  styleUrls: ['./cook-page.component.css']
 })
 export class CookPageComponent implements OnInit {
 	steps: Step[];
@@ -14,35 +14,42 @@ export class CookPageComponent implements OnInit {
 
 	firstStep: boolean = true;
 	lastStep: boolean = false;
+	servingSize: number;
 
 	previousStep: string;
 	currentStep: string;
 	nextStep: string;
 	timeLeft: number;
 
+	timeHoursFirst: number;
+	timeHoursSecond: number;
+	timeMinutesFirst: number;
+	timeMinutesSecond: number;
+	timeSecondsFirst: number;
+	timeSecondsSecond: number;
+
 	timerInterval;
 
 	constructor(private recipePass: RecipePassService){}
 
 	ngOnInit() {
-		this.getSteps();
+		var recipe: Recipe = this.recipePass.getRecipe();
+		this.steps = recipe.steps;
+		this.servingSize = recipe.servingSize;
 		this.stepNum = 1;
-		this.currentStep = this.steps[this.stepNum-1].getInstruction();
-		this.nextStep = this.steps[this.stepNum].getInstruction();
-		this.timeLeft = this.steps[this.stepNum-1].getTimer();
-	}
-
-	getSteps(): void {
-/**		
-*		var recipe: Recipe;
-*		recipe = this.recipePass.getRecipe();
-*		this.steps = recipe.getSteps();
-*/
-		var tmpSteps: Step[] = [];
-		tmpSteps[0] = new Step("Cut the bread", 0);
-		tmpSteps[1] = new Step("Warm the butter", 5);
-		tmpSteps[2] = new Step("Enjoy", 0);
-		this.steps = tmpSteps;
+		this.currentStep = this.steps[this.stepNum-1].instructions;
+		if(this.steps.length > 1)
+			this.nextStep = this.steps[this.stepNum].instructions;
+		else
+			this.lastStep = true;
+//		this.timeLeft = this.steps[this.stepNum-1].timer;
+		this.timeLeft = 88888;
+		this.timeHoursFirst = Math.floor(this.timeLeft/3600/10);
+		this.timeHoursSecond = Math.floor(this.timeLeft/3600%10);
+		this.timeMinutesFirst = Math.floor(this.timeLeft%3600/60/10);
+		this.timeMinutesSecond = Math.floor(this.timeLeft%3600/60%10);
+		this.timeSecondsFirst = Math.floor(this.timeLeft%3600%60/10);
+		this.timeSecondsSecond = Math.floor(this.timeLeft%3600%60%10);
 	}
 
 	next(): void {
@@ -52,11 +59,11 @@ export class CookPageComponent implements OnInit {
 		if(this.stepNum == this.steps.length) {			
 			this.lastStep = true;
 		} else {
-			this.nextStep = this.steps[this.stepNum].getInstruction();
+			this.nextStep = this.steps[this.stepNum].instructions;
 		}
-		this.previousStep = this.steps[this.stepNum-2].getInstruction();
-		this.currentStep = this.steps[this.stepNum-1].getInstruction();
-		this.timeLeft = this.steps[this.stepNum-1].getTimer();
+		this.previousStep = this.steps[this.stepNum-2].instructions;
+		this.currentStep = this.steps[this.stepNum-1].instructions;
+		this.timeLeft = this.steps[this.stepNum-1].timer;
 	}
 
 	previous(): void {
@@ -66,24 +73,30 @@ export class CookPageComponent implements OnInit {
 		if(this.stepNum == 1) {
 			this.firstStep = true;
 		} else {
-			this.previousStep = this.steps[this.stepNum-2].getInstruction();
+			this.previousStep = this.steps[this.stepNum-2].instructions;
 		}
-		this.currentStep = this.steps[this.stepNum-1].getInstruction();
-		this.nextStep = this.steps[this.stepNum].getInstruction();
-		this.timeLeft = this.steps[this.stepNum-1].getTimer();
+		this.currentStep = this.steps[this.stepNum-1].instructions;
+		this.nextStep = this.steps[this.stepNum].instructions;
+		this.timeLeft = this.steps[this.stepNum-1].timer;
 	}
 	
 	hasTimer(): boolean {
-		if(this.steps[this.stepNum - 1].getTimer() > 0)
+		if(this.steps[this.stepNum-1].timer > 0)
 			return true;
 		else
 			return false;
 	}
 
 	startTimer(): void {
+		console.log("timerStarted");
 		this.timerInterval = setInterval(() => {
 			if(this.timeLeft > 0) {
-				this.timeLeft --;
+				this.timeHoursFirst = Math.floor(this.timeLeft/3600/10);
+				this.timeHoursSecond = Math.floor(this.timeLeft/3600%10);
+				this.timeMinutesFirst = Math.floor(this.timeLeft%3600/60/10);
+				this.timeMinutesSecond = Math.floor(this.timeLeft%3600/60%10);
+				this.timeSecondsFirst = Math.floor(this.timeLeft%3600%60/10);
+				this.timeSecondsSecond = Math.floor(this.timeLeft%3600%60%10);
 			}
 			else {
 				clearInterval(this.timerInterval);
-- 
cgit v1.1


From 2ce49662e65fa0a3bdd2a2681d02586c30c4f431 Mon Sep 17 00:00:00 2001
From: schencej <schencej@clarkson.edu>
Date: Tue, 10 Dec 2019 22:23:25 -0500
Subject: added ingredient scaling and styling to pre cook page

---
 .../pre-cook-pop-up/pre-cook-pop-up.component.css  | 37 ++++++++++++++++++++++
 .../pre-cook-pop-up/pre-cook-pop-up.component.html | 17 ++++++----
 .../pre-cook-pop-up/pre-cook-pop-up.component.ts   | 32 ++++++++++++++++---
 3 files changed, 74 insertions(+), 12 deletions(-)

(limited to 'recipeBuddy/src/app')

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 e69de29..809e58b 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
@@ -0,0 +1,37 @@
+h1 {text-align: center}
+h4 {	text-align: center;
+	margin-bottom:0px;
+   }
+.outer-box {
+	display:grid;
+	width: 400px;
+	margin: auto;
+	padding: 10px;
+	border: solid;
+	align-content: center;
+	align-self: center;
+}
+
+.input-box {
+	text-align:center;
+	margin: auto;
+}
+
+.ingredients-list {
+	margin: auto;
+	padding: 10px;
+	border: solid;
+	outline: 0px solid;
+}
+
+.button {
+	display: block;
+	margin: 10px auto;
+}
+
+li{text-align: center}
+input{display: inline-block;
+	width: 20px}
+button{width: 150px;
+	height: 50px;
+	}
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 dc87efd..5fe4620 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
@@ -1,13 +1,16 @@
-<div>
-{{cookedRecipe.name}}
-	<div>
-		Serving Size: {{cookedRecipe.servingSize}} 
+<div *ngIf="cookedRecipe" class="outer-box"> 
+	<h1>{{cookedRecipe.name}}</h1> 
+
+	<div class="input-box">
+		Serving<input (keyup)="updateRecipe($event)">
 	</div>
-	<div> Ingredients:
+
+	<h4>Ingredients:</h4>
+	<div class="ingredients-list">
 		<li *ngFor="let ing of cookedRecipe.ingredients">
-			{{ing.name}}, {{ing.amount}} unit: {{ing.units}}
+			{{ing.name}}, {{ing.amount}} {{ing.unit}}
 	
 	</div>
 </div>
 
-<button routerLink="/cook"> Ready </button>
+<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 396784d..208993f 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
@@ -1,24 +1,46 @@
 import { Component, OnInit } from '@angular/core';
-import { RecipePassService } from '../RecipePass/recipe-pass.service';
+import { RecipePassService } from '../recipePass/recipe-pass.service';
 import { Recipe } from '../DataModels/recipe';
+import { Ingredient } from '../DataModels/ingredient';
 import { BackendService } from '../REST_service/backend.service';
+import { Router } from '@angular/router';
 
 @Component({
   selector: 'app-pre-cook-pop-up',
   templateUrl: './pre-cook-pop-up.component.html',
   styleUrls: ['./pre-cook-pop-up.component.css']
+//  providers: [RecipePassService]
 })
 export class PreCookPopUpComponent implements OnInit {
 
   cookedRecipe: Recipe;
+  newSize: number;
+  originalAmounts: number[] = [];
+  originalSize: number;
 
-  constructor(private recipePass: RecipePassService, private backend: BackendService) { }
+  constructor(private recipePass: RecipePassService, private backend: BackendService, private router: Router) { }
 
   ngOnInit() {
-	this.backend.getRecipe(1).subscribe(res =>
+	this.backend.getRecipe(15).subscribe(res =>
 	{
-		this.cookedRecipe = res
+		console.log(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.recipeToBeCooked = this.recipePass.getRecipe();
+  }
+
+  updateRecipe(event: any) {
+	if(event.target.value) {
+		this.newSize = parseInt(event.target.value);
+		for(var _i = 0; _i < this.cookedRecipe.ingredients.length; _i++) {
+			this.cookedRecipe.ingredients[_i].amount = Math.round(this.originalAmounts[_i] * (this.newSize / this.originalSize));
+		}
+
+		this.cookedRecipe.servingSize = this.newSize;
+		this.recipePass.setRecipe(this.cookedRecipe);
+	}
   }
 }
-- 
cgit v1.1


From 10e1f5849fb7f64dd188f08b5e5f682d0b162777 Mon Sep 17 00:00:00 2001
From: schencej <schencej@clarkson.edu>
Date: Tue, 10 Dec 2019 22:24:09 -0500
Subject: fixed recipe pass service

---
 recipeBuddy/src/app/DataModels/step.ts    | 10 +++++-----
 recipeBuddy/src/app/app-routing.module.ts |  4 +++-
 recipeBuddy/src/app/app.module.ts         |  4 ++--
 3 files changed, 10 insertions(+), 8 deletions(-)

(limited to 'recipeBuddy/src/app')

diff --git a/recipeBuddy/src/app/DataModels/step.ts b/recipeBuddy/src/app/DataModels/step.ts
index 06c15c9..ef07596 100644
--- a/recipeBuddy/src/app/DataModels/step.ts
+++ b/recipeBuddy/src/app/DataModels/step.ts
@@ -1,14 +1,14 @@
 export class Step {
-	public instruction: string;
+	public instructions: string;
 	public timer: number;
 
-	public constructor(instruction: string, timer: number) {
-		this.instruction = instruction;
+	public constructor(instructions: string, timer: number) {
+		this.instructions = instructions;
 		this.timer = timer;
 	}
 
-	public getInstruction(): string {
-		return this.instruction;
+	public getInstructions(): string {
+		return this.instructions;
 	}
 
 	public getTimer(): number {
diff --git a/recipeBuddy/src/app/app-routing.module.ts b/recipeBuddy/src/app/app-routing.module.ts
index 049bf74..8bd5fed 100644
--- a/recipeBuddy/src/app/app-routing.module.ts
+++ b/recipeBuddy/src/app/app-routing.module.ts
@@ -7,9 +7,11 @@ import { AddRecipeComponent } from './add-recipe/add-recipe.component';
 
 const routes: Routes = [
 	{ path: '', redirectTo: '/cook', pathMatch: 'full' },
-	{path: 'preCook' , component: PreCookPopUpComponent },
+	{ path: 'preCook' , component: PreCookPopUpComponent },
 	{ path: 'add', component: AddRecipeComponent },
 	{ path: 'cook', component: CookPageComponent }
+];
+
 @NgModule({
 	imports: [RouterModule.forRoot(routes)],
 	exports: [RouterModule]
diff --git a/recipeBuddy/src/app/app.module.ts b/recipeBuddy/src/app/app.module.ts
index a2db49c..00a26c4 100644
--- a/recipeBuddy/src/app/app.module.ts
+++ b/recipeBuddy/src/app/app.module.ts
@@ -6,12 +6,12 @@ import { MatDialogModule } from '@angular/material';
 
 import { AppComponent } from './app.component';
 import { CookPageComponent} from './cook-page/cook-page.component';
+//import { RecipePassService } from './recipePass/recipe-pass.service';
 
 import { AppRoutingModule } from './app-routing.module';
 
 import { HttpClientModule } from '@angular/common/http';
 import { PreCookPopUpComponent } from './pre-cook-pop-up/pre-cook-pop-up.component';
-import { RecipePassService } from './recipePass/recipe-pass.service'
 import { AddRecipeComponent } from './add-recipe/add-recipe.component';
 
 import { ReactiveFormsModule } from '@angular/forms';
@@ -41,7 +41,7 @@ import { MatButtonModule } from '@angular/material/button';
     MatIconModule,
     MatButtonModule
   ],
-  providers: [RecipePassService],
   bootstrap: [AppComponent],
+//  providers: [RecipePassService]
 })
 export class AppModule { }
-- 
cgit v1.1


From 34ceddd42d6e44f57f4697a254533872c53f4844 Mon Sep 17 00:00:00 2001
From: Tucker Evans <tuckerevans24@gmail.com>
Date: Tue, 10 Dec 2019 19:34:30 -0500
Subject: Revert steps.instructions -> step.instruction

For compatibility with backend JSON.
---
 recipeBuddy/src/app/DataModels/step.ts               |  8 ++++----
 recipeBuddy/src/app/cook-page/cook-page.component.ts | 16 ++++++++--------
 2 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'recipeBuddy/src/app')

diff --git a/recipeBuddy/src/app/DataModels/step.ts b/recipeBuddy/src/app/DataModels/step.ts
index ef07596..ec33e15 100644
--- a/recipeBuddy/src/app/DataModels/step.ts
+++ b/recipeBuddy/src/app/DataModels/step.ts
@@ -1,14 +1,14 @@
 export class Step {
-	public instructions: string;
+	public instruction: string;
 	public timer: number;
 
-	public constructor(instructions: string, timer: number) {
-		this.instructions = instructions;
+	public constructor(instruction: string, timer: number) {
+		this.instruction = instruction;
 		this.timer = timer;
 	}
 
 	public getInstructions(): string {
-		return this.instructions;
+		return this.instruction;
 	}
 
 	public getTimer(): number {
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;
 	}
 	
-- 
cgit v1.1


From b0bd782b6ff20ff874afc9ebf0b8ab9274ea2a09 Mon Sep 17 00:00:00 2001
From: Tucker Evans <tuckerevans24@gmail.com>
Date: Tue, 10 Dec 2019 19:43:32 -0500
Subject: Fix removes testing value for timeLeft on step-card

---
 recipeBuddy/src/app/cook-page/cook-page.component.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'recipeBuddy/src/app')

diff --git a/recipeBuddy/src/app/cook-page/cook-page.component.ts b/recipeBuddy/src/app/cook-page/cook-page.component.ts
index 3def7db..a3a1dfe 100644
--- a/recipeBuddy/src/app/cook-page/cook-page.component.ts
+++ b/recipeBuddy/src/app/cook-page/cook-page.component.ts
@@ -42,8 +42,8 @@ export class CookPageComponent implements OnInit {
 			this.nextStep = this.steps[this.stepNum].instruction;
 		else
 			this.lastStep = true;
-//		this.timeLeft = this.steps[this.stepNum-1].timer;
-		this.timeLeft = 88888;
+
+		this.timeLeft = this.steps[this.stepNum-1].timer;
 		this.timeHoursFirst = Math.floor(this.timeLeft/3600/10);
 		this.timeHoursSecond = Math.floor(this.timeLeft/3600%10);
 		this.timeMinutesFirst = Math.floor(this.timeLeft%3600/60/10);
-- 
cgit v1.1