diff options
| -rw-r--r-- | app/routes.py | 9 | ||||
| -rw-r--r-- | app/templates/base.html | 6 | ||||
| -rw-r--r-- | app/templates/base/index.html | 69 | ||||
| -rw-r--r-- | app/templates/user/login.html | 68 | ||||
| -rw-r--r-- | app/templates/user/register.html | 68 | ||||
| -rw-r--r-- | docs/project_outline.tex | 4 |
6 files changed, 214 insertions, 10 deletions
diff --git a/app/routes.py b/app/routes.py index c162b8d..0cb9043 100644 --- a/app/routes.py +++ b/app/routes.py @@ -4,5 +4,12 @@ from flask import render_template @app.route("/", methods=["GET"]) def index(): - db = database_get() return render_template('base/index.html') + +@app.route("/login", methods=["GET"]) +def login(): + return render_template('user/login.html') + +@app.route("/register", methods=["GET"]) +def register(): + return render_template('user/register.html') diff --git a/app/templates/base.html b/app/templates/base.html index 6f23b73..3139dcd 100644 --- a/app/templates/base.html +++ b/app/templates/base.html @@ -7,7 +7,7 @@ <!-- Bulma css --> <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bulma@0.9.3/css/bulma.min.css"> - <title>Strenghty</title> + <title>Strenghty 💪</title> </head> <body> <!-- navbar --> @@ -51,8 +51,8 @@ <div class="navbar-end"> <div class="navbar-item"> <div class="buttons"> - <a class="button is-primary"><strong>Sign up</strong></a> - <a class="button is-light">Log in</a> + <a class="button is-primary" href="register"><strong>Sign up</strong></a> + <a class="button is-light" href="login">Log in</a> </div> </div> </div> diff --git a/app/templates/base/index.html b/app/templates/base/index.html index 11d266c..70f52e8 100644 --- a/app/templates/base/index.html +++ b/app/templates/base/index.html @@ -1,7 +1,68 @@ -{% extends "base.html" %} +<!doctype HTML> +<html lang="en"> + <head> + <meta charset="utf8"> + <meta name="viewport" content="width=device-width, initial-scale=1"> -{% block content %} + <!-- Bulma css --> + <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bulma@0.9.3/css/bulma.min.css"> -<b>Welcome to Strengthy</b> + <title>Strenghty 💪</title> + </head> + <body> + <!-- navbar --> + <nav class="navbar" role="navigation" aria-label="main navigation"> + <div class="navbar-brand"> + <a class="navbar-item" href="/"> + <img src="https://bulma.io/images/bulma-logo.png" width="112" height="28"> + </a> -{% endblock %} + <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 id="navbarBasicExample" class="navbar-menu"> + <div class="navbar-start"> + <a class="navbar-item"> + Start a Workout + </a> + + <a class="navbar-item"> + Progress + </a> + + <div class="navbar-item has-dropdown is-hoverable"> + <a class="navbar-link"> + More + </a> + + <div class="navbar-dropdown"> + <a class="navbar-item"> + TODO + </a> + </div> + </div> + </div> + + <!-- TODO: change based on login state --> + <div class="navbar-end"> + <div class="navbar-item"> + <div class="buttons"> + <a class="button is-primary" href="register"><strong>Sign up</strong></a> + <a class="button is-light" href="login">Log in</a> + </div> + </div> + </div> + </div> + </nav> + + <!-- Actual content --> + {% block content %}{% endblock %} + <p>This is the index page.</html> + +<!-- TODO: footer --> + </body> + </html> diff --git a/app/templates/user/login.html b/app/templates/user/login.html index e69de29..350449a 100644 --- a/app/templates/user/login.html +++ b/app/templates/user/login.html @@ -0,0 +1,68 @@ +<!doctype HTML> +<html lang="en"> + <head> + <meta charset="utf8"> + <meta name="viewport" content="width=device-width, initial-scale=1"> + + <!-- Bulma css --> + <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bulma@0.9.3/css/bulma.min.css"> + + <title>Strenghty 💪</title> + </head> + <body> + <!-- navbar --> + <nav class="navbar" role="navigation" aria-label="main navigation"> + <div class="navbar-brand"> + <a class="navbar-item" href="/"> + <img src="https://bulma.io/images/bulma-logo.png" width="112" height="28"> + </a> + + <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 id="navbarBasicExample" class="navbar-menu"> + <div class="navbar-start"> + <a class="navbar-item"> + Start a Workout + </a> + + <a class="navbar-item"> + Progress + </a> + + <div class="navbar-item has-dropdown is-hoverable"> + <a class="navbar-link"> + More + </a> + + <div class="navbar-dropdown"> + <a class="navbar-item"> + TODO + </a> + </div> + </div> + </div> + + <!-- TODO: change based on login state --> + <div class="navbar-end"> + <div class="navbar-item"> + <div class="buttons"> + <a class="button is-primary" href="register"><strong>Sign up</strong></a> + <a class="button is-light" href="login">Log in</a> + </div> + </div> + </div> + </div> + </nav> + + <!-- Actual content --> + {% block content %}{% endblock %} + <p>This is the login page.</p> + + <!-- TODO: footer --> + </body> +</html> diff --git a/app/templates/user/register.html b/app/templates/user/register.html index e69de29..e63ed06 100644 --- a/app/templates/user/register.html +++ b/app/templates/user/register.html @@ -0,0 +1,68 @@ +<!doctype HTML> +<html lang="en"> + <head> + <meta charset="utf8"> + <meta name="viewport" content="width=device-width, initial-scale=1"> + + <!-- Bulma css --> + <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bulma@0.9.3/css/bulma.min.css"> + + <title>Strenghty 💪</title> + </head> + <body> + <!-- navbar --> + <nav class="navbar" role="navigation" aria-label="main navigation"> + <div class="navbar-brand"> + <a class="navbar-item" href="/"> + <img src="https://bulma.io/images/bulma-logo.png" width="112" height="28"> + </a> + + <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 id="navbarBasicExample" class="navbar-menu"> + <div class="navbar-start"> + <a class="navbar-item"> + Start a Workout + </a> + + <a class="navbar-item"> + Progress + </a> + + <div class="navbar-item has-dropdown is-hoverable"> + <a class="navbar-link"> + More + </a> + + <div class="navbar-dropdown"> + <a class="navbar-item"> + TODO + </a> + </div> + </div> + </div> + + <!-- TODO: change based on login state --> + <div class="navbar-end"> + <div class="navbar-item"> + <div class="buttons"> + <a class="button is-primary" href="register"><strong>Sign up</strong></a> + <a class="button is-light" href="login">Log in</a> + </div> + </div> + </div> + </div> + </nav> + + <!-- Actual content --> + {% block content %}{% endblock %} + <p>This is the register page.</p> + + <!-- TODO: footer --> + </body> +</html> diff --git a/docs/project_outline.tex b/docs/project_outline.tex index ad94cc2..c822d12 100644 --- a/docs/project_outline.tex +++ b/docs/project_outline.tex @@ -106,7 +106,7 @@ The web application will be developed in Python using the Flask framework. A dat \begin{description} \item[Description] Users will be able to change their password. \item[Rational] Allow users to use whichever password they want. - \item[Inputs] USer inputs old and new password in a form. + \item[Inputs] User inputs old and new password in a form. \item[Outputs] User's password is updated in the database. \item[Dependencies] User will need to be logged in. \end{description} @@ -132,7 +132,7 @@ The web application will be developed in Python using the Flask framework. A dat \subsection{Req. 6 - User Homepage} \begin{description} \item[Description] When a user is logged in, they will be presented with a homepage suggesting to create a goal, view predictions, view past records, and record a new workout. - \item[Rational] New users need to learn what the application is, and why they might be interested in using it. + \item[Rational] Users need to be able to view their workouts and information. \item[Inputs] Login State from User Account Management \item[Outputs] A HTML Page as described above \item[Dependencies] User will need to be logged in |