From 651c877315b0669eeb4a3a8447691ae65accf20b Mon Sep 17 00:00:00 2001
From: Tucker Evans <tuckerevans24@gmail.com>
Date: Wed, 4 Dec 2019 21:49:49 -0500
Subject: Add base for add-recipe component

Just changes done by `ng g component add-recipe`
---
 .../src/app/add-recipe/add-recipe.component.css    |  0
 .../src/app/add-recipe/add-recipe.component.html   |  1 +
 .../app/add-recipe/add-recipe.component.spec.ts    | 25 ++++++++++++++++++++++
 .../src/app/add-recipe/add-recipe.component.ts     | 15 +++++++++++++
 recipeBuddy/src/app/app.module.ts                  |  6 ++++--
 5 files changed, 45 insertions(+), 2 deletions(-)
 create mode 100644 recipeBuddy/src/app/add-recipe/add-recipe.component.css
 create mode 100644 recipeBuddy/src/app/add-recipe/add-recipe.component.html
 create mode 100644 recipeBuddy/src/app/add-recipe/add-recipe.component.spec.ts
 create mode 100644 recipeBuddy/src/app/add-recipe/add-recipe.component.ts

(limited to 'recipeBuddy/src')

diff --git a/recipeBuddy/src/app/add-recipe/add-recipe.component.css b/recipeBuddy/src/app/add-recipe/add-recipe.component.css
new file mode 100644
index 0000000..e69de29
diff --git a/recipeBuddy/src/app/add-recipe/add-recipe.component.html b/recipeBuddy/src/app/add-recipe/add-recipe.component.html
new file mode 100644
index 0000000..29e904b
--- /dev/null
+++ b/recipeBuddy/src/app/add-recipe/add-recipe.component.html
@@ -0,0 +1 @@
+<p>add-recipe works!</p>
diff --git a/recipeBuddy/src/app/add-recipe/add-recipe.component.spec.ts b/recipeBuddy/src/app/add-recipe/add-recipe.component.spec.ts
new file mode 100644
index 0000000..86b2da6
--- /dev/null
+++ b/recipeBuddy/src/app/add-recipe/add-recipe.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { AddRecipeComponent } from './add-recipe.component';
+
+describe('AddRecipeComponent', () => {
+  let component: AddRecipeComponent;
+  let fixture: ComponentFixture<AddRecipeComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ AddRecipeComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(AddRecipeComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/recipeBuddy/src/app/add-recipe/add-recipe.component.ts b/recipeBuddy/src/app/add-recipe/add-recipe.component.ts
new file mode 100644
index 0000000..a7be0e0
--- /dev/null
+++ b/recipeBuddy/src/app/add-recipe/add-recipe.component.ts
@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'app-add-recipe',
+  templateUrl: './add-recipe.component.html',
+  styleUrls: ['./add-recipe.component.css']
+})
+export class AddRecipeComponent implements OnInit {
+
+  constructor() { }
+
+  ngOnInit() {
+  }
+
+}
diff --git a/recipeBuddy/src/app/app.module.ts b/recipeBuddy/src/app/app.module.ts
index eaa0553..fb12cf6 100644
--- a/recipeBuddy/src/app/app.module.ts
+++ b/recipeBuddy/src/app/app.module.ts
@@ -9,13 +9,15 @@ import { StepCardComponent } from './cook-page/step-card/step-card.component';
 
 import { AppRoutingModule } from './app-routing.module';
 
-import {HttpClientModule } from '@angular/common/http'
+import { HttpClientModule } from '@angular/common/http';
+import { AddRecipeComponent } from './add-recipe/add-recipe.component'
 
 @NgModule({
   declarations: [
     AppComponent,
     CookPageComponent,
-    StepCardComponent
+    StepCardComponent,
+    AddRecipeComponent
   ],
   imports: [
     BrowserModule,
-- 
cgit v1.1


From 443ded565b1482eaf17176967372f3986497f1b8 Mon Sep 17 00:00:00 2001
From: Tucker Evans <tuckerevans24@gmail.com>
Date: Wed, 4 Dec 2019 23:00:02 -0500
Subject: Add basic form for adding a recipe

---
 .../src/app/add-recipe/add-recipe.component.html   | 75 +++++++++++++++++++++-
 .../src/app/add-recipe/add-recipe.component.ts     | 57 +++++++++++++++-
 recipeBuddy/src/app/app-routing.module.ts          |  4 +-
 recipeBuddy/src/app/app.module.ts                  |  7 +-
 4 files changed, 137 insertions(+), 6 deletions(-)

(limited to 'recipeBuddy/src')

diff --git a/recipeBuddy/src/app/add-recipe/add-recipe.component.html b/recipeBuddy/src/app/add-recipe/add-recipe.component.html
index 29e904b..3a42687 100644
--- a/recipeBuddy/src/app/add-recipe/add-recipe.component.html
+++ b/recipeBuddy/src/app/add-recipe/add-recipe.component.html
@@ -1 +1,74 @@
-<p>add-recipe works!</p>
+<form [formGroup]="recipeForm">
+	<label>
+		Name:
+		<input type="text" formControlName="recipeName">
+	</label>
+	<label>
+		Description:
+		<input type="text" formControlName="desc">
+	</label>
+	<label>
+		Servings:
+		<input type="text" formControlName="servingSize">
+	</label>
+	<label>
+		Cooking Time:
+		<input type="text" formControlName="cookTime">
+	</label>
+	<label>
+		Keywords/Tags:
+		<input type="text" formControlName="tags">
+	</label>
+	<label>
+		Photos (URLS):
+		<input type="text" formControlName="photos">
+	</label>
+
+	<div formArrayName="ingredients">
+		<h3>Ingredients</h3>
+		<button (click)="addIngredient()">Add Ingredient</button>
+		<div *ngFor="let address of ingredients.controls; let i=index">
+			<div [formGroupName]="i">
+				<h4>Ingredient {{ i + 1 }}</h4>
+				<label>
+					Name:
+					<input type="text"
+					formControlName="ingrName">
+				</label>
+				<label>
+					Amount:
+					<input type="text"
+					formControlName="amount">
+				</label>
+				<label>
+					Name:
+					<input type="text"
+					formControlName="units">
+				</label>
+			</div>
+		</div>
+	</div>
+
+	<div formArrayName="steps">
+		<h3>Steps</h3>
+		<button (click)="addStep()">Add Step</button>
+		<div *ngFor="let address of steps.controls; let i=index">
+			<div [formGroupName]="i">
+				<h4>Step {{ i + 1 }}</h4>
+				<label>
+					Instructions:
+					<input type="text"
+					formControlName="instruct">
+				</label>
+				<label>
+					Timer:
+					<input type="text"
+					formControlName="timer">
+				</label>
+			</div>
+		</div>
+	</div>
+</form>
+<p>
+Value: {{ recipeForm.value | json }}
+</p>
diff --git a/recipeBuddy/src/app/add-recipe/add-recipe.component.ts b/recipeBuddy/src/app/add-recipe/add-recipe.component.ts
index a7be0e0..b0e5ce5 100644
--- a/recipeBuddy/src/app/add-recipe/add-recipe.component.ts
+++ b/recipeBuddy/src/app/add-recipe/add-recipe.component.ts
@@ -1,15 +1,68 @@
 import { Component, OnInit } from '@angular/core';
 
+import { FormControl } from '@angular/forms';
+
+import { FormBuilder } from '@angular/forms';
+import { FormArray } from '@angular/forms';
+
 @Component({
   selector: 'app-add-recipe',
   templateUrl: './add-recipe.component.html',
   styleUrls: ['./add-recipe.component.css']
 })
-export class AddRecipeComponent implements OnInit {
 
-  constructor() { }
+export class AddRecipeComponent {
+
+  recipeForm = this.fb.group({
+    recipeName: [''],
+    desc: [''],
+    ingredients: this.fb.array([
+      this.fb.group({
+        ingrName: [''],
+        amount: [''],
+        units: ['']
+        })
+    ]),
+    steps: this.fb.array([
+      this.fb.group({
+        instruct: [''],
+        timer: ['']
+        })
+    ]),
+    servingSize: [''],
+    cookTime: [''],
+    tags: [''],
+    photos: ['']
+  });
+  constructor(private fb: FormBuilder) { }
 
   ngOnInit() {
   }
 
+  get ingredients() {
+    return this.recipeForm.get('ingredients') as FormArray;
+  }
+
+  addIngredient() {
+    this.ingredients.push(
+    this.fb.group({
+      ingrName: [''],
+      amount: [''],
+      units: ['']
+      })
+  );
+  }
+
+  get steps() {
+    return this.recipeForm.get('steps') as FormArray;
+  }
+
+  addStep() {
+    this.steps.push(
+    this.fb.group({
+      instruct: [''],
+      timer: ['']
+      })
+  );
+  }
 }
diff --git a/recipeBuddy/src/app/app-routing.module.ts b/recipeBuddy/src/app/app-routing.module.ts
index a6e4399..bb7c96e 100644
--- a/recipeBuddy/src/app/app-routing.module.ts
+++ b/recipeBuddy/src/app/app-routing.module.ts
@@ -2,10 +2,12 @@ import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
 
 import { CookPageComponent } from './cook-page/cook-page.component';
+import { AddRecipeComponent } from './add-recipe/add-recipe.component';
 
 const routes: Routes = [
 	{ path: '', redirectTo: '/cook', pathMatch: 'full' },
-	{ path: 'cook', component: CookPageComponent }
+	{ path: 'cook', component: CookPageComponent },
+	{ path: 'add', component: AddRecipeComponent }
 ];
 
 @NgModule({
diff --git a/recipeBuddy/src/app/app.module.ts b/recipeBuddy/src/app/app.module.ts
index fb12cf6..4d2ab47 100644
--- a/recipeBuddy/src/app/app.module.ts
+++ b/recipeBuddy/src/app/app.module.ts
@@ -10,7 +10,9 @@ import { StepCardComponent } from './cook-page/step-card/step-card.component';
 import { AppRoutingModule } from './app-routing.module';
 
 import { HttpClientModule } from '@angular/common/http';
-import { AddRecipeComponent } from './add-recipe/add-recipe.component'
+import { AddRecipeComponent } from './add-recipe/add-recipe.component';
+
+import { ReactiveFormsModule } from '@angular/forms';
 
 @NgModule({
   declarations: [
@@ -23,7 +25,8 @@ import { AddRecipeComponent } from './add-recipe/add-recipe.component'
     BrowserModule,
     AppRoutingModule,
     MatCardModule,
-    HttpClientModule
+    HttpClientModule,
+    ReactiveFormsModule
   ],
   providers: [],
   bootstrap: [AppComponent]
-- 
cgit v1.1


From 1431653196467eec7608cb30592d462b4c207be4 Mon Sep 17 00:00:00 2001
From: Tucker Evans <tuckerevans24@gmail.com>
Date: Thu, 5 Dec 2019 15:03:16 -0500
Subject: Add material look to Add Recipe form

---
 .../src/app/add-recipe/add-recipe.component.css    | 15 ++++
 .../src/app/add-recipe/add-recipe.component.html   | 91 ++++++++++------------
 recipeBuddy/src/app/app.module.ts                  | 13 +++-
 recipeBuddy/src/index.html                         |  2 +
 recipeBuddy/src/styles.css                         |  3 +
 5 files changed, 75 insertions(+), 49 deletions(-)

(limited to 'recipeBuddy/src')

diff --git a/recipeBuddy/src/app/add-recipe/add-recipe.component.css b/recipeBuddy/src/app/add-recipe/add-recipe.component.css
index e69de29..901e02d 100644
--- a/recipeBuddy/src/app/add-recipe/add-recipe.component.css
+++ b/recipeBuddy/src/app/add-recipe/add-recipe.component.css
@@ -0,0 +1,15 @@
+.form {
+	min-width: 150px;
+	max-width: 750px;
+	width: 100%;
+	margin-left: auto;
+	margin-right: auto;
+}
+
+.full-width {
+	width: 100%;
+}
+
+td {
+	padding-right: 8px;
+}
diff --git a/recipeBuddy/src/app/add-recipe/add-recipe.component.html b/recipeBuddy/src/app/add-recipe/add-recipe.component.html
index 3a42687..b4f70ce 100644
--- a/recipeBuddy/src/app/add-recipe/add-recipe.component.html
+++ b/recipeBuddy/src/app/add-recipe/add-recipe.component.html
@@ -1,70 +1,65 @@
-<form [formGroup]="recipeForm">
-	<label>
-		Name:
-		<input type="text" formControlName="recipeName">
-	</label>
-	<label>
-		Description:
-		<input type="text" formControlName="desc">
-	</label>
-	<label>
-		Servings:
-		<input type="text" formControlName="servingSize">
-	</label>
-	<label>
-		Cooking Time:
-		<input type="text" formControlName="cookTime">
-	</label>
-	<label>
-		Keywords/Tags:
-		<input type="text" formControlName="tags">
-	</label>
-	<label>
-		Photos (URLS):
-		<input type="text" formControlName="photos">
-	</label>
+<form [formGroup]="recipeForm" class="form">
+<h2>Add Recipe</h2>
+	<mat-form-field class="full-width">
+		<input matInput placeholder="Name" type="text" formControlName="recipeName">
+	</mat-form-field>
+	<mat-form-field class="full-width">
+		<textarea matInput placeholder="Description"
+		formControlName="desc"> TEST </textarea>
+	</mat-form-field>
+	<mat-form-field class="full-width">
+		<input matInput placeholder="Servings" type=text formControlName="servingSize">
+	</mat-form-field>
+	<mat-form-field class="full-width">
+		<input matInput placeholder="Cooking Time" type="text" formControlName="cookTime">
+	</mat-form-field>
+	<mat-form-field class="full-width">
+		<input matInput placeholder="Keywords/Tags" type="text" formControlName="tags">
+	</mat-form-field>
+	<mat-form-field class="full-width">
+		<input matInput placeholder="Photos (URLS)" type="text" formControlName="photos">
+	</mat-form-field>
 
 	<div formArrayName="ingredients">
 		<h3>Ingredients</h3>
-		<button (click)="addIngredient()">Add Ingredient</button>
+		<button mat-mini-fab color="primary" (click)="addIngredient()">
+			<mat-icon>add</mat-icon>
+		</button>
 		<div *ngFor="let address of ingredients.controls; let i=index">
 			<div [formGroupName]="i">
 				<h4>Ingredient {{ i + 1 }}</h4>
-				<label>
-					Name:
-					<input type="text"
+				<mat-form-field class="full-width">
+					<input matInput placeholder="Name" type="text"
 					formControlName="ingrName">
-				</label>
-				<label>
-					Amount:
-					<input type="text"
+				</mat-form-field>
+				<mat-form-field class="full-width">
+					<input matInput placeholder="Amount" type="text"
 					formControlName="amount">
-				</label>
-				<label>
-					Name:
-					<input type="text"
+				</mat-form-field>
+				<mat-form-field class="full-width">
+					<input matInput placeholder="Units" type="text"
 					formControlName="units">
-				</label>
+				</mat-form-field>
 			</div>
 		</div>
 	</div>
 
 	<div formArrayName="steps">
 		<h3>Steps</h3>
-		<button (click)="addStep()">Add Step</button>
+		<button mat-mini-fab color="primary" (click)="addStep()">
+			<mat-icon>add</mat-icon>
+		</button>
 		<div *ngFor="let address of steps.controls; let i=index">
 			<div [formGroupName]="i">
 				<h4>Step {{ i + 1 }}</h4>
-				<label>
-					Instructions:
-					<input type="text"
-					formControlName="instruct">
-				</label>
-				<label>
-					Timer:
-					<input type="text"
+				<mat-form-field class="full-width">
+					<textarea matInput placeholder="Instructions" type="text" formControlName="instruct">
+					</textarea>
+				</mat-form-field>
+				<mat-form-field class="full-width">
+					<input matInput placeholder="Timer" type="text"
 					formControlName="timer">
-				</label>
+				</mat-form-field>
 			</div>
 		</div>
 	</div>
diff --git a/recipeBuddy/src/app/app.module.ts b/recipeBuddy/src/app/app.module.ts
index 4d2ab47..359254e 100644
--- a/recipeBuddy/src/app/app.module.ts
+++ b/recipeBuddy/src/app/app.module.ts
@@ -13,6 +13,12 @@ import { HttpClientModule } from '@angular/common/http';
 import { AddRecipeComponent } from './add-recipe/add-recipe.component';
 
 import { ReactiveFormsModule } from '@angular/forms';
+import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+
+import { MatInputModule } from '@angular/material/input';
+import { MatFormFieldModule } from '@angular/material';
+import { MatIconModule } from '@angular/material/icon';
+import { MatButtonModule } from '@angular/material/button';
 
 @NgModule({
   declarations: [
@@ -26,7 +32,12 @@ import { ReactiveFormsModule } from '@angular/forms';
     AppRoutingModule,
     MatCardModule,
     HttpClientModule,
-    ReactiveFormsModule
+    ReactiveFormsModule,
+    NoopAnimationsModule,
+    MatInputModule,
+    MatFormFieldModule,
+    MatIconModule,
+    MatButtonModule
   ],
   providers: [],
   bootstrap: [AppComponent]
diff --git a/recipeBuddy/src/index.html b/recipeBuddy/src/index.html
index 122efbf..29b1c1b 100644
--- a/recipeBuddy/src/index.html
+++ b/recipeBuddy/src/index.html
@@ -6,6 +6,8 @@
   <base href="/">
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <link rel="icon" type="image/x-icon" href="favicon.ico">
+  <link href="https://fonts.googleapis.com/css?family=Roboto:300,400,500&display=swap" rel="stylesheet">
+  <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
 </head>
 <body>
   <app-root></app-root>
diff --git a/recipeBuddy/src/styles.css b/recipeBuddy/src/styles.css
index 90d4ee0..7e7239a 100644
--- a/recipeBuddy/src/styles.css
+++ b/recipeBuddy/src/styles.css
@@ -1 +1,4 @@
 /* You can add global styles to this file, and also import other style files */
+
+html, body { height: 100%; }
+body { margin: 0; font-family: Roboto, "Helvetica Neue", sans-serif; }
-- 
cgit v1.1


From efc880aa101b046e77ff9feb5045225cd44afbf8 Mon Sep 17 00:00:00 2001
From: Tucker Evans <tuckerevans24@gmail.com>
Date: Fri, 6 Dec 2019 15:14:17 -0500
Subject: Add submit button to form

---
 recipeBuddy/src/app/add-recipe/add-recipe.component.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'recipeBuddy/src')

diff --git a/recipeBuddy/src/app/add-recipe/add-recipe.component.html b/recipeBuddy/src/app/add-recipe/add-recipe.component.html
index b4f70ce..7569560 100644
--- a/recipeBuddy/src/app/add-recipe/add-recipe.component.html
+++ b/recipeBuddy/src/app/add-recipe/add-recipe.component.html
@@ -1,4 +1,4 @@
-<form [formGroup]="recipeForm" class="form">
+<form [formGroup]="recipeForm" class="form" (ngSubmit)="onSubmit()">
 <h2>Add Recipe</h2>
 	<mat-form-field class="full-width">
 		<input matInput placeholder="Name" type="text" formControlName="recipeName">
@@ -63,6 +63,7 @@
 			</div>
 		</div>
 	</div>
+	<button mat-button color="primary" type="submit">Submit</button>
 </form>
 <p>
 Value: {{ recipeForm.value | json }}
-- 
cgit v1.1


From aeb7bfe5c46a4bb146d0e28560c535d6e7e3ef2d Mon Sep 17 00:00:00 2001
From: Tucker Evans <tuckerevans24@gmail.com>
Date: Fri, 6 Dec 2019 15:16:05 -0500
Subject: Add instruction for lists in form

The keyword and photos input now have a placeholder instructing the user
to separate inputs with commas.
---
 recipeBuddy/src/app/add-recipe/add-recipe.component.html | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'recipeBuddy/src')

diff --git a/recipeBuddy/src/app/add-recipe/add-recipe.component.html b/recipeBuddy/src/app/add-recipe/add-recipe.component.html
index 7569560..699f306 100644
--- a/recipeBuddy/src/app/add-recipe/add-recipe.component.html
+++ b/recipeBuddy/src/app/add-recipe/add-recipe.component.html
@@ -13,11 +13,13 @@
 	<mat-form-field class="full-width">
 		<input matInput placeholder="Cooking Time" type="text" formControlName="cookTime">
 	</mat-form-field>
-	<mat-form-field class="full-width">
-		<input matInput placeholder="Keywords/Tags" type="text" formControlName="tags">
+	<mat-form-field class="full-width" floatLabel="options.value.floatLabel">
+    <mat-label>Keywords/Tags</mat-label>
+		<input matInput placeholder="Separate with a comma" type="text" formControlName="tags">
 	</mat-form-field>
-	<mat-form-field class="full-width">
-		<input matInput placeholder="Photos (URLS)" type="text" formControlName="photos">
+	<mat-form-field class="full-width" floatLabel="options.value.floatLabel">
+		<mat-label>Photos (URLS)</mat-label>
+		<input matInput placeholder="Separate with a comma" type="text" formControlName="photos">
 	</mat-form-field>
 
 	<div formArrayName="ingredients">
-- 
cgit v1.1


From 994f8ee685d9db04d575ceabee869b9e948684c2 Mon Sep 17 00:00:00 2001
From: Tucker Evans <tuckerevans24@gmail.com>
Date: Fri, 6 Dec 2019 15:17:32 -0500
Subject: Add convert form data to Recipe Object

---
 .../src/app/add-recipe/add-recipe.component.ts     | 46 +++++++++++++++++++++-
 1 file changed, 45 insertions(+), 1 deletion(-)

(limited to 'recipeBuddy/src')

diff --git a/recipeBuddy/src/app/add-recipe/add-recipe.component.ts b/recipeBuddy/src/app/add-recipe/add-recipe.component.ts
index b0e5ce5..eaa45d2 100644
--- a/recipeBuddy/src/app/add-recipe/add-recipe.component.ts
+++ b/recipeBuddy/src/app/add-recipe/add-recipe.component.ts
@@ -5,6 +5,12 @@ import { FormControl } from '@angular/forms';
 import { FormBuilder } from '@angular/forms';
 import { FormArray } from '@angular/forms';
 
+import { Recipe } from '../DataModels/recipe';
+import { Ingredient } from '../DataModels/ingredient'
+import { Step } from '../DataModels/step';
+import { BackendService } from '../REST_service/backend.service';
+
+
 @Component({
   selector: 'app-add-recipe',
   templateUrl: './add-recipe.component.html',
@@ -34,7 +40,9 @@ export class AddRecipeComponent {
     tags: [''],
     photos: ['']
   });
-  constructor(private fb: FormBuilder) { }
+  constructor(private fb: FormBuilder,
+              private restService: BackendService
+              ) { }
 
   ngOnInit() {
   }
@@ -65,4 +73,40 @@ export class AddRecipeComponent {
       })
   );
   }
+
+  onSubmit() {
+    console.log('In Submit')
+    var formData = this.recipeForm.value;
+
+    var ingredients = []
+    var i;
+    for  (i = 0; i < formData.ingredients.length; i++) {
+      ingredients.push(new Ingredient(formData.ingredients[0].ingrName,
+                                      formData.ingredients[0].amount,
+                                      formData.ingredients[0].unit,
+                                      ""
+                       ));
+    }
+
+    var steps = []
+    for  (i = 0; i < formData.ingredients.length; i++) {
+      steps.push(new Step(formData.steps[0].instruct,
+                          formData.steps[0].timer
+                       ));
+    }
+
+    var recipe = new Recipe (0,                    //id
+                             formData.recipeName,  //name
+                             formData.desc,        //description
+                             ingredients,          //ingredients
+                             steps,                //steps
+                             formData.servingSize, //servingSize
+                             formData.cookTime,    //cookTime
+                             0,                    //timesCooked
+                             0,                    //rating
+                             formData.tags,        //tags
+                             formData.photos       //photos
+                             );
+    console.log(JSON.stringify(recipe))
+  }
 }
-- 
cgit v1.1


From 5fdef8455c33dcd192497c6fe0217ccb89e8bf66 Mon Sep 17 00:00:00 2001
From: Tucker Evans <tuckerevans24@gmail.com>
Date: Fri, 6 Dec 2019 15:18:01 -0500
Subject: Fix constructors for Step and Recipe data models

---
 recipeBuddy/src/app/DataModels/recipe.ts | 14 +++++++++++++-
 recipeBuddy/src/app/DataModels/step.ts   |  2 +-
 2 files changed, 14 insertions(+), 2 deletions(-)

(limited to 'recipeBuddy/src')

diff --git a/recipeBuddy/src/app/DataModels/recipe.ts b/recipeBuddy/src/app/DataModels/recipe.ts
index 368f237..937153f 100644
--- a/recipeBuddy/src/app/DataModels/recipe.ts
+++ b/recipeBuddy/src/app/DataModels/recipe.ts
@@ -14,7 +14,17 @@ export class Recipe {
 	private tags: string[];
 	private photos: string[];
 
-	public constructor(id: number, name: string, description: string, ingredients: Ingredient[], steps: Step[], servingSize: number, cookTime: number, rating: number, tags: string[]) {
+	public constructor(id: number,
+                      name: string,
+                      description: string,
+                      ingredients: Ingredient[],
+                      steps: Step[],
+                      servingSize: number,
+                      cookTime: number,
+                      timesCooked: number,
+                      rating: number,
+                      tags: string[],
+                      photos: string[]) {
 		this.id = id;
 		this.name = name;
 		this.description = description;
@@ -24,6 +34,8 @@ export class Recipe {
 		this.cookTime = cookTime;
 		this.rating = rating;
 		this.tags = tags;
+    this.photos = photos;
+    this.timesCooked = timesCooked;
 	}
 
 	public getId(): number {
diff --git a/recipeBuddy/src/app/DataModels/step.ts b/recipeBuddy/src/app/DataModels/step.ts
index 1c1ca7b..67e14c1 100644
--- a/recipeBuddy/src/app/DataModels/step.ts
+++ b/recipeBuddy/src/app/DataModels/step.ts
@@ -2,7 +2,7 @@ export class Step {
 	private instruction: string;
 	private timer: number;
 
-	public contructor(instruction: string, timer: number) {
+	public constructor(instruction: string, timer: number) {
 		this.instruction = instruction;
 		this.timer = timer;
 	}
-- 
cgit v1.1


From 3b43f292a605717d08d3623e09bf35a4e0301414 Mon Sep 17 00:00:00 2001
From: Tucker Evans <tuckerevans24@gmail.com>
Date: Sat, 7 Dec 2019 10:54:24 -0500
Subject: Fix set non-submit buttons type to "button"

This stops these buttons from triggering the submit action.
---
 recipeBuddy/src/app/add-recipe/add-recipe.component.html | 5 +++--
 recipeBuddy/src/app/add-recipe/add-recipe.component.ts   | 1 -
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'recipeBuddy/src')

diff --git a/recipeBuddy/src/app/add-recipe/add-recipe.component.html b/recipeBuddy/src/app/add-recipe/add-recipe.component.html
index 699f306..7e80e4e 100644
--- a/recipeBuddy/src/app/add-recipe/add-recipe.component.html
+++ b/recipeBuddy/src/app/add-recipe/add-recipe.component.html
@@ -24,7 +24,8 @@
 
 	<div formArrayName="ingredients">
 		<h3>Ingredients</h3>
-		<button mat-mini-fab color="primary" (click)="addIngredient()">
+		<button mat-mini-fab color="primary" (click)="addIngredient()"
+		type="button">
 			<mat-icon>add</mat-icon>
 		</button>
 		<div *ngFor="let address of ingredients.controls; let i=index">
@@ -48,7 +49,7 @@
 
 	<div formArrayName="steps">
 		<h3>Steps</h3>
-		<button mat-mini-fab color="primary" (click)="addStep()">
+		<button mat-mini-fab color="primary" (click)="addStep()" type="button">
 			<mat-icon>add</mat-icon>
 		</button>
 		<div *ngFor="let address of steps.controls; let i=index">
diff --git a/recipeBuddy/src/app/add-recipe/add-recipe.component.ts b/recipeBuddy/src/app/add-recipe/add-recipe.component.ts
index eaa45d2..469871b 100644
--- a/recipeBuddy/src/app/add-recipe/add-recipe.component.ts
+++ b/recipeBuddy/src/app/add-recipe/add-recipe.component.ts
@@ -75,7 +75,6 @@ export class AddRecipeComponent {
   }
 
   onSubmit() {
-    console.log('In Submit')
     var formData = this.recipeForm.value;
 
     var ingredients = []
-- 
cgit v1.1


From 2a89221eee68bc26ea3e90c380ce983f5a0985f0 Mon Sep 17 00:00:00 2001
From: Tucker Evans <tuckerevans24@gmail.com>
Date: Sat, 7 Dec 2019 11:51:22 -0500
Subject: Add removing Ingredients/Steps from add form

---
 .../src/app/add-recipe/add-recipe.component.css    | 30 +++++++++++++++++++++-
 .../src/app/add-recipe/add-recipe.component.html   |  8 ++++++
 .../src/app/add-recipe/add-recipe.component.ts     |  8 ++++++
 3 files changed, 45 insertions(+), 1 deletion(-)

(limited to 'recipeBuddy/src')

diff --git a/recipeBuddy/src/app/add-recipe/add-recipe.component.css b/recipeBuddy/src/app/add-recipe/add-recipe.component.css
index 901e02d..9d74c53 100644
--- a/recipeBuddy/src/app/add-recipe/add-recipe.component.css
+++ b/recipeBuddy/src/app/add-recipe/add-recipe.component.css
@@ -1,15 +1,43 @@
 .form {
 	min-width: 150px;
 	max-width: 750px;
-	width: 100%;
+	width: 95%;
 	margin-left: auto;
 	margin-right: auto;
+  padding-left: 5px;
+  padding-right: 5px;
 }
 
 .full-width {
 	width: 100%;
 }
 
+.half-width {
+	width: 50%;
+  padding: 1%;
+  margin-left:auto;
+  margin-right:auto;
+}
+
+.quarter-width {
+	width: 25%;
+  padding: 1%;
+  margin-left:auto;
+  margin-right:auto;
+}
+
+.third-width {
+	width: 33%;
+  padding: 1%;
+  margin-left:auto;
+  margin-right:auto;
+}
+
 td {
 	padding-right: 8px;
 }
+
+.center {
+  margin-left:auto;
+  margin-right:auto;
+}
diff --git a/recipeBuddy/src/app/add-recipe/add-recipe.component.html b/recipeBuddy/src/app/add-recipe/add-recipe.component.html
index 7e80e4e..47d2ea1 100644
--- a/recipeBuddy/src/app/add-recipe/add-recipe.component.html
+++ b/recipeBuddy/src/app/add-recipe/add-recipe.component.html
@@ -43,6 +43,10 @@
 					<input matInput placeholder="Units" type="text"
 					formControlName="units">
 				</mat-form-field>
+				<button matSuffix mat-mini-fab (click)="rmIngredient(i)"
+					type="button" style="margin-left: 10px">
+					<mat-icon>remove</mat-icon>
+				</button>
 			</div>
 		</div>
 	</div>
@@ -63,6 +67,10 @@
 					<input matInput placeholder="Timer" type="text"
 					formControlName="timer">
 				</mat-form-field>
+				<button matSuffix mat-mini-fab (click)="rmStep(i)"
+					type="button" style="margin-left: 10px">
+					<mat-icon>remove</mat-icon>
+				</button>
 			</div>
 		</div>
 	</div>
diff --git a/recipeBuddy/src/app/add-recipe/add-recipe.component.ts b/recipeBuddy/src/app/add-recipe/add-recipe.component.ts
index 469871b..cdd63c8 100644
--- a/recipeBuddy/src/app/add-recipe/add-recipe.component.ts
+++ b/recipeBuddy/src/app/add-recipe/add-recipe.component.ts
@@ -61,6 +61,10 @@ export class AddRecipeComponent {
   );
   }
 
+  rmIngredient(i) {
+    this.ingredients.removeAt(i);
+  }
+
   get steps() {
     return this.recipeForm.get('steps') as FormArray;
   }
@@ -74,6 +78,10 @@ export class AddRecipeComponent {
   );
   }
 
+  rmStep(i) {
+    this.steps.removeAt(i);
+  }
+
   onSubmit() {
     var formData = this.recipeForm.value;
 
-- 
cgit v1.1


From 75a82f8a40b9f296aa71a4b6cef0fa8ea8a1c591 Mon Sep 17 00:00:00 2001
From: Tucker Evans <tuckerevans24@gmail.com>
Date: Sat, 7 Dec 2019 11:52:00 -0500
Subject: Fix UI of add form

Moves Add/Delete buttons around
Puts Ingredient/Step parts together
Changes Submit button look
Removes JSON preview of form value object
---
 .../src/app/add-recipe/add-recipe.component.html   | 40 +++++++++++++---------
 1 file changed, 23 insertions(+), 17 deletions(-)

(limited to 'recipeBuddy/src')

diff --git a/recipeBuddy/src/app/add-recipe/add-recipe.component.html b/recipeBuddy/src/app/add-recipe/add-recipe.component.html
index 47d2ea1..36d45b6 100644
--- a/recipeBuddy/src/app/add-recipe/add-recipe.component.html
+++ b/recipeBuddy/src/app/add-recipe/add-recipe.component.html
@@ -24,22 +24,19 @@
 
 	<div formArrayName="ingredients">
 		<h3>Ingredients</h3>
-		<button mat-mini-fab color="primary" (click)="addIngredient()"
-		type="button">
-			<mat-icon>add</mat-icon>
-		</button>
 		<div *ngFor="let address of ingredients.controls; let i=index">
 			<div [formGroupName]="i">
 				<h4>Ingredient {{ i + 1 }}</h4>
-				<mat-form-field class="full-width">
+				<div class="full-width">
+				<mat-form-field class="quarter-width">
 					<input matInput placeholder="Name" type="text"
 					formControlName="ingrName">
 				</mat-form-field>
-				<mat-form-field class="full-width">
+				<mat-form-field class="quarter-width">
 					<input matInput placeholder="Amount" type="text"
 					formControlName="amount">
 				</mat-form-field>
-				<mat-form-field class="full-width">
+				<mat-form-field class="quarter-width">
 					<input matInput placeholder="Units" type="text"
 					formControlName="units">
 				</mat-form-field>
@@ -47,35 +44,44 @@
 					type="button" style="margin-left: 10px">
 					<mat-icon>remove</mat-icon>
 				</button>
+				</div>
 			</div>
 		</div>
+		<div style="text-align: center">
+		<button mat-mini-fab (click)="addIngredient()"
+		type="button">
+			<mat-icon>add</mat-icon>
+		</button>
+		</div>
 	</div>
 
 	<div formArrayName="steps">
 		<h3>Steps</h3>
-		<button mat-mini-fab color="primary" (click)="addStep()" type="button">
-			<mat-icon>add</mat-icon>
-		</button>
 		<div *ngFor="let address of steps.controls; let i=index">
 			<div [formGroupName]="i">
 				<h4>Step {{ i + 1 }}</h4>
-				<mat-form-field class="full-width">
+				<div class="ful-width">
+				<mat-form-field class="half-width">
 					<textarea matInput placeholder="Instructions" type="text" formControlName="instruct">
 					</textarea>
 				</mat-form-field>
-				<mat-form-field class="full-width">
-					<input matInput placeholder="Timer" type="text"
+				<mat-form-field class="quarter-width">
+					<mat-label>Timer</mat-label>
+					<input matInput placeholder="hh:mm" type="text"
 					formControlName="timer">
 				</mat-form-field>
 				<button matSuffix mat-mini-fab (click)="rmStep(i)"
 					type="button" style="margin-left: 10px">
 					<mat-icon>remove</mat-icon>
 				</button>
+				</div>
 			</div>
 		</div>
+		<div style="text-align: center">
+			<button mat-mini-fab (click)="addStep()" matSuffix type="button">
+				<mat-icon>add</mat-icon>
+			</button>
+		</div>
 	</div>
-	<button mat-button color="primary" type="submit">Submit</button>
+	<button mat-flat-button color="primary" type="submit">Submit</button>
 </form>
-<p>
-Value: {{ recipeForm.value | json }}
-</p>
-- 
cgit v1.1


From 4efaeb517b94690483a14f25a224de73c0f1b055 Mon Sep 17 00:00:00 2001
From: Tucker Evans <tuckerevans24@gmail.com>
Date: Sat, 7 Dec 2019 13:32:21 -0500
Subject: Add add recipe form requires a recipe name before submitting

---
 recipeBuddy/src/app/add-recipe/add-recipe.component.html | 6 ++++--
 recipeBuddy/src/app/add-recipe/add-recipe.component.ts   | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

(limited to 'recipeBuddy/src')

diff --git a/recipeBuddy/src/app/add-recipe/add-recipe.component.html b/recipeBuddy/src/app/add-recipe/add-recipe.component.html
index 36d45b6..a8a3e5f 100644
--- a/recipeBuddy/src/app/add-recipe/add-recipe.component.html
+++ b/recipeBuddy/src/app/add-recipe/add-recipe.component.html
@@ -1,7 +1,8 @@
 <form [formGroup]="recipeForm" class="form" (ngSubmit)="onSubmit()">
 <h2>Add Recipe</h2>
 	<mat-form-field class="full-width">
-		<input matInput placeholder="Name" type="text" formControlName="recipeName">
+		<input matInput placeholder="Name" type="text"
+			formControlName="recipeName" required>
 	</mat-form-field>
 	<mat-form-field class="full-width">
 		<textarea matInput placeholder="Description"
@@ -83,5 +84,6 @@
 			</button>
 		</div>
 	</div>
-	<button mat-flat-button color="primary" type="submit">Submit</button>
+	<button mat-flat-button color="primary" type="submit"
+	[disabled]="!recipeForm.valid">Submit</button>
 </form>
diff --git a/recipeBuddy/src/app/add-recipe/add-recipe.component.ts b/recipeBuddy/src/app/add-recipe/add-recipe.component.ts
index cdd63c8..b4f4d1e 100644
--- a/recipeBuddy/src/app/add-recipe/add-recipe.component.ts
+++ b/recipeBuddy/src/app/add-recipe/add-recipe.component.ts
@@ -5,12 +5,13 @@ import { FormControl } from '@angular/forms';
 import { FormBuilder } from '@angular/forms';
 import { FormArray } from '@angular/forms';
 
+import { Validators } from '@angular/forms';
+
 import { Recipe } from '../DataModels/recipe';
 import { Ingredient } from '../DataModels/ingredient'
 import { Step } from '../DataModels/step';
 import { BackendService } from '../REST_service/backend.service';
 
-
 @Component({
   selector: 'app-add-recipe',
   templateUrl: './add-recipe.component.html',
@@ -20,7 +21,7 @@ import { BackendService } from '../REST_service/backend.service';
 export class AddRecipeComponent {
 
   recipeForm = this.fb.group({
-    recipeName: [''],
+    recipeName: ['', Validators.required],
     desc: [''],
     ingredients: this.fb.array([
       this.fb.group({
@@ -40,6 +41,7 @@ export class AddRecipeComponent {
     tags: [''],
     photos: ['']
   });
+
   constructor(private fb: FormBuilder,
               private restService: BackendService
               ) { }
-- 
cgit v1.1


From 99287dff749f7c6fa050b597115270496738d77c Mon Sep 17 00:00:00 2001
From: Tucker Evans <tuckerevans24@gmail.com>
Date: Sun, 8 Dec 2019 15:38:08 -0500
Subject: Add basic input validation to add recipe form

Validates: Name is required, Timer/Cook Time are digits,
Amount/Servings are numbers (digits with optional decimal point).
---
 .../src/app/add-recipe/add-recipe.component.html   | 38 +++++++++++++++++-----
 .../src/app/add-recipe/add-recipe.component.ts     | 10 +++---
 2 files changed, 34 insertions(+), 14 deletions(-)

(limited to 'recipeBuddy/src')

diff --git a/recipeBuddy/src/app/add-recipe/add-recipe.component.html b/recipeBuddy/src/app/add-recipe/add-recipe.component.html
index a8a3e5f..76095f9 100644
--- a/recipeBuddy/src/app/add-recipe/add-recipe.component.html
+++ b/recipeBuddy/src/app/add-recipe/add-recipe.component.html
@@ -3,19 +3,35 @@
 	<mat-form-field class="full-width">
 		<input matInput placeholder="Name" type="text"
 			formControlName="recipeName" required>
+		<mat-hint>
+			Name is required
+		</mat-hint>
+		<mat-error>
+			Name is required
+		</mat-error>
 	</mat-form-field>
 	<mat-form-field class="full-width">
 		<textarea matInput placeholder="Description"
 		formControlName="desc"> TEST </textarea>
 	</mat-form-field>
 	<mat-form-field class="full-width">
-		<input matInput placeholder="Servings" type=text formControlName="servingSize">
+		<input matInput placeholder="Servings" type=text
+		formControlName="servingSize" pattern="^[0-9]*(\.[0-9]*)?$">
+		<mat-error>
+			Servings must be a number.
+		</mat-error>
 	</mat-form-field>
 	<mat-form-field class="full-width">
-		<input matInput placeholder="Cooking Time" type="text" formControlName="cookTime">
+		
+		<input matInput placeholder="Cooking Time" type="text" formControlName="cookTime"
+		pattern="^[0-9]*$">
+		<span matSuffix>Minutes</span>
+		<mat-error>
+			Must be in the form hh:mm
+		</mat-error>
 	</mat-form-field>
 	<mat-form-field class="full-width" floatLabel="options.value.floatLabel">
-    <mat-label>Keywords/Tags</mat-label>
+		<mat-label>Keywords/Tags</mat-label>
 		<input matInput placeholder="Separate with a comma" type="text" formControlName="tags">
 	</mat-form-field>
 	<mat-form-field class="full-width" floatLabel="options.value.floatLabel">
@@ -25,7 +41,7 @@
 
 	<div formArrayName="ingredients">
 		<h3>Ingredients</h3>
-		<div *ngFor="let address of ingredients.controls; let i=index">
+		<div *ngFor="let ingr of ingredients.controls; let i=index">
 			<div [formGroupName]="i">
 				<h4>Ingredient {{ i + 1 }}</h4>
 				<div class="full-width">
@@ -34,8 +50,12 @@
 					formControlName="ingrName">
 				</mat-form-field>
 				<mat-form-field class="quarter-width">
-					<input matInput placeholder="Amount" type="text"
-					formControlName="amount">
+					<input matInput placeholder="Amount"
+					type="text"
+					formControlName="amount" pattern="^[0-9]*(\.[0-9]*)?$">
+					<mat-error>
+						Amount must be a number.
+					</mat-error>
 				</mat-form-field>
 				<mat-form-field class="quarter-width">
 					<input matInput placeholder="Units" type="text"
@@ -67,9 +87,9 @@
 					</textarea>
 				</mat-form-field>
 				<mat-form-field class="quarter-width">
-					<mat-label>Timer</mat-label>
-					<input matInput placeholder="hh:mm" type="text"
-					formControlName="timer">
+					<input matInput placeholder="Timer" type="text"
+					formControlName="timer" pattern="^[0-9]*$">
+					<span matSuffix>Minutes</span>
 				</mat-form-field>
 				<button matSuffix mat-mini-fab (click)="rmStep(i)"
 					type="button" style="margin-left: 10px">
diff --git a/recipeBuddy/src/app/add-recipe/add-recipe.component.ts b/recipeBuddy/src/app/add-recipe/add-recipe.component.ts
index b4f4d1e..50ea1cd 100644
--- a/recipeBuddy/src/app/add-recipe/add-recipe.component.ts
+++ b/recipeBuddy/src/app/add-recipe/add-recipe.component.ts
@@ -26,7 +26,7 @@ export class AddRecipeComponent {
     ingredients: this.fb.array([
       this.fb.group({
         ingrName: [''],
-        amount: [''],
+        amount: ['', Validators.pattern('^[0-9]*(\.[0-9]*)?$')],
         units: ['']
         })
     ]),
@@ -36,8 +36,8 @@ export class AddRecipeComponent {
         timer: ['']
         })
     ]),
-    servingSize: [''],
-    cookTime: [''],
+    servingSize: ['', Validators.pattern('^[0-9]*(\.[0-9]*)?$')],
+    cookTime: ['', Validators.pattern('^[0-9]*$')],
     tags: [''],
     photos: ['']
   });
@@ -57,7 +57,7 @@ export class AddRecipeComponent {
     this.ingredients.push(
     this.fb.group({
       ingrName: [''],
-      amount: [''],
+      amount: ['', Validators.pattern('^[0-9]*(\.[0-9]*)?$')],
       units: ['']
       })
   );
@@ -75,7 +75,7 @@ export class AddRecipeComponent {
     this.steps.push(
     this.fb.group({
       instruct: [''],
-      timer: ['']
+      timer: ['', Validators.pattern('^[0-9]*$')]
       })
   );
   }
-- 
cgit v1.1


From bb1ecccbf324c59097a828a862a10201f76d02a9 Mon Sep 17 00:00:00 2001
From: Tucker Evans <tuckerevans24@gmail.com>
Date: Sun, 8 Dec 2019 16:41:39 -0500
Subject: Add recipe is now sent to backend from add form

---
 .../src/app/add-recipe/add-recipe.component.ts     | 27 ++++++++++++++++------
 1 file changed, 20 insertions(+), 7 deletions(-)

(limited to 'recipeBuddy/src')

diff --git a/recipeBuddy/src/app/add-recipe/add-recipe.component.ts b/recipeBuddy/src/app/add-recipe/add-recipe.component.ts
index 50ea1cd..bc88eb7 100644
--- a/recipeBuddy/src/app/add-recipe/add-recipe.component.ts
+++ b/recipeBuddy/src/app/add-recipe/add-recipe.component.ts
@@ -91,17 +91,23 @@ export class AddRecipeComponent {
     var i;
     for  (i = 0; i < formData.ingredients.length; i++) {
       ingredients.push(new Ingredient(formData.ingredients[0].ingrName,
-                                      formData.ingredients[0].amount,
+                                      parseFloat(formData.ingredients[0].amount),
                                       formData.ingredients[0].unit,
                                       ""
                        ));
+      if (isNaN(ingredients[ingredients.length - 1].amount)) {
+        ingredients[ingredients.length - 1].amount = 0;
+      }
     }
 
     var steps = []
     for  (i = 0; i < formData.ingredients.length; i++) {
       steps.push(new Step(formData.steps[0].instruct,
-                          formData.steps[0].timer
+                          parseInt(formData.steps[0].timer)
                        ));
+      if (isNaN(steps[steps.length - 1].timer)) {
+        steps[steps.length - 1].timer = 0;
+      }
     }
 
     var recipe = new Recipe (0,                    //id
@@ -109,13 +115,20 @@ export class AddRecipeComponent {
                              formData.desc,        //description
                              ingredients,          //ingredients
                              steps,                //steps
-                             formData.servingSize, //servingSize
-                             formData.cookTime,    //cookTime
+                             parseFloat(formData.servingSize), //servingSize
+                             parseInt(formData.cookTime),    //cookTime
                              0,                    //timesCooked
                              0,                    //rating
-                             formData.tags,        //tags
-                             formData.photos       //photos
+                             formData.tags.split(','),        //tags
+                             formData.photos.split(',')       //photos
                              );
-    console.log(JSON.stringify(recipe))
+      if (isNaN(recipe.servingSize)) {
+        recipe.servingSize = 0;
+      }
+
+      if (isNaN(recipe.cookTime)) {
+        recipe.cookTime = 0;
+      }
+    this.restService.createRecipe(recipe).subscribe()
   }
 }
-- 
cgit v1.1


From 2a46419961ab4db50146434945a57859893f8d54 Mon Sep 17 00:00:00 2001
From: Tucker Evans <tuckerevans24@gmail.com>
Date: Sun, 8 Dec 2019 17:26:32 -0500
Subject: Fix remove accessing private values of Recipe/Ingredient/Step

---
 .../src/app/add-recipe/add-recipe.component.ts     | 26 ++++++++--------------
 1 file changed, 9 insertions(+), 17 deletions(-)

(limited to 'recipeBuddy/src')

diff --git a/recipeBuddy/src/app/add-recipe/add-recipe.component.ts b/recipeBuddy/src/app/add-recipe/add-recipe.component.ts
index bc88eb7..407997c 100644
--- a/recipeBuddy/src/app/add-recipe/add-recipe.component.ts
+++ b/recipeBuddy/src/app/add-recipe/add-recipe.component.ts
@@ -90,45 +90,37 @@ export class AddRecipeComponent {
     var ingredients = []
     var i;
     for  (i = 0; i < formData.ingredients.length; i++) {
+    var tmp_amount = parseFloat(formData.ingredients[0].amount)
       ingredients.push(new Ingredient(formData.ingredients[0].ingrName,
-                                      parseFloat(formData.ingredients[0].amount),
+                                      (isNaN(tmp_amount) ? 0 : tmp_amount),
                                       formData.ingredients[0].unit,
                                       ""
                        ));
-      if (isNaN(ingredients[ingredients.length - 1].amount)) {
-        ingredients[ingredients.length - 1].amount = 0;
-      }
     }
 
     var steps = []
     for  (i = 0; i < formData.ingredients.length; i++) {
+      var tmp_timer = parseInt(formData.steps[0].timer)
       steps.push(new Step(formData.steps[0].instruct,
-                          parseInt(formData.steps[0].timer)
+                          (isNaN(tmp_timer) ? 0 : tmp_timer)
                        ));
-      if (isNaN(steps[steps.length - 1].timer)) {
-        steps[steps.length - 1].timer = 0;
-      }
     }
 
+    var servingsTmp = parseFloat(formData.servingSize)
+    var cookTimeTmp = parseInt(formData.cookTime)
+
     var recipe = new Recipe (0,                    //id
                              formData.recipeName,  //name
                              formData.desc,        //description
                              ingredients,          //ingredients
                              steps,                //steps
-                             parseFloat(formData.servingSize), //servingSize
-                             parseInt(formData.cookTime),    //cookTime
+                             (isNaN(servingsTmp) ? 0 :servingsTmp), //servingSize
+                             (isNaN(cookTimeTmp) ? 0 :cookTimeTmp),    //cookTime
                              0,                    //timesCooked
                              0,                    //rating
                              formData.tags.split(','),        //tags
                              formData.photos.split(',')       //photos
                              );
-      if (isNaN(recipe.servingSize)) {
-        recipe.servingSize = 0;
-      }
-
-      if (isNaN(recipe.cookTime)) {
-        recipe.cookTime = 0;
-      }
     this.restService.createRecipe(recipe).subscribe()
   }
 }
-- 
cgit v1.1


From 7743f0b8756eefa877f0ab0001617f9d8f6a1528 Mon Sep 17 00:00:00 2001
From: schencej <schencej@clarkson.edu>
Date: Sun, 8 Dec 2019 18:23:06 -0500
Subject: added recipePass service

---
 .../src/app/recipePass/recipe-pass.service.spec.ts   | 12 ++++++++++++
 .../src/app/recipePass/recipe-pass.service.ts        | 20 ++++++++++++++++++++
 2 files changed, 32 insertions(+)
 create mode 100644 recipeBuddy/src/app/recipePass/recipe-pass.service.spec.ts
 create mode 100644 recipeBuddy/src/app/recipePass/recipe-pass.service.ts

(limited to 'recipeBuddy/src')

diff --git a/recipeBuddy/src/app/recipePass/recipe-pass.service.spec.ts b/recipeBuddy/src/app/recipePass/recipe-pass.service.spec.ts
new file mode 100644
index 0000000..f3a8388
--- /dev/null
+++ b/recipeBuddy/src/app/recipePass/recipe-pass.service.spec.ts
@@ -0,0 +1,12 @@
+import { TestBed } from '@angular/core/testing';
+
+import { RecipePassService } from './recipe-pass.service';
+
+describe('RecipePassService', () => {
+  beforeEach(() => TestBed.configureTestingModule({}));
+
+  it('should be created', () => {
+    const service: RecipePassService = TestBed.get(RecipePassService);
+    expect(service).toBeTruthy();
+  });
+});
diff --git a/recipeBuddy/src/app/recipePass/recipe-pass.service.ts b/recipeBuddy/src/app/recipePass/recipe-pass.service.ts
new file mode 100644
index 0000000..e925973
--- /dev/null
+++ b/recipeBuddy/src/app/recipePass/recipe-pass.service.ts
@@ -0,0 +1,20 @@
+import { Injectable } from '@angular/core';
+import { Recipe } from '../DataModels/recipe';
+
+@Injectable({
+	providedIn: 'root',
+})
+export class RecipePassService {
+
+	private sourceRecipe: Recipe;
+
+  constructor() { }
+
+	public setRecipe (recipeToPass: Recipe) {
+		this.sourceRecipe = recipeToPass;
+	}
+
+	public getRecipe (): Recipe {
+		return this.sourceRecipe;
+	}
+}
-- 
cgit v1.1


From 4f2f07dd448739c5b620a4ac5f3457349b737e00 Mon Sep 17 00:00:00 2001
From: schencej <schencej@clarkson.edu>
Date: Mon, 9 Dec 2019 17:36:10 -0500
Subject: made all data model member variables public

---
 recipeBuddy/src/app/DataModels/ingredient.ts |  8 ++++----
 recipeBuddy/src/app/DataModels/recipe.ts     | 22 +++++++++++-----------
 recipeBuddy/src/app/DataModels/step.ts       |  6 +++---
 3 files changed, 18 insertions(+), 18 deletions(-)

(limited to 'recipeBuddy/src')

diff --git a/recipeBuddy/src/app/DataModels/ingredient.ts b/recipeBuddy/src/app/DataModels/ingredient.ts
index c79b475..720514c 100644
--- a/recipeBuddy/src/app/DataModels/ingredient.ts
+++ b/recipeBuddy/src/app/DataModels/ingredient.ts
@@ -1,8 +1,8 @@
 export class Ingredient {
-	private name: string;
-	private amount: number;
-	private unit: string;
-	private type_: string;
+	public name: string;
+	public amount: number;
+	public unit: string;
+	public type_: string;
 
 	public constructor(name: string, amount: number, unit: string, type_: string) {
 		this.name = name;
diff --git a/recipeBuddy/src/app/DataModels/recipe.ts b/recipeBuddy/src/app/DataModels/recipe.ts
index 368f237..9d833be 100644
--- a/recipeBuddy/src/app/DataModels/recipe.ts
+++ b/recipeBuddy/src/app/DataModels/recipe.ts
@@ -2,17 +2,17 @@ import {Step} from "./step"
 import {Ingredient} from "./ingredient"
 
 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 id: number;
+	public name: string;
+	public description: string;
+	public ingredients: Ingredient[];
+	public steps: Step[];
+	public servingSize: number;
+	public cookTime: number;
+	public timesCooked: number;
+	public rating: number;
+	public tags: string[];
+	public photos: string[];
 
 	public constructor(id: number, name: string, description: string, ingredients: Ingredient[], steps: Step[], servingSize: number, cookTime: number, rating: number, tags: string[]) {
 		this.id = id;
diff --git a/recipeBuddy/src/app/DataModels/step.ts b/recipeBuddy/src/app/DataModels/step.ts
index 1c1ca7b..06c15c9 100644
--- a/recipeBuddy/src/app/DataModels/step.ts
+++ b/recipeBuddy/src/app/DataModels/step.ts
@@ -1,8 +1,8 @@
 export class Step {
-	private instruction: string;
-	private timer: number;
+	public instruction: string;
+	public timer: number;
 
-	public contructor(instruction: string, timer: number) {
+	public constructor(instruction: string, timer: number) {
 		this.instruction = instruction;
 		this.timer = timer;
 	}
-- 
cgit v1.1


From 161b1a1b2c3023da26388719cf962039742de350 Mon Sep 17 00:00:00 2001
From: schencej <schencej@clarkson.edu>
Date: Mon, 9 Dec 2019 17:38:03 -0500
Subject: added additional functionality to cook page

---
 .../src/app/cook-page/cook-page.component.css      | 14 ++++
 .../src/app/cook-page/cook-page.component.html     | 22 +++---
 .../src/app/cook-page/cook-page.component.ts       | 78 ++++++++++++++++------
 .../cook-page/step-card/step-card.component.css    |  0
 .../cook-page/step-card/step-card.component.html   |  1 -
 .../step-card/step-card.component.spec.ts          | 25 -------
 .../app/cook-page/step-card/step-card.component.ts |  9 ---
 7 files changed, 83 insertions(+), 66 deletions(-)
 delete mode 100644 recipeBuddy/src/app/cook-page/step-card/step-card.component.css
 delete mode 100644 recipeBuddy/src/app/cook-page/step-card/step-card.component.html
 delete mode 100644 recipeBuddy/src/app/cook-page/step-card/step-card.component.spec.ts
 delete mode 100644 recipeBuddy/src/app/cook-page/step-card/step-card.component.ts

(limited to 'recipeBuddy/src')

diff --git a/recipeBuddy/src/app/cook-page/cook-page.component.css b/recipeBuddy/src/app/cook-page/cook-page.component.css
index 41b3d42..4f44224 100644
--- a/recipeBuddy/src/app/cook-page/cook-page.component.css
+++ b/recipeBuddy/src/app/cook-page/cook-page.component.css
@@ -11,13 +11,20 @@
 
 .previous {
 	margin: auto;
+	width: 200px;
+	height: 200px;
 	border: solid;
+	align: center;
 	text-align: center;
 	grid-column: 1;
+
+	
 }
 
 .current {
 	margin: auto;
+	width: 300px;
+	height:300px;
 	border: solid;
 	text-align: center;
 	grid-column: 2;
@@ -25,7 +32,10 @@
 
 .next {
 	margin: auto;
+	width: 200px;
+	height: 200px;
 	border: solid;
+	align: center;
 	text-align: center;
 	grid-column: 3;
 
@@ -37,3 +47,7 @@
 	grid-gap: 10px;
 	grid-template-rows: 1fr;
 }
+
+.step-count {
+	text-align: center;
+}
diff --git a/recipeBuddy/src/app/cook-page/cook-page.component.html b/recipeBuddy/src/app/cook-page/cook-page.component.html
index 39bef2e..db1c0a8 100644
--- a/recipeBuddy/src/app/cook-page/cook-page.component.html
+++ b/recipeBuddy/src/app/cook-page/cook-page.component.html
@@ -1,22 +1,26 @@
 <div class="container">
-	<div class="previous">
-		<h1>Step {{step -1}}</h1>
+	<div class="previous" *ngIf="!firstStep">
+		<h1>Step {{stepNum -1}}</h1>
 		<p>{{previousStep}}</p>
 	</div>
 	
 	<div class="current">
-		<h1>Step {{step}}</h1>
+		<h1>Step {{stepNum}}</h1>
 		<p>{{currentStep}}</p>
-		<p>{{timeLeft}}</p>
-		<div>
+		<div *ngIf="hasTimer()">
+			<p>{{timeLeft}}</p>
 			<button (click)="startTimer()">Start Timer</button>
 		</div>
-		<button (click)="previous()">Previous</button>
-		<button (click)="next()">next</button>
+		<button *ngIf="!firstStep" (click)="previous()">Previous</button>
+		<button *ngIf="!lastStep" (click)="next()">next</button>
 	</div>
 	
-	<div class="next">
-		<h1>Step {{step +1}}</h1>
+	<div class="next" *ngIf="!lastStep">
+		<h1>Step {{stepNum +1}}</h1>
 		<p>{{nextStep}}</p>
 	</div>
 </div>
+
+<div class="step-count">
+	<h1>Step: {{stepNum}}/{{steps.length}}</h1>
+</div>
diff --git a/recipeBuddy/src/app/cook-page/cook-page.component.ts b/recipeBuddy/src/app/cook-page/cook-page.component.ts
index 51a4c67..f114634 100644
--- a/recipeBuddy/src/app/cook-page/cook-page.component.ts
+++ b/recipeBuddy/src/app/cook-page/cook-page.component.ts
@@ -1,17 +1,20 @@
 import {Component, OnInit} from '@angular/core';
+import {Recipe} from '../DataModels/recipe';
+import {Step} from '../DataModels/step';
+import {RecipePassService} from '../recipePass/recipe-pass.service'
 
-/**
- * @title Card with multiple sections
- */
 @Component({
   selector: 'app-cook-page',
   templateUrl: './cook-page.component.html',
   styleUrls: ['./cook-page.component.css'],
 })
 export class CookPageComponent implements OnInit {
-	step: number;
-	instructions: string[] = ["Cut the bread", "Toast the bread", "Warm the butter", "Apply butter to bread", "Enjoy"];
-	timers: number[] = [5,60,30,0,0];
+	steps: Step[];
+	stepNum: number;
+
+	firstStep: boolean = true;
+	lastStep: boolean = false;
+
 	previousStep: string;
 	currentStep: string;
 	nextStep: string;
@@ -19,30 +22,62 @@ export class CookPageComponent implements OnInit {
 
 	timerInterval;
 
+	constructor(private recipePass: RecipePassService){}
+
 	ngOnInit() {
-		this.step = 1;
-		this.previousStep = "";
-		this.currentStep = this.instructions[this.step-1];
-		this.nextStep = this.instructions[this.step];
-		this.timeLeft = this.timers[this.step-1];
+		this.getSteps();
+		this.stepNum = 1;
+		this.currentStep = this.steps[this.stepNum-1].getInstruction();
+		this.nextStep = this.steps[this.stepNum].getInstruction();
+		this.timeLeft = this.steps[this.stepNum-1].getTimer();
+	}
+
+	getSteps(): void {
+/**		
+*		var recipe: Recipe;
+*		recipe = this.recipePass.getRecipe();
+*		this.steps = recipe.getSteps();
+*/
+		var tmpSteps: Step[] = [];
+		tmpSteps[0] = new Step("Cut the bread", 0);
+		tmpSteps[1] = new Step("Warm the butter", 5);
+		tmpSteps[2] = new Step("Enjoy", 0);
+		this.steps = tmpSteps;
 	}
 
 	next(): void {
+		this.firstStep = false;
 		clearInterval(this.timerInterval);
-		this.step++;
-		this.previousStep = this.instructions[this.step-2];
-		this.currentStep = this.instructions[this.step-1];
-		this.nextStep = this.instructions[this.step];
-		this.timeLeft = this.timers[this.step-1];
+		this.stepNum++;
+		if(this.stepNum == this.steps.length) {			
+			this.lastStep = true;
+		} else {
+			this.nextStep = this.steps[this.stepNum].getInstruction();
+		}
+		this.previousStep = this.steps[this.stepNum-2].getInstruction();
+		this.currentStep = this.steps[this.stepNum-1].getInstruction();
+		this.timeLeft = this.steps[this.stepNum-1].getTimer();
 	}
 
 	previous(): void {
+		this.lastStep = false;
 		clearInterval(this.timerInterval);
-		this.step--;
-		this.previousStep = this.instructions[this.step-2];
-		this.currentStep = this.instructions[this.step-1];
-		this.nextStep = this.instructions[this.step];
-		this.timeLeft = this.timers[this.step-1];
+		this.stepNum--;
+		if(this.stepNum == 1) {
+			this.firstStep = true;
+		} else {
+			this.previousStep = this.steps[this.stepNum-2].getInstruction();
+		}
+		this.currentStep = this.steps[this.stepNum-1].getInstruction();
+		this.nextStep = this.steps[this.stepNum].getInstruction();
+		this.timeLeft = this.steps[this.stepNum-1].getTimer();
+	}
+	
+	hasTimer(): boolean {
+		if(this.steps[this.stepNum - 1].getTimer() > 0)
+			return true;
+		else
+			return false;
 	}
 
 	startTimer(): void {
@@ -56,4 +91,3 @@ export class CookPageComponent implements OnInit {
 		}, 1000)
 	}
 }
-
diff --git a/recipeBuddy/src/app/cook-page/step-card/step-card.component.css b/recipeBuddy/src/app/cook-page/step-card/step-card.component.css
deleted file mode 100644
index e69de29..0000000
diff --git a/recipeBuddy/src/app/cook-page/step-card/step-card.component.html b/recipeBuddy/src/app/cook-page/step-card/step-card.component.html
deleted file mode 100644
index c3edca3..0000000
--- a/recipeBuddy/src/app/cook-page/step-card/step-card.component.html
+++ /dev/null
@@ -1 +0,0 @@
-<p>step-card works!</p>
diff --git a/recipeBuddy/src/app/cook-page/step-card/step-card.component.spec.ts b/recipeBuddy/src/app/cook-page/step-card/step-card.component.spec.ts
deleted file mode 100644
index 011bc44..0000000
--- a/recipeBuddy/src/app/cook-page/step-card/step-card.component.spec.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { StepCardComponent } from './step-card.component';
-
-describe('StepCardComponent', () => {
-  let component: StepCardComponent;
-  let fixture: ComponentFixture<StepCardComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [ StepCardComponent ]
-    })
-    .compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(StepCardComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/recipeBuddy/src/app/cook-page/step-card/step-card.component.ts b/recipeBuddy/src/app/cook-page/step-card/step-card.component.ts
deleted file mode 100644
index 6d490b7..0000000
--- a/recipeBuddy/src/app/cook-page/step-card/step-card.component.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { Component } from '@angular/core';
-
-@Component({
-  selector: 'step-card',
-  templateUrl: 'step-card.component.html',
-  styleUrls: ['step-card.component.css']
-})
-export class StepCardComponent{
-}
-- 
cgit v1.1