Merge commit 'cafe1b4fd3cc02554f44ffbaa8467d867a6838cb' into chrisundercoffer

10 files changed, 200 insertions, 0 deletions

diff --git a/recipeBuddy/src/app/DataModels/ingredient.spec.ts b/recipeBuddy/src/app/DataModels/ingredient.spec.ts
new file mode 100644
index 0000000..17b5858
--- /dev/null
+++ b/recipeBuddy/src/app/DataModels/ingredient.spec.ts
@@ -0,0 +1,7 @@
+import { Ingredients } from './ingredients';
+
+describe('Ingredients', () => {
+  it('should create an instance', () => {
+    expect(new Ingredients()).toBeTruthy();
+  });
+});
diff --git a/recipeBuddy/src/app/DataModels/ingredient.ts b/recipeBuddy/src/app/DataModels/ingredient.ts
new file mode 100644
index 0000000..0ede1d1
--- /dev/null
+++ b/recipeBuddy/src/app/DataModels/ingredient.ts
@@ -0,0 +1,29 @@
+export class Ingredient {
+	private name: string;
+	private amount: number;
+	private unit: string;
+	private type_: string;
+
+	public constructor(name: string, amount: number, unit: string, type_: string) {
+		this.name = names;
+		this.amount = amount;
+		this.unit = unit;
+		this.type_ = type_;
+	}
+
+	public getName(): string {
+		return this.name;
+	}
+
+	public getAmount(): number {
+		return this.amount;
+	}
+
+	public getUnit(): string {
+		return this.unit;
+	}
+
+	public getType(): string {
+		return this.type_;
+	}
+}
diff --git a/recipeBuddy/src/app/DataModels/ingredients.spec.ts b/recipeBuddy/src/app/DataModels/ingredients.spec.ts
new file mode 100644
index 0000000..17b5858
--- /dev/null
+++ b/recipeBuddy/src/app/DataModels/ingredients.spec.ts
@@ -0,0 +1,7 @@
+import { Ingredients } from './ingredients';
+
+describe('Ingredients', () => {
+  it('should create an instance', () => {
+    expect(new Ingredients()).toBeTruthy();
+  });
+});
diff --git a/recipeBuddy/src/app/DataModels/ingredients.ts b/recipeBuddy/src/app/DataModels/ingredients.ts
new file mode 100644
index 0000000..6f96e69
--- /dev/null
+++ b/recipeBuddy/src/app/DataModels/ingredients.ts
@@ -0,0 +1,29 @@
+export class Ingredients {
+	private names: string[];
+	private amounts: number[];
+	private units: string[];
+	private types: string[];
+
+	public constructor(names: string[], amounts: number[], units: string[], types: string[]) {
+		this.names = names;
+		this.amounts = amounts;
+		this.units = units;
+		this.types = types;
+	}
+
+	public getNames(): string[] {
+		return this.names;
+	}
+
+	public getAmounts(): number[] {
+		return this.amounts;
+	}
+
+	public getUnits(): string[] {
+		return this.units;
+	}
+
+	public getTypes(): string[] {
+		return this.types;
+	}
+}
diff --git a/recipeBuddy/src/app/DataModels/recipe.spec.ts b/recipeBuddy/src/app/DataModels/recipe.spec.ts
new file mode 100644
index 0000000..af34608
--- /dev/null
+++ b/recipeBuddy/src/app/DataModels/recipe.spec.ts
@@ -0,0 +1,7 @@
+import { Recipe } from './recipe';
+
+describe('Recipe', () => {
+  it('should create an instance', () => {
+    expect(new Recipe()).toBeTruthy();
+  });
+});
diff --git a/recipeBuddy/src/app/DataModels/recipe.ts b/recipeBuddy/src/app/DataModels/recipe.ts
new file mode 100644
index 0000000..3194adc
--- /dev/null
+++ b/recipeBuddy/src/app/DataModels/recipe.ts
@@ -0,0 +1,71 @@
+import {Steps} from "./steps"
+import {Ingredients} from "./ingredients"
+
+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 constructor(id: number, name: string, description: string, ingredients: Ingredients, steps: Steps, servingSize: number, cookTime: number, rating: number, tags: string[]) {
+		this.id = id;
+		this.name = name;
+		this.description = description;
+		this.ingredients = ingredients;
+		this.steps = steps;
+		this.servingSize = servingSize;
+		this.cookTime = cookTime;
+		this.rating = rating;
+		this.tags = tags;
+	}
+
+	public getId(): number {
+		return this.id;
+	}
+
+	public getName(): string {
+		return this.name;
+	}
+
+	public getDescription(): string {
+		return this.description;
+	}
+
+	public getIngredients(): Ingredients {
+		return this.ingredients;
+	}
+
+	public getSteps(): Steps {
+		return this.steps;
+	}
+
+	public getServingSize(): number {
+		return this.servingSize;
+	}
+
+	public getCookTime(): number {
+		return this.cookTime;
+	}
+  
+	public getTimesCooked(): number {
+		return timesCooked;
+	}
+	public getRating(): number {
+		return this.rating;
+	}
+
+	public getTags(): string[] {
+		return this.tags;
+	}
+  
+	public getPhotos(): string[] {
+		return this.photos;
+	}
+}
diff --git a/recipeBuddy/src/app/DataModels/step.spec.ts b/recipeBuddy/src/app/DataModels/step.spec.ts
new file mode 100644
index 0000000..e315565
--- /dev/null
+++ b/recipeBuddy/src/app/DataModels/step.spec.ts
@@ -0,0 +1,7 @@
+import { Steps } from './steps';
+
+describe('Steps', () => {
+  it('should create an instance', () => {
+    expect(new Steps()).toBeTruthy();
+  });
+});
diff --git a/recipeBuddy/src/app/DataModels/step.ts b/recipeBuddy/src/app/DataModels/step.ts
new file mode 100644
index 0000000..674a6df
--- /dev/null
+++ b/recipeBuddy/src/app/DataModels/step.ts
@@ -0,0 +1,18 @@
+export class Steps {
+	private instruction: string;
+	private timer: number;
+
+	public contructor(instruction: string, timer: number) {
+		this.instruction = instruction;
+		this.timer = timer;
+	}
+
+	public getInstruction(): string {
+		return this.instruction;
+	}
+
+	public getTimer(): number {
+		return this.timer;
+	}
+
+}
diff --git a/recipeBuddy/src/app/DataModels/steps.spec.ts b/recipeBuddy/src/app/DataModels/steps.spec.ts
new file mode 100644
index 0000000..e315565
--- /dev/null
+++ b/recipeBuddy/src/app/DataModels/steps.spec.ts
@@ -0,0 +1,7 @@
+import { Steps } from './steps';
+
+describe('Steps', () => {
+  it('should create an instance', () => {
+    expect(new Steps()).toBeTruthy();
+  });
+});
diff --git a/recipeBuddy/src/app/DataModels/steps.ts b/recipeBuddy/src/app/DataModels/steps.ts
new file mode 100644
index 0000000..9061dc2
--- /dev/null
+++ b/recipeBuddy/src/app/DataModels/steps.ts
@@ -0,0 +1,18 @@
+export class Steps {
+	private instructions: string[];
+	private timers: number[];
+
+	public contructor(instructions: string[], timers: number[]) {
+		this.instructions = instructions;
+		this.timers = timers;
+	}
+
+	public getInstructions(): string[] {
+		return this.instructions;
+	}
+
+	public getTimers(): number[] {
+		return this.timers;
+	}
+
+}