Merge branch 'master' of stilbruch.xyz:strengthy

5 files changed, 68 insertions, 34 deletions

diff --git a/app/templates/base/form.html b/app/templates/base/form.html
index 72083ae..9f356e0 100644
--- a/app/templates/base/form.html
+++ b/app/templates/base/form.html
@@ -4,7 +4,7 @@
 	<div class="container">
 		<div class="columns is-centered">
 			<div class="column {{ column_classes }}">
-				<h1 class="title is-2">{{ title }}</h1>
+				<h1 class="title is-2">{% block title %}{% endblock %}</h1>
 
 				<!-- TODO: render errors -->
 				{% with messages = get_flashed_messages(with_categories=true) %}
diff --git a/app/templates/base/layout.html b/app/templates/base/layout.html
index 89ad385..fe83440 100644
--- a/app/templates/base/layout.html
+++ b/app/templates/base/layout.html
@@ -47,7 +47,7 @@
 							</span>
 
 							<span class="navbar-item">
-								<a class="button is-white is-outlined" href="/workout/record">
+								<a class="button is-white is-outlined" href="/workout/select">
 									<span class="icon">
 										<i class="fa fa-pencil"></i>
 									</span>
diff --git a/app/templates/home.html b/app/templates/home.html
index 9f8dfe9..c9aa90d 100644
--- a/app/templates/home.html
+++ b/app/templates/home.html
@@ -79,7 +79,7 @@
 												</p>
 											</section>
 											<footer class="modal-card-foot">
-												<button class="button is-danger">Confirm</button>
+												<a href="/api/workout/delete?id={{ workout.id }}" class="button is-danger">Confirm</a>
 												<button class="button">Cancel</button>
 											</footer>
 										</div>
diff --git a/app/templates/workout/record.html b/app/templates/workout/record.html
index 1a544fc..94fe611 100644
--- a/app/templates/workout/record.html
+++ b/app/templates/workout/record.html
@@ -1,37 +1,48 @@
-{% extends 'base/layout.html' %}
+{% extends 'base/form.html' %}
 
-{% block content %}
+{% block title %}Record {{ workout.name }}{% endblock %}
 
-<div class="continer">
-	<div class="columns is-centered">
-		<div class="column">
-			<h1 class="title is-2">Leg Day</h1>
-			<div class="box">
-				<div class="tabs is-fullwidth">
-				  <ul>
-				    <li>
-				      <a>
-				        <span class="icon"><i class="fas fa-angle-left" aria-hidden="true"></i></span>
-				        <span>Left</span>
-				      </a>
-				    </li>
-				    <li>
-				      <a>
-				        <span class="icon"><i class="fas fa-angle-up" aria-hidden="true"></i></span>
-				        <span>Up</span>
-				      </a>
-				    </li>
-				    <li>
-				      <a>
-				        <span>Right</span>
-				        <span class="icon"><i class="fas fa-angle-right" aria-hidden="true"></i></span>
-				      </a>
-				    </li>
-				  </ul>
-				</div>
-			</div>
-		</div>
+{% block form %}
+{% for exercise in workout.exercises %}
+<div>
+	<h1 id="{{ exercise.name }}" class="title is-4 has-text-black">{{ exercise.name }}</h1>
+	<table class="table is-fullwidth is-hoverable">
+		<thead>
+			<th>Set</th>
+			<th>lbs</th>
+			<th>Reps</th>
+			<th>Done</th>
+		</thead>
+		<tbody>
+			{% for i in range(exercise.sets) %}
+				<tr>
+					<th>{{ i + 1 }}</th>
+					<td><input class="input" type="number"></td>
+					<td><input class="input" type="number"></td>
+					<td>
+						<a class="button" onClick="onClickSetCheck(this)">
+							<span class="icon is-small">
+								<i class="fa fa-check"></i>
+							</span>
+						</a>
+					</td>
+				</tr>
+			{% endfor %}
+		</tbody>
+	</table>
+	<div class="buttons is-centered">
+		<a class="button is-primary" onClick="onClickAddSet(this)">
+			<span class="icon is-small">
+				<i class="fa fa-plus"></i>
+			</span>
+			<span>Add Set</span>
+		</a>
+		<a class="button is-danger">Skip</a>
 	</div>
+	<hr>
 </div>
+{% endfor %}
+
+<script async type="text/javascript" src="/static/js/record.js"></script>
 
 {% endblock %}
diff --git a/app/templates/workout/select.html b/app/templates/workout/select.html
new file mode 100644
index 0000000..c01a4f8
--- /dev/null
+++ b/app/templates/workout/select.html
@@ -0,0 +1,23 @@
+{% extends 'base/layout.html' %}
+
+{% block content %}
+<div class="continer">
+	<div class="columns is-centered">
+		{% for workout in current_user.workouts %}
+			<div class="column">
+				<div class="card">
+					<header class="card-header">
+						<p class="card-header-title"> {{ workout.name }}</p>
+					</header>
+					<div class="card-content">
+						<div class="content">
+							<a class="button" href="/workout/record?id={{ workout.id }}">Start</a>
+						</div>
+					</div>
+				</div>
+			</div>
+		{% endfor %}
+	</div>
+</div>
+
+{% endblock %}