summaryrefslogtreecommitdiff
path: root/recipeBuddy/src/app
diff options
context:
space:
mode:
authorTucker Evans <tuckerevans24@gmail.com>2019-12-02 10:54:41 -0500
committerTucker Evans <tuckerevans24@gmail.com>2019-12-02 10:58:11 -0500
commit737063651a31b05631fbb3fae5803da5db0ee389 (patch)
treeffa520a5415f0a5cfbfffe9ffa15bd6b2f0422ca /recipeBuddy/src/app
parent74855d03f44adf2e77d5d6af38e18e1cfe45e700 (diff)
Fix Ingredients as array in recipe
Diffstat (limited to 'recipeBuddy/src/app')
-rw-r--r--recipeBuddy/src/app/DataModels/ingredient.spec.ts (renamed from recipeBuddy/src/app/DataModels/ingredients.spec.ts)0
-rw-r--r--recipeBuddy/src/app/DataModels/ingredient.ts29
-rw-r--r--recipeBuddy/src/app/DataModels/ingredients.ts29
-rw-r--r--recipeBuddy/src/app/DataModels/recipe.ts2
4 files changed, 30 insertions, 30 deletions
diff --git a/recipeBuddy/src/app/DataModels/ingredients.spec.ts b/recipeBuddy/src/app/DataModels/ingredient.spec.ts
index 17b5858..17b5858 100644
--- a/recipeBuddy/src/app/DataModels/ingredients.spec.ts
+++ b/recipeBuddy/src/app/DataModels/ingredient.spec.ts
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.ts b/recipeBuddy/src/app/DataModels/ingredients.ts
deleted file mode 100644
index 6f96e69..0000000
--- a/recipeBuddy/src/app/DataModels/ingredients.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-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.ts b/recipeBuddy/src/app/DataModels/recipe.ts
index 82e4a73..7ca7421 100644
--- a/recipeBuddy/src/app/DataModels/recipe.ts
+++ b/recipeBuddy/src/app/DataModels/recipe.ts
@@ -5,7 +5,7 @@ export class Recipe {
private id: number;
private name: string;
private description: string;
- private ingredients: Ingredients;
+ private ingredients: Ingredient[];
private steps: Steps;
private servingSize: number;
private cookTime: number;