Skip to content
Snippets Groups Projects
Commit 460f4ef0 authored by Brian Wood's avatar Brian Wood
Browse files

Updates

parent d957e4d2
No related branches found
No related tags found
No related merge requests found
...@@ -13,7 +13,6 @@ def login(): ...@@ -13,7 +13,6 @@ def login():
password = request.form['password'] password = request.form['password']
user = User.validateUser(email, password) user = User.validateUser(email, password)
print 'here'
if user is not None: if user is not None:
session['user'] = user.toJSON() session['user'] = user.toJSON()
...@@ -51,3 +50,9 @@ def signup(): ...@@ -51,3 +50,9 @@ def signup():
error = "The passwords you entered did not match. Please try again." error = "The passwords you entered did not match. Please try again."
return render_template('login/signup.html', error=error, email=email) return render_template('login/signup.html', error=error, email=email)
return render_template('login/signup.html') return render_template('login/signup.html')
@app.route('/logout', methods=['GET', 'POST'])
def logout():
if 'user' in session:
session.pop('user')
return redirect(url_for('start'))
{% extends "usernav.html" %} {% extends "usernav.html" if user else 'index.html'%}
{% block content %} {% block content %}
<div class="col-sm-12"> <div class="col-sm-12">
<div class="jumbotron"> <div class="jumbotron">
......
{% extends "index.html" %} {% extends "usernav.html" %}
{% block content %} {% block content %}
<div class="col-sm-12"> <div class="col-sm-12">
<h3>My Libraries</h3> <h3>My Libraries</h3>
......
{% extends "index.html" %} {% extends "index.html" %}
{% block usernav %}
{% block usernav if user %}
<p class="navbar-text">Hello, {{ user.email }}</p> <p class="navbar-text">Hello, {{ user.email }}</p>
<ul class="nav navbar-nav navbar-right"> <ul class="nav navbar-nav navbar-right">
<li><a href="{{ url_for('libraries') }}">Libraries</a></li> <li><a href="{{ url_for('libraries') }}">Libraries</a></li>
<li><a href="{{ url_for('movies') }}">Movies</a></li> <li><a href="{{ url_for('movies') }}">Movies</a></li>
<li><a href="#">Loaned Out</a></li> <li><a href="{{ url_for('loaned') }}">Loaned Out</a></li>
<li><a href="#">Logout</a></li> <li><a href="{{ url_for('logout') }}">Logout</a></li>
</ul> </ul>
{% endblock %} {% endblock %}
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment