Merge branch 'master' into main-page-in-progresstest-main

1 files changed, 13 insertions, 9 deletions

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>