Update layout

author: stilbruch <stilbruch@protonmail.com> 2022-04-06 11:24:44 -0500
committer: stilbruch <stilbruch@protonmail.com> 2022-04-06 11:24:44 -0500
commit: afc5d4f9b6d7e5dffcded802552d817ccfbfb960 (patch)
tree: ab505aeefafbb5ed975753a17d5fae4b3ec9be19 /app
parent: 80a35cac95eb206080636ed3bb2c1c0895c95fd4 (diff)
download: Strengthy-afc5d4f9b6d7e5dffcded802552d817ccfbfb960.tar.xz
Strengthy-afc5d4f9b6d7e5dffcded802552d817ccfbfb960.zip
3 files changed, 101 insertions, 91 deletions
diff --git a/app/templates/base/form.html b/app/templates/base/form.html
index 22f926b..9f356e0 100644
--- a/app/templates/base/form.html
+++ b/app/templates/base/form.html
@@ -1,37 +1,31 @@
 {% extends 'base/layout.html' %}
 
 {% block content %}
-<div class="form">
-	<section class="hero is-primary is-fullheight-with-navbar gym-background">
-		<div class="hero-body">
-			<div class="container">
-				<div class="columns is-centered">
-					<div class="column {{ column_classes }}">
-						<h1 class="title is-2">{% block title %}{% endblock %}</h1>
+	<div class="container">
+		<div class="columns is-centered">
+			<div class="column {{ column_classes }}">
+				<h1 class="title is-2">{% block title %}{% endblock %}</h1>
 
-						<!-- TODO: render errors -->
-						{% with messages = get_flashed_messages(with_categories=true) %}
-						{% if messages %}
-						{% for category, message in messages %}
-							{% if category == "message" %}
-								<div class="notification is-info">
-							{% else %}
-								<div class="notification is-{{ category }}">
-							{% endif %}
-								{{ message }}
-							</div>
-						{% endfor %}
-						{% endif %}
-						{% endwith %}
-
-						<form method="POST" class="box">
-							{{ form.csrf_token }}
-							{% block form %}{% endblock %}
-						</form>
+				<!-- TODO: render errors -->
+				{% with messages = get_flashed_messages(with_categories=true) %}
+				{% if messages %}
+				{% for category, message in messages %}
+					{% if category == "message" %}
+						<div class="notification is-info">
+					{% else %}
+						<div class="notification is-{{ category }}">
+					{% endif %}
+						{{ message }}
 					</div>
-				</div>
+				{% endfor %}
+				{% endif %}
+				{% endwith %}
+
+				<form method="POST" class="box">
+					{{ form.csrf_token }}
+					{% block form %}{% endblock %}
+				</form>
 			</div>
 		</div>
-	</section>
-</div>
+	</div>
 {% endblock %}
diff --git a/app/templates/base/layout.html b/app/templates/base/layout.html
index 8e2b979..d33515e 100644
--- a/app/templates/base/layout.html
+++ b/app/templates/base/layout.html
@@ -18,65 +18,86 @@
 	<title>Strenghty 💪</title>
 </head>
 <body>
-	<!-- navbar -->
-	<nav class="navbar" role="navigation" aria-label="main navigation">
-		<div class="navbar-brand">
-			<a class="navbar-item">
-				<img src="/static/favicon/apple-touch-icon.png">
-			</a>
-			</div>
-
-			<a role="button" class="navbar-burger" aria-label="menu" aria-expanded="false" data-target="navbarBasicExample">
-				<span aria-hidden="true"></span>
-				<span aria-hidden="true"></span>
-				<span aria-hidden="true"></span>
-			</a>
-		</div>
-
-		<div class="navbar-menu">
-			<div class="navbar-start">
-				{% if current_user.is_authenticated %}
-					<a href="/home" class="navbar-item">
-						Home
+	<section class="hero is-info is-fullheight gym-background">
+		<div class="hero-head">
+			<nav class="navbar">
+				<div class="navbar-brand">
+					<a class="navbar-item" href="../">
+						<img src="/static/favicon/apple-touch-icon.png" alt="Logo">
 					</a>
+					<span class="navbar-burger burger" data-target="navbarMenu">
+						<span></span>
+						<span></span>
+						<span></span>
+					</span>
+				</div>
 
-					<a href="workout/create" class="navbar-item">
-						Record a Workout
-					</a>
+				<div class="navbar-menu">
+					<div class="navbar-start">
+						{% if current_user.is_authenticated %}
+							<span class="navbar-item">
+								<a class="button is-white is-outlined" href="/home">
+									<span class="icon">
+										<i class="fa fa-home"></i>
+									</span>
+									<span>Home</span>
+								</a>
+							</span>
 
-					<div class="navbar-item has-dropdown is-hoverable">
-						<a class="navbar-link">
-							Manage Workouts
-						</a>
+							<span class="navbar-item">
+								<a class="button is-white is-outlined" href="#">
+									<span class="icon">
+										<i class="fa fa-pencil"></i>
+									</span>
+									<span>Record a Workout</span>
+								</a>
+							</span>
 
-						<div class="navbar-dropdown">
-							<a class="navbar-item">
-								Create New Workout
-							</a>
-						</div>
+							<span class="navbar-item">
+								<a class="button is-white is-outlined" href="#">
+									<span class="icon">
+										<i class="fa fa-file-pen"></i>
+									</span>
+									<span>Manage Workouts</span>
+								</a>
+							</span>
+						{% endif %}
 					</div>
-				{% endif %}
 
-				<!-- TODO: divider and list workouts -->
-				</div>
-			</div>
-
-			<div class="navbar-end">
-				<div class="navbar-item">
-					<div class="buttons">
+					<div class="navbar-end">
 						{% if current_user.is_authenticated %}
-							<a class="button is-light" href="/logout">Log Out</a>
+							<span class="navbar-item">
+								<a class="button is-white is-outlined" href="/logout">
+									<span>Log Out</span>
+								</a>
+							</span>
 						{% else %}
-							<a class="button is-primary" href="/register"><strong>Sign Up</strong></a>
-							<a class="button is-light" href="/login">Log In</a>
+							<span class="navbar-item">
+								<a class="button is-white is-outlined" href="/login">
+									<span class="icon">
+										<i class="fa fa-user"></i>
+									</span>
+									<span>Login</span>
+								</a>
+							</span>
+							<span class="navbar-item">
+								<a class="button is-white is-outlined" href="/register">
+									<span class="icon">
+										<i class="fa fa-pencil"></i>
+									</span>
+									<span>Sign Up</span>
+								</a>
+							</span>
 						{% endif %}
 					</div>
 				</div>
-			</div>
+			</nav>
 		</div>
-	</nav>
 
-	{% block content %}{% endblock %}
+		<div class="hero-body">
+			{% block content %}{% endblock %}
+		</div>
+	</section>
 
 	<!-- TODO: footer -->
 </body>
diff --git a/app/templates/index.html b/app/templates/index.html
index e3bf978..b48ce9f 100644
--- a/app/templates/index.html
+++ b/app/templates/index.html
@@ -2,22 +2,17 @@
 
 {% block content %}
 
-<section class="hero is-info is-fullheight-with-navbar gym-background">
-	<div class="hero-body">
-		<div class="container has-text-centered">
-			<div class="column is-6 is-offset-3">
-				<h1 class="title">
-					Welcome to Strengthy
-				</h1>
-				<h1 class="subtitle">
-					Strenghty is an open source fitness tracking application that
-					helps users meet their fitness goals. To get started,
-					<a href="/register">Sign Up</a> to create an account.
-				</h1>
-			</div>
-		</div>
+<div class="container has-text-centered">
+	<div class="column is-6 is-offset-3">
+		<h1 class="title">
+			Welcome to Strengthy
+		</h1>
+		<h2 class="subtitle">
+			Strenghty is an open source fitness tracking application that
+			helps users meet their fitness goals. To get started,
+			<a href="/register">Sign Up</a> to create an account.
+		</h2>
 	</div>
-
-</section>
+</div>
 
 {% endblock %}
author	stilbruch <stilbruch@protonmail.com>	2022-04-06 11:24:44 -0500
committer	stilbruch <stilbruch@protonmail.com>	2022-04-06 11:24:44 -0500
commit	afc5d4f9b6d7e5dffcded802552d817ccfbfb960 (patch)
tree	ab505aeefafbb5ed975753a17d5fae4b3ec9be19 /app
parent	80a35cac95eb206080636ed3bb2c1c0895c95fd4 (diff)
download	Strengthy-afc5d4f9b6d7e5dffcded802552d817ccfbfb960.tar.xz Strengthy-afc5d4f9b6d7e5dffcded802552d817ccfbfb960.zip