From 870fb7a7b2faeb9e7e4a99d08d14da61e7b7ad4f Mon Sep 17 00:00:00 2001 From: Tucker Evans Date: Mon, 2 Dec 2019 10:55:46 -0500 Subject: Fix Steps as array in recipe --- recipeBuddy/src/app/DataModels/recipe.ts | 2 +- recipeBuddy/src/app/DataModels/step.spec.ts | 7 +++++++ recipeBuddy/src/app/DataModels/step.ts | 18 ++++++++++++++++++ recipeBuddy/src/app/DataModels/steps.spec.ts | 7 ------- recipeBuddy/src/app/DataModels/steps.ts | 18 ------------------ 5 files changed, 26 insertions(+), 26 deletions(-) create mode 100644 recipeBuddy/src/app/DataModels/step.spec.ts create mode 100644 recipeBuddy/src/app/DataModels/step.ts delete mode 100644 recipeBuddy/src/app/DataModels/steps.spec.ts delete mode 100644 recipeBuddy/src/app/DataModels/steps.ts diff --git a/recipeBuddy/src/app/DataModels/recipe.ts b/recipeBuddy/src/app/DataModels/recipe.ts index 7ca7421..71cebd0 100644 --- a/recipeBuddy/src/app/DataModels/recipe.ts +++ b/recipeBuddy/src/app/DataModels/recipe.ts @@ -6,7 +6,7 @@ export class Recipe { private name: string; private description: string; private ingredients: Ingredient[]; - private steps: Steps; + private steps: Step[]; private servingSize: number; private cookTime: number; private rating: number; 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 deleted file mode 100644 index e315565..0000000 --- a/recipeBuddy/src/app/DataModels/steps.spec.ts +++ /dev/null @@ -1,7 +0,0 @@ -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 deleted file mode 100644 index 9061dc2..0000000 --- a/recipeBuddy/src/app/DataModels/steps.ts +++ /dev/null @@ -1,18 +0,0 @@ -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; - } - -} -- cgit v1.1