3 files changed, 31 insertions, 19 deletions

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 368f237..18c4716 100644
--- a/recipeBuddy/src/app/DataModels/recipe.ts
+++ b/recipeBuddy/src/app/DataModels/recipe.ts
@@ -2,19 +2,29 @@ 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, description: string, ingredients: Ingredient[], steps: Step[], servingSize: number, cookTime: number, rating: number, tags: string[]) {
+	public constructor(id: number,
+                      name: string,
+                      description: string,
+                      ingredients: Ingredient[],
+                      steps: Step[],
+                      servingSize: number,
+                      cookTime: number,
+                      timesCooked: number,
+                      rating: number,
+                      tags: string[],
+                      photos: string[]) {
 		this.id = id;
 		this.name = name;
 		this.description = description;
@@ -24,6 +34,8 @@ export class Recipe {
 		this.cookTime = cookTime;
 		this.rating = rating;
 		this.tags = tags;
+    this.photos = photos;
+    this.timesCooked = timesCooked;
 	}
 
 	public getId(): number {
diff --git a/recipeBuddy/src/app/DataModels/step.ts b/recipeBuddy/src/app/DataModels/step.ts
index 1c1ca7b..06c15c9 100644
--- a/recipeBuddy/src/app/DataModels/step.ts
+++ b/recipeBuddy/src/app/DataModels/step.ts
@@ -1,8 +1,8 @@
 export class Step {
-	private instruction: string;
-	private timer: number;
+	public instruction: string;
+	public timer: number;
 
-	public contructor(instruction: string, timer: number) {
+	public constructor(instruction: string, timer: number) {
 		this.instruction = instruction;
 		this.timer = timer;
 	}