From f94d81c5283cbf5be2f2a96faa21807e381e1c5c Mon Sep 17 00:00:00 2001 From: Tucker Evans Date: Mon, 2 Dec 2019 19:48:15 -0500 Subject: Fix typos in DataModels Mostly variable name fixes and type fixes. Also delete unused DataModels --- recipeBuddy/src/app/DataModels/recipe.ts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'recipeBuddy/src/app/DataModels/recipe.ts') diff --git a/recipeBuddy/src/app/DataModels/recipe.ts b/recipeBuddy/src/app/DataModels/recipe.ts index 3194adc..368f237 100644 --- a/recipeBuddy/src/app/DataModels/recipe.ts +++ b/recipeBuddy/src/app/DataModels/recipe.ts @@ -1,5 +1,5 @@ -import {Steps} from "./steps" -import {Ingredients} from "./ingredients" +import {Step} from "./step" +import {Ingredient} from "./ingredient" export class Recipe { private id: number; @@ -14,7 +14,7 @@ export class Recipe { 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[]) { + public constructor(id: number, name: string, description: string, ingredients: Ingredient[], steps: Step[], servingSize: number, cookTime: number, rating: number, tags: string[]) { this.id = id; this.name = name; this.description = description; @@ -38,11 +38,11 @@ export class Recipe { return this.description; } - public getIngredients(): Ingredients { + public getIngredients(): Ingredient[] { return this.ingredients; } - public getSteps(): Steps { + public getSteps(): Step[] { return this.steps; } @@ -55,7 +55,7 @@ export class Recipe { } public getTimesCooked(): number { - return timesCooked; + return this.timesCooked; } public getRating(): number { return this.rating; -- cgit v1.1