14 files changed, 140 insertions, 93 deletions

diff --git a/backend/readme.adoc b/backend/readme.adoc
index b10ea07..bc3c50f 100644
--- a/backend/readme.adoc
+++ b/backend/readme.adoc
@@ -37,12 +37,11 @@ The current implementation expects (and returns) recipes in the form:
 			"name": "Ingredient 1 Name",
 			"amount": 1.0,
 			"unit": "Ingredient Units"
-			"type_": ""
 		},
 	],
 	"steps": [
 		{
-			"instructions": "Step Instructions/Description",
+			"instruction": "Step Instructions/Description",
 			"timer": 0
 		}
 	]
@@ -122,11 +121,11 @@ $ curl -X POST api.recipebuddy.xyz:8888/recipes -d '
 		{"name":"INGR 2","amount":1,"unit":"oz"}
 	],
 	"steps":[
-		{"instructions":"Step 1: Do this first","timer":10}
+		{"instruction":"Step 1: Do this first","timer":10}
 	]
 }'
 
-{"Status":{"Code":201,"Msg":"Recipe added successfully"},"Data":{"id":2,"name":"Test Recipe 2","description":"This is a descripiton for the test recipe","photos":["photo_url_1","photo_url_2"],"servingSize":0,"cookTime":60,"rating":5,"timesCooked":0,"tags":["keyword_1","keyword_2","keyword_3"],"ingredients":[{"name":"INGR 1","amount":2.5,"unit":"cups"},{"name":"INGR 2","amount":1,"unit":"oz"}],"steps":[{"instructions":"Step 1: Do this first","timer":10}]}}
+{"Status":{"Code":201,"Msg":"Recipe added successfully"},"Data":{"id":2,"name":"Test Recipe 2","description":"This is a descripiton for the test recipe","photos":["photo_url_1","photo_url_2"],"servingSize":0,"cookTime":60,"rating":5,"timesCooked":0,"tags":["keyword_1","keyword_2","keyword_3"],"ingredients":[{"name":"INGR 1","amount":2.5,"unit":"cups"},{"name":"INGR 2","amount":1,"unit":"oz"}],"steps":[{"instruction":"Step 1: Do this first","timer":10}]}}
 ----
 
 Read
@@ -138,7 +137,7 @@ http://api.recipebuddy.xyz:8888/recipes/0[`/recipes/{id}`], the HTTP body is ign
 ----
 $ curl -X GET api.recipebuddy.xyz:8888/recipes/1
 
-{"Status":{"Code":200,"Msg":"Successful"},"Data":{"id":1,"name":"Test Recipe","description":"This is a descripiton for the test recipe","photos":["photo_url_1","photo_url_2",""],"servingSize":0,"cookTime":60,"rating":5,"timesCooked":0,"tags":["keyword_1","keyword_2","keyword_3",""],"ingredients":[{"name":"INGR 1","amount":2.5,"unit":"cups"},{"name":"INGR 2","amount":1,"unit":"oz"}],"steps":[{"instructions":"Step 1: Do this first","timer":10}]}}
+{"Status":{"Code":200,"Msg":"Successful"},"Data":{"id":1,"name":"Test Recipe","description":"This is a descripiton for the test recipe","photos":["photo_url_1","photo_url_2",""],"servingSize":0,"cookTime":60,"rating":5,"timesCooked":0,"tags":["keyword_1","keyword_2","keyword_3",""],"ingredients":[{"name":"INGR 1","amount":2.5,"unit":"cups"},{"name":"INGR 2","amount":1,"unit":"oz"}],"steps":[{"instruction":"Step 1: Do this first","timer":10}]}}
 ----
 
 To access a list of all recipe ids in the database send a `GET` request to
@@ -171,11 +170,11 @@ $ curl -X PUT localhost:8888/recipes/1 -d '
 		{ "name":"INGR 2", "amount":1, "unit":"oz" }
 	],
 	"steps":[
-		{ "instructions":"Step 1: Do this first", "timer":10 }
+		{ "instruction":"Step 1: Do this first", "timer":10 }
 	]
 }'
 
-{"Status":{"Code":201,"Msg":"Recipe added successfully"},"Data":{"id":1,"name":"Test Recipe 1","description":"This is a descripiton for the test recipe","photos":["photo_url_1","photo_url_2"],"servingSize":0,"cookTime":60,"rating":5,"timesCooked":0,"tags":["keyword_1","keyword_2","keyword_3"],"ingredients":[{"name":"INGR 1","amount":2.5,"unit":"cups"},{"name":"INGR 2","amount":1,"unit":"oz"}],"steps":[{"instructions":"Step 1: Do this first","timer":10}]}}
+{"Status":{"Code":201,"Msg":"Recipe added successfully"},"Data":{"id":1,"name":"Test Recipe 1","description":"This is a descripiton for the test recipe","photos":["photo_url_1","photo_url_2"],"servingSize":0,"cookTime":60,"rating":5,"timesCooked":0,"tags":["keyword_1","keyword_2","keyword_3"],"ingredients":[{"name":"INGR 1","amount":2.5,"unit":"cups"},{"name":"INGR 2","amount":1,"unit":"oz"}],"steps":[{"instruction":"Step 1: Do this first","timer":10}]}}
 
 ----
 [WARNING]
diff --git a/backend/recipe.go b/backend/recipe.go
index a3191c3..59b7366 100644
--- a/backend/recipe.go
+++ b/backend/recipe.go
@@ -6,12 +6,11 @@ import "strings"
 type Ingredient struct {
 	Name   string  `json:"name"`
 	Amount float64 `json:"amount"`
-	Unit   string  `json:"units"`
-	Type   string  `json:"type"`
+	Unit   string  `json:"unit"`
 }
 
 type Step struct {
-	Desc string `json:"instructions"`
+	Desc string `json:"instruction"`
 	Time int    `json:"timer"`
 }
 
diff --git a/recipeBuddy/src/app/DataModels/ingredient.ts b/recipeBuddy/src/app/DataModels/ingredient.ts
index c79b475..720514c 100644
--- a/recipeBuddy/src/app/DataModels/ingredient.ts
+++ b/recipeBuddy/src/app/DataModels/ingredient.ts
@@ -1,8 +1,8 @@
 export class Ingredient {
-	private name: string;
-	private amount: number;
-	private unit: string;
-	private type_: string;
+	public name: string;
+	public amount: number;
+	public unit: string;
+	public type_: string;
 
 	public constructor(name: string, amount: number, unit: string, type_: string) {
 		this.name = name;
diff --git a/recipeBuddy/src/app/DataModels/recipe.ts b/recipeBuddy/src/app/DataModels/recipe.ts
index 937153f..18c4716 100644
--- a/recipeBuddy/src/app/DataModels/recipe.ts
+++ b/recipeBuddy/src/app/DataModels/recipe.ts
@@ -2,17 +2,17 @@ import {Step} from "./step"
 import {Ingredient} from "./ingredient"
 
 export class Recipe {
-	private id: number;
-	private name: string;
-	private description: string;
-	private ingredients: Ingredient[];
-	private steps: Step[];
-	private servingSize: number;
-	private cookTime: number;
-	private timesCooked: number;
-	private rating: number;
-	private tags: string[];
-	private photos: string[];
+	public id: number;
+	public name: string;
+	public description: string;
+	public ingredients: Ingredient[];
+	public steps: Step[];
+	public servingSize: number;
+	public cookTime: number;
+	public timesCooked: number;
+	public rating: number;
+	public tags: string[];
+	public photos: string[];
 
 	public constructor(id: number,
                       name: string,
diff --git a/recipeBuddy/src/app/DataModels/step.ts b/recipeBuddy/src/app/DataModels/step.ts
index 67e14c1..06c15c9 100644
--- a/recipeBuddy/src/app/DataModels/step.ts
+++ b/recipeBuddy/src/app/DataModels/step.ts
@@ -1,6 +1,6 @@
 export class Step {
-	private instruction: string;
-	private timer: number;
+	public instruction: string;
+	public timer: number;
 
 	public constructor(instruction: string, timer: number) {
 		this.instruction = instruction;
diff --git a/recipeBuddy/src/app/cook-page/cook-page.component.css b/recipeBuddy/src/app/cook-page/cook-page.component.css
index 41b3d42..4f44224 100644
--- a/recipeBuddy/src/app/cook-page/cook-page.component.css
+++ b/recipeBuddy/src/app/cook-page/cook-page.component.css
@@ -11,13 +11,20 @@
 
 .previous {
 	margin: auto;
+	width: 200px;
+	height: 200px;
 	border: solid;
+	align: center;
 	text-align: center;
 	grid-column: 1;
+
+	
 }
 
 .current {
 	margin: auto;
+	width: 300px;
+	height:300px;
 	border: solid;
 	text-align: center;
 	grid-column: 2;
@@ -25,7 +32,10 @@
 
 .next {
 	margin: auto;
+	width: 200px;
+	height: 200px;
 	border: solid;
+	align: center;
 	text-align: center;
 	grid-column: 3;
 
@@ -37,3 +47,7 @@
 	grid-gap: 10px;
 	grid-template-rows: 1fr;
 }
+
+.step-count {
+	text-align: center;
+}
diff --git a/recipeBuddy/src/app/cook-page/cook-page.component.html b/recipeBuddy/src/app/cook-page/cook-page.component.html
index 39bef2e..db1c0a8 100644
--- a/recipeBuddy/src/app/cook-page/cook-page.component.html
+++ b/recipeBuddy/src/app/cook-page/cook-page.component.html
@@ -1,22 +1,26 @@
 <div class="container">
-	<div class="previous">
-		<h1>Step {{step -1}}</h1>
+	<div class="previous" *ngIf="!firstStep">
+		<h1>Step {{stepNum -1}}</h1>
 		<p>{{previousStep}}</p>
 	</div>
 	
 	<div class="current">
-		<h1>Step {{step}}</h1>
+		<h1>Step {{stepNum}}</h1>
 		<p>{{currentStep}}</p>
-		<p>{{timeLeft}}</p>
-		<div>
+		<div *ngIf="hasTimer()">
+			<p>{{timeLeft}}</p>
 			<button (click)="startTimer()">Start Timer</button>
 		</div>
-		<button (click)="previous()">Previous</button>
-		<button (click)="next()">next</button>
+		<button *ngIf="!firstStep" (click)="previous()">Previous</button>
+		<button *ngIf="!lastStep" (click)="next()">next</button>
 	</div>
 	
-	<div class="next">
-		<h1>Step {{step +1}}</h1>
+	<div class="next" *ngIf="!lastStep">
+		<h1>Step {{stepNum +1}}</h1>
 		<p>{{nextStep}}</p>
 	</div>
 </div>
+
+<div class="step-count">
+	<h1>Step: {{stepNum}}/{{steps.length}}</h1>
+</div>
diff --git a/recipeBuddy/src/app/cook-page/cook-page.component.ts b/recipeBuddy/src/app/cook-page/cook-page.component.ts
index 51a4c67..f114634 100644
--- a/recipeBuddy/src/app/cook-page/cook-page.component.ts
+++ b/recipeBuddy/src/app/cook-page/cook-page.component.ts
@@ -1,17 +1,20 @@
 import {Component, OnInit} from '@angular/core';
+import {Recipe} from '../DataModels/recipe';
+import {Step} from '../DataModels/step';
+import {RecipePassService} from '../recipePass/recipe-pass.service'
 
-/**
- * @title Card with multiple sections
- */
 @Component({
   selector: 'app-cook-page',
   templateUrl: './cook-page.component.html',
   styleUrls: ['./cook-page.component.css'],
 })
 export class CookPageComponent implements OnInit {
-	step: number;
-	instructions: string[] = ["Cut the bread", "Toast the bread", "Warm the butter", "Apply butter to bread", "Enjoy"];
-	timers: number[] = [5,60,30,0,0];
+	steps: Step[];
+	stepNum: number;
+
+	firstStep: boolean = true;
+	lastStep: boolean = false;
+
 	previousStep: string;
 	currentStep: string;
 	nextStep: string;
@@ -19,30 +22,62 @@ export class CookPageComponent implements OnInit {
 
 	timerInterval;
 
+	constructor(private recipePass: RecipePassService){}
+
 	ngOnInit() {
-		this.step = 1;
-		this.previousStep = "";
-		this.currentStep = this.instructions[this.step-1];
-		this.nextStep = this.instructions[this.step];
-		this.timeLeft = this.timers[this.step-1];
+		this.getSteps();
+		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;
 	}
 
 	next(): void {
+		this.firstStep = false;
 		clearInterval(this.timerInterval);
-		this.step++;
-		this.previousStep = this.instructions[this.step-2];
-		this.currentStep = this.instructions[this.step-1];
-		this.nextStep = this.instructions[this.step];
-		this.timeLeft = this.timers[this.step-1];
+		this.stepNum++;
+		if(this.stepNum == this.steps.length) {			
+			this.lastStep = true;
+		} else {
+			this.nextStep = this.steps[this.stepNum].getInstruction();
+		}
+		this.previousStep = this.steps[this.stepNum-2].getInstruction();
+		this.currentStep = this.steps[this.stepNum-1].getInstruction();
+		this.timeLeft = this.steps[this.stepNum-1].getTimer();
 	}
 
 	previous(): void {
+		this.lastStep = false;
 		clearInterval(this.timerInterval);
-		this.step--;
-		this.previousStep = this.instructions[this.step-2];
-		this.currentStep = this.instructions[this.step-1];
-		this.nextStep = this.instructions[this.step];
-		this.timeLeft = this.timers[this.step-1];
+		this.stepNum--;
+		if(this.stepNum == 1) {
+			this.firstStep = true;
+		} else {
+			this.previousStep = this.steps[this.stepNum-2].getInstruction();
+		}
+		this.currentStep = this.steps[this.stepNum-1].getInstruction();
+		this.nextStep = this.steps[this.stepNum].getInstruction();
+		this.timeLeft = this.steps[this.stepNum-1].getTimer();
+	}
+	
+	hasTimer(): boolean {
+		if(this.steps[this.stepNum - 1].getTimer() > 0)
+			return true;
+		else
+			return false;
 	}
 
 	startTimer(): void {
@@ -56,4 +91,3 @@ export class CookPageComponent implements OnInit {
 		}, 1000)
 	}
 }
-
diff --git a/recipeBuddy/src/app/cook-page/step-card/step-card.component.css b/recipeBuddy/src/app/cook-page/step-card/step-card.component.css
deleted file mode 100644
index e69de29..0000000
--- a/recipeBuddy/src/app/cook-page/step-card/step-card.component.css
+++ /dev/null
diff --git a/recipeBuddy/src/app/cook-page/step-card/step-card.component.html b/recipeBuddy/src/app/cook-page/step-card/step-card.component.html
deleted file mode 100644
index c3edca3..0000000
--- a/recipeBuddy/src/app/cook-page/step-card/step-card.component.html
+++ /dev/null
@@ -1 +0,0 @@
-<p>step-card works!</p>
diff --git a/recipeBuddy/src/app/cook-page/step-card/step-card.component.spec.ts b/recipeBuddy/src/app/cook-page/step-card/step-card.component.spec.ts
deleted file mode 100644
index 011bc44..0000000
--- a/recipeBuddy/src/app/cook-page/step-card/step-card.component.spec.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { StepCardComponent } from './step-card.component';
-
-describe('StepCardComponent', () => {
-  let component: StepCardComponent;
-  let fixture: ComponentFixture<StepCardComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [ StepCardComponent ]
-    })
-    .compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(StepCardComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/recipeBuddy/src/app/cook-page/step-card/step-card.component.ts b/recipeBuddy/src/app/cook-page/step-card/step-card.component.ts
deleted file mode 100644
index 6d490b7..0000000
--- a/recipeBuddy/src/app/cook-page/step-card/step-card.component.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { Component } from '@angular/core';
-
-@Component({
-  selector: 'step-card',
-  templateUrl: 'step-card.component.html',
-  styleUrls: ['step-card.component.css']
-})
-export class StepCardComponent{
-}
diff --git a/recipeBuddy/src/app/recipePass/recipe-pass.service.spec.ts b/recipeBuddy/src/app/recipePass/recipe-pass.service.spec.ts
new file mode 100644
index 0000000..f3a8388
--- /dev/null
+++ b/recipeBuddy/src/app/recipePass/recipe-pass.service.spec.ts
@@ -0,0 +1,12 @@
+import { TestBed } from '@angular/core/testing';
+
+import { RecipePassService } from './recipe-pass.service';
+
+describe('RecipePassService', () => {
+  beforeEach(() => TestBed.configureTestingModule({}));
+
+  it('should be created', () => {
+    const service: RecipePassService = TestBed.get(RecipePassService);
+    expect(service).toBeTruthy();
+  });
+});
diff --git a/recipeBuddy/src/app/recipePass/recipe-pass.service.ts b/recipeBuddy/src/app/recipePass/recipe-pass.service.ts
new file mode 100644
index 0000000..e925973
--- /dev/null
+++ b/recipeBuddy/src/app/recipePass/recipe-pass.service.ts
@@ -0,0 +1,20 @@
+import { Injectable } from '@angular/core';
+import { Recipe } from '../DataModels/recipe';
+
+@Injectable({
+	providedIn: 'root',
+})
+export class RecipePassService {
+
+	private sourceRecipe: Recipe;
+
+  constructor() { }
+
+	public setRecipe (recipeToPass: Recipe) {
+		this.sourceRecipe = recipeToPass;
+	}
+
+	public getRecipe (): Recipe {
+		return this.sourceRecipe;
+	}
+}