diff options
Diffstat (limited to 'recipeBuddy/src')
| -rw-r--r-- | recipeBuddy/src/app/DataModels/step.ts | 10 | ||||
| -rw-r--r-- | recipeBuddy/src/app/app-routing.module.ts | 4 | ||||
| -rw-r--r-- | recipeBuddy/src/app/app.module.ts | 4 | 
3 files changed, 10 insertions, 8 deletions
diff --git a/recipeBuddy/src/app/DataModels/step.ts b/recipeBuddy/src/app/DataModels/step.ts index 06c15c9..ef07596 100644 --- a/recipeBuddy/src/app/DataModels/step.ts +++ b/recipeBuddy/src/app/DataModels/step.ts @@ -1,14 +1,14 @@  export class Step { -	public instruction: string; +	public instructions: string;  	public timer: number; -	public constructor(instruction: string, timer: number) { -		this.instruction = instruction; +	public constructor(instructions: string, timer: number) { +		this.instructions = instructions;  		this.timer = timer;  	} -	public getInstruction(): string { -		return this.instruction; +	public getInstructions(): string { +		return this.instructions;  	}  	public getTimer(): number { diff --git a/recipeBuddy/src/app/app-routing.module.ts b/recipeBuddy/src/app/app-routing.module.ts index 049bf74..8bd5fed 100644 --- a/recipeBuddy/src/app/app-routing.module.ts +++ b/recipeBuddy/src/app/app-routing.module.ts @@ -7,9 +7,11 @@ import { AddRecipeComponent } from './add-recipe/add-recipe.component';  const routes: Routes = [  	{ path: '', redirectTo: '/cook', pathMatch: 'full' }, -	{path: 'preCook' , component: PreCookPopUpComponent }, +	{ path: 'preCook' , component: PreCookPopUpComponent },  	{ path: 'add', component: AddRecipeComponent },  	{ path: 'cook', component: CookPageComponent } +]; +  @NgModule({  	imports: [RouterModule.forRoot(routes)],  	exports: [RouterModule] diff --git a/recipeBuddy/src/app/app.module.ts b/recipeBuddy/src/app/app.module.ts index a2db49c..00a26c4 100644 --- a/recipeBuddy/src/app/app.module.ts +++ b/recipeBuddy/src/app/app.module.ts @@ -6,12 +6,12 @@ import { MatDialogModule } from '@angular/material';  import { AppComponent } from './app.component';  import { CookPageComponent} from './cook-page/cook-page.component'; +//import { RecipePassService } from './recipePass/recipe-pass.service';  import { AppRoutingModule } from './app-routing.module';  import { HttpClientModule } from '@angular/common/http';  import { PreCookPopUpComponent } from './pre-cook-pop-up/pre-cook-pop-up.component'; -import { RecipePassService } from './recipePass/recipe-pass.service'  import { AddRecipeComponent } from './add-recipe/add-recipe.component';  import { ReactiveFormsModule } from '@angular/forms'; @@ -41,7 +41,7 @@ import { MatButtonModule } from '@angular/material/button';      MatIconModule,      MatButtonModule    ], -  providers: [RecipePassService],    bootstrap: [AppComponent], +//  providers: [RecipePassService]  })  export class AppModule { }  | 
